Skip to content

Fix Spring webmvc latestDep tests for spring boot 4 #15525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurit merged 9 commits into from
Dec 4, 2025
Merged

Fix Spring webmvc latestDep tests for spring boot 4 #15525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
92b0afc
Start spring webmvc update
jaydeluca Nov 24, 2025
a450d41
more deferred stuff
jaydeluca Nov 24, 2025
f375b2c
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instru…
jaydeluca Nov 26, 2025
48ca19a
more attempts
jaydeluca Nov 26, 2025
89d6ac9
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instru…
jaydeluca Nov 28, 2025
8e1f5e1
more trying
jaydeluca Nov 28, 2025
4932990
Merge branch 'main' of github.com:jaydeluca/opentelemetry-java-instru…
jaydeluca Dec 3, 2025
ffd2d6b
remove inst
jaydeluca Dec 3, 2025
2695209
remove unneeded exception changes
jaydeluca Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ dependencies {
testLibrary("org.springframework.boot:spring-boot-starter-test:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter-web:3.0.0")
testLibrary("org.springframework.boot:spring-boot-starter-security:3.0.0")

// tests don't work with spring boot 4 yet
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-test:3.+") // documented limitation
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-web:3.+") // documented limitation
latestDepTestLibrary("org.springframework.boot:spring-boot-starter-security:3.+") // documented limitation
}

// spring 6 requires java 17
Expand Down
8 changes: 7 additions & 1 deletion .../opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ protected Class<?> filterConfigClass() {
protected ConfigurableApplicationContext setupServer() {
SpringApplication app =
new SpringApplication(FilteredAppConfig.class, securityConfigClass(), filterConfigClass());
app.setDefaultProperties(Map.of("server.port", port, "server.error.include-message", "always"));

app.setDefaultProperties(
Map.of(
"server.port",
port,
testLatestDeps ? "spring.web.error.include-message" : "server.error.include-message",
"always"));
return app.run();
}

Expand Down
2 changes: 0 additions & 2 deletions ...rc/main/java/io/opentelemetry/instrumentation/spring/webmvc/filter/FilteredAppConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@ public void configurePathMatch(PathMatchConfigurer configurer) {}
@Override
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
configurer
.favorPathExtension(false)
.favorParameter(true)
.ignoreAcceptHeader(true)
.useJaf(false)
.defaultContentTypeStrategy(webRequest -> Collections.singletonList(MediaType.TEXT_PLAIN));
}

Expand Down
7 changes: 7 additions & 0 deletions ...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,12 @@ public void configure(IgnoredTypesBuilder builder) {
.allowClass("org.springframework.boot.logging.logback.")
.allowClass("org.springframework.boot.web.filter.")
.allowClass("org.springframework.boot.web.servlet.")
.allowClass("org.springframework.boot.servlet.filter.")
.allowClass("org.springframework.boot.web.server.servlet.context.")
.allowClass("org.springframework.boot.web.embedded.netty.GracefulShutdown$$Lambda")
.allowClass("org.springframework.boot.web.embedded.tomcat.GracefulShutdown$$Lambda")
.allowClass("org.springframework.boot.tomcat.GracefulShutdown$$Lambda")
.allowClass("org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory$$Lambda")
.allowClass(
"org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory$$Lambda")
.allowClass(
Expand All @@ -123,6 +127,9 @@ public void configure(IgnoredTypesBuilder builder) {
"org.springframework.boot.autoconfigure.web.WebProperties$Resources$Cache$Cachecontrol$$Lambda")
.allowClass("org.springframework.boot.web.embedded.netty.NettyWebServer$")
.allowClass("org.springframework.boot.web.embedded.tomcat.TomcatEmbeddedContext$$Lambda")
.allowClass("org.springframework.boot.tomcat.TomcatEmbeddedContext$$Lambda")
.allowClass("org.springframework.boot.tomcat.TomcatWebServer$")
.allowClass("org.springframework.boot.tomcat.TomcatEmbeddedWebappClassLoader")
.allowClass(
"org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer$")
.allowClass(
Expand Down
Loading