Skip to content

Commit ad3bae2

Browse files
committed
fix capitalization in requestURLOverride
1 parent 3501071 commit ad3bae2

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void testNonErroneousMultiGet() {
379379
new JspSpanAssertionBuilder()
380380
.withParent(trace.getSpan(2))
381381
.withRoute("/common/javaLoopH2.jsp")
382-
.withRequestURLOverride("/includes/includeMulti.jsp")
382+
.withRequestUrlOverride("/includes/includeMulti.jsp")
383383
.build()),
384384
span ->
385385
spanAsserts.assertCompileSpan(
@@ -395,7 +395,7 @@ void testNonErroneousMultiGet() {
395395
new JspSpanAssertionBuilder()
396396
.withParent(trace.getSpan(2))
397397
.withRoute("/common/javaLoopH2.jsp")
398-
.withRequestURLOverride("/includes/includeMulti.jsp")
398+
.withRequestUrlOverride("/includes/includeMulti.jsp")
399399
.build())));
400400

401401
assertThat(res.status().code()).isEqualTo(200);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ void testNonErroneousGetForwardedToJspWithMultipleIncludes() {
271271
new JspSpanAssertionBuilder()
272272
.withParent(trace.getSpan(4))
273273
.withRoute("/common/javaLoopH2.jsp")
274-
.withRequestURLOverride("/includes/includeMulti.jsp")
274+
.withRequestUrlOverride("/includes/includeMulti.jsp")
275275
.withForwardOrigin("/forwards/forwardToIncludeMulti.jsp")
276276
.build()),
277277
span ->
@@ -288,7 +288,7 @@ void testNonErroneousGetForwardedToJspWithMultipleIncludes() {
288288
new JspSpanAssertionBuilder()
289289
.withParent(trace.getSpan(4))
290290
.withRoute("/common/javaLoopH2.jsp")
291-
.withRequestURLOverride("/includes/includeMulti.jsp")
291+
.withRequestUrlOverride("/includes/includeMulti.jsp")
292292
.withForwardOrigin("/forwards/forwardToIncludeMulti.jsp")
293293
.build())));
294294

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class JspSpan {
1111
private SpanData parent;
1212
private String method;
1313
private String className;
14-
private String requestURLOverride;
14+
private String requestUrlOverride;
1515
private String forwardOrigin;
1616
private String route;
1717
private int responseStatus;
@@ -42,12 +42,12 @@ public void setClassName(String className) {
4242
this.className = className;
4343
}
4444

45-
public String getRequestURLOverride() {
46-
return requestURLOverride;
45+
public String getRequestUrlOverride() {
46+
return requestUrlOverride;
4747
}
4848

49-
public void setRequestURLOverride(String requestURLOverride) {
50-
this.requestURLOverride = requestURLOverride;
49+
public void setRequestUrlOverride(String requestUrlOverride) {
50+
this.requestUrlOverride = requestUrlOverride;
5151
}
5252

5353
public String getForwardOrigin() {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class JspSpanAssertionBuilder {
1212
private String method;
1313
private String route;
1414
private String className;
15-
private String requestURLOverride;
15+
private String requestUrlOverride;
1616
private String forwardOrigin;
1717
private int responseStatus;
1818
private Class<?> exceptionClass;
@@ -38,8 +38,8 @@ public JspSpanAssertionBuilder withClassName(String className) {
3838
return this;
3939
}
4040

41-
public JspSpanAssertionBuilder withRequestURLOverride(String requestURLOverride) {
42-
this.requestURLOverride = requestURLOverride;
41+
public JspSpanAssertionBuilder withRequestUrlOverride(String requestUrlOverride) {
42+
this.requestUrlOverride = requestUrlOverride;
4343
return this;
4444
}
4545

@@ -69,7 +69,7 @@ public JspSpan build() {
6969
serverSpan.setMethod(this.method);
7070
serverSpan.setRoute(this.route);
7171
serverSpan.setClassName(this.className);
72-
serverSpan.setRequestURLOverride(this.requestURLOverride);
72+
serverSpan.setRequestUrlOverride(this.requestUrlOverride);
7373
serverSpan.setForwardOrigin(this.forwardOrigin);
7474
serverSpan.setResponseStatus(this.responseStatus);
7575
serverSpan.setExceptionClass(this.exceptionClass);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ SpanDataAssert assertCompileSpan(SpanDataAssert span, JspSpan spanData) {
110110
}
111111

112112
SpanDataAssert assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
113-
String requestURL = spanData.getRoute();
114-
if (spanData.getRequestURLOverride() != null) {
115-
requestURL = spanData.getRequestURLOverride();
113+
String requestUrl = spanData.getRoute();
114+
if (spanData.getRequestUrlOverride() != null) {
115+
requestUrl = spanData.getRequestUrlOverride();
116116
}
117117

118118
if (spanData.getExceptionClass() != null) {
@@ -144,7 +144,7 @@ SpanDataAssert assertRenderSpan(SpanDataAssert span, JspSpan spanData) {
144144
return span.hasName("Render " + spanData.getRoute())
145145
.hasParent(spanData.getParent())
146146
.hasAttributesSatisfyingExactly(
147-
equalTo(stringKey("jsp.requestURL"), baseUrl + requestURL),
147+
equalTo(stringKey("jsp.requestURL"), baseUrl + requestUrl),
148148
satisfies(
149149
stringKey("jsp.forwardOrigin"),
150150
val ->

0 commit comments

Comments
 (0)