diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala index 1e4e5abde61e..43f3edd54283 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestAsyncWebServer.scala @@ -47,8 +47,9 @@ object AkkaHttpTestAsyncWebServer { case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) - case ERROR => resp.withEntity(endpoint.getBody) - case EXCEPTION => throw new Exception(endpoint.getBody) + case ERROR => resp.withEntity(endpoint.getBody) + case EXCEPTION => + throw new IllegalStateException(endpoint.getBody) case _ => HttpResponse(status = NOT_FOUND.getStatus) .withEntity(NOT_FOUND.getBody) diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala index e81c3036b1f3..9b55cb3f899a 100644 --- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala +++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpTestSyncWebServer.scala @@ -44,8 +44,9 @@ object AkkaHttpTestSyncWebServer { case QUERY_PARAM => resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) - case ERROR => resp.withEntity(endpoint.getBody) - case EXCEPTION => throw new Exception(endpoint.getBody) + case ERROR => resp.withEntity(endpoint.getBody) + case EXCEPTION => + throw new IllegalStateException(endpoint.getBody) case _ => HttpResponse(status = NOT_FOUND.getStatus) .withEntity(NOT_FOUND.getBody) diff --git a/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java b/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java index 4f8e008ba6ef..a7a9504f10ee 100644 --- a/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java +++ b/instrumentation/armeria/armeria-1.3/testing/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/AbstractArmeriaHttpServerTest.java @@ -82,7 +82,7 @@ protected Server setupServer() { .runWithSpan( "controller", () -> { - throw new Exception(EXCEPTION.getBody()); + throw new IllegalStateException(EXCEPTION.getBody()); })); sb.service( diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala index eba08585c610..3881555a8377 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala @@ -33,7 +33,7 @@ class FinatraController extends Controller { any(EXCEPTION.getPath) { request: Request => controller( EXCEPTION, - supplier(() => throw new Exception(EXCEPTION.getBody)) + supplier(() => throw new IllegalStateException(EXCEPTION.getBody)) ) } diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala index 95719e122f96..461cdf30e138 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala @@ -78,7 +78,9 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] { if (endpoint == ServerEndpoint.EXCEPTION) { span .hasStatus(StatusData.error()) - .hasException(new Exception(ServerEndpoint.EXCEPTION.getBody)) + .hasException( + new IllegalStateException(ServerEndpoint.EXCEPTION.getBody) + ) } span diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala index e855fb6933e1..bf0ca60da7fa 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala +++ b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraController.scala @@ -36,7 +36,7 @@ class FinatraController extends Controller { any(EXCEPTION.getPath) { request: Request => controller( EXCEPTION, - supplier(() => throw new Exception(EXCEPTION.getBody)) + supplier(() => throw new IllegalStateException(EXCEPTION.getBody)) ) } diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala index 73e6ff556888..94750c4fe503 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala @@ -79,7 +79,9 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] { if (endpoint == ServerEndpoint.EXCEPTION) { span .hasStatus(StatusData.error()) - .hasException(new Exception(ServerEndpoint.EXCEPTION.getBody)) + .hasException( + new IllegalStateException(ServerEndpoint.EXCEPTION.getBody) + ) } span diff --git a/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy b/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy index 560728c41d0f..2ef963ffb921 100644 --- a/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy +++ b/instrumentation/grails-3.0/javaagent/src/test/groovy/test/TestController.groovy @@ -58,7 +58,7 @@ class TestController implements Controller { @Action def exception() { controller(EXCEPTION) { - throw new Exception(EXCEPTION.body) + throw new IllegalStateException(EXCEPTION.body) } } diff --git a/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java b/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java index e8d42efd8169..c8dcf6c45163 100644 --- a/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java +++ b/instrumentation/grails-3.0/javaagent/src/test/java/test/GrailsTest.java @@ -156,7 +156,7 @@ public SpanDataAssert assertHandlerSpan( span.hasName(getHandlerSpanName(endpoint)).hasKind(SpanKind.INTERNAL); if (endpoint == EXCEPTION) { span.hasStatus(StatusData.error()); - span.hasException(new Exception(EXCEPTION.getBody())); + span.hasException(new IllegalStateException(EXCEPTION.getBody())); } return span; } diff --git a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java index 126b79a1da43..55b85c2c5b94 100644 --- a/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-11.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v11_0/JettyHandlerTest.java @@ -83,7 +83,6 @@ protected void configure(HttpServerTestOptions options) { Sets.difference( DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setHasResponseSpan(endpoint -> endpoint == REDIRECT || endpoint == ERROR); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> true); } diff --git a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java index 9d0e5e728f00..498bc624defd 100644 --- a/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java +++ b/instrumentation/jetty/jetty-12.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v12_0/Jetty12HandlerTest.java @@ -63,7 +63,6 @@ protected void configure(HttpServerTestOptions options) { unused -> Sets.difference( DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); } diff --git a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java index 30b119a60c8f..49196c6dbf93 100644 --- a/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java +++ b/instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/JettyHandlerTest.java @@ -83,7 +83,6 @@ protected void configure(HttpServerTestOptions options) { Sets.difference( DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(HttpAttributes.HTTP_ROUTE))); options.setHasResponseSpan(endpoint -> endpoint == REDIRECT || endpoint == ERROR); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseCustomizer(endpoint -> endpoint != EXCEPTION); } diff --git a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt index a00bb78a9d5b..36258096a572 100644 --- a/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt +++ b/instrumentation/ktor/ktor-1.0/library/src/test/kotlin/io/opentelemetry/instrumentation/ktor/v1_0/KtorHttpServerTest.kt @@ -60,7 +60,7 @@ class KtorHttpServerTest : AbstractHttpServerTest() { get(ServerEndpoint.EXCEPTION.path) { controller(ServerEndpoint.EXCEPTION) { - throw Exception(ServerEndpoint.EXCEPTION.body) + throw IllegalStateException(ServerEndpoint.EXCEPTION.body) } } diff --git a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt index 600973a1a29b..13c424166036 100644 --- a/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt +++ b/instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/AbstractKtorHttpServerTest.kt @@ -57,7 +57,7 @@ abstract class AbstractKtorHttpServerTest : AbstractHttpServerTest resp.withEntity(uri.queryString().orNull) case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) - case ERROR => resp.withEntity(endpoint.getBody) - case EXCEPTION => throw new Exception(endpoint.getBody) + case ERROR => resp.withEntity(endpoint.getBody) + case EXCEPTION => + throw new IllegalStateException(endpoint.getBody) case _ => HttpResponse(status = NOT_FOUND.getStatus) .withEntity(NOT_FOUND.getBody) diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala index 9016fd37847c..7a84c668e4cd 100644 --- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala +++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala @@ -42,7 +42,7 @@ object PekkoHttpTestSyncWebServer { case REDIRECT => resp.withHeaders(headers.Location(endpoint.getBody)) case ERROR => resp.withEntity(endpoint.getBody) - case EXCEPTION => throw new Exception(endpoint.getBody) + case EXCEPTION => throw new IllegalStateException(endpoint.getBody) case _ => HttpResponse(status = NOT_FOUND.getStatus) .withEntity(NOT_FOUND.getBody) diff --git a/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java b/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java index 721f709753b4..97e53fcb5292 100644 --- a/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java +++ b/instrumentation/restlet/restlet-1.1/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.java @@ -206,7 +206,6 @@ protected void configure(HttpServerTestOptions options) { options.setTestPathParam(true); options.setTestErrorBody(false); options.setTestHttpPipelining(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setExpectedHttpRoute( (endpoint, method) -> { if (HttpConstants._OTHER.equals(method)) { diff --git a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java index dbe3fab16e15..7ba0e3bc01e2 100644 --- a/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java +++ b/instrumentation/restlet/restlet-2.0/testing/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.java @@ -227,7 +227,6 @@ protected void configure(HttpServerTestOptions options) { super.configure(options); options.setTestPathParam(true); options.setTestErrorBody(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setExpectedHttpRoute( (endpoint, method) -> { if (HttpConstants._OTHER.equals(method)) { diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java index 81136e5b572b..07ac818be6ed 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/JettyServlet2Test.java @@ -93,7 +93,6 @@ protected void configure(HttpServerTestOptions options) { options.setTestCaptureHttpHeaders(false); options.setHasResponseSpan(e -> e.equals(REDIRECT) || e.equals(ERROR)); options.setHasResponseCustomizer(e -> true); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); } @Override diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AbstractServlet3Test.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AbstractServlet3Test.java index fb154f68ba99..882ec82e6c39 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AbstractServlet3Test.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/AbstractServlet3Test.java @@ -69,7 +69,6 @@ protected void configure(HttpServerTestOptions options) { options.setTestCaptureRequestParameters(true); options.setHasResponseCustomizer(e -> true); options.setHasResponseSpan(this::hasResponseSpan); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); } protected boolean hasResponseSpan(ServerEndpoint endpoint) { diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java index 53176264f306..26e292cc3a69 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServlet3Test.java @@ -46,7 +46,6 @@ public static boolean isBefore94() { protected void configure(HttpServerTestOptions options) { super.configure(options); options.setTestNotFound(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setContextPath("/jetty-context"); options.setVerifyServerSpanEndTime(!isAsyncTest()); } diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java index 4eb14dd9fc63..7c1632b100d3 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/jetty/JettyServletHandlerTest.java @@ -41,7 +41,6 @@ protected void configure(HttpServerTestOptions options) { super.configure(options); options.setContextPath(""); options.setTestNotFound(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHttpAttributes( serverEndpoint -> { Set> attributes = diff --git a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java index 72a2cacc0e4e..f9563d35540a 100644 --- a/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java +++ b/instrumentation/servlet/servlet-3.0/testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v3_0/tomcat/TomcatServlet3Test.java @@ -6,7 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v3_0.tomcat; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR; -import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS; import static org.assertj.core.api.Assertions.assertThat; @@ -71,7 +70,6 @@ public abstract class TomcatServlet3Test extends AbstractServlet3Test servlet) - throws Exception { + ServletContextHandler servletContext, String path, Class servlet) { servletContext.addServlet(servlet, path); } } diff --git a/instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java b/instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java index 45f0cb19aa74..6383de5093a1 100644 --- a/instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java +++ b/instrumentation/servlet/servlet-5.0/jetty11-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty/JettyServletHandlerTest.java @@ -5,8 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty; -import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION; - import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; @@ -36,7 +34,6 @@ protected void configure(HttpServerTestOptions options) { super.configure(options); options.setContextPath(""); options.setTestNotFound(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHttpAttributes( serverEndpoint -> { Set> attributes = diff --git a/instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java b/instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java index 1eba647f9fc8..deb4c814b7b9 100644 --- a/instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java +++ b/instrumentation/servlet/servlet-5.0/jetty12-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/jetty12/Jetty12Servlet5Test.java @@ -5,8 +5,6 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.jetty12; -import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION; - import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; @@ -30,7 +28,6 @@ public abstract class Jetty12Servlet5Test protected void configure(HttpServerTestOptions options) { super.configure(options); options.setTestNotFound(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setContextPath("/jetty-context"); } @@ -64,8 +61,7 @@ public void stopServer(Server server) throws Exception { @Override public void addServlet( - ServletContextHandler servletContext, String path, Class servlet) - throws Exception { + ServletContextHandler servletContext, String path, Class servlet) { servletContext.addServlet(servlet, path); } } diff --git a/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/AbstractServlet5Test.java b/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/AbstractServlet5Test.java index 35da3928cebd..2a4ff2f858e6 100644 --- a/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/AbstractServlet5Test.java +++ b/instrumentation/servlet/servlet-5.0/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/AbstractServlet5Test.java @@ -69,7 +69,6 @@ protected void configure(HttpServerTestOptions options) { options.setTestCaptureRequestParameters(true); options.setHasResponseCustomizer(e -> true); options.setHasResponseSpan(this::hasResponseSpan); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); } protected boolean hasResponseSpan(ServerEndpoint endpoint) { diff --git a/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/TomcatServlet5Test.java b/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/TomcatServlet5Test.java index 82a4dff407d4..ca6de3c88030 100644 --- a/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/TomcatServlet5Test.java +++ b/instrumentation/servlet/servlet-5.0/tomcat-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/servlet/v5_0/tomcat/TomcatServlet5Test.java @@ -6,7 +6,6 @@ package io.opentelemetry.javaagent.instrumentation.servlet.v5_0.tomcat; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.ERROR; -import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.NOT_FOUND; import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS; import static org.assertj.core.api.Assertions.assertThat; @@ -71,7 +70,6 @@ public abstract class TomcatServlet5Test extends AbstractServlet5Test true); } } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java index db292d9224ba..764a8ebe8c7c 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/AbstractServletFilterTest.java @@ -49,7 +49,6 @@ protected void configure(HttpServerTestOptions options) { options.setHasResponseSpan( endpoint -> endpoint == REDIRECT || endpoint == ERROR || endpoint == NOT_FOUND); options.setTestPathParam(true); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); } @Override diff --git a/instrumentation/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2ActionSpanTest.java b/instrumentation/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2ActionSpanTest.java index 05c1de44a893..f7d91eed52b1 100644 --- a/instrumentation/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2ActionSpanTest.java +++ b/instrumentation/struts-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/struts2/Struts2ActionSpanTest.java @@ -96,7 +96,6 @@ protected void configure(HttpServerTestOptions options) { options.setTestPathParam(true); options.setTestErrorBody(false); options.setHasHandlerSpan(endpoint -> !endpoint.equals(NOT_FOUND)); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseSpan( endpoint -> endpoint == REDIRECT diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java index 4a08cc9c7a83..b96d4d504692 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatAsyncTest.java @@ -112,7 +112,6 @@ protected void configure(HttpServerTestOptions options) { return super.expectedHttpRoute(endpoint, method); }); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseSpan(endpoint -> endpoint == NOT_FOUND || endpoint == REDIRECT); } diff --git a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java index 74e666f7a7c9..8eae88015a3c 100644 --- a/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java +++ b/instrumentation/tomcat/tomcat-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v10_0/TomcatHandlerTest.java @@ -102,7 +102,6 @@ protected void configure(HttpServerTestOptions options) { options.setHasResponseCustomizer(serverEndpoint -> true); options.setTestCaptureRequestParameters(true); options.setTestErrorBody(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseSpan( endpoint -> endpoint == REDIRECT || endpoint == ERROR || endpoint == NOT_FOUND); diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java index abe4e5e5eafe..fcd7e38cf768 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatAsyncTest.java @@ -107,7 +107,6 @@ protected void configure(HttpServerTestOptions options) { return super.expectedHttpRoute(endpoint, method); }); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseSpan(endpoint -> endpoint == NOT_FOUND || endpoint == REDIRECT); } diff --git a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java index 23f1b4be3fd0..be7109d4ad30 100644 --- a/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java +++ b/instrumentation/tomcat/tomcat-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/v7_0/TomcatHandlerTest.java @@ -102,7 +102,6 @@ protected void configure(HttpServerTestOptions options) { options.setHasResponseCustomizer(serverEndpoint -> true); options.setTestCaptureRequestParameters(true); options.setTestErrorBody(false); - options.setExpectedException(new IllegalStateException(EXCEPTION.getBody())); options.setHasResponseSpan( endpoint -> endpoint == REDIRECT || endpoint == ERROR || endpoint == NOT_FOUND); diff --git a/instrumentation/undertow-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowServerTest.java b/instrumentation/undertow-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowServerTest.java index bbadcf3b5c1b..442a2d0418de 100644 --- a/instrumentation/undertow-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowServerTest.java +++ b/instrumentation/undertow-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/undertow/UndertowServerTest.java @@ -23,7 +23,6 @@ import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension; import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions; -import io.opentelemetry.instrumentation.testing.util.ThrowingRunnable; import io.opentelemetry.semconv.ClientAttributes; import io.opentelemetry.semconv.ExceptionAttributes; import io.opentelemetry.semconv.HttpAttributes; @@ -106,10 +105,9 @@ public Undertow setupServer() { exchange -> testing.runWithSpan( "controller", - (ThrowingRunnable) - () -> { - throw new Exception(EXCEPTION.getBody()); - })) + () -> { + throw new IllegalStateException(EXCEPTION.getBody()); + })) .addExactPath( INDEXED_CHILD.rawPath(), exchange -> diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java index 970184967589..13e79b8f31b7 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java @@ -40,7 +40,7 @@ public final class HttpServerTestOptions { BiFunction expectedHttpRoute = (endpoint, method) -> null; Function sockPeerAddr = unused -> "127.0.0.1"; String contextPath = ""; - Throwable expectedException = new Exception(EXCEPTION.body); + Throwable expectedException = new IllegalStateException(EXCEPTION.body); // we're calling /success in the test, and most servers respond with 200 anyway int responseCodeOnNonStandardHttpMethod = ServerEndpoint.SUCCESS.status;