fix capitalization in requestURLOverride

open-telemetry · Jul 16, 2024 · ad3bae2 · ad3bae2
1 parent 3501071
commit ad3bae2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/...est/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java b/...est/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java
@@ -379,7 +379,7 @@ void testNonErroneousMultiGet() {
                         new JspSpanAssertionBuilder()
                             .withParent(trace.getSpan(2))
                             .withRoute("/common/javaLoopH2.jsp")
-                            .withRequestURLOverride("/includes/includeMulti.jsp")
+                            .withRequestUrlOverride("/includes/includeMulti.jsp")
                             .build()),
                 span ->
                     spanAsserts.assertCompileSpan(
@@ -395,7 +395,7 @@ void testNonErroneousMultiGet() {
                         new JspSpanAssertionBuilder()
                             .withParent(trace.getSpan(2))
                             .withRoute("/common/javaLoopH2.jsp")
-                            .withRequestURLOverride("/includes/includeMulti.jsp")
+                            .withRequestUrlOverride("/includes/includeMulti.jsp")
                             .build())));
 
     assertThat(res.status().code()).isEqualTo(200);

diff --git a/...t/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java b/...t/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java
@@ -271,7 +271,7 @@ void testNonErroneousGetForwardedToJspWithMultipleIncludes() {
                         new JspSpanAssertionBuilder()
                             .withParent(trace.getSpan(4))
                             .withRoute("/common/javaLoopH2.jsp")
-                            .withRequestURLOverride("/includes/includeMulti.jsp")
+                            .withRequestUrlOverride("/includes/includeMulti.jsp")
                             .withForwardOrigin("/forwards/forwardToIncludeMulti.jsp")
                             .build()),
                 span ->
@@ -288,7 +288,7 @@ void testNonErroneousGetForwardedToJspWithMultipleIncludes() {
                         new JspSpanAssertionBuilder()
                             .withParent(trace.getSpan(4))
                             .withRoute("/common/javaLoopH2.jsp")
-                            .withRequestURLOverride("/includes/includeMulti.jsp")
+                            .withRequestUrlOverride("/includes/includeMulti.jsp")
                             .withForwardOrigin("/forwards/forwardToIncludeMulti.jsp")
                             .build())));
 

diff --git a/...p-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpan.java b/...p-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpan.java
@@ -11,7 +11,7 @@ class JspSpan {
   private SpanData parent;
   private String method;
   private String className;
-  private String requestURLOverride;
+  private String requestUrlOverride;
   private String forwardOrigin;
   private String route;
   private int responseStatus;
@@ -42,12 +42,12 @@ public void setClassName(String className) {
     this.className = className;
   }
 
-  public String getRequestURLOverride() {
-    return requestURLOverride;
+  public String getRequestUrlOverride() {
+    return requestUrlOverride;
   }
 
-  public void setRequestURLOverride(String requestURLOverride) {
-    this.requestURLOverride = requestURLOverride;
+  public void setRequestUrlOverride(String requestUrlOverride) {
+    this.requestUrlOverride = requestUrlOverride;
   }
 
   public String getForwardOrigin() {

diff --git a/...src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertionBuilder.java b/...src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertionBuilder.java
@@ -12,7 +12,7 @@ class JspSpanAssertionBuilder {
   private String method;
   private String route;
   private String className;
-  private String requestURLOverride;
+  private String requestUrlOverride;
   private String forwardOrigin;
   private int responseStatus;
   private Class<?> exceptionClass;
@@ -38,8 +38,8 @@ public JspSpanAssertionBuilder withClassName(String className) {
     return this;
   }
 
-  public JspSpanAssertionBuilder withRequestURLOverride(String requestURLOverride) {
-    this.requestURLOverride = requestURLOverride;
+  public JspSpanAssertionBuilder withRequestUrlOverride(String requestUrlOverride) {
+    this.requestUrlOverride = requestUrlOverride;
     return this;
   }
 
@@ -69,7 +69,7 @@ public JspSpan build() {
     serverSpan.setMethod(this.method);
     serverSpan.setRoute(this.route);
     serverSpan.setClassName(this.className);
-    serverSpan.setRequestURLOverride(this.requestURLOverride);
+    serverSpan.setRequestUrlOverride(this.requestUrlOverride);
     serverSpan.setForwardOrigin(this.forwardOrigin);
     serverSpan.setResponseStatus(this.responseStatus);
     serverSpan.setExceptionClass(this.exceptionClass);

diff --git a/...agent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java b/...agent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java
@@ -110,9 +110,9 @@ SpanDataAssert assertCompileSpan(SpanDataAssert span, JspSpan spanData) {
   }
 
   SpanDataAssert assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
-    String requestURL = spanData.getRoute();
-    if (spanData.getRequestURLOverride() != null) {
-      requestURL = spanData.getRequestURLOverride();
+    String requestUrl = spanData.getRoute();
+    if (spanData.getRequestUrlOverride() != null) {
+      requestUrl = spanData.getRequestUrlOverride();
     }
 
     if (spanData.getExceptionClass() != null) {
@@ -144,7 +144,7 @@ SpanDataAssert assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
     return span.hasName("Render " + spanData.getRoute())
         .hasParent(spanData.getParent())
         .hasAttributesSatisfyingExactly(
-            equalTo(stringKey("jsp.requestURL"), baseUrl + requestURL),
+            equalTo(stringKey("jsp.requestURL"), baseUrl + requestUrl),
             satisfies(
                 stringKey("jsp.forwardOrigin"),
                 val ->