diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy index e7d7af03fdf0..9e78c51028d5 100644 --- 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/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/JavaxResponseInstrumentationFactory.java b/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/JavaxResponseInstrumentationFactory.java index eac154456031..ece7ac568a05 100644 --- a/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/javax/response/JavaxResponseInstrumentationFactory.java +++ b/instrumentation/servlet/servlet-javax-common/javaagent/src/main/java/io/opentelemetry/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() {}