Skip to content

Commit 49d2b0d

Browse files
ezdacezdac
committed
gnosis-keyper: move metrics to package
1 parent ac86575 commit 49d2b0d

File tree

6 files changed

+34
-29
lines changed

6 files changed

+34
-29
lines changed

‎rolling-shutter/keyperimpl/gnosis/handlers.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
1717
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
1818
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/gnosisssztypes"
19+
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/metrics"
1920
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
2021
"github.com/shutter-network/rolling-shutter/rolling-shutter/p2pmsg"
2122
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
@@ -338,7 +339,7 @@ func (h *DecryptionKeysHandler) HandleMessage(ctx context.Context, msg p2pmsg.Me
338339
}
339340

340341
eonString := fmt.Sprint(keys.Eon)
341-
metricsTxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
342-
metricsTxPointerAge.WithLabelValues(eonString).Set(0)
342+
metrics.TxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
343+
metrics.TxPointerAge.WithLabelValues(eonString).Set(0)
343344
return []p2pmsg.Message{}, nil
344345
}

‎rolling-shutter/keyperimpl/gnosis/messagingmiddleware.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/config"
1919
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
2020
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/gnosisssztypes"
21+
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/metrics"
2122
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
2223
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
2324
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/retry"
@@ -189,7 +190,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeyShares(
189190
)
190191
slotStartTime := time.Unix(int64(slotStartTimestamp), 0)
191192
delta := time.Since(slotStartTime)
192-
metricsKeySharesSentTimeDelta.WithLabelValues(fmt.Sprint(originalMsg.Eon)).Observe(delta.Seconds())
193+
metrics.KeySharesSentTimeDelta.WithLabelValues(fmt.Sprint(originalMsg.Eon)).Observe(delta.Seconds())
193194
return msg, nil
194195
}
195196

@@ -279,7 +280,7 @@ func (i *MessagingMiddleware) interceptDecryptionKeys(
279280
)
280281
slotStartTime := time.Unix(int64(slotStartTimestamp), 0)
281282
delta := time.Since(slotStartTime)
282-
metricsKeysSentTimeDelta.WithLabelValues(fmt.Sprint(originalMsg.Eon)).Observe(delta.Seconds())
283+
metrics.KeysSentTimeDelta.WithLabelValues(fmt.Sprint(originalMsg.Eon)).Observe(delta.Seconds())
283284
return msg, nil
284285
}
285286

@@ -309,7 +310,7 @@ func (i *MessagingMiddleware) advanceTxPointer(ctx context.Context, msg *p2pmsg.
309310
return errors.Wrap(err, "failed to set tx pointer")
310311
}
311312
eonString := fmt.Sprint(msg.Eon)
312-
metricsTxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
313-
metricsTxPointerAge.WithLabelValues(eonString).Set(0)
313+
metrics.TxPointer.WithLabelValues(eonString).Set(float64(newTxPointer))
314+
metrics.TxPointerAge.WithLabelValues(eonString).Set(0)
314315
return nil
315316
}

‎rolling-shutter/keyperimpl/gnosis/metrics.go renamed to ‎rolling-shutter/keyperimpl/gnosis/metrics/metrics.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package gnosis
1+
package metrics
22

33
import "github.com/prometheus/client_golang/prometheus"
44

