Skip to content

Commit 2695209

Browse files
committed
remove unneeded exception changes
1 parent ffd2d6b commit 2695209

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
@Configuration
2525
class ServletFilterConfig {
2626

27-
private static final boolean testLatestDeps = Boolean.getBoolean("testLatestDeps");
28-
2927
@Bean
3028
Filter servletFilter() {
3129
return new Filter() {
@@ -56,9 +54,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
5654
} else if (endpoint == ServerEndpoint.ERROR) {
5755
resp.sendError(endpoint.getStatus(), endpoint.getBody());
5856
} else if (endpoint == ServerEndpoint.EXCEPTION) {
59-
if (testLatestDeps) {
60-
throw new IllegalArgumentException(endpoint.getBody());
61-
}
6257
throw new IllegalStateException(endpoint.getBody());
6358
} else if (endpoint == ServerEndpoint.INDEXED_CHILD) {
6459
INDEXED_CHILD.collectSpanAttributes(req::getParameter);

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,5 @@ protected SpanDataAssert assertResponseSpan(
102102
protected void configure(HttpServerTestOptions options) {
103103
super.configure(options);
104104
options.setResponseCodeOnNonStandardHttpMethod(400);
105-
if (testLatestDeps) {
106-
options.setExpectedException(
107-
new IllegalArgumentException(ServerEndpoint.EXCEPTION.getBody()));
108-
}
109105
}
110106
}

0 commit comments

Comments
 (0)