Enable by default

Author: amarziali

dd-java-agent/benchmark/src/jmh/java/lambdabench/LambdaExecutorBenchmark.java

@@ -19,8 +19,8 @@
 import org.openjdk.jmh.annotations.TearDown;
 
 /**
- * Compares lambda {@code Runnable} allocation and submission with no agent, wrapping, and field
- * injection.
+ * Compares lambda {@code Runnable} allocation, execution, and submission with no agent, wrapping,
+ * and field injection.
  *
  * <ul>
  *   <li>{@link NoAgent} — baseline, no agent.
@@ -30,8 +30,9 @@
  *       field-injected, so no wrapper is allocated and identity is preserved.
  * </ul>
  *
- * <p>With the GC profiler, {@code allocateCapturingRunnable} isolates the injected field's object
- * size cost while {@code submitLambda} includes the wrapper allocation tradeoff. Run with:
+ * <p>{@code runUntracedLambda} isolates the advice cost when no context was attached. With the GC
+ * profiler, {@code allocateCapturingRunnable} isolates the injected field's object size cost while
+ * {@code submitLambda} includes the wrapper allocation tradeoff. Run with:
  *
  * <pre>{@code
  * ./gradlew :dd-java-agent:benchmark:jmh \
@@ -82,12 +83,30 @@ public static class CapturingLambdaState {
     public void run() {}
   }
 
+  @State(Scope.Thread)
+  public static class DirectRunState {
+    Runnable runnable;
+    int executions;
+
+    @Setup
+    public void setup() {
+      runnable = () -> executions++;
+    }
+  }
+
   /** Allocates an untraced capturing Runnable. */
   @Benchmark
   public Runnable allocateCapturingRunnable(CapturingLambdaState state) {
     return state::run;
   }
 
+  /** Executes an already-created lambda Runnable without an active trace. */
+  @Benchmark
+  public int runUntracedLambda(DirectRunState state) {
+    state.runnable.run();
+    return state.executions;
+  }
+
   /** Submit a lambda Runnable to the executor under an active trace, and wait for it to run. */
   @Benchmark
   public void submitLambda(ExecutorState state) throws InterruptedException {
@@ -134,9 +153,9 @@ private static Object supplyTarget() {
   @Fork
   public static class NoAgent extends LambdaExecutorBenchmark {}
 
-  @Fork(jvmArgsAppend = AGENT)
+  @Fork(jvmArgsAppend = {AGENT, "-Ddd.trace.lambda.enabled=false"})
   public static class AgentLambdaOff extends LambdaExecutorBenchmark {}
 
-  @Fork(jvmArgsAppend = {AGENT, "-Ddd.trace.lambda.enabled=true"})
+  @Fork(jvmArgsAppend = AGENT)
   public static class AgentLambdaOn extends LambdaExecutorBenchmark {}
 }

dd-java-agent/instrumentation/java/java-lambda/java-lambda-1.8/src/main/java/datadog/trace/instrumentation/java/lang/invoke/LambdaMetafactoryInstrumentation.java

@@ -52,11 +52,6 @@ public LambdaMetafactoryInstrumentation() {
     super("lambda");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public String instrumentedType() {
     return METAFACTORY;

dd-java-agent/instrumentation/java/java-lambda/java-lambda-1.8/src/test/java/testdog/trace/instrumentation/lambda/ClojureAFnIntegrationTest.java

@@ -10,7 +10,6 @@
 import datadog.trace.test.junit.utils.config.WithConfig;
 import org.junit.jupiter.api.Test;
 
-@WithConfig(key = "trace.lambda.enabled", value = "true")
 @WithConfig(key = "trace.runnable.enabled", value = "false")
 public class ClojureAFnIntegrationTest extends AbstractInstrumentationTest {
 

dd-java-agent/instrumentation/java/java-lambda/java-lambda-1.8/src/test/java/testdog/trace/instrumentation/lambda/LambdaMetafactoryIntegrationTest.java

@@ -12,7 +12,6 @@
 import datadog.trace.api.Trace;
 import datadog.trace.bootstrap.FieldBackedContextAccessor;
 import datadog.trace.bootstrap.instrumentation.java.concurrent.RunnableWrapper;
-import datadog.trace.test.junit.utils.config.WithConfig;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -22,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 
 /** Lambda integration tests outside the ignored {@code datadog.*} prefix. */
-@WithConfig(key = "trace.lambda.enabled", value = "true")
 public class LambdaMetafactoryIntegrationTest extends AbstractInstrumentationTest {
 
   @Test

dd-smoke-tests/java9-modules/src/main/java11/testdog/moduleapp/LambdaTask.java

@@ -19,7 +19,8 @@ public static void runOnExecutor() throws InterruptedException {
     try {
       final CountDownLatch latch = new CountDownLatch(1);
       final Runnable task = latch::countDown;
-      assertFieldInjection(task, Boolean.getBoolean("dd.trace.lambda.enabled"));
+      assertFieldInjection(
+          task, Boolean.parseBoolean(System.getProperty("dd.trace.lambda.enabled", "true")));
       pool.execute(task);
       if (!latch.await(10, TimeUnit.SECONDS)) {
         throw new IllegalStateException("lambda task did not run");

…etest/Java9ModulesLambdaSmokeTest.groovy …va9ModulesLambdaDisabledSmokeTest.groovydd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesLambdaSmokeTest.groovy renamed to dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesLambdaDisabledSmokeTest.groovy dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesLambdaSmokeTest.groovy renamed to dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesLambdaDisabledSmokeTest.groovy

@@ -4,13 +4,13 @@ import datadog.environment.JavaVirtualMachine
 import datadog.environment.OperatingSystem
 import spock.lang.IgnoreIf
 
-/** Verifies field injection adds the required read edge to a named module. */
+/** Verifies lambda transformation can be disabled for a named module. */
 @IgnoreIf({
   OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() && JavaVirtualMachine.isJ9()
 })
-class Java9ModulesLambdaSmokeTest extends Java9ModulesSmokeTest {
+class Java9ModulesLambdaDisabledSmokeTest extends Java9ModulesSmokeTest {
   @Override
   def javaProperties() {
-    return super.javaProperties() + "-Ddd.trace.lambda.enabled=true"
+    return super.javaProperties() + "-Ddd.trace.lambda.enabled=false"
   }
 }

metadata/supported-configurations.json

@@ -7957,7 +7957,7 @@
       {
         "version": "A",
         "type": "boolean",
-        "default": "false",
+        "default": "true",
         "aliases": ["DD_TRACE_INTEGRATION_LAMBDA_ENABLED", "DD_INTEGRATION_LAMBDA_ENABLED"]
       }
     ],