Update OTLP span -> DD span logic for operation and resource name (#3…

…0616)
DataDog · Nov 6, 2024 · 47294c1 · 47294c1
1 parent a7ae2d3
commit 47294c1
Show file tree

Hide file tree

Showing 8 changed files with 843 additions and 91 deletions.
diff --git a/pkg/trace/api/otlp.go b/pkg/trace/api/otlp.go
@@ -61,6 +61,33 @@ type OTLPReceiver struct {
 
 // NewOTLPReceiver returns a new OTLPReceiver which sends any incoming traces down the out channel.
 func NewOTLPReceiver(out chan<- *Payload, cfg *config.AgentConfig, statsd statsd.ClientInterface, timing timing.Reporter) *OTLPReceiver {
+	operationAndResourceNamesV2GateEnabled := cfg.HasFeature("enable_operation_and_resource_name_logic_v2")
+	operationAndResourceNamesV2GateEnabledVal := 0.0
+	if operationAndResourceNamesV2GateEnabled {
+		operationAndResourceNamesV2GateEnabledVal = 1.0
+	}
+	_ = statsd.Gauge("datadog.trace_agent.otlp.operation_and_resource_names_v2_gate_enabled", operationAndResourceNamesV2GateEnabledVal, nil, 1)
+
+	spanNameAsResourceNameEnabledVal := 0.0
+	if cfg.OTLPReceiver.SpanNameAsResourceName {
+		if operationAndResourceNamesV2GateEnabled {
+			log.Warnf("Detected SpanNameAsResourceName in config - this feature will be deprecated in a future version, and overrides feature gate \"enable_operation_and_resource_name_logic_v2\". Please remove it and set \"operation.name\" attribute on your spans instead.")
+		} else {
+			log.Warnf("Detected SpanNameAsResourceName in config - this feature will be deprecated in a future version. Please remove it, enable feature gate \"enable_operation_and_resource_name_logic_v2\", and set \"operation.name\" attribute on your spans instead.")
+		}
+		spanNameAsResourceNameEnabledVal = 1.0
+	}
+	_ = statsd.Gauge("datadog.trace_agent.otlp.span_name_as_resource_name_enabled", spanNameAsResourceNameEnabledVal, nil, 1)
+	spanNameRemappingsEnabledVal := 0.0
+	if cfg.OTLPReceiver.SpanNameRemappings != nil && len(cfg.OTLPReceiver.SpanNameRemappings) > 0 {
+		if operationAndResourceNamesV2GateEnabled {
+			log.Warnf("Detected SpanNameRemappings in config - this feature will be deprecated in a future version. Please remove it to access functionality from feature gate \"enable_operation_and_resource_name_logic_v2\".")
+		} else {
+			log.Warnf("Detected SpanNameRemappings in config - this feature will be deprecated in a future version. Please remove it and enable feature gate \"enable_operation_and_resource_name_logic_v2\"")
+		}
+		spanNameRemappingsEnabledVal = 1.0
+	}
+	_ = statsd.Gauge("datadog.trace_agent.otlp.span_name_remappings_enabled", spanNameRemappingsEnabledVal, nil, 1)
 	computeTopLevelBySpanKindVal := 0.0
 	if cfg.HasFeature("enable_otlp_compute_top_level_by_span_kind") {
 		computeTopLevelBySpanKindVal = 1.0
@@ -215,7 +242,13 @@ func (o *OTLPReceiver) receiveResourceSpansV2(ctx context.Context, rspans ptrace
 		libspans := rspans.ScopeSpans().At(i)
 		for j := 0; j < libspans.Spans().Len(); j++ {
 			otelspan := libspans.Spans().At(j)
-			if _, exists := o.ignoreResNames[traceutil.GetOTelResource(otelspan, otelres)]; exists {
+			var resourceName string
+			if transform.OperationAndResourceNameV2Enabled(o.conf) {
+				resourceName = traceutil.GetOTelResourceV2(otelspan, otelres)
+			} else {
+				resourceName = traceutil.GetOTelResourceV1(otelspan, otelres)
+			}
+			if _, exists := o.ignoreResNames[resourceName]; exists {
 				continue
 			}
 
@@ -583,29 +616,41 @@ func (o *OTLPReceiver) convertSpan(rattr map[string]string, lib pcommon.Instrume
 		transform.SetMetaOTLP(span, semconv.OtelStatusDescription, msg)
 	}
 	transform.Status2Error(in.Status(), in.Events(), span)
-	if span.Name == "" {
-		name := in.Name()
-		if !o.conf.OTLPReceiver.SpanNameAsResourceName {
-			name = traceutil.OTelSpanKindName(in.Kind())
-			if lib.Name() != "" {
-				name = lib.Name() + "." + name
-			} else {
-				name = "opentelemetry." + name
+	if transform.OperationAndResourceNameV2Enabled(o.conf) {
+		span.Name = traceutil.GetOTelOperationNameV2(in)
+	} else {
+		if span.Name == "" {
+			name := in.Name()
+			if !o.conf.OTLPReceiver.SpanNameAsResourceName {
+				name = traceutil.OTelSpanKindName(in.Kind())
+				if lib.Name() != "" {
+					name = lib.Name() + "." + name
+				} else {
+					name = "opentelemetry." + name
+				}
 			}
+			if v, ok := o.conf.OTLPReceiver.SpanNameRemappings[name]; ok {
+				name = v
+			}
+			span.Name = name
 		}
-		if v, ok := o.conf.OTLPReceiver.SpanNameRemappings[name]; ok {
-			name = v
-		}
-		span.Name = name
 	}
 	if span.Service == "" {
 		span.Service = "OTLPResourceNoServiceName"
 	}
 	if span.Resource == "" {
-		if r := resourceFromTags(span.Meta); r != "" {
-			span.Resource = r
+		if transform.OperationAndResourceNameV2Enabled(o.conf) {
+			res := pcommon.NewResource()
+			for k, v := range rattr {
+				res.Attributes().PutStr(k, v)
+			}
+			span.Resource = traceutil.GetOTelResourceV2(in, res)
 		} else {
-			span.Resource = in.Name()
+			if r := resourceFromTags(span.Meta); r != "" {
+				span.Resource = r
+			} else {
+				span.Resource = in.Name()
+			}
 		}
 	}
 	if span.Type == "" {