clean up

DataDog · Jul 11, 2024 · 2481985 · 2481985
1 parent ca62dad
commit 2481985
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/build.gradle
@@ -27,11 +27,10 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late
 
 dependencies {
   main_java17CompileOnly group: 'org.eclipse.jetty', name: 'jetty-client', version: '12.0.0'
-
-  //because contains some instrumentation that still apply
-  testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))
   // to test conflicts
+  testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-9.1'))
   testImplementation(project(':dd-java-agent:instrumentation:jetty-client:jetty-client-10.0'))
+
   testImplementation(project(path:':dd-java-agent:testing', configuration:'shadow')) {
     // explicitly declared below.
     exclude group: 'org.eclipse.jetty'

diff --git a/...nt-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java b/...nt-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java
@@ -33,8 +33,6 @@ public void onBegin(Response response) {
   @Override
   public void onComplete(Result result) {
     if (delegate instanceof Response.CompleteListener) {
-      // this probably does the wrong thing, but preserves old behaviour and is consistent
-      // with other http clients with completion callback registration
       try (AgentScope scope = activate(parent)) {
         ((Response.CompleteListener) delegate).onComplete(result);
       }

diff --git a/...ent/instrumentation/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy b/...ent/instrumentation/jetty-client/jetty-client-12.0/src/test/groovy/JettyClientTest.groovy
@@ -66,7 +66,6 @@ abstract class JettyClientTest extends HttpClientTest {
     try {
       def resp = req.send()
       blockUntilChildSpansFinished(1)
-      //assert propagatesContext
       return resp.status
     } catch (ExecutionException ex) {
       if (ex.cause instanceof HttpResponseException) {