Update the default expected exception in server tests (#12555)

Author: jaydeluca

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)

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)

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(

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))
     )
   }
 

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

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))
     )
   }
 

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

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)
     }
   }
 

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;
   }

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);
   }