Skip to content
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

Remove old web3signer metrics: v6 #14920

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+11 −42
Open

Remove old web3signer metrics: v6 #14920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fa9e95
removing repeated fork specific metrics for a universal one
james-prysm Feb 12, 2025
03debd9
changelog
james-prysm Feb 12, 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
3 changes: 3 additions & 0 deletions changelog/james-prysm_remove-old-web3signer-metrics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Changed

- removed old web3signer metrics in favor for a universal one
16 changes: 8 additions & 8 deletions validator/keymanager/remote-web3signer/keymanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ func handleBlock(ctx context.Context, validator *validator.Validate, request *va
if err = validator.StructCtx(ctx, bockSignRequest); err != nil {
return nil, err
}
blockSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("phase0", "false").Inc()
return json.Marshal(bockSignRequest)
}

Expand Down Expand Up @@ -522,7 +522,7 @@ func handleBlockAltair(ctx context.Context, validator *validator.Validate, reque
if err = validator.StructCtx(ctx, blockv2AltairSignRequest); err != nil {
return nil, err
}
blockAltairSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("altair", "false").Inc()
return json.Marshal(blockv2AltairSignRequest)
}

Expand All @@ -534,7 +534,7 @@ func handleBlockBellatrix(ctx context.Context, validator *validator.Validate, re
if err = validator.StructCtx(ctx, blockv2BellatrixSignRequest); err != nil {
return nil, err
}
blockBellatrixSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("bellatrix", "false").Inc()
return json.Marshal(blockv2BellatrixSignRequest)
}

Expand All @@ -546,7 +546,7 @@ func handleBlindedBlockBellatrix(ctx context.Context, validator *validator.Valid
if err = validator.StructCtx(ctx, blindedBlockv2SignRequest); err != nil {
return nil, err
}
blindedBlockBellatrixSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("bellatrix", "true").Inc()
return json.Marshal(blindedBlockv2SignRequest)
}

Expand All @@ -558,7 +558,7 @@ func handleBlockCapella(ctx context.Context, validator *validator.Validate, requ
if err = validator.StructCtx(ctx, blockv2CapellaSignRequest); err != nil {
return nil, err
}
blockCapellaSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("capella", "false").Inc()
return json.Marshal(blockv2CapellaSignRequest)
}

Expand All @@ -570,7 +570,7 @@ func handleBlindedBlockCapella(ctx context.Context, validator *validator.Validat
if err = validator.StructCtx(ctx, blindedBlockv2CapellaSignRequest); err != nil {
return nil, err
}
blindedBlockCapellaSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("capella", "true").Inc()
return json.Marshal(blindedBlockv2CapellaSignRequest)
}

Expand All @@ -582,7 +582,7 @@ func handleBlockDeneb(ctx context.Context, validator *validator.Validate, reques
if err = validator.StructCtx(ctx, blockv2DenebSignRequest); err != nil {
return nil, err
}
blockDenebSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("deneb", "false").Inc()
return json.Marshal(blockv2DenebSignRequest)
}

Expand All @@ -594,7 +594,7 @@ func handleBlindedBlockDeneb(ctx context.Context, validator *validator.Validate,
if err = validator.StructCtx(ctx, blindedBlockv2DenebSignRequest); err != nil {
return nil, err
}
blindedBlockDenebSignRequestsTotal.Inc()
remoteBlockSignRequestsTotal.WithLabelValues("deneb", "true").Inc()
return json.Marshal(blindedBlockv2DenebSignRequest)
}

Expand Down
34 changes: 0 additions & 34 deletions validator/keymanager/remote-web3signer/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,40 +27,6 @@ var (
Name: "remote_web3signer_attestation_sign_requests_total",
Help: "Total number of attestation sign requests",
})
//TODO: deprecate these fork specific counters in prysm v6...
blockSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_block_sign_requests_total",
Help: "Total number of block sign requests",
})
blockAltairSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_block_altair_sign_requests_total",
Help: "Total number of block altair sign requests",
})
blockBellatrixSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_block_bellatrix_sign_requests_total",
Help: "Total number of block bellatrix sign requests",
})
blindedBlockBellatrixSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_blinded_block_bellatrix_sign_requests_total",
Help: "Total number of blinded block bellatrix sign requests",
})
blockCapellaSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_block_capella_sign_requests_total",
Help: "Total number of block capella sign requests",
})
blindedBlockCapellaSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_blinded_block_capella_sign_requests_total",
Help: "Total number of block capella sign requests",
})
blockDenebSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_block_deneb_sign_requests_total",
Help: "Total number of block deneb sign requests",
})
blindedBlockDenebSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
Name: "remote_web3signer_blinded_block_deneb_sign_requests_total",
Help: "Total number of blinded block deneb sign requests",
})
/////

remoteBlockSignRequestsTotal = promauto.NewCounterVec(prometheus.CounterOpts{
Name: "remote_block_sign_requests_total",
Expand Down
Loading