Skip to content

fix: register init metrics #5196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nugaon merged 3 commits into from
Sep 2, 2025
Merged

fix: register init metrics #5196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8732ea9
fix: register init metrics
nugaon Aug 25, 2025
2777ba5
refactor: unexport metrics
nugaon Aug 28, 2025
532984b
fix: use hasher pool in testsocmine test
nugaon Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions pkg/node/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ func newMetrics() nodeMetrics {
}
}

// RegisterMetrics registers all metrics from the package
func (m nodeMetrics) RegisterMetrics() {
prometheus.MustRegister(m.WarmupDuration)
prometheus.MustRegister(m.FullSyncDuration)
func getMetrics(nodeMetrics nodeMetrics) []prometheus.Collector {
return metrics.PrometheusCollectorsFromFields(nodeMetrics)
}
2 changes: 1 addition & 1 deletion pkg/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ func NewBee(
var pullSyncStartTime time.Time

nodeMetrics := newMetrics()
nodeMetrics.RegisterMetrics()

tracer, tracerCloser, err := tracing.NewTracer(&tracing.Options{
Enabled: o.TracingEnabled,
Expand Down Expand Up @@ -1266,6 +1265,7 @@ func NewBee(
apiService.MustRegisterMetrics(kad.Metrics()...)
apiService.MustRegisterMetrics(saludService.Metrics()...)
apiService.MustRegisterMetrics(stateStoreMetrics.Metrics()...)
apiService.MustRegisterMetrics(getMetrics(nodeMetrics)...)

if pullerService != nil {
apiService.MustRegisterMetrics(pullerService.Metrics()...)
Expand Down
13 changes: 8 additions & 5 deletions pkg/storageincentives/soc_mine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ func TestSocMine(t *testing.T) {
}
// the transformed address hasher factory function
prefixhasher := func() hash.Hash { return swarm.NewPrefixHasher(prefix) }
trHasher := func() hash.Hash { return bmt.NewHasher(prefixhasher) }
// Create a pool for efficient hasher reuse
trHasherPool := bmt.NewPool(bmt.NewConf(prefixhasher, swarm.BmtBranches, 8))
// the bignum cast of the maximum sample value (upper bound on transformed addresses as a 256-bit article)
// this constant is for a minimum reserve size of 2 million chunks with sample size of 16
// = 1.284401 * 10^71 = 1284401 + 66 0-s
Expand Down Expand Up @@ -79,13 +80,13 @@ func TestSocMine(t *testing.T) {
// for sanity check: given a filterSOCAddr requiring a 0 leading bit (chance of 1/2)
// we expect an overall rough 4 million chunks to be mined to create this sample
// for 8 workers that is half a million round on average per worker
err = makeChunks(t, signer, sampleSize, filterSOCAddr, filterTrAddr, trHasher)
err = makeChunks(t, signer, sampleSize, filterSOCAddr, filterTrAddr, trHasherPool)
if err != nil {
t.Fatal(err)
}
}

func makeChunks(t *testing.T, signer crypto.Signer, sampleSize int, filterSOCAddr func(swarm.Address) bool, filterTrAddr func(swarm.Address) (bool, error), trHasher func() hash.Hash) error {
func makeChunks(t *testing.T, signer crypto.Signer, sampleSize int, filterSOCAddr func(swarm.Address) bool, filterTrAddr func(swarm.Address) (bool, error), trHasherPool *bmt.Pool) error {
t.Helper()

// set owner address from signer
Expand Down Expand Up @@ -129,6 +130,8 @@ func makeChunks(t *testing.T, signer crypto.Signer, sampleSize int, filterSOCAdd
eg.Go(func() (err error) {
offset := i * 4
found := 0
// Get one hasher per goroutine from the pool to avoid race conditions
hasher := trHasherPool.Get()
for seed := uint32(1); ; seed++ {
select {
case <-ectx.Done():
Expand All @@ -148,9 +151,9 @@ func makeChunks(t *testing.T, signer crypto.Signer, sampleSize int, filterSOCAdd
if !filterSOCAddr(addr) {
continue
}
hasher := trHasher()
data := s.WrappedChunk().Data()
hasher.(*bmt.Hasher).SetHeader(data[:8])
hasher.Reset()
hasher.SetHeader(data[:8])
_, err = hasher.Write(data[8:])
if err != nil {
return err
Expand Down
Loading