add feature flag for interface support

interface support add overhead at startup so need to be manually
enabled

Author: jpbempel

dd-java-agent/instrumentation/datadog/dynamic-instrumentation/span-origin/src/main/java/datadog/trace/instrumentation/codeorigin/CodeOriginInstrumentation.java

@@ -17,13 +17,10 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public abstract class CodeOriginInstrumentation extends Tracing
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  private static final Logger log = LoggerFactory.getLogger(CodeOriginInstrumentation.class);
   private final OneOf<NamedElement> matcher;
 
   @SuppressForbidden
@@ -46,20 +43,28 @@ public String hierarchyMarkerType() {
 
   @Override
   public ElementMatcher<TypeDescription> hierarchyMatcher() {
-    return HierarchyMatchers.declaresMethod(HierarchyMatchers.isAnnotatedWith(matcher))
-        .or(
-            HierarchyMatchers.implementsInterface(
-                HierarchyMatchers.declaresMethod(HierarchyMatchers.isAnnotatedWith(matcher))));
+    ElementMatcher.Junction<TypeDescription> matcher =
+        HierarchyMatchers.declaresMethod(HierarchyMatchers.isAnnotatedWith(this.matcher));
+    if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
+      matcher =
+          matcher.or(
+              HierarchyMatchers.implementsInterface(
+                  HierarchyMatchers.declaresMethod(
+                      HierarchyMatchers.isAnnotatedWith(this.matcher))));
+    }
+    return matcher;
   }
 
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(
         HierarchyMatchers.isAnnotatedWith(matcher),
         "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
-    transformer.applyAdvice(
-        ElementMatchers.isDeclaredBy(
-            hasSuperType(isInterface().and(declaresMethod(isAnnotatedWith(matcher))))),
-        "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
+    if (InstrumenterConfig.get().isCodeOriginInterfaceSupport()) {
+      transformer.applyAdvice(
+          ElementMatchers.isDeclaredBy(
+              hasSuperType(isInterface().and(declaresMethod(isAnnotatedWith(matcher))))),
+          "datadog.trace.instrumentation.codeorigin.EntrySpanOriginAdvice");
+    }
   }
 }

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/SpringCodeOriginIntegrationTest.java

@@ -25,6 +25,7 @@ protected ProcessBuilder createProcessBuilder(Path logFilePath, String... params
     List<String> commandParams = getDebuggerCommandParams();
     commandParams.add("-Ddd.trace.enabled=true"); // explicitly enable tracer
     commandParams.add("-Ddd.code.origin.for.spans.enabled=true");
+    commandParams.add("-Ddd.code.origin.for.spans.interface.support=true");
     return ProcessBuilderHelper.createProcessBuilder(
         commandParams, logFilePath, getAppClass(), params);
   }

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -50,9 +50,8 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_WRITER_BAGGAGE_INJECT = true;
   static final String DEFAULT_SITE = "datadoghq.com";
 
-  static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_ENABLED = false;
+  static final boolean DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT = false;
   static final int DEFAULT_CODE_ORIGIN_MAX_USER_FRAMES = 8;
-  static final boolean DEFAULT_TRACE_SPAN_ORIGIN_ENRICHED = false;
   static final boolean DEFAULT_TRACE_ENABLED = true;
   public static final boolean DEFAULT_TRACE_OTEL_ENABLED = false;
   static final boolean DEFAULT_INTEGRATIONS_ENABLED = true;

dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java

@@ -10,6 +10,8 @@
  */
 public final class TraceInstrumentationConfig {
   public static final String CODE_ORIGIN_FOR_SPANS_ENABLED = "code.origin.for.spans.enabled";
+  public static final String CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT =
+      "code.origin.for.spans.interface.support";
   public static final String CODE_ORIGIN_MAX_USER_FRAMES = "code.origin.max.user.frames";
   public static final String TRACE_ENABLED = "trace.enabled";
   public static final String INTEGRATIONS_ENABLED = "integrations.enabled";

internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java

@@ -5,6 +5,7 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_RASP_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_APP_LOGS_COLLECTION_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_ENABLED;
+import static datadog.trace.api.ConfigDefaults.DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_DATA_JOBS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_IAST_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_INTEGRATIONS_ENABLED;
@@ -50,6 +51,7 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.AKKA_FORK_JOIN_TASK_NAME;
 import static datadog.trace.api.config.TraceInstrumentationConfig.AXIS_TRANSPORT_CLASS_NAME;
 import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_ENABLED;
+import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT;
 import static datadog.trace.api.config.TraceInstrumentationConfig.EXPERIMENTAL_DEFER_INTEGRATIONS_UNTIL;
 import static datadog.trace.api.config.TraceInstrumentationConfig.HTTP_URL_CONNECTION_CLASS_NAME;
 import static datadog.trace.api.config.TraceInstrumentationConfig.INSTRUMENTATION_CONFIG_ID;
@@ -139,6 +141,7 @@ public class InstrumenterConfig {
   private final boolean integrationsEnabled;
 
   private final boolean codeOriginEnabled;
+  private final boolean codeOriginInterfaceSupport;
   private final boolean traceEnabled;
   private final boolean traceOtelEnabled;
   private final boolean metricsOtelEnabled;
@@ -241,6 +244,10 @@ private InstrumenterConfig() {
     codeOriginEnabled =
         configProvider.getBoolean(
             CODE_ORIGIN_FOR_SPANS_ENABLED, getDefaultCodeOriginForSpanEnabled());
+    codeOriginInterfaceSupport =
+        configProvider.getBoolean(
+            CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT,
+            DEFAULT_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT);
     traceEnabled = configProvider.getBoolean(TRACE_ENABLED, DEFAULT_TRACE_ENABLED);
     traceOtelEnabled = configProvider.getBoolean(TRACE_OTEL_ENABLED, DEFAULT_TRACE_OTEL_ENABLED);
     metricsOtelEnabled =
@@ -373,6 +380,10 @@ public boolean isCodeOriginEnabled() {
     return codeOriginEnabled;
   }
 
+  public boolean isCodeOriginInterfaceSupport() {
+    return codeOriginInterfaceSupport;
+  }
+
   public boolean isTriageEnabled() {
     return triageEnabled;
   }

metadata/supported-configurations.json

@@ -905,6 +905,14 @@
         "aliases": []
       }
     ],
+    "DD_CODE_ORIGIN_FOR_SPANS_INTERFACE_SUPPORT": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "true",
+        "aliases": []
+      }
+    ],
     "DD_CODE_ORIGIN_MAX_USER_FRAMES": [
       {
         "version": "A",