Fix AWS tests for indy, enable for testing with indy flag

open-telemetry · Oct 2, 2023 · 5adf59e · 5adf59e
1 parent 80dee2f
commit 5adf59e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 5 deletions.
diff --git a/...ntelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java b/...ntelemetry/javaagent/instrumentation/awssdk/v2_2/AbstractAwsSdkInstrumentationModule.java
@@ -27,11 +27,6 @@ public boolean isHelperClass(String className) {
     return className.startsWith("io.opentelemetry.contrib.awsxray.");
   }
 
-  @Override
-  public boolean isIndyModule() {
-    return false;
-  }
-
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // We don't actually transform it but want to make sure we only apply the instrumentation when

diff --git a/...a/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java b/...a/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/AwsSdkInstrumentationModule.java
@@ -13,6 +13,9 @@
 import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ClassInjector;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.ExtendedInstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.injection.InjectionMode;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @AutoService(InstrumentationModule.class)
 public class AwsSdkInstrumentationModule extends AbstractAwsSdkInstrumentationModule
@@ -21,6 +24,35 @@ public AwsSdkInstrumentationModule() {
     super("aws-sdk-2.2-core");
   }
 
+  @Override
+  @SuppressWarnings("unchecked")
+  public List<String> getAdditionalHelperClassNames() {
+    if (isIndyModule()) {
+      // With the invokedynamic approach, the SnsInstrumentationModule and SqsInstrumentationModule
+      // are not required anymore, because we don't inject the helpers which reference potentially
+      // missing classes
+      // Instead, those are loaded by the InstrumentationModuleClassloader and LinkageErrors are
+      // caught just like when using those classes as library instrumentation
+      List<String> helpers = new ArrayList<>();
+      InstrumentationModule[] modules = {
+        new SnsInstrumentationModule(), new SqsInstrumentationModule()
+      };
+      for (InstrumentationModule include : modules) {
+        try {
+          List<String> moduleRefs =
+              (List<String>)
+                  include.getClass().getDeclaredMethod("getMuzzleHelperClassNames").invoke(include);
+          helpers.addAll(moduleRefs);
+        } catch (Exception e) {
+          throw new IllegalStateException(e);
+        }
+      }
+      return helpers;
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
   /**
    * Injects resource file with reference to our {@link TracingExecutionInterceptor} to allow SDK's
    * service loading mechanism to pick it up.