diff --git a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java index cd0eebdc7ee9..ededd4845d2f 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationBasicTests.java +++ b/instrumentation/jsp-2.3/javaagent/src/test/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/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java index e8d6f4d81ab0..fa37882c5e5e 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspInstrumentationForwardTests.java +++ b/instrumentation/jsp-2.3/javaagent/src/test/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/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpan.java b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpan.java index c6afcd112c77..094b047087d0 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpan.java +++ b/instrumentation/jsp-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/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertionBuilder.java b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertionBuilder.java index ee2df4b03874..b24f592495c4 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertionBuilder.java +++ b/instrumentation/jsp-2.3/javaagent/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/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java index 58ed0355adb6..a8f345da6a50 100644 --- a/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java +++ b/instrumentation/jsp-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jsp/JspSpanAssertions.java @@ -111,8 +111,8 @@ SpanDataAssert assertCompileSpan(SpanDataAssert span, JspSpan spanData) { SpanDataAssert assertRenderSpan(SpanDataAssert span, JspSpan spanData) { String requestURL = spanData.getRoute(); - if (spanData.getRequestURLOverride() != null) { - requestURL = spanData.getRequestURLOverride(); + if (spanData.getRequestUrlOverride() != null) { + requestURL = spanData.getRequestUrlOverride(); } if (spanData.getExceptionClass() != null) {