From ad97f206b4cd124c21aba22a6c8628e09dd356ca Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Mon, 19 May 2025 18:43:41 +0200
Subject: [PATCH] Enable Kotlin coroutines integration by default

---
 .../kotlin/coroutines/KotlinCoroutinesModule.java          | 7 +------
 .../AbstractKotlinCoroutineInstrumentationTest.groovy      | 7 -------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
index 6de4186cac8..1d08842cfae 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
+++ b/dd-java-agent/instrumentation/kotlin-coroutines/src/main/java/datadog/trace/instrumentation/kotlin/coroutines/KotlinCoroutinesModule.java
@@ -9,12 +9,7 @@
 @AutoService(InstrumenterModule.class)
 public class KotlinCoroutinesModule extends InstrumenterModule.Tracing {
   public KotlinCoroutinesModule() {
-    super("kotlin_coroutine.experimental");
-  }
-
-  @Override
-  protected final boolean defaultEnabled() {
-    return false;
+    super("kotlin_coroutine");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy
index 74b81c92ed7..13f951a3570 100644
--- a/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/kotlin-coroutines/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy
@@ -20,13 +20,6 @@ abstract class AbstractKotlinCoroutineInstrumentationTest<T extends CoreKotlinCo
     ['single thread pool', ThreadPoolDispatcherKt.newSingleThreadContext("Single-Thread")],
   ]
 
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-
-    injectSysConfig("dd.integration.kotlin_coroutine.experimental.enabled", "true")
-  }
-
   def "kotlin cancellation prevents trace #dispatcherName"() {
     setup:
     CoreKotlinCoroutineTests kotlinTest = getCoreKotlinCoroutineTestsInstance(dispatcher)