Enable running with indy for jodd-http-4.2 (#9898)

open-telemetry · Nov 17, 2023 · a3b0e31 · a3b0e31
1 parent 9fb5b3f
commit a3b0e31
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/instrumentation/jodd-http-4.2/javaagent-unit-tests/build.gradle.kts b/instrumentation/jodd-http-4.2/javaagent-unit-tests/build.gradle.kts
@@ -0,0 +1,10 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+dependencies {
+  testImplementation("org.jodd:jodd-http:4.2.0")
+  testImplementation(project(":instrumentation:jodd-http-4.2:javaagent"))
+  testImplementation(project(":instrumentation-api"))
+  testImplementation(project(":instrumentation-api-semconv"))
+}
diff --git a/...4_2/JoddHttpHttpAttributesGetterTest.java → ...4_2/JoddHttpHttpAttributesGetterTest.java b/...4_2/JoddHttpHttpAttributesGetterTest.java → ...4_2/JoddHttpHttpAttributesGetterTest.java
diff --git a/.../opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java b/.../opentelemetry/javaagent/instrumentation/joddhttp/v4_2/JoddHttpInstrumentationModule.java
@@ -18,13 +18,6 @@ public JoddHttpInstrumentationModule() {
     super("jodd-http", "jodd-http-4.2");
   }
 
-  @Override
-  public boolean isIndyModule() {
-    // JoddHttpHttpAttributesGetterTest is not an agent test, with indy it can't access
-    // JoddHttpHttpAttributesGetter
-    return false;
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return Collections.singletonList(new JoddHttpInstrumentation());

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -324,6 +324,7 @@ include(":instrumentation:jms:jms-common:javaagent-unit-tests")
 include(":instrumentation:jmx-metrics:javaagent")
 include(":instrumentation:jmx-metrics:library")
 include(":instrumentation:jodd-http-4.2:javaagent")
+include(":instrumentation:jodd-http-4.2:javaagent-unit-tests")
 include(":instrumentation:jsf:jsf-javax-common:javaagent")
 include(":instrumentation:jsf:jsf-javax-common:testing")
 include(":instrumentation:jsf:jsf-jakarta-common:javaagent")