Merge branch 'master' into alexeyk/refactor-buildSrc-from-groovy-to-kotlin

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java

@@ -3,22 +3,20 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers;
-import java.io.IOException;
 import net.bytebuddy.asm.Advice;
 
 class ProcessImplStartAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static AgentSpan startSpan(@Advice.Argument(0) final String[] command) throws IOException {
+  public static AgentSpan beforeStart(@Advice.Argument(0) final String[] command) {
     if (!ProcessImplInstrumentationHelpers.ONLINE) {
       return null;
     }
 
-    if (command.length == 0) {
+    if (command.length == 0 || !AgentTracer.isRegistered()) {
       return null;
     }
 
-    final AgentTracer.TracerAPI tracer = AgentTracer.get();
-    final AgentSpan span = tracer.startSpan("appsec", "command_execution");
+    final AgentSpan span = AgentTracer.startSpan("appsec", "command_execution");
     span.setSpanType("system");
     span.setResourceName(ProcessImplInstrumentationHelpers.determineResource(command));
     span.setTag("component", "subprocess");
@@ -29,7 +27,7 @@ public static AgentSpan startSpan(@Advice.Argument(0) final String[] command) th
   }
 
   @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
-  public static void endSpan(
+  public static void afterStart(
       @Advice.Return Process p, @Advice.Enter AgentSpan span, @Advice.Thrown Throwable t) {
     if (span == null) {
       return;

dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/RuntimeExecStringAdvice.java

@@ -1,20 +1,23 @@
 package datadog.trace.instrumentation.java.lang;
 
+import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers;
-import java.io.IOException;
 import net.bytebuddy.asm.Advice;
 
 class RuntimeExecStringAdvice {
   @Advice.OnMethodEnter(suppress = Throwable.class)
-  public static void beforeExec(@Advice.Argument(0) final String command) throws IOException {
-    if (command == null) {
-      return;
+  public static boolean beforeExec(@Advice.Argument(0) final String command) {
+    if (command == null || !AgentTracer.isRegistered()) {
+      return false;
     }
     ProcessImplInstrumentationHelpers.shiRaspCheck(command);
+    return true;
   }
 
   @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
-  public static void afterExec() {
-    ProcessImplInstrumentationHelpers.resetCheckShi();
+  public static void afterExec(@Advice.Enter boolean checking) {
+    if (checking) {
+      ProcessImplInstrumentationHelpers.resetCheckShi();
+    }
   }
 }

dd-smoke-tests/field-injection/src/test/groovy/datadog/smoketest/FieldInjectionSmokeTest.groovy

@@ -61,7 +61,6 @@ class FieldInjectionSmokeTest extends Specification {
     command.add("-XX:ErrorFile=/tmp/hs_err_pid%p.log")
     // turn off these features as their debug output can break up our expected logging lines on IBM JVMs
     // causing random test failures (we are not testing these features here so they don't need to be on)
-    command.add("-Ddd.crashtracking.enabled=false")
     command.add("-Ddd.instrumentation.telemetry.enabled=false")
     command.add("-Ddd.remote_config.enabled=false")
     command.add("-Ddd.writer.type=TraceStructureWriter")

internal-api/src/main/java/datadog/trace/util/AgentTaskScheduler.java

@@ -4,6 +4,7 @@
 import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER;
 import static datadog.trace.util.AgentThreadFactory.newAgentThread;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -225,6 +226,12 @@ private void prepareWorkQueue() {
     } catch (final InterruptedException e) {
       // ignore, we only want to preload queue internals
     }
+    if (this == INSTANCE) {
+      // preload a future no-op task to ensure workQueue.take() will use await with timeout during
+      // premain - otherwise on Java 25 it will load ForkJoinPool which in turn loads ForkJoinTask,
+      // which then means we lose the chance to field-inject context into ForkJoinTask instances
+      workQueue.offer(FUTURE_NOOP_PLACEHOLDER);
+    }
   }
 
   // for testing
@@ -302,6 +309,9 @@ public void run() {
 
   private static final AtomicInteger TASK_SEQUENCE_GENERATOR = new AtomicInteger();
 
+  private static final PeriodicTask<Object> FUTURE_NOOP_PLACEHOLDER =
+      new PeriodicTask<>(null, new Scheduled<>(null), 10, 0, MINUTES);
+
   private static final class PeriodicTask<T> implements Delayed {
 
     private final Task<T> task;