Make auto scope propagation configurable

monosoul · monosoul · commit 48922a70edf5 · 2023-01-26T00:57:59.000+01:00
Signed-off-by: monosoul &lt;Kloz.Klaud@gmail.com&gt;
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutinesInstrumentation.java b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutinesInstrumentation.java
@@ -9,8 +9,14 @@ abstract class AbstractKotlinCoroutinesInstrumentation extends Instrumenter.Trac
       "kotlinx.coroutines.CoroutineContextKt";
   protected static final String COROUTINE_CONTEXT_CLASS_NAME = "kotlin.coroutines.CoroutineContext";
 
+  private static final String INSTRUMENTATION_NAME = "kotlin_coroutine.experimental";
+
   public AbstractKotlinCoroutinesInstrumentation() {
-    super("kotlin_coroutine.experimental");
+    super(INSTRUMENTATION_NAME);
+  }
+
+  static String prefixedPropertyName(final String propertyName) {
+    return "dd.integration." + INSTRUMENTATION_NAME + "." + propertyName;
   }
 
   @Override
@@ -24,6 +30,7 @@ public String[] helperClassNames() {
       packageName + ".ScopeStateCoroutineContext",
       packageName + ".ScopeStateCoroutineContext$ContextElementKey",
       packageName + ".CoroutineContextHelper",
+      packageName + ".AbstractKotlinCoroutinesInstrumentation",
     };
   }
 }
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/ScopeStateCoroutineContext.java b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/ScopeStateCoroutineContext.java
@@ -1,6 +1,8 @@
 package datadog.trace.instrumentation.kotlin.coroutines;
 
+import static datadog.trace.instrumentation.kotlin.coroutines.AbstractKotlinCoroutinesInstrumentation.prefixedPropertyName;
 import static datadog.trace.instrumentation.kotlin.coroutines.CoroutineContextHelper.getJob;
+import static java.lang.Boolean.getBoolean;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
@@ -29,9 +31,15 @@ public ScopeStateCoroutineContext() {
   public void maybeInitialize() {
     if (!isInitialized) {
       final AgentScope activeScope = AgentTracer.get().activeScope();
+      final boolean autoPropagationEnabled =
+          getBoolean(prefixedPropertyName("auto_propagation.enabled"));
       if (activeScope != null) {
-        activeScope.setAsyncPropagation(true);
-        continuation = activeScope.captureConcurrent();
+        if (autoPropagationEnabled) {
+          activeScope.setAsyncPropagation(true);
+        }
+        if (activeScope.isAsyncPropagating()) {
+          continuation = activeScope.captureConcurrent();
+        }
       }
       isInitialized = true;
     }
