Align apache http client 5 instrumentation names

amarziali · amarziali · commit 03a57f4778f1 · 2024-02-01T10:53:35.000+01:00
diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java
@@ -27,7 +27,8 @@ public class ApacheHttpAsyncClientInstrumentation extends Instrumenter.Tracing
     implements Instrumenter.CanShortcutTypeMatching {
 
   public ApacheHttpAsyncClientInstrumentation() {
-    super("httpasyncclient5", "apache-httpasyncclient5");
+    super(
+        "httpasyncclient5", "apache-httpasyncclient5", "httpasyncclient", "apache-httpasyncclient");
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientDecorator.java
@@ -17,7 +17,14 @@ public class ApacheHttpClientDecorator extends HttpClientDecorator<HttpRequest,
 
   @Override
   protected String[] instrumentationNames() {
-    return new String[] {"httpclient5", "apache-httpclient5", "apache-http-client5"};
+    return new String[] {
+      "httpclient5",
+      "apache-httpclient5",
+      "apache-http-client5",
+      "httpclient",
+      "apache-httpclient",
+      "apache-http-client"
+    };
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java
@@ -23,7 +23,13 @@ public class ApacheHttpClientInstrumentation extends Instrumenter.Tracing
     implements Instrumenter.CanShortcutTypeMatching {
 
   public ApacheHttpClientInstrumentation() {
-    super("httpclient5", "apache-httpclient5", "apache-http-client5");
+    super(
+        "httpclient5",
+        "apache-httpclient5",
+        "apache-http-client5",
+        "httpclient",
+        "apache-httpclient",
+        "apache-http-client");
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public class ApacheHttpAsyncClientInstrumentation extends Instrumenter.Tracing`
`27`	`27`	`implements Instrumenter.CanShortcutTypeMatching {`
`28`	`28`
`29`	`29`	`public ApacheHttpAsyncClientInstrumentation() {`
`30`		`- super("httpasyncclient5", "apache-httpasyncclient5");`
	`30`	`+ super(`
	`31`	`+ "httpasyncclient5", "apache-httpasyncclient5", "httpasyncclient", "apache-httpasyncclient");`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`@Override`