Instrument EMR's relocated AWS SDK (#8157)

* Support configuring a different namespace in AWS-SDK module
DataDog · Jan 6, 2025 · 6ef294d · 6ef294d
1 parent 350b2cd
commit 6ef294d
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 10 deletions.
diff --git a/...11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java b/...11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AWSHttpClientInstrumentation.java
@@ -22,10 +22,15 @@
  */
 public class AWSHttpClientInstrumentation
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public AWSHttpClientInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String instrumentedType() {
-    return "com.amazonaws.http.AmazonHttpClient";
+    return namespace + ".http.AmazonHttpClient";
   }
 
   @Override

diff --git a/.../aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java b/.../aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkModule.java
@@ -9,10 +9,16 @@
 
 /** Groups the instrumentations for AWS SDK 1.11.0+. */
 @AutoService(InstrumenterModule.class)
-public final class AwsSdkModule extends InstrumenterModule.Tracing {
+public class AwsSdkModule extends InstrumenterModule.Tracing {
+  private final String namespace;
 
   public AwsSdkModule() {
-    super("aws-sdk");
+    this("com.amazonaws", "aws-sdk");
+  }
+
+  protected AwsSdkModule(String namespace, String instrumentationName) {
+    super(instrumentationName);
+    this.namespace = namespace;
   }
 
   @Override
@@ -30,18 +36,18 @@ public String[] helperClassNames() {
   @Override
   public Map<String, String> contextStore() {
     Map<String, String> map = new java.util.HashMap<>();
-    map.put("com.amazonaws.services.sqs.model.ReceiveMessageResult", "java.lang.String");
+    map.put(namespace + ".services.sqs.model.ReceiveMessageResult", "java.lang.String");
     map.put(
-        "com.amazonaws.AmazonWebServiceRequest",
+        namespace + ".AmazonWebServiceRequest",
         "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
     return map;
   }
 
   @Override
   public List<Instrumenter> typeInstrumentations() {
     return Arrays.asList(
-        new AWSHttpClientInstrumentation(),
-        new RequestExecutorInstrumentation(),
-        new HandlerChainFactoryInstrumentation());
+        new AWSHttpClientInstrumentation(namespace),
+        new RequestExecutorInstrumentation(namespace),
+        new HandlerChainFactoryInstrumentation(namespace));
   }
 }
diff --git a/.../aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java b/.../aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/EmrSdkModule.java
@@ -0,0 +1,25 @@
+package datadog.trace.instrumentation.aws.v0;
+
+import static java.util.Collections.singletonMap;
+
+import com.google.auto.service.AutoService;
+import datadog.trace.agent.tooling.InstrumenterModule;
+import java.util.Map;
+
+/** Repackaged AWS SDK instrumentations for Amazon EMR. */
+@AutoService(InstrumenterModule.class)
+public class EmrSdkModule extends AwsSdkModule {
+  public EmrSdkModule() {
+    super("com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws", "emr-aws-sdk");
+  }
+
+  @Override
+  public String muzzleDirective() {
+    return "emr-aws-sdk";
+  }
+
+  @Override
+  public Map<String, String> adviceShading() {
+    return singletonMap("com.amazonaws", "com.amazon.ws.emr.hadoop.fs.shaded.com.amazonaws");
+  }
+}
diff --git a/...rc/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java b/...rc/main/java/datadog/trace/instrumentation/aws/v0/HandlerChainFactoryInstrumentation.java
@@ -15,10 +15,15 @@
  */
 public final class HandlerChainFactoryInstrumentation
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public HandlerChainFactoryInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String instrumentedType() {
-    return "com.amazonaws.handlers.HandlerChainFactory";
+    return namespace + ".handlers.HandlerChainFactory";
   }
 
   @Override

diff --git a/....0/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java b/....0/src/main/java/datadog/trace/instrumentation/aws/v0/RequestExecutorInstrumentation.java
@@ -19,10 +19,15 @@
  */
 public final class RequestExecutorInstrumentation
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
+  private final String namespace;
+
+  public RequestExecutorInstrumentation(String namespace) {
+    this.namespace = namespace;
+  }
 
   @Override
   public String instrumentedType() {
-    return "com.amazonaws.http.AmazonHttpClient$RequestExecutor";
+    return namespace + ".http.AmazonHttpClient$RequestExecutor";
   }
 
   @Override