Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
ebedbfe7
Unverified
Commit
ebedbfe7
authored
Jun 07, 2021
by
Ralph Pichler
Committed by
GitHub
Jun 07, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add more metrics to accounting and settlements (#2013)
parent
2c5f15be
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
51 additions
and
5 deletions
+51
-5
go.mod
go.mod
+1
-1
accounting.go
pkg/accounting/accounting.go
+2
-0
metrics.go
pkg/accounting/metrics.go
+7
-0
metrics.go
pkg/settlement/pseudosettle/metrics.go
+32
-4
pseudosettle.go
pkg/settlement/pseudosettle/pseudosettle.go
+9
-0
No files found.
go.mod
View file @
ebedbfe7
...
...
@@ -76,6 +76,6 @@ require (
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.0.1-2020.1.4 // indirect
resenje.org/singleflight v0.2.0
// indirect
resenje.org/singleflight v0.2.0
resenje.org/web v0.4.3
)
pkg/accounting/accounting.go
View file @
ebedbfe7
...
...
@@ -163,6 +163,8 @@ func (a *Accounting) Reserve(ctx context.Context, peer swarm.Address, price uint
accountingPeer
.
lock
.
Lock
()
defer
accountingPeer
.
lock
.
Unlock
()
a
.
metrics
.
AccountingReserveCount
.
Inc
()
currentBalance
,
err
:=
a
.
Balance
(
peer
)
if
err
!=
nil
{
if
!
errors
.
Is
(
err
,
ErrPeerNoBalance
)
{
...
...
pkg/accounting/metrics.go
View file @
ebedbfe7
...
...
@@ -19,6 +19,7 @@ type metrics struct {
CreditEventsCount
prometheus
.
Counter
AccountingDisconnectsCount
prometheus
.
Counter
AccountingBlocksCount
prometheus
.
Counter
AccountingReserveCount
prometheus
.
Counter
}
func
newMetrics
()
metrics
{
...
...
@@ -61,6 +62,12 @@ func newMetrics() metrics {
Name
:
"accounting_blocks_count"
,
Help
:
"Number of occurrences of temporarily skipping a peer to avoid crossing their disconnect thresholds"
,
}),
AccountingReserveCount
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"accounting_reserve_count"
,
Help
:
"Number of reserve calls"
,
}),
}
}
...
...
pkg/settlement/pseudosettle/metrics.go
View file @
ebedbfe7
...
...
@@ -13,8 +13,12 @@ type metrics struct {
// all metrics fields must be exported
// to be able to return them by Metrics()
// using reflection
TotalReceivedPseudoSettlements
prometheus
.
Counter
TotalSentPseudoSettlements
prometheus
.
Counter
TotalReceivedPseudoSettlements
prometheus
.
Counter
TotalSentPseudoSettlements
prometheus
.
Counter
ReceivedPseudoSettlements
prometheus
.
Counter
SentPseudoSettlements
prometheus
.
Counter
ReceivedPseudoSettlementsErrors
prometheus
.
Counter
SentPseudoSettlementsErrors
prometheus
.
Counter
}
func
newMetrics
()
metrics
{
...
...
@@ -25,13 +29,37 @@ func newMetrics() metrics {
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"total_received_pseudosettlements"
,
Help
:
"Amount of
pseudotoken
s received from peers (income of the node)"
,
Help
:
"Amount of
time settlement
s received from peers (income of the node)"
,
}),
TotalSentPseudoSettlements
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"total_sent_pseudosettlements"
,
Help
:
"Amount of pseudotokens sent to peers (costs paid by the node)"
,
Help
:
"Amount of of time settlements sent to peers (costs paid by the node)"
,
}),
ReceivedPseudoSettlements
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"received_pseudosettlements"
,
Help
:
"Number of time settlements received from peers"
,
}),
SentPseudoSettlements
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"sent_pseudosettlements"
,
Help
:
"Number of time settlements sent to peers"
,
}),
ReceivedPseudoSettlementsErrors
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"received_pseudosettlements_errors"
,
Help
:
"Errors of time settlements received from peers"
,
}),
SentPseudoSettlementsErrors
:
prometheus
.
NewCounter
(
prometheus
.
CounterOpts
{
Namespace
:
m
.
Namespace
,
Subsystem
:
subsystem
,
Name
:
"sent_pseudosettlements_errorss"
,
Help
:
"Errors of time settlements sent to peers"
,
}),
}
}
...
...
pkg/settlement/pseudosettle/pseudosettle.go
View file @
ebedbfe7
...
...
@@ -163,6 +163,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
defer
func
()
{
if
err
!=
nil
{
_
=
stream
.
Reset
()
s
.
metrics
.
ReceivedPseudoSettlementsErrors
.
Inc
()
}
else
{
go
stream
.
FullClose
()
}
...
...
@@ -230,6 +231,7 @@ func (s *Service) handler(ctx context.Context, p p2p.Peer, stream p2p.Stream) (e
receivedPaymentF64
,
_
:=
big
.
NewFloat
(
0
)
.
SetInt
(
paymentAmount
)
.
Float64
()
s
.
metrics
.
TotalReceivedPseudoSettlements
.
Add
(
receivedPaymentF64
)
s
.
metrics
.
ReceivedPseudoSettlements
.
Inc
()
return
s
.
accounting
.
NotifyRefreshmentReceived
(
p
.
Address
,
paymentAmount
)
}
...
...
@@ -240,6 +242,12 @@ func (s *Service) Pay(ctx context.Context, peer swarm.Address, amount *big.Int,
var
err
error
defer
func
()
{
if
err
!=
nil
{
s
.
metrics
.
ReceivedPseudoSettlementsErrors
.
Inc
()
}
}()
var
lastTime
lastPayment
err
=
s
.
store
.
Get
(
totalKey
(
peer
,
SettlementSentPrefix
),
&
lastTime
)
if
err
!=
nil
{
...
...
@@ -339,6 +347,7 @@ func (s *Service) Pay(ctx context.Context, peer swarm.Address, amount *big.Int,
amountFloat
,
_
:=
new
(
big
.
Float
)
.
SetInt
(
acceptedAmount
)
.
Float64
()
s
.
metrics
.
TotalSentPseudoSettlements
.
Add
(
amountFloat
)
s
.
metrics
.
SentPseudoSettlements
.
Inc
()
return
acceptedAmount
,
lastTime
.
CheckTimestamp
,
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment