Simplify Apache HttpAsyncClient instrumentation (open-telemetry#1894)

* Simplify Apache HttpAsyncClient instrumentation * Bump baseline version to 4.1 * Remove all the Intellij auto-formatting of README
malafeev · Dec 14, 2020 · 8bcd5f1 · 8bcd5f1
1 parent c741eaa
commit 8bcd5f1
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -214,7 +214,7 @@ Because the automatic instrumentation runs in a different classpath than the ins
 | Library/Framework                                                                                                                     | Versions                       |
 |---------------------------------------------------------------------------------------------------------------------------------------|--------------------------------|
 | [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html)                                                                    | 10.0+                          |
-| [Apache HttpAsyncClient](https://hc.apache.org/index.html)                                                                            | 4.0+                           |
+| [Apache HttpAsyncClient](https://hc.apache.org/index.html)                                                                            | 4.1+                           |
 | [Apache HttpClient](https://hc.apache.org/index.html)                                                                                 | 2.0+                           |
 | [Armeria](https://armeria.dev)                                                                                                        | 0.99.8+                        |
 | [AsyncHttpClient](https://github.com/AsyncHttpClient/async-http-client)                                                               | 1.9+ (not including 2.x yet)   |

diff --git a/...entation/apache-httpasyncclient-4.0/javaagent/apache-httpasyncclient-4.0-javaagent.gradle b/...entation/apache-httpasyncclient-4.0/javaagent/apache-httpasyncclient-4.0-javaagent.gradle
diff --git a/...aagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java b/...aagent/instrumentation/apachehttpasyncclient/ApacheHttpClientRedirectInstrumentation.java
diff --git a/...entation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle b/...entation/apache-httpasyncclient-4.1/javaagent/apache-httpasyncclient-4.1-javaagent.gradle
@@ -0,0 +1,16 @@
+apply from: "$rootDir/gradle/instrumentation.gradle"
+
+muzzle {
+  pass {
+    group = "org.apache.httpcomponents"
+    module = "httpasyncclient"
+    // 4.0 and 4.0.1 don't copy over the traceparent (etc) http headers on redirect
+    versions = "[4.1,)"
+    // TODO implement a muzzle check so that 4.0.x (at least 4.0 and 4.0.1) do not get applied
+    //  and then bring back assertInverse
+  }
+}
+
+dependencies {
+  library group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1'
+}
diff --git a/...ApacheHttpAsyncClientInstrumentation.java → ...ApacheHttpAsyncClientInstrumentation.java b/...ApacheHttpAsyncClientInstrumentation.java → ...ApacheHttpAsyncClientInstrumentation.java
diff --git a/...HttpAsyncClientInstrumentationModule.java → ...HttpAsyncClientInstrumentationModule.java b/...HttpAsyncClientInstrumentationModule.java → ...HttpAsyncClientInstrumentationModule.java
@@ -15,12 +15,11 @@
 @AutoService(InstrumentationModule.class)
 public class ApacheHttpAsyncClientInstrumentationModule extends InstrumentationModule {
   public ApacheHttpAsyncClientInstrumentationModule() {
-    super("apache-httpasyncclient", "apache-httpasyncclient-4.0");
+    super("apache-httpasyncclient", "apache-httpasyncclient-4.1");
   }
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return asList(
-        new ApacheHttpAsyncClientInstrumentation(), new ApacheHttpClientRedirectInstrumentation());
+    return asList(new ApacheHttpAsyncClientInstrumentation());
   }
 }
diff --git a/...ncclient/ApacheHttpAsyncClientTracer.java → ...ncclient/ApacheHttpAsyncClientTracer.java b/...ncclient/ApacheHttpAsyncClientTracer.java → ...ncclient/ApacheHttpAsyncClientTracer.java
diff --git a/...asyncclient/HttpHeadersInjectAdapter.java → ...asyncclient/HttpHeadersInjectAdapter.java b/...asyncclient/HttpHeadersInjectAdapter.java → ...asyncclient/HttpHeadersInjectAdapter.java
diff --git a/.../ApacheHttpAsyncClientCallbackTest.groovy → .../ApacheHttpAsyncClientCallbackTest.groovy b/.../ApacheHttpAsyncClientCallbackTest.groovy → .../ApacheHttpAsyncClientCallbackTest.groovy
diff --git a/...cheHttpAsyncClientNullCallbackTest.groovy → ...cheHttpAsyncClientNullCallbackTest.groovy b/...cheHttpAsyncClientNullCallbackTest.groovy → ...cheHttpAsyncClientNullCallbackTest.groovy
diff --git a/...t/groovy/ApacheHttpAsyncClientTest.groovy → ...t/groovy/ApacheHttpAsyncClientTest.groovy b/...t/groovy/ApacheHttpAsyncClientTest.groovy → ...t/groovy/ApacheHttpAsyncClientTest.groovy
diff --git a/...ent/src/test/groovy/HttpUriRequest.groovy → ...ent/src/test/groovy/HttpUriRequest.groovy b/...ent/src/test/groovy/HttpUriRequest.groovy → ...ent/src/test/groovy/HttpUriRequest.groovy
diff --git a/...on/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle b/...on/elasticsearch/elasticsearch-rest-5.0/javaagent/elasticsearch-rest-5.0-javaagent.gradle
@@ -26,7 +26,7 @@ dependencies {
   implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common:javaagent')
 
   testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent')
-  testImplementation project(':instrumentation:apache-httpasyncclient-4.0:javaagent')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.1:javaagent')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'

diff --git a/...on/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle b/...on/elasticsearch/elasticsearch-rest-6.4/javaagent/elasticsearch-rest-6.4-javaagent.gradle
@@ -26,7 +26,7 @@ dependencies {
   implementation project(':instrumentation:elasticsearch:elasticsearch-rest-common:javaagent')
 
   testImplementation project(':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent')
-  testImplementation project(':instrumentation:apache-httpasyncclient-4.0:javaagent')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.1:javaagent')
   //TODO: review the following claim, we are not using embedded ES anymore
   // Netty is used, but it adds complexity to the tests since we're using embedded ES.
   //testImplementation project(':instrumentation:netty:netty-4.1:javaagent')

diff --git a/...search/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle b/...search/elasticsearch-transport-5.0/javaagent/elasticsearch-transport-5.0-javaagent.gradle
@@ -22,7 +22,7 @@ dependencies {
 
   // Ensure no cross interference
   testImplementation project(':instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent')
-  testImplementation project(':instrumentation:apache-httpasyncclient-4.0:javaagent')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.1:javaagent')
   testImplementation project(':instrumentation:netty:netty-4.1:javaagent')
 
   testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'

diff --git a/...search/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle b/...search/elasticsearch-transport-5.3/javaagent/elasticsearch-transport-5.3-javaagent.gradle
@@ -20,7 +20,7 @@ dependencies {
 
   implementation project(':instrumentation:elasticsearch:elasticsearch-transport-common:javaagent')
 
-  testImplementation project(':instrumentation:apache-httpasyncclient-4.0:javaagent')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.1:javaagent')
   testImplementation project(':instrumentation:netty:netty-4.1:javaagent')
   testImplementation project(':instrumentation:spring:spring-data-1.8:javaagent')
 

diff --git a/...search/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle b/...search/elasticsearch-transport-6.0/javaagent/elasticsearch-transport-6.0-javaagent.gradle
@@ -30,7 +30,7 @@ dependencies {
 
   // Ensure no cross interference
   testImplementation project(':instrumentation:elasticsearch:elasticsearch-rest-5.0:javaagent')
-  testImplementation project(':instrumentation:apache-httpasyncclient-4.0:javaagent')
+  testImplementation project(':instrumentation:apache-httpasyncclient-4.1:javaagent')
   testImplementation project(':instrumentation:netty:netty-4.1:javaagent')
 
   testLibrary group: 'org.elasticsearch.plugin', name: 'transport-netty4-client', version: '6.0.0'

diff --git a/settings.gradle b/settings.gradle
@@ -56,7 +56,7 @@ include ':smoke-tests'
 include ':instrumentation:akka-actor-2.5:javaagent'
 include ':instrumentation:akka-http-10.0:javaagent'
 include ':instrumentation:apache-camel-2.20:javaagent'
-include ':instrumentation:apache-httpasyncclient-4.0:javaagent'
+include ':instrumentation:apache-httpasyncclient-4.1:javaagent'
 include ':instrumentation:apache-httpclient:apache-httpclient-2.0:javaagent'
 include ':instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent'
 include ':instrumentation:armeria-1.0:javaagent'