5-
var metricsTxPointer = prometheus.NewGaugeVec(
5+
var TxPointer = prometheus.NewGaugeVec(
66
prometheus.GaugeOpts{
77
Namespace: "shutter",
88
Subsystem: "gnosis",
@@ -12,7 +12,7 @@ var metricsTxPointer = prometheus.NewGaugeVec(
1212
[]string{"eon"},
1313
)
1414

15-
var metricsTxPointerAge = prometheus.NewGaugeVec(
15+
var TxPointerAge = prometheus.NewGaugeVec(
1616
prometheus.GaugeOpts{
1717
Namespace: "shutter",
1818
Subsystem: "gnosis",
@@ -22,7 +22,7 @@ var metricsTxPointerAge = prometheus.NewGaugeVec(
2222
[]string{"eon"},
2323
)
2424

25-
var metricsLatestTxSubmittedEventIndex = prometheus.NewGaugeVec(
25+
var LatestTxSubmittedEventIndex = prometheus.NewGaugeVec(
2626
prometheus.GaugeOpts{
2727
Namespace: "shutter",
2828
Subsystem: "gnosis",
@@ -32,7 +32,7 @@ var metricsLatestTxSubmittedEventIndex = prometheus.NewGaugeVec(
3232
[]string{"eon"},
3333
)
3434

35-
var metricsTxSubmittedEventsSyncedUntil = prometheus.NewGauge(
35+
var TxSubmittedEventsSyncedUntil = prometheus.NewGauge(
3636
prometheus.GaugeOpts{
3737
Namespace: "shutter",
3838
Subsystem: "gnosis",
@@ -41,7 +41,7 @@ var metricsTxSubmittedEventsSyncedUntil = prometheus.NewGauge(
4141
},
4242
)
4343

44-
var metricsValidatorRegistrationsSyncedUntil = prometheus.NewGauge(
44+
var ValidatorRegistrationsSyncedUntil = prometheus.NewGauge(
4545
prometheus.GaugeOpts{
4646
Namespace: "shutter",
4747
Subsystem: "gnosis",
@@ -50,7 +50,7 @@ var metricsValidatorRegistrationsSyncedUntil = prometheus.NewGauge(
5050
},
5151
)
5252

53-
var metricsNumValidatorRegistrations = prometheus.NewGauge(
53+
var NumValidatorRegistrations = prometheus.NewGauge(
5454
prometheus.GaugeOpts{
5555
Namespace: "shutter",
5656
Subsystem: "gnosis",
@@ -61,7 +61,7 @@ var metricsNumValidatorRegistrations = prometheus.NewGauge(
6161

6262
var slotTimeDeltaBuckets = []float64{-5, -4.5, -4.0, -3.5, -3.0, -2.5, -2.0, -1.5, -1.0, -0.5, -0, 1.0, 100}
6363

64-
var metricsKeysSentTimeDelta = prometheus.NewHistogramVec(
64+
var KeysSentTimeDelta = prometheus.NewHistogramVec(
6565
prometheus.HistogramOpts{
6666
Namespace: "shutter",
6767
Subsystem: "gnosis",
@@ -72,7 +72,7 @@ var metricsKeysSentTimeDelta = prometheus.NewHistogramVec(
7272
[]string{"eon"},
7373
)
7474

75-
var metricsKeySharesSentTimeDelta = prometheus.NewHistogramVec(
75+
var KeySharesSentTimeDelta = prometheus.NewHistogramVec(
7676
prometheus.HistogramOpts{
7777
Namespace: "shutter",
7878
Subsystem: "gnosis",
@@ -84,12 +84,12 @@ var metricsKeySharesSentTimeDelta = prometheus.NewHistogramVec(
8484
)
8585

8686
func init() {
87-
prometheus.MustRegister(metricsTxPointer)
88-
prometheus.MustRegister(metricsTxPointerAge)
89-
prometheus.MustRegister(metricsLatestTxSubmittedEventIndex)
90-
prometheus.MustRegister(metricsTxSubmittedEventsSyncedUntil)
91-
prometheus.MustRegister(metricsValidatorRegistrationsSyncedUntil)
92-
prometheus.MustRegister(metricsNumValidatorRegistrations)
93-
prometheus.MustRegister(metricsKeysSentTimeDelta)
94-
prometheus.MustRegister(metricsKeySharesSentTimeDelta)
87+
prometheus.MustRegister(TxPointer)
88+
prometheus.MustRegister(TxPointerAge)
89+
prometheus.MustRegister(LatestTxSubmittedEventIndex)
90+
prometheus.MustRegister(TxSubmittedEventsSyncedUntil)
91+
prometheus.MustRegister(ValidatorRegistrationsSyncedUntil)
92+
prometheus.MustRegister(NumValidatorRegistrations)
93+
prometheus.MustRegister(KeysSentTimeDelta)
94+
prometheus.MustRegister(KeySharesSentTimeDelta)
9595
}

‎rolling-shutter/keyperimpl/gnosis/newslot.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
corekeyperdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/database"
2020
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyper/epochkghandler"
2121
gnosisdatabase "github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
22+
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/metrics"
2223
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
2324
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/broker"
2425
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/identitypreimage"
@@ -217,8 +218,8 @@ func getTxPointer(ctx context.Context, db *pgxpool.Pool, eon int64, maxTxPointer
217218
return 0, errors.Wrap(err, "failed to query transaction submitted event count from db")
218219
}
219220
}
220-
metricsTxPointer.WithLabelValues(eonString).Set(float64(txPointer))
221-
metricsTxPointerAge.WithLabelValues(eonString).Set(float64(txPointerAge))
221+
metrics.TxPointer.WithLabelValues(eonString).Set(float64(txPointer))
222+
metrics.TxPointerAge.WithLabelValues(eonString).Set(float64(txPointerAge))
222223
return txPointer, nil
223224
}
224225

‎rolling-shutter/keyperimpl/gnosis/sequencersyncer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
sequencerBindings "github.com/shutter-network/gnosh-contracts/gnoshcontracts/sequencer"
1818

1919
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
20+
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/metrics"
2021
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
2122
"github.com/shutter-network/rolling-shutter/rolling-shutter/shdb"
2223
)
@@ -182,7 +183,7 @@ func (s *SequencerSyncer) syncRange(
182183
Int("num-inserted-events", len(filteredEvents)).
183184
Int("num-discarded-events", len(events)-len(filteredEvents)).
184185
Msg("synced sequencer contract")
185-
metricsTxSubmittedEventsSyncedUntil.Set(float64(end))
186+
metrics.TxSubmittedEventsSyncedUntil.Set(float64(end))
186187
return nil
187188
}
188189

@@ -254,7 +255,7 @@ func (s *SequencerSyncer) insertTransactionSubmittedEvents(
254255
if err != nil {
255256
return errors.Wrap(err, "failed to insert transaction submitted event into db")
256257
}
257-
metricsLatestTxSubmittedEventIndex.WithLabelValues(fmt.Sprint(event.Eon)).Set(float64(event.TxIndex))
258+
metrics.LatestTxSubmittedEventIndex.WithLabelValues(fmt.Sprint(event.Eon)).Set(float64(event.TxIndex))
258259
log.Debug().
259260
Uint64("index", event.TxIndex).
260261
Uint64("block", event.Raw.BlockNumber).

‎rolling-shutter/keyperimpl/gnosis/validatorsyncer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
blst "github.com/supranational/blst/bindings/go"
1919

2020
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/database"
21+
"github.com/shutter-network/rolling-shutter/rolling-shutter/keyperimpl/gnosis/metrics"
2122
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley"
2223
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/beaconapiclient"
2324
"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/validatorregistry"
@@ -107,8 +108,8 @@ func (v *ValidatorSyncer) syncRange(ctx context.Context, start, end uint64) erro
107108
Int("num-discarded-events", len(events)-len(filteredEvents)).
108109
Int64("num-registrations", numRegistrations).
109110
Msg("synced validator registry")
110-
metricsNumValidatorRegistrations.Set(float64(numRegistrations))
111-
metricsValidatorRegistrationsSyncedUntil.Set(float64(end))
111+
metrics.NumValidatorRegistrations.Set(float64(numRegistrations))
112+
metrics.ValidatorRegistrationsSyncedUntil.Set(float64(end))
112113
return nil
113114
}
114115

0 commit comments

Comments
 (0)