lift DeploymentUidKey attribute to newOtelResource (#2296)

PeerDB-io · Nov 26, 2024 · 2d9dd21 · 2d9dd21
1 parent 83350b5
commit 2d9dd21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/flow/connectors/postgres/cdc.go b/flow/connectors/postgres/cdc.go
@@ -25,7 +25,6 @@ import (
 	"github.com/PeerDB-io/peer-flow/model"
 	"github.com/PeerDB-io/peer-flow/model/qvalue"
 	"github.com/PeerDB-io/peer-flow/otel_metrics"
-	"github.com/PeerDB-io/peer-flow/peerdbenv"
 	"github.com/PeerDB-io/peer-flow/shared"
 )
 
@@ -481,7 +480,6 @@ func PullCdcRecords[Items model.Items](
 		if fetchedBytesCounter != nil {
 			fetchedBytesCounter.Add(ctx, int64(len(msg.Data)), metric.WithAttributeSet(attribute.NewSet(
 				attribute.String(otel_metrics.FlowNameKey, req.FlowJobName),
-				attribute.String(otel_metrics.DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()),
 			)))
 		}
 

diff --git a/flow/connectors/postgres/postgres.go b/flow/connectors/postgres/postgres.go
@@ -1223,8 +1223,7 @@ func (c *PostgresConnector) HandleSlotInfo(
 			attribute.String(otel_metrics.FlowNameKey, alertKeys.FlowName),
 			attribute.String(otel_metrics.PeerNameKey, alertKeys.PeerName),
 			attribute.String(otel_metrics.SlotNameKey, alertKeys.SlotName),
-			attribute.String(otel_metrics.DeploymentUidKey, peerdbenv.PeerDBDeploymentUID())),
-		))
+		)))
 	} else {
 		logger.Warn("warning: slotMetricGauges.SlotLagGauge is nil")
 	}
@@ -1241,7 +1240,6 @@ func (c *PostgresConnector) HandleSlotInfo(
 		slotMetricGauges.OpenConnectionsGauge.Record(ctx, res.CurrentOpenConnections, metric.WithAttributeSet(attribute.NewSet(
 			attribute.String(otel_metrics.FlowNameKey, alertKeys.FlowName),
 			attribute.String(otel_metrics.PeerNameKey, alertKeys.PeerName),
-			attribute.String(otel_metrics.DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()),
 		)))
 	} else {
 		logger.Warn("warning: slotMetricGauges.OpenConnectionsGauge is nil")
@@ -1257,7 +1255,6 @@ func (c *PostgresConnector) HandleSlotInfo(
 			metric.WithAttributeSet(attribute.NewSet(
 				attribute.String(otel_metrics.FlowNameKey, alertKeys.FlowName),
 				attribute.String(otel_metrics.PeerNameKey, alertKeys.PeerName),
-				attribute.String(otel_metrics.DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()),
 			)),
 		)
 	} else {
@@ -1281,7 +1278,6 @@ func (c *PostgresConnector) HandleSlotInfo(
 				metric.WithAttributeSet(attribute.NewSet(
 					attribute.String(otel_metrics.FlowNameKey, alertKeys.FlowName),
 					attribute.String(otel_metrics.PeerNameKey, alertKeys.PeerName),
-					attribute.String(otel_metrics.DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()),
 				)),
 			)
 		} else {

diff --git a/flow/otel_metrics/otel_manager.go b/flow/otel_metrics/otel_manager.go
@@ -83,7 +83,10 @@ func (om *OtelManager) GetOrInitInt64Counter(name string, opts ...metric.Int64Co
 
 // newOtelResource returns a resource describing this application.
 func newOtelResource(otelServiceName string, attrs ...attribute.KeyValue) (*resource.Resource, error) {
-	allAttrs := append([]attribute.KeyValue{semconv.ServiceNameKey.String(otelServiceName)}, attrs...)
+	allAttrs := append([]attribute.KeyValue{
+		semconv.ServiceNameKey.String(otelServiceName),
+		attribute.String(DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()),
+	}, attrs...)
 	return resource.Merge(
 		resource.Default(),
 		resource.NewWithAttributes(
@@ -181,7 +184,7 @@ func SetupPeerDBMetricsProvider(otelServiceName string) (*sdkmetric.MeterProvide
 }
 
 func SetupTemporalMetricsProvider(otelServiceName string) (*sdkmetric.MeterProvider, error) {
-	otelResource, err := newOtelResource(otelServiceName, attribute.String(DeploymentUidKey, peerdbenv.PeerDBDeploymentUID()))
+	otelResource, err := newOtelResource(otelServiceName)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create OpenTelemetry resource: %w", err)
 	}