Review fixes for jsp-2.3:javaagent (open-telemetry#17482)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: otelbot[bot]

instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/HttpJspPageInstrumentationSingletons.java

@@ -23,7 +23,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.HttpJspPage;
 
-public class HttpJspPageInstrumentationSingletons {
+class HttpJspPageInstrumentationSingletons {
   private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
       DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "jsp")
           .getBoolean("experimental_span_attributes/development", false);
@@ -51,7 +51,7 @@ private static String spanNameOnRender(HttpServletRequest req) {
     return "Render " + spanName;
   }
 
-  public static Instrumenter<HttpServletRequest, Void> instrumenter() {
+  static Instrumenter<HttpServletRequest, Void> instrumenter() {
     return instrumenter;
   }
 

instrumentation/jsp-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsp/JspCompilationContextInstrumentationSingletons.java

@@ -17,7 +17,7 @@
 import org.apache.jasper.JspCompilationContext;
 import org.apache.jasper.compiler.Compiler;
 
-public class JspCompilationContextInstrumentationSingletons {
+class JspCompilationContextInstrumentationSingletons {
   private static final boolean CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES =
       DeclarativeConfigUtil.getInstrumentationConfig(GlobalOpenTelemetry.get(), "jsp")
           .getBoolean("experimental_span_attributes/development", false);
@@ -35,11 +35,11 @@ public class JspCompilationContextInstrumentationSingletons {
             .buildInstrumenter(SpanKindExtractor.alwaysInternal());
   }
 
-  public static String spanNameOnCompile(JspCompilationContext jspCompilationContext) {
+  private static String spanNameOnCompile(JspCompilationContext jspCompilationContext) {
     return "Compile " + jspCompilationContext.getJspFile();
   }
 
-  public static Instrumenter<JspCompilationContext, Void> instrumenter() {
+  static Instrumenter<JspCompilationContext, Void> instrumenter() {
     return instrumenter;
   }
 

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

@@ -68,7 +68,6 @@ protected Tomcat setupServer() throws Exception {
     tomcatServer.setPort(port);
     tomcatServer.getConnector();
 
-    // comment to debug
     tomcatServer.setSilent(true);
 
     // this is needed in tomcat 9, this triggers the creation of a connector, will not

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

@@ -58,7 +58,6 @@ protected Tomcat setupServer() throws Exception {
     tomcatServer.setPort(port);
     tomcatServer.getConnector();
 
-    // comment to debug
     tomcatServer.setSilent(true);
 
     // this is needed in tomcat 9, this triggers the creation of a connector, will not

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

@@ -82,7 +82,7 @@ public void setExceptionClass(Class<?> exceptionClass) {
     this.exceptionClass = exceptionClass;
   }
 
-  public boolean getErrorMessageOptional() {
+  public boolean isErrorMessageOptional() {
     return errorMessageOptional;
   }
 

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

@@ -69,7 +69,7 @@ void assertServerSpan(SpanDataAssert span, JspSpan spanData) {
                               EXCEPTION_MESSAGE,
                               val ->
                                   val.satisfiesAnyOf(
-                                      v -> assertThat(spanData.getErrorMessageOptional()).isTrue(),
+                                      v -> assertThat(spanData.isErrorMessageOptional()).isTrue(),
                                       v -> val.isInstanceOf(String.class))),
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
     }
@@ -146,7 +146,7 @@ void assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
                               EXCEPTION_MESSAGE,
                               val ->
                                   val.satisfiesAnyOf(
-                                      v -> assertThat(spanData.getErrorMessageOptional()).isTrue(),
+                                      v -> assertThat(spanData.isErrorMessageOptional()).isTrue(),
                                       v -> val.isInstanceOf(String.class))),
                           satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
     }