Merge branch 'master' into dougqh/tagset

Author: dougqh

dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleForkedTest.groovy

@@ -22,12 +22,6 @@ import spock.lang.Shared
 
 class MuleForkedTest extends WithHttpServer<MuleTestContainer> {
 
-  // TODO since mule uses reactor core, things sometime propagate to places where they're not closed
-  @Override
-  boolean useStrictTraceWrites() {
-    return false
-  }
-
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()

dd-java-agent/instrumentation/mule-4.5/src/test/groovy/mule4/MuleHttpServerForkedTest.groovy

@@ -9,12 +9,6 @@ import spock.lang.Shared
 
 class MuleHttpServerForkedTest extends HttpServerTest<MuleTestContainer> {
 
-  // TODO since mule uses reactor core, things sometime propagate to places where they're not closed
-  @Override
-  boolean useStrictTraceWrites() {
-    return false
-  }
-
   @Override
   boolean testRedirect() {
     // Dynamic adding of headers to and HttpResponse from inside a mule application seems

dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/test/groovy/OpensearchRestClientTest.groovy

@@ -31,12 +31,6 @@ class OpensearchRestClientTest extends InstrumentationSpecification {
   @Shared
   RestClient client
 
-  @Override
-  boolean useStrictTraceWrites() {
-    //FIXME IDM
-    false
-  }
-
   def setupSpec() {
 
     aosWorkingDir = File.createTempDir("test-aos-working-dir-", "")

dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchNodeClientTest.groovy

@@ -28,12 +28,6 @@ class OpensearchNodeClientTest extends InstrumentationSpecification {
 
   def client = testNode.client()
 
-  @Override
-  boolean useStrictTraceWrites() {
-    //FIXME IDM
-    false
-  }
-
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()

internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java

@@ -47,6 +47,7 @@ public class InferredProxySpan implements ImplicitContextKeyed {
     SUPPORTED_PROXIES = new HashMap<>();
     SUPPORTED_PROXIES.put("aws-apigateway", "aws.apigateway");
     SUPPORTED_PROXIES.put("aws-httpapi", "aws.httpapi");
+    SUPPORTED_PROXIES.put("azure-apim", "azure.apim");
   }
 
   private final Map<String, String> headers;

internal-api/src/test/java/datadog/trace/api/gateway/InferredProxySpanTests.java

@@ -241,7 +241,10 @@ void testSupportedProxySystems(String proxySystem, String expectedSpanName) {
   }
 
   static Stream<Arguments> supportedProxySystems() {
-    return Stream.of(of("aws-apigateway", "aws.apigateway"), of("aws-httpapi", "aws.httpapi"));
+    return Stream.of(
+        of("aws-apigateway", "aws.apigateway"),
+        of("aws-httpapi", "aws.httpapi"),
+        of("azure-apim", "azure.apim"));
   }
 
   @Test