Tag span metrics with 'otel.library' when we know it was created by an OTel extension (#7463)

mcculls · web-flow · commit 0c5f7c2383e6 · 2024-08-19T12:36:10.000+01:00
Metrics for spans created manually via the OTel API continue to be tagged with 'otel'.
diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelTracer.java
@@ -9,7 +9,7 @@
 
 @ParametersAreNonnullByDefault
 class OtelTracer implements Tracer {
-  private static final String INSTRUMENTATION_NAME = "otel";
+  private static final String INSTRUMENTATION_NAME = otelInstrumentationName();
   private final AgentTracer.TracerAPI tracer;
   private final String instrumentationScopeName;
 
@@ -24,4 +24,12 @@ public SpanBuilder spanBuilder(String spanName) {
         this.tracer.buildSpan(INSTRUMENTATION_NAME, SPAN_KIND_INTERNAL).withResourceName(spanName);
     return new OtelSpanBuilder(delegate);
   }
+
+  @SuppressWarnings("ConstantConditions")
+  private static String otelInstrumentationName() {
+    // is this the bootstrap shim for drop-in support, or the shim for manual instrumentation?
+    return OtelTracer.class.getName().startsWith("datadog.trace.bootstrap")
+        ? "otel.library"
+        : "otel";
+  }
 }
