Address review feedback on okhttp AsyncCall instrumentation

- Scope AsyncCallInstrumentation's muzzle to a named [3.0,4.0) directive
  (okhttp-async-3) so the 3.x-only async-call capture no longer claims the
  module-wide [3.0,) range; real version gate remains knownMatchingTypes.
- Remove two verbose comments amarziali flagged (the rationale lives in the
  vthread21Test javadoc, which documents and verifies it).
- Remove the maxJavaVersion=24 cap on both okhttp vthread suites. The cap was
  mis-inherited from java-concurrent-21.0, whose cap exists because its own
  test uses StructuredTaskScope.ShutdownOnFailure (a preview API removed in
  JDK 25) - not an instrumentation limit. Verified okhttp 3.x/4.x/5.x vthread
  suites pass on JDK 25.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: dougqh

dd-java-agent/instrumentation/okhttp/okhttp-3.0/build.gradle

@@ -1,10 +1,25 @@
 muzzle {
+  // Core tracing (OkHttp3Instrumentation -> TracingInterceptor), IAST and AppSec reference OkHttp
+  // types and apply to 3.x/4.x/5.x.
   pass {
+    name = 'okhttp-3'
     group = "com.squareup.okhttp3"
     module = "okhttp"
     versions = "[3.0,)"
     assertInverse = true
   }
+  // AsyncCallInstrumentation is 3.x-only: the matched type okhttp3.RealCall$AsyncCall relocated to
+  // okhttp3.internal.connection.RealCall$AsyncCall in 4.x (handled by the okhttp-4.0 module). Its
+  // advice references only java.lang.Runnable, never an OkHttp type, so muzzle has nothing
+  // version-specific to enforce here — this directive documents the [3.0,4.0) boundary; the real
+  // gate is knownMatchingTypes. No assertInverse for the same reason: with no OkHttp reference
+  // muzzle would pass outside the range (nothing to be missing), contradicting the assertion.
+  pass {
+    name = 'okhttp-async-3'
+    group = "com.squareup.okhttp3"
+    module = "okhttp"
+    versions = "[3.0,4.0)"
+  }
 }
 
 apply from: "$rootDir/gradle/java.gradle"
@@ -25,11 +40,6 @@ tasks.named("compileVthread21TestJava", JavaCompile) {
 tasks.named("vthread21Test", Test) {
   testJvmConstraints {
     minJavaVersion = JavaVersion.VERSION_21
-    // Cap at 24 to match java-concurrent-21.0, which provides the virtual-thread scope propagation
-    // (TaskRunner/VirtualThread instrumentation) this suite relies on and is only supported through
-    // JDK 24. Without this, the suite runs on the JDK 25 / "tip" (26) CI shards and times out
-    // because that propagation chain isn't active there.
-    maxJavaVersion = JavaVersion.VERSION_24
   }
 }
 

dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AsyncCallInstrumentation.java

@@ -12,42 +12,20 @@
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 
-/**
- * Captures the active scope at {@code AsyncCall.<init>} (i.e. the moment {@code
- * Call.enqueue(callback)} was invoked on the user's thread) and stores it in the {@code
- * ContextStore<Runnable, State>} shared with the rest of the concurrent instrumentation. {@code
- * RunnableInstrumentation} then re-activates that scope on {@code AsyncCall.run()} entry, which
- * overrides whatever scope {@code TaskRunner.run()} (or {@code beforeExecute}) put in place from
- * the dispatcher's worker thread.
- *
- * <p>Without this, {@code TaskRunnerInstrumentation} captures whatever scope happens to be active
- * on the worker thread when {@code Dispatcher.promoteAndExecute()} dequeues and submits the call —
- * and when promotion runs from inside {@code Dispatcher.finished()} (i.e. recursively from a
- * <em>different</em> AsyncCall's run()), that scope belongs to the finishing call, not to the
- * caller who actually enqueued this AsyncCall. Result: under concurrent OkHttp load, {@code
- * okhttp.request} spans cross-contaminate between traces.
- *
- * <p>{@code AsyncCall} is an inner class of {@code RealCall} and transitively implements {@link
- * Runnable}. This module targets OkHttp 3.x, where it lives at {@code okhttp3.RealCall$AsyncCall}.
- * OkHttp 4.x+ relocated it to {@code okhttp3.internal.connection.RealCall$AsyncCall}, which is
- * handled by the separate {@code okhttp-4.0} module.
- */
 @AutoService(InstrumenterModule.class)
 public final class AsyncCallInstrumentation extends InstrumenterModule.ContextTracking
     implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
   public AsyncCallInstrumentation() {
-    // Re-use the existing "okhttp" / "okhttp-3" instrumentation names so we don't introduce a
-    // separately-toggleable feature flag (DD_TRACE_OKHTTP_ASYNC_CALL_ENABLED). The capture here
-    // is conceptually part of the OkHttp instrumentation — if you disable OkHttp tracing, you
-    // also disable this capture, which is the right behavior.
-    //
-    // This is a ContextTracking module (like RunnableInstrumentation, which consumes the state we
-    // write) rather than a Tracing module: its sole job is to propagate the captured scope through
-    // the shared ContextStore<Runnable, State>, not to create spans of its own.
     super("okhttp", "okhttp-3");
   }
 
+  @Override
+  public String muzzleDirective() {
+    // 3.x only: okhttp3.RealCall$AsyncCall relocated in 4.x (handled by the okhttp-4.0 module).
+    return "okhttp-async-3";
+  }
+
   @Override
   public String[] knownMatchingTypes() {
     return new String[] {

dd-java-agent/instrumentation/okhttp/okhttp-4.0/build.gradle

@@ -33,9 +33,6 @@ addTestSuiteForDir('vthread21Test5', 'vthread21Test')
   tasks.named(suite, Test) {
     testJvmConstraints {
       minJavaVersion = JavaVersion.VERSION_21
-      // Cap at 24 to match java-concurrent-21.0, which provides the virtual-thread scope propagation
-      // these suites rely on and is only supported through JDK 24. See okhttp-3.0 for details.
-      maxJavaVersion = JavaVersion.VERSION_24
     }
   }
   tasks.named("check") {