Fix dropwizard tests

open-telemetry · Dec 6, 2021 · 465dd78 · 465dd78
1 parent c6ce3f4
commit 465dd78
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy
@@ -82,6 +82,11 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport> implements Ag
     endpoint != NOT_FOUND
   }
 
+  @Override
+  boolean hasResponseSpan(ServerEndpoint endpoint) {
+    endpoint == NOT_FOUND
+  }
+
   @Override
   boolean testPathParam() {
     true
@@ -112,6 +117,11 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport> implements Ag
     }
   }
 
+  @Override
+  void responseSpan(TraceAssert trace, int index, Object parent, String method, ServerEndpoint endpoint) {
+    sendErrorSpan(trace, index, parent)
+  }
+
   static class TestApp extends Application<Configuration> {
     @Override
     void initialize(Bootstrap<Configuration> bootstrap) {

diff --git a/...javaagent/instrumentation/servlet/javax/response/JavaxResponseInstrumentationFactory.java b/...javaagent/instrumentation/servlet/javax/response/JavaxResponseInstrumentationFactory.java
@@ -14,11 +14,8 @@ public final class JavaxResponseInstrumentationFactory {
 
   public static TypeInstrumentation create() {
     return new HttpServletResponseInstrumentation(
-        BASE_PACKAGE, adviceClassName(".ResponseSendAdvice"));
-  }
-
-  private static String adviceClassName(String suffix) {
-    return JavaxResponseInstrumentationFactory.class.getPackage().getName() + suffix;
+        BASE_PACKAGE,
+        JavaxResponseInstrumentationFactory.class.getPackage().getName() + ".ResponseSendAdvice");
   }
 
   private JavaxResponseInstrumentationFactory() {}