Fix Spring 7 and Spring Boot 4 modules by adinauer · Pull Request #4602 · getsentry/sentry-java

adinauer · 2025-08-04T14:32:32Z

📜 Description

Bump Kotlin version to the minimum one supported by Spring
Some classes were moved around in the new Spring/Boot version, use them
Rename .api files

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

I added tests to verify the changes.
No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
I updated the docs if needed.
I updated the wizard if needed.
Review from the native team if needed.
No breaking change or entry added to the changelog.
No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

adinauer · 2025-08-04T14:32:51Z

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more

This stack of pull requests is managed by Graphite. Learn more about stacking.

github-actions · 2025-08-04T14:34:44Z

	Fails
🚫	Please consider adding a changelog entry for the next release.

Instructions and example for changelog

Please add an entry to CHANGELOG.md to the "Unreleased" section. Make sure the entry includes this PR's number.

Example:

## Unreleased

- Fix Spring 7 and Spring Boot 4 modules ([#4602](https://github.com/getsentry/sentry-java/pull/4602))

If none of the above apply, you can opt out of this check by adding #skip-changelog to the PR description.

Generated by 🚫 dangerJS against 7887992

github-actions · 2025-08-04T14:49:05Z

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	476.22 ms	553.04 ms	76.82 ms
Size	1.58 MiB	2.09 MiB	521.83 KiB

Baseline results on branch: 08-04-add_new_modules_for_spring_7_and_spring_boot_4

Startup times

Revision	Plain	With Sentry	Diff
`b2c2d0b`	414.00 ms	447.42 ms	33.42 ms

App size

Revision	Plain	With Sentry	Diff
`b2c2d0b`	1.58 MiB	2.09 MiB	521.57 KiB

Previous results on branch: 08-04-fix_spring_7_and_spring_boot_4_modules

Startup times

Revision	Plain	With Sentry	Diff
`ecb0016`	432.46 ms	484.08 ms	51.62 ms

App size

Revision	Plain	With Sentry	Diff
`ecb0016`	1.58 MiB	2.09 MiB	521.56 KiB

cursor · 2025-08-08T10:05:30Z

sentry-spring-7/src/main/java/io/sentry/spring/jakarta/SentrySpringFilter.java

    if (scopes.getOptions().isSendDefaultPii()
        && qualifiesForCaching(request, scopes.getOptions().getMaxRequestBodySize())) {
-      return new ContentCachingRequestWrapper(request);
+      return new ContentCachingRequestWrapper(request, 0);


Bug: Request Body Caching Limit Set Incorrectly

The ContentCachingRequestWrapper constructor now hardcodes 0 as the cache limit. This likely disables or severely restricts request body caching, overriding the intended behavior determined by qualifiesForCaching and the maxRequestBodySize configuration (e.g., 1000 bytes for SMALL, 10000 for MEDIUM).

* Add new modules for Spring 7 and Spring Boot 4 * Fix Spring 7 and Spring Boot 4 modules (#4602) * Attempt to fix kotlin 2.2 issue (#4603) * Fix Spring 7 and Spring Boot 4 modules * Attempt to fix kotlin 2.2 issue * Second attempt to fix Kotlin 2.2 (#4610) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat (#4613) --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> * Address compose-related issues * Fix tests for Spring 7 and Spring Boot 4 (#4614) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat * Fix tests for Spring 7 and Spring Boot 4 * Move Spring 7 and Spring Boot 4 packages (#4615) * Move Spring 7 and Spring Boot 4 packages * Fix class not found due to OTel not supporting spring boot 4 yet (#4616) * Format code * some fixes * change kotlin 1.8 to 1.9 and some cleanup * ignore warnings about api level that is not relevant * fix optional dependencies in SentryAutoConfiguration * Update trace origin * Remove duplicate e2e test config * Update Strings for Spring 7 and Spring Boot 4 * Disable Spring Boot 4 agentless e2e tests for now --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: markushi <markus.hintersteiner@sentry.io> * changelog * fix ci * add ignored span origins for Spring 7 and Spring Boot 4 * move changelog * Example how to fix version mismatch (#4642) * Fix ignored span origin * move changelog --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: markushi <markus.hintersteiner@sentry.io> Co-authored-by: Alex Alderman Webb <alexander.webb@sentry.io>

…speed up tests (#4641) * Add new modules for Spring 7 and Spring Boot 4 * Fix Spring 7 and Spring Boot 4 modules (#4602) * Attempt to fix kotlin 2.2 issue (#4603) * Fix Spring 7 and Spring Boot 4 modules * Attempt to fix kotlin 2.2 issue * Second attempt to fix Kotlin 2.2 (#4610) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat (#4613) --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> * Address compose-related issues * Fix tests for Spring 7 and Spring Boot 4 (#4614) * Second attempt to fix Kotlin 2.2 * Format code * Third attempt at fixing Kotlin 2.2 compat * Fix tests for Spring 7 and Spring Boot 4 * Move Spring 7 and Spring Boot 4 packages (#4615) * Move Spring 7 and Spring Boot 4 packages * Fix class not found due to OTel not supporting spring boot 4 yet (#4616) * Format code * some fixes * change kotlin 1.8 to 1.9 and some cleanup * ignore warnings about api level that is not relevant * fix optional dependencies in SentryAutoConfiguration * Update trace origin * Remove duplicate e2e test config * Update Strings for Spring 7 and Spring Boot 4 * Disable Spring Boot 4 agentless e2e tests for now --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: markushi <markus.hintersteiner@sentry.io> * changelog * fix ci * add ignored span origins for Spring 7 and Spring Boot 4 * move changelog * Speed up tests * docs(changelog): Add entry for external shutdown/session-flush timeout options Co-Authored-By: Claude <noreply@anthropic.com> * ref: Use tracingEnabledRunner in boot4 and jakarta test classes The tracingEnabledRunner was defined but unused in spring-boot-4 and spring-boot-jakarta. Migrate the tracing tests to use it, matching what was already done in spring-boot. Co-Authored-By: Claude <noreply@anthropic.com> * ref: Add Millis suffix to ExternalOptions timeout fields Rename shutdownTimeout/sessionFlushTimeout to shutdownTimeoutMillis/sessionFlushTimeoutMillis for consistency with SentryOptions naming convention. Co-Authored-By: Claude <noreply@anthropic.com> * ref: Add Millis suffix to ExternalOptions timeout fields Rename shutdownTimeout/sessionFlushTimeout to shutdownTimeoutMillis/sessionFlushTimeoutMillis in ExternalOptions for consistency with SentryOptions naming convention. Also rename the sentry.properties keys from shutdown-timeout to shutdown-timeout-millis and session-flush-timeout to session-flush-timeout-millis. Co-Authored-By: Claude <noreply@anthropic.com> * docs(changelog): Restructure timeout options changelog entry List each configuration method separately for clarity. Co-Authored-By: Claude <noreply@anthropic.com> * fix(test): Use baseContextRunner for transport factory tests Tests asserting AsyncHttpTransportFactory must not use contextRunner which includes NoOpTransportConfiguration, as the NoOp bean would override the auto-configured transport factory. Co-Authored-By: Claude <noreply@anthropic.com> * Format code * ci: retrigger CI --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io> Co-authored-by: markushi <markus.hintersteiner@sentry.io> Co-authored-by: Claude <noreply@anthropic.com>

This was referenced Aug 4, 2025

Add new modules for Spring 7 and Spring Boot 4 #4601

Merged

Attempt to fix kotlin 2.2 issue #4603

Merged

adinauer force-pushed the 08-04-fix_spring_7_and_spring_boot_4_modules branch from c7988b5 to a5d68ca Compare August 6, 2025 14:34

adinauer mentioned this pull request Aug 6, 2025

Second attempt to fix Kotlin 2.2 #4610

Merged

7 tasks

Fix Spring 7 and Spring Boot 4 modules

7887992

adinauer force-pushed the 08-04-fix_spring_7_and_spring_boot_4_modules branch from a5d68ca to 7887992 Compare August 7, 2025 13:02

adinauer force-pushed the 08-04-add_new_modules_for_spring_7_and_spring_boot_4 branch from e7a97e5 to 3ec789b Compare August 7, 2025 13:02

This was referenced Aug 7, 2025

Third attempt at fixing Kotlin 2.2 compat #4613

Merged

Fix tests for Spring 7 and Spring Boot 4 #4614

Merged

Move Spring 7 and Spring Boot 4 packages #4615

Merged

Fix class not found due to OTel not supporting spring boot 4 yet #4616

Merged

lcian approved these changes Aug 8, 2025

View reviewed changes

adinauer marked this pull request as ready for review August 8, 2025 10:02

adinauer requested review from markushi, romtsn and stefanosiano as code owners August 8, 2025 10:02

adinauer merged commit ddeada2 into 08-04-add_new_modules_for_spring_7_and_spring_boot_4 Aug 8, 2025
33 of 70 checks passed

adinauer deleted the 08-04-fix_spring_7_and_spring_boot_4_modules branch August 8, 2025 10:02

cursor bot reviewed Aug 8, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix Spring 7 and Spring Boot 4 modules#4602

Fix Spring 7 and Spring Boot 4 modules#4602
adinauer merged 1 commit into08-04-add_new_modules_for_spring_7_and_spring_boot_4from
08-04-fix_spring_7_and_spring_boot_4_modules

adinauer commented Aug 4, 2025 •

edited by lcian

Loading

Uh oh!

adinauer commented Aug 4, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Aug 4, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Aug 4, 2025 •

edited

Loading

Baseline results on branch: 08-04-add_new_modules_for_spring_7_and_spring_boot_4

Startup times

App size

Previous results on branch: 08-04-fix_spring_7_and_spring_boot_4_modules

Startup times

App size

Uh oh!

Uh oh!

cursor bot Aug 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

adinauer commented Aug 4, 2025 • edited by lcian Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📜 Description

💡 Motivation and Context

💚 How did you test it?

📝 Checklist

🔮 Next steps

Uh oh!

adinauer commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Instructions and example for changelog

Uh oh!

github-actions bot commented Aug 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Performance metrics 🚀

Baseline results on branch: 08-04-add_new_modules_for_spring_7_and_spring_boot_4

Startup times

App size

Previous results on branch: 08-04-fix_spring_7_and_spring_boot_4_modules

Startup times

App size

Uh oh!

Uh oh!

cursor bot Aug 8, 2025

Choose a reason for hiding this comment

Bug: Request Body Caching Limit Set Incorrectly

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

adinauer commented Aug 4, 2025 •

edited by lcian

Loading

adinauer commented Aug 4, 2025 •

edited

Loading

github-actions bot commented Aug 4, 2025 •

edited

Loading

github-actions bot commented Aug 4, 2025 •

edited

Loading