make metrics match across versions

This commit is contained in:
tycho garen
2022-06-16 09:32:53 -04:00
parent db39cfbfb2
commit b1ef61a893
3 changed files with 10 additions and 10 deletions

View File

@@ -50,16 +50,16 @@ func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
Name: "peer_pending_send_bytes",
Help: "Number of bytes pending being sent to a given peer.",
}, append(labels, "peer_id")).With(labelsAndValues...),
PeerConnectionSuccess: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
PeersConnectedSuccess: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
Namespace: namespace,
Subsystem: MetricsSubsystem,
Name: "peer_connection_success",
Name: "peers_connected_success",
Help: "Number of successful connection attempts",
}, labels).With(labelsAndValues...),
PeerConnectionFailure: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
PeersConnectedFailure: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
Namespace: namespace,
Subsystem: MetricsSubsystem,
Name: "peer_connection_failure",
Name: "peers_connected_failure",
Help: "Number failed connection attempts",
}, labels).With(labelsAndValues...),
PeersConnectedIncoming: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
@@ -115,8 +115,8 @@ func NopMetrics() *Metrics {
PeerReceiveBytesTotal: discard.NewCounter(),
PeerSendBytesTotal: discard.NewCounter(),
PeerPendingSendBytes: discard.NewGauge(),
PeerConnectionSuccess: discard.NewCounter(),
PeerConnectionFailure: discard.NewCounter(),
PeersConnectedSuccess: discard.NewCounter(),
PeersConnectedFailure: discard.NewCounter(),
PeersConnectedIncoming: discard.NewGauge(),
PeersConnectedOutgoing: discard.NewGauge(),
RouterPeerQueueRecv: discard.NewHistogram(),

View File

@@ -40,9 +40,9 @@ type Metrics struct {
PeerPendingSendBytes metrics.Gauge `metrics_labels:"peer_id"`
// Number of successful connection attempts
PeerConnectionSuccess metrics.Counter
PeersConnectedSuccess metrics.Counter
// Number failed connection attempts
PeerConnectionFailure metrics.Counter
PeersConnectedFailure metrics.Counter
// Number of peers connected as a result of dialing the
// peer.

View File

@@ -575,7 +575,7 @@ func (m *PeerManager) TryDialNext() (NodeAddress, error) {
func (m *PeerManager) DialFailed(ctx context.Context, address NodeAddress) error {
m.mtx.Lock()
defer m.mtx.Unlock()
m.metrics.PeerConnectionFailure.Add(1)
m.metrics.PeersConnectedFailure.Add(1)
delete(m.dialing, address.NodeID)
for from, to := range m.upgrading {
@@ -640,7 +640,7 @@ func (m *PeerManager) Dialed(address NodeAddress) error {
m.mtx.Lock()
defer m.mtx.Unlock()
m.metrics.PeerConnectionSuccess.Add(1)
m.metrics.PeersConnectedSuccess.Add(1)
delete(m.dialing, address.NodeID)