Review fixes for jsp-2.3:javaagent

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

@@ -18,75 +18,75 @@ class JspSpan {
   private Class<?> exceptionClass;
   private boolean errorMessageOptional;
 
-  public SpanData getParent() {
+  SpanData getParent() {
     return parent;
   }
 
-  public void setParent(SpanData parent) {
+  void setParent(SpanData parent) {
     this.parent = parent;
   }
 
-  public String getMethod() {
+  String getMethod() {
     return method;
   }
 
-  public void setMethod(String method) {
+  void setMethod(String method) {
     this.method = method;
   }
 
-  public String getClassName() {
+  String getClassName() {
     return className;
   }
 
-  public void setClassName(String className) {
+  void setClassName(String className) {
     this.className = className;
   }
 
-  public String getRequestUrlOverride() {
+  String getRequestUrlOverride() {
     return requestUrlOverride;
   }
 
-  public void setRequestUrlOverride(String requestUrlOverride) {
+  void setRequestUrlOverride(String requestUrlOverride) {
     this.requestUrlOverride = requestUrlOverride;
   }
 
-  public String getForwardOrigin() {
+  String getForwardOrigin() {
     return forwardOrigin;
   }
 
-  public void setForwardOrigin(String forwardOrigin) {
+  void setForwardOrigin(String forwardOrigin) {
     this.forwardOrigin = forwardOrigin;
   }
 
-  public String getRoute() {
+  String getRoute() {
     return route;
   }
 
-  public void setRoute(String route) {
+  void setRoute(String route) {
     this.route = route;
   }
 
-  public int getResponseStatus() {
+  int getResponseStatus() {
     return responseStatus;
   }
 
-  public void setResponseStatus(int responseStatus) {
+  void setResponseStatus(int responseStatus) {
     this.responseStatus = responseStatus;
   }
 
-  public Class<?> getExceptionClass() {
+  Class<?> getExceptionClass() {
     return exceptionClass;
   }
 
-  public void setExceptionClass(Class<?> exceptionClass) {
+  void setExceptionClass(Class<?> exceptionClass) {
     this.exceptionClass = exceptionClass;
   }
 
-  public boolean isErrorMessageOptional() {
+  boolean isErrorMessageOptional() {
     return errorMessageOptional;
   }
 
-  public void setErrorMessageOptional(boolean errorMessageOptional) {
+  void setErrorMessageOptional(boolean errorMessageOptional) {
     this.errorMessageOptional = errorMessageOptional;
   }
 }

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

@@ -18,52 +18,52 @@ class JspSpanAssertionBuilder {
   private Class<?> exceptionClass;
   private boolean errorMessageOptional;
 
-  public JspSpanAssertionBuilder withParent(SpanData parent) {
+  JspSpanAssertionBuilder withParent(SpanData parent) {
     this.parent = parent;
     return this;
   }
 
-  public JspSpanAssertionBuilder withMethod(String method) {
+  JspSpanAssertionBuilder withMethod(String method) {
     this.method = method;
     return this;
   }
 
-  public JspSpanAssertionBuilder withRoute(String route) {
+  JspSpanAssertionBuilder withRoute(String route) {
     this.route = route;
     return this;
   }
 
-  public JspSpanAssertionBuilder withClassName(String className) {
+  JspSpanAssertionBuilder withClassName(String className) {
     this.className = className;
     return this;
   }
 
-  public JspSpanAssertionBuilder withRequestUrlOverride(String requestUrlOverride) {
+  JspSpanAssertionBuilder withRequestUrlOverride(String requestUrlOverride) {
     this.requestUrlOverride = requestUrlOverride;
     return this;
   }
 
-  public JspSpanAssertionBuilder withForwardOrigin(String forwardOrigin) {
+  JspSpanAssertionBuilder withForwardOrigin(String forwardOrigin) {
     this.forwardOrigin = forwardOrigin;
     return this;
   }
 
-  public JspSpanAssertionBuilder withResponseStatus(int responseStatus) {
+  JspSpanAssertionBuilder withResponseStatus(int responseStatus) {
     this.responseStatus = responseStatus;
     return this;
   }
 
-  public JspSpanAssertionBuilder withExceptionClass(Class<?> exceptionClass) {
+  JspSpanAssertionBuilder withExceptionClass(Class<?> exceptionClass) {
     this.exceptionClass = exceptionClass;
     return this;
   }
 
-  public JspSpanAssertionBuilder withErrorMessageOptional(boolean errorMessageOptional) {
+  JspSpanAssertionBuilder withErrorMessageOptional(boolean errorMessageOptional) {
     this.errorMessageOptional = errorMessageOptional;
     return this;
   }
 
-  public JspSpan build() {
+  JspSpan build() {
     JspSpan serverSpan = new JspSpan();
     serverSpan.setParent(this.parent);
     serverSpan.setMethod(this.method);

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

@@ -31,7 +31,7 @@
 import io.opentelemetry.sdk.trace.data.StatusData;
 
 class JspSpanAssertions {
-  static final boolean isExperimentalEnabled =
+  static final boolean EXPERIMENTAL_ENABLED =
       Boolean.getBoolean("otel.instrumentation.jsp.experimental-span-attributes");
 
   private final String baseUrl;
@@ -42,8 +42,8 @@ class JspSpanAssertions {
     this.port = port;
   }
 
-  public static String experimental(String value) {
-    if (isExperimentalEnabled) {
+  static String experimental(String value) {
+    if (EXPERIMENTAL_ENABLED) {
       return value;
     }
     return null;
@@ -153,7 +153,7 @@ void assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
 
     span.hasName("Render " + spanData.getRoute()).hasParent(spanData.getParent());
 
-    if (isExperimentalEnabled) {
+    if (EXPERIMENTAL_ENABLED) {
       span.hasAttributesSatisfyingExactly(
           equalTo(stringKey("jsp.requestURL"), baseUrl + requestUrl),
           satisfies(

instrumentation/jsp-2.3/metadata.yaml

@@ -7,12 +7,14 @@ features:
 library_link: https://jakarta.ee/specifications/pages/
 configurations:
   - name: otel.instrumentation.common.experimental.view-telemetry.enabled
+    declarative_name: java.common.view_telemetry/development.enabled
     description: Enables the creation of experimental view spans.
     type: boolean
     default: false
   - name: otel.instrumentation.jsp.experimental-span-attributes
+    declarative_name: java.jsp.experimental_span_attributes/development
     description: >
       Enables experimental span attributes `jsp.forwardOrigin`, `jsp.requestURL`, `jsp.compiler`,
       and `jsp.classFQCN`.
     type: boolean
-    default: false
+    default: false