Fix V0 HTTP client operation names to prevent duplicate endpoints in APM Endpoints view

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy

@@ -16,6 +16,11 @@ import java.util.concurrent.TimeUnit
 @Timeout(5)
 class ApacheHttpAsyncClientCallbackTest extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
+  @Override
+  String operation() {
+    "apache-httpasyncclient.request"
+  }
+
   @Shared
   RequestConfig requestConfig = RequestConfig.custom()
   .setConnectTimeout(CONNECT_TIMEOUT_MS)

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy

@@ -11,7 +11,12 @@ import spock.lang.Timeout
 import java.util.concurrent.Future
 
 @Timeout(5)
-class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0{
+class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+
+  @Override
+  String operation() {
+    "apache-httpasyncclient.request"
+  }
 
   @Shared
   RequestConfig requestConfig = RequestConfig.custom()

dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/test/groovy/ApacheHttpAsyncClientTest.groovy

@@ -95,6 +95,10 @@ abstract class ApacheHttpAsyncClientTest extends HttpClientTest {
 }
 
 class ApacheHttpAsyncClientV0Test extends ApacheHttpAsyncClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "apache-httpasyncclient.request"
+  }
 }
 
 class ApacheHttpAsyncClientV1ForkedTest extends ApacheHttpAsyncClientTest implements TestingGenericHttpNamingConventions.ClientV1 {

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy

@@ -13,6 +13,11 @@ import spock.lang.Timeout
 @Timeout(5)
 class ApacheHttpClientResponseHandlerTest extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
+  @Override
+  String operation() {
+    "apache-httpclient.request"
+  }
+
   @Shared
   def client = new DefaultHttpClient()
 

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/test/groovy/ApacheHttpClientTest.groovy

@@ -14,6 +14,12 @@ import spock.lang.Shared
 import spock.lang.Timeout
 
 abstract class ApacheHttpClientTest<T extends HttpRequest> extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+
+  @Override
+  String operation() {
+    "apache-httpclient.request"
+  }
+
   @Shared
   def client = new DefaultHttpClient()
 

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpAsyncClient5Test.groovy

@@ -58,6 +58,10 @@ abstract class ApacheHttpAsyncClient5Test<T extends HttpRequest> extends HttpCli
 }
 
 class ApacheHttpAsyncClient5NamingV0Test extends ApacheHttpAsyncClient5Test implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "apache-httpclient.request"
+  }
 }
 
 class ApacheHttpAsyncClient5NamingV1ForkedTest extends ApacheHttpAsyncClient5Test implements TestingGenericHttpNamingConventions.ClientV1 {

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy

@@ -17,6 +17,11 @@ import java.util.concurrent.TimeUnit
 @Timeout(5)
 class ApacheHttpClientResponseHandlerTest extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
+  @Override
+  String operation() {
+    "apache-httpclient.request"
+  }
+
   @Shared
   def client = HttpClients.custom()
   .setConnectionManager(new BasicHttpClientConnectionManager())

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/test/groovy/ApacheHttpClientTest.groovy

@@ -18,6 +18,11 @@ import java.util.concurrent.TimeUnit
 
 abstract class ApacheHttpClientTest<T extends HttpRequest> extends HttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
+  @Override
+  String operation() {
+    "apache-httpclient.request"
+  }
+
   @Shared
   def client = HttpClients.custom()
   .setConnectionManager(new BasicHttpClientConnectionManager())

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/LegacyAWS1ClientForkedTest.groovy

@@ -179,7 +179,7 @@ class LegacyAWS1ClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "$method $path"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -291,7 +291,7 @@ class LegacyAWS1ClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "$method /$url"
           spanType DDSpanTypes.HTTP_CLIENT
           errored true
@@ -418,7 +418,7 @@ class LegacyAWS1ClientForkedTest extends InstrumentationSpecification {
         }
         (1..4).each {
           span {
-            operationName "http.request"
+            operationName "apache-httpclient.request"
             resourceName "GET /someBucket/someKey"
             spanType DDSpanTypes.HTTP_CLIENT
             errored true

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test_before_1_11_106/groovy/LegacyAWS0ClientForkedTest.groovy

@@ -125,7 +125,7 @@ class LegacyAWS0ClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "$method $path"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -207,7 +207,7 @@ class LegacyAWS0ClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "$method /$url"
           spanType DDSpanTypes.HTTP_CLIENT
           errored true
@@ -331,7 +331,7 @@ class LegacyAWS0ClientForkedTest extends InstrumentationSpecification {
         }
         (1..4).each {
           span {
-            operationName "http.request"
+            operationName "apache-httpclient.request"
             resourceName "GET /someBucket/someKey"
             spanType DDSpanTypes.HTTP_CLIENT
             errored true

dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/test/groovy/LegacyAws2ClientForkedTest.groovy

@@ -156,7 +156,7 @@ class LegacyAws2ClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "$method $path"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -421,7 +421,7 @@ class LegacyAws2ClientForkedTest extends InstrumentationSpecification {
         }
         (1..4).each {
           span {
-            operationName "http.request"
+            operationName "apache-httpclient.request"
             resourceName "GET /somebucket/somekey"
             spanType DDSpanTypes.HTTP_CLIENT
             errored true

dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy

@@ -244,7 +244,7 @@ class SnsClientV0Test extends SnsClientTest {
     if ("SNS" == awsService) {
       return "aws.http"
     }
-    return "http.request"
+    return "apache-httpclient.request"
   }
 
   @Override
@@ -289,7 +289,7 @@ class SnsClientV0DataStreamsTest extends SnsClientTest {
     if ("SNS" == awsService) {
       return "aws.http"
     }
-    return "http.request"
+    return "apache-httpclient.request"
   }
 
   @Override

dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/test/groovy/LegacySqsClientForkedTest.groovy

@@ -100,7 +100,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /?/somequeue"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -146,7 +146,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /?/somequeue"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -229,7 +229,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /?/somequeue"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -295,7 +295,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /?/somequeue"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -340,7 +340,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /?/somequeue"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false

dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/test/groovy/LegacySqsClientForkedTest.groovy

@@ -103,7 +103,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -149,7 +149,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -231,7 +231,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -294,7 +294,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false
@@ -339,7 +339,7 @@ class LegacySqsClientForkedTest extends InstrumentationSpecification {
           }
         }
         span {
-          operationName "http.request"
+          operationName "apache-httpclient.request"
           resourceName "POST /"
           spanType DDSpanTypes.HTTP_CLIENT
           errored false

dd-java-agent/instrumentation/commons-httpclient-2.0/src/test/groovy/CommonsHttpClientTest.groovy

@@ -77,6 +77,10 @@ abstract class CommonsHttpClientTest extends HttpClientTest {
 }
 
 class CommonsHttpClientV0ForkedTest extends CommonsHttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "commons-http-client.request"
+  }
 }
 
 class CommonsHttpClientV1ForkedTest extends CommonsHttpClientTest implements TestingGenericHttpNamingConventions.ClientV1 {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy

@@ -97,7 +97,7 @@ class Elasticsearch6RestClientTest extends InstrumentationSpecification {
         span {
           serviceName "elasticsearch"
           resourceName "GET /_cluster/health"
-          operationName "http.request"
+          operationName "apache-httpasyncclient.request"
           spanType DDSpanTypes.HTTP_CLIENT
           childOf span(0)
           tags {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy

@@ -101,7 +101,7 @@ class Elasticsearch6RestClientTest extends InstrumentationSpecification {
         span {
           serviceName "elasticsearch"
           resourceName "GET _cluster/health"
-          operationName "http.request"
+          operationName "apache-httpasyncclient.request"
           spanType DDSpanTypes.HTTP_CLIENT
           childOf span(0)
           tags {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/test/groovy/Elasticsearch6RestClientTest.groovy

@@ -97,7 +97,7 @@ class Elasticsearch6RestClientTest extends InstrumentationSpecification {
         span {
           serviceName "elasticsearch"
           resourceName "GET _cluster/health"
-          operationName "http.request"
+          operationName "apache-httpasyncclient.request"
           spanType DDSpanTypes.HTTP_CLIENT
           childOf span(0)
           tags {

dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/test/groovy/Elasticsearch7RestClientTest.groovy

@@ -133,7 +133,7 @@ class Elasticsearch7RestClientTest extends InstrumentationSpecification {
         span {
           serviceName "elasticsearch"
           resourceName "GET /_cluster/health"
-          operationName "http.request"
+          operationName "apache-httpasyncclient.request"
           spanType DDSpanTypes.HTTP_CLIENT
           childOf span(0)
           tags {

dd-java-agent/instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientAsyncTest.groovy

@@ -7,6 +7,12 @@ import spock.lang.Timeout
 @Flaky
 @Timeout(5)
 class GoogleHttpClientAsyncTest extends AbstractGoogleHttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+
+  @Override
+  String operation() {
+    "google-http-client.request"
+  }
+
   @Override
   HttpResponse executeRequest(HttpRequest request) {
     return request.executeAsync().get()

dd-java-agent/instrumentation/google-http-client-1.19/src/test/groovy/GoogleHttpClientTest.groovy

@@ -13,6 +13,10 @@ abstract class GoogleHttpClientTest extends AbstractGoogleHttpClientTest {
 
 @Timeout(5)
 class GoogleHttpClientV0ForkedTest extends GoogleHttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "google-http-client.request"
+  }
 }
 
 @Timeout(5)

dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/test/groovy/GrizzlyAsyncHttpClientTest.groovy

@@ -105,6 +105,10 @@ abstract class GrizzlyAsyncHttpClientTest extends HttpClientTest {
 }
 
 class GrizzlyAsyncHttpClientV0Test extends GrizzlyAsyncHttpClientTest implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "grizzly-http-async-client.request"
+  }
 }
 
 class GrizzlyAsyncHttpClientV1ForkedTest extends GrizzlyAsyncHttpClientTest implements TestingGenericHttpNamingConventions.ClientV1 {

dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionConnectFirstTest.groovy

@@ -4,7 +4,12 @@ import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions
 import spock.lang.Timeout
 
 @Timeout(5)
-class HttpUrlConnectionConnectFirstTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0{
+class HttpUrlConnectionConnectFirstTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0 {
+
+  @Override
+  String operation() {
+    "http-url-connection.request"
+  }
 
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, String body, Closure callback) {

dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy

@@ -4,6 +4,11 @@ import spock.lang.Timeout
 @Timeout(5)
 class HttpUrlConnectionResponseCodeOnlyTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0 {
 
+  @Override
+  String operation() {
+    "http-url-connection.request"
+  }
+
   @Override
   int doRequest(String method, URI uri, Map<String, String> headers, String body, Closure callback) {
     HttpURLConnection connection = uri.toURL().openConnection()

dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/HttpUrlConnectionTest.groovy

@@ -376,7 +376,12 @@ abstract class HttpUrlConnectionTest extends HttpClientTest {
   }
 }
 
-class HttpUrlConnectionV0ForkedTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0 {}
+class HttpUrlConnectionV0ForkedTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV0 {
+  @Override
+  String operation() {
+    "http-url-connection.request"
+  }
+}
 
 class HttpUrlConnectionV1ForkedTest extends HttpUrlConnectionTest implements TestingGenericHttpNamingConventions.ClientV1 {
 }