diff --git a/bridge/metrics.go b/bridge/metrics.go index f9279a0..879e23b 100644 --- a/bridge/metrics.go +++ b/bridge/metrics.go @@ -23,23 +23,17 @@ func (s *Server) ObserveMetrics(ctx context.Context, observer otelapi.Observer) { // bridge_active var val int64 = 0 if s.status.Active { - val++ - } - if s.partnerStatus != nil && s.partnerStatus.Active { - val++ + val = 1 } observer.ObserveInt64(metrics.BridgeActive, val, otelapi.WithAttributes( attribute.String(metrics.LabelBridge, s.cfg.Name), )) } - { // bridge_active + { // bridge_up var val int64 = 0 if s.status.Up { - val++ - } - if s.partnerStatus != nil && s.partnerStatus.Up { - val++ + val = 1 } observer.ObserveInt64(metrics.BridgeUp, val, otelapi.WithAttributes( attribute.String(metrics.LabelBridge, s.cfg.Name), diff --git a/metrics/exports.go b/metrics/exports.go index 58adcf2..b88ce24 100644 --- a/metrics/exports.go +++ b/metrics/exports.go @@ -7,18 +7,16 @@ import ( // Bridge var ( - // BridgeActive is a number of active bridges at a given moment + // BridgeActive indicates whether the bridge is currently active BridgeActive otelapi.Int64Observable - // BridgeUp is a number of online bridges at a given moment + // BridgeUp indicates whether the bridge is currently up BridgeUp otelapi.Int64Observable - // TunnelInterfaceActive is a number of active tunnel interfaces at a given - // moment + // TunnelInterfaceActive indicates whether the tunnel interface is active TunnelInterfaceActive otelapi.Int64Observable - // TunnelInterfaceUp is a number of online tunnel interfaces at a given - // moment + // TunnelInterfaceUp indicates whether the tunnel interface is up TunnelInterfaceUp otelapi.Int64Observable ) diff --git a/metrics/metrics.go b/metrics/metrics.go index d09e3a3..641c8df 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -101,7 +101,7 @@ func setupLatencyBoundariesUs(ctx context.Context, cfg *config.Metrics) error { func setupBridgeActive(ctx context.Context, _ *config.Metrics) error { bridgeActive, err := meter.Int64ObservableGauge("bridge_active", - otelapi.WithDescription("number of active bridges at a given moment"), + otelapi.WithDescription("indicates whether the bridge is currently active"), ) if err != nil { return err @@ -112,7 +112,7 @@ func setupBridgeActive(ctx context.Context, _ *config.Metrics) error { func setupBridgeUp(ctx context.Context, _ *config.Metrics) error { bridgeUp, err := meter.Int64ObservableGauge("bridge_up", - otelapi.WithDescription("number of online bridges at a given moment"), + otelapi.WithDescription("indicates whether the bridge is currently up"), ) if err != nil { return err @@ -123,7 +123,7 @@ func setupBridgeUp(ctx context.Context, _ *config.Metrics) error { func setupTunnelInterfaceActive(ctx context.Context, _ *config.Metrics) error { tunnelInterfaceActive, err := meter.Int64ObservableGauge("tunnel_interface_active", - otelapi.WithDescription("number of active tunnel interfaces at a given moment"), + otelapi.WithDescription("indicates whether the tunnel interface is active"), ) if err != nil { return err @@ -134,7 +134,7 @@ func setupTunnelInterfaceActive(ctx context.Context, _ *config.Metrics) error { func setupTunnelInterfaceUp(ctx context.Context, _ *config.Metrics) error { tunnelInterfaceUp, err := meter.Int64ObservableGauge("tunnel_interface_up", - otelapi.WithDescription("number of online tunnel interfaces at a given moment"), + otelapi.WithDescription("indicates whether the tunnel interface is up"), ) if err != nil { return err