Update asynchttpclient-2.0 to Instrumenter API (#3211)

* Update asynchttpclient-2.0 to Instrumenter API * Fix play-2.4 tests
open-telemetry · Jun 11, 2021 · f7a24b0 · f7a24b0
1 parent cc43cf3
commit f7a24b0
Show file tree

Hide file tree

Showing 27 changed files with 394 additions and 223 deletions.
diff --git a/...e-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy b/...e-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy
@@ -95,7 +95,7 @@ class CommonsHttpClientTest extends HttpClientTest<HttpMethod> implements AgentT
   Set<AttributeKey<?>> httpAttributes(URI uri) {
     Set<AttributeKey<?>> extra = [
       SemanticAttributes.HTTP_SCHEME,
-      SemanticAttributes.HTTP_TARGET,
+      SemanticAttributes.HTTP_TARGET
     ]
     super.httpAttributes(uri) + extra
   }

diff --git a/...he-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy b/...he-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy
@@ -46,7 +46,7 @@ abstract class ApacheHttpClientTest<T extends HttpRequest> extends HttpClientTes
   Set<AttributeKey<?>> httpAttributes(URI uri) {
     Set<AttributeKey<?>> extra = [
       SemanticAttributes.HTTP_SCHEME,
-      SemanticAttributes.HTTP_TARGET,
+      SemanticAttributes.HTTP_TARGET
     ]
     super.httpAttributes(uri) + extra
   }

diff --git a/...he-httpclient/apache-httpclient-5.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy b/...he-httpclient/apache-httpclient-5.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy
@@ -51,7 +51,7 @@ abstract class ApacheHttpClientTest<T extends HttpRequest> extends HttpClientTes
   Set<AttributeKey<?>> httpAttributes(URI uri) {
     Set<AttributeKey<?>> extra = [
       SemanticAttributes.HTTP_SCHEME,
-      SemanticAttributes.HTTP_TARGET,
+      SemanticAttributes.HTTP_TARGET
     ]
     super.httpAttributes(uri) + extra
   }

diff --git a/...groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.groovy b/...groovy/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpClientTest.groovy
@@ -70,7 +70,7 @@ abstract class AbstractArmeriaHttpClientTest extends HttpClientTest<HttpRequest>
       SemanticAttributes.HTTP_REQUEST_CONTENT_LENGTH,
       SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH,
       SemanticAttributes.HTTP_SCHEME,
-      SemanticAttributes.HTTP_TARGET,
+      SemanticAttributes.HTTP_TARGET
     ]
     super.httpAttributes(uri) + extra
   }

diff --git a/...pclient/AsyncHttpClientInjectAdapter.java → ...nt/v1_9/AsyncHttpClientInjectAdapter.java b/...pclient/AsyncHttpClientInjectAdapter.java → ...nt/v1_9/AsyncHttpClientInjectAdapter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import com.ning.http.client.Request;
 import io.opentelemetry.context.propagation.TextMapSetter;

diff --git a/...AsyncHttpClientInstrumentationModule.java → ...AsyncHttpClientInstrumentationModule.java b/...AsyncHttpClientInstrumentationModule.java → ...AsyncHttpClientInstrumentationModule.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static java.util.Arrays.asList;
 

diff --git a/...synchttpclient/AsyncHttpClientTracer.java → ...ttpclient/v1_9/AsyncHttpClientTracer.java b/...synchttpclient/AsyncHttpClientTracer.java → ...ttpclient/v1_9/AsyncHttpClientTracer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import com.ning.http.client.Request;
 import com.ning.http.client.Response;

diff --git a/...ynchttpclient/RequestInstrumentation.java → ...tpclient/v1_9/RequestInstrumentation.java b/...ynchttpclient/RequestInstrumentation.java → ...tpclient/v1_9/RequestInstrumentation.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge.currentContext;
-import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.AsyncHttpClientTracer.tracer;
+import static io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9.AsyncHttpClientTracer.tracer;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

diff --git a/...ation/asynchttpclient/ResponseAdvice.java → .../asynchttpclient/v1_9/ResponseAdvice.java b/...ation/asynchttpclient/ResponseAdvice.java → .../asynchttpclient/v1_9/ResponseAdvice.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import com.ning.http.client.AsyncCompletionHandler;
 import com.ning.http.client.AsyncHandler;

diff --git a/...synchttpclient/ResponseFailureAdvice.java → ...ttpclient/v1_9/ResponseFailureAdvice.java b/...synchttpclient/ResponseFailureAdvice.java → ...ttpclient/v1_9/ResponseFailureAdvice.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import com.ning.http.client.AsyncCompletionHandler;
 import com.ning.http.client.AsyncHandler;

diff --git a/...nchttpclient/ResponseInstrumentation.java → ...pclient/v1_9/ResponseInstrumentation.java b/...nchttpclient/ResponseInstrumentation.java → ...pclient/v1_9/ResponseInstrumentation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.asynchttpclient;
+package io.opentelemetry.javaagent.instrumentation.asynchttpclient.v1_9;
 
 import static io.opentelemetry.javaagent.extension.matcher.ClassLoaderMatcher.hasClassesNamed;
 import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;

diff --git a/.../async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle b/.../async-http-client/async-http-client-2.0/javaagent/async-http-client-2.0-javaagent.gradle
@@ -17,6 +17,9 @@ muzzle {
 dependencies {
   library "org.asynchttpclient:async-http-client:2.0.0"
 
+  compileOnly "com.google.auto.value:auto-value-annotations"
+  annotationProcessor "com.google.auto.value:auto-value"
+
   testInstrumentation project(':instrumentation:netty:netty-4.0:javaagent')
 }
 

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java b/...ava/io/opentelemetry/javaagent/instrumentation/asynchttpclient/AsyncHttpClientTracer.java
diff --git a/.../main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseAdvice.java b/.../main/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseAdvice.java
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseFailureAdvice.java b/...ava/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseFailureAdvice.java
diff --git a/...a/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseInstrumentation.java b/...a/io/opentelemetry/javaagent/instrumentation/asynchttpclient/ResponseInstrumentation.java