sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-13 08:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove cluster tag from proxy metrics

Browse Source
This commit is contained in:
pascal
2026-07-30 18:29:56 +02:00
parent c1f0006012
commit b27d7cfbb1
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/internals/modules/reverseproxy/proxy/manager/controller.go
+3 -3
View File
@@ -36,7 +36,7 @@ func NewGRPCController(proxyGRPCServer *nbgrpc.ProxyServiceServer, meter metric.
// SendServiceUpdateToCluster sends a service update to a specific proxy cluster. // SendServiceUpdateToCluster sends a service update to a specific proxy cluster.
func (c *GRPCController) SendServiceUpdateToCluster(ctx context.Context, accountID string, update *proto.ProxyMapping, clusterAddr string) { func (c *GRPCController) SendServiceUpdateToCluster(ctx context.Context, accountID string, update *proto.ProxyMapping, clusterAddr string) {
c.proxyGRPCServer.SendServiceUpdateToCluster(ctx, update, clusterAddr) c.proxyGRPCServer.SendServiceUpdateToCluster(ctx, update, clusterAddr)
c.metrics.IncrementServiceUpdateSendCount(clusterAddr) c.metrics.IncrementServiceUpdateSendCount()
} }
// GetOIDCValidationConfig returns the OIDC validation configuration from the gRPC server. // GetOIDCValidationConfig returns the OIDC validation configuration from the gRPC server.
@@ -53,7 +53,7 @@ func (c *GRPCController) RegisterProxyToCluster(ctx context.Context, clusterAddr
proxySet.(*sync.Map).Store(proxyID, struct{}{}) proxySet.(*sync.Map).Store(proxyID, struct{}{})
log.WithContext(ctx).Debugf("Registered proxy %s to cluster %s", proxyID, clusterAddr) log.WithContext(ctx).Debugf("Registered proxy %s to cluster %s", proxyID, clusterAddr)
c.metrics.IncrementProxyConnectionCount(clusterAddr) c.metrics.IncrementProxyConnectionCount()
return nil return nil
} }
@@ -67,7 +67,7 @@ func (c *GRPCController) UnregisterProxyFromCluster(ctx context.Context, cluster
proxySet.(*sync.Map).Delete(proxyID) proxySet.(*sync.Map).Delete(proxyID)
log.WithContext(ctx).Debugf("Unregistered proxy %s from cluster %s", proxyID, clusterAddr) log.WithContext(ctx).Debugf("Unregistered proxy %s from cluster %s", proxyID, clusterAddr)
c.metrics.DecrementProxyConnectionCount(clusterAddr) c.metrics.DecrementProxyConnectionCount()
} }
return nil return nil
} }
management/internals/modules/reverseproxy/proxy/manager/metrics.go
+6 -16
View File
@@ -3,7 +3,6 @@ package manager
import ( import (
"context" "context"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric"
) )
@@ -48,25 +47,16 @@ func newMetrics(meter metric.Meter) (*metrics, error) {
}, nil }, nil
} }
func (m *metrics) IncrementProxyConnectionCount(clusterAddr string) { func (m *metrics) IncrementProxyConnectionCount() {
m.proxyConnectionCount.Add(context.Background(), 1, m.proxyConnectionCount.Add(context.Background(), 1)
metric.WithAttributes(
attribute.String("cluster", clusterAddr),
))
} }
func (m *metrics) DecrementProxyConnectionCount(clusterAddr string) { func (m *metrics) DecrementProxyConnectionCount() {
m.proxyConnectionCount.Add(context.Background(), -1, m.proxyConnectionCount.Add(context.Background(), -1)
metric.WithAttributes(
attribute.String("cluster", clusterAddr),
))
} }
func (m *metrics) IncrementServiceUpdateSendCount(clusterAddr string) { func (m *metrics) IncrementServiceUpdateSendCount() {
m.serviceUpdateSendCount.Add(context.Background(), 1, m.serviceUpdateSendCount.Add(context.Background(), 1)
metric.WithAttributes(
attribute.String("cluster", clusterAddr),
))
} }
func (m *metrics) IncrementProxyHeartbeatCount() { func (m *metrics) IncrementProxyHeartbeatCount() {