jsp tests

Author: jaydeluca

instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java

@@ -44,8 +44,7 @@
 class JspInstrumentationBasicTests extends AbstractHttpServerUsingTest<Tomcat> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private static JspSpanAssertions spanAsserts;
 

instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java

@@ -38,8 +38,7 @@
 class JspInstrumentationForwardTests extends AbstractHttpServerUsingTest<Tomcat> {
 
   @RegisterExtension
-  public static final InstrumentationExtension testing =
-      HttpServerInstrumentationExtension.forAgent();
+  static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
   private static JspSpanAssertions spanAsserts;
 

instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java

@@ -31,7 +31,7 @@ class JspSpanAssertions {
     this.port = port;
   }
 
-  SpanDataAssert assertServerSpan(SpanDataAssert span, JspSpan spanData) {
+  void assertServerSpan(SpanDataAssert span, JspSpan spanData) {
     if (spanData.getExceptionClass() != null) {
       span.hasStatus(StatusData.error())
           .hasEventsSatisfyingExactly(
@@ -58,7 +58,7 @@ SpanDataAssert assertServerSpan(SpanDataAssert span, JspSpan spanData) {
                               val -> val.isInstanceOf(String.class))));
     }
 
-    return span.hasName(spanData.getMethod() + " " + spanData.getRoute())
+    span.hasName(spanData.getMethod() + " " + spanData.getRoute())
         .hasNoParent()
         .hasKind(SpanKind.SERVER)
         .hasAttributesSatisfyingExactly(
@@ -83,7 +83,7 @@ SpanDataAssert assertServerSpan(SpanDataAssert span, JspSpan spanData) {
                         v -> assertThat(v).isEqualTo("500"))));
   }
 
-  SpanDataAssert assertCompileSpan(SpanDataAssert span, JspSpan spanData) {
+  void assertCompileSpan(SpanDataAssert span, JspSpan spanData) {
     if (spanData.getExceptionClass() != null) {
       span.hasStatus(StatusData.error())
           .hasEventsSatisfyingExactly(
@@ -102,7 +102,7 @@ SpanDataAssert assertCompileSpan(SpanDataAssert span, JspSpan spanData) {
                               val -> val.isInstanceOf(String.class))));
     }
 
-    return span.hasName("Compile " + spanData.getRoute())
+    span.hasName("Compile " + spanData.getRoute())
         .hasParent(spanData.getParent())
         .hasAttributesSatisfyingExactly(
             equalTo(stringKey("jsp.classFQCN"), "org.apache.jsp." + spanData.getClassName()),