Allow configuring shutdown and session flush timeouts externally and speed up tests#4641
Merged
Allow configuring shutdown and session flush timeouts externally and speed up tests#4641
Conversation
* 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>
adinauer
requested review from
markushi,
romtsn and
stefanosiano
as code owners
adinauer
changed the base branch from
fix/spring-boot-3-4-request-caching
to
08-04-add_new_modules_for_spring_7_and_spring_boot_4
lcian
approved these changes
Aug 25, 2025
Base automatically changed from
08-04-add_new_modules_for_spring_7_and_spring_boot_4
to
main
August 26, 2025 10:34
Contributor
Performance metrics 🚀
|
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 91bb874 | 314.47 ms | 440.00 ms | 125.53 ms |
| dba088c | 333.98 ms | 381.16 ms | 47.18 ms |
| d15471f | 310.66 ms | 368.19 ms | 57.53 ms |
| bbc35bb | 298.53 ms | 372.17 ms | 73.64 ms |
| d15471f | 307.28 ms | 381.85 ms | 74.57 ms |
| ad8da22 | 362.98 ms | 453.94 ms | 90.96 ms |
| cf708bd | 408.35 ms | 458.98 ms | 50.63 ms |
| 96449e8 | 361.30 ms | 423.39 ms | 62.09 ms |
| 27d7cf8 | 309.43 ms | 364.27 ms | 54.85 ms |
| 91bb874 | 311.00 ms | 363.47 ms | 52.47 ms |
App size
| Revision | Plain | With Sentry | Diff |
|---|---|---|---|
| 91bb874 | 1.58 MiB | 2.13 MiB | 559.07 KiB |
| dba088c | 1.58 MiB | 2.13 MiB | 558.99 KiB |
| d15471f | 1.58 MiB | 2.13 MiB | 559.54 KiB |
| bbc35bb | 1.58 MiB | 2.12 MiB | 553.01 KiB |
| d15471f | 1.58 MiB | 2.13 MiB | 559.54 KiB |
| ad8da22 | 1.58 MiB | 2.29 MiB | 719.83 KiB |
| cf708bd | 1.58 MiB | 2.11 MiB | 539.71 KiB |
| 96449e8 | 1.58 MiB | 2.11 MiB | 539.35 KiB |
| 27d7cf8 | 1.58 MiB | 2.12 MiB | 549.42 KiB |
| 91bb874 | 1.58 MiB | 2.13 MiB | 559.07 KiB |
sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt
Show resolved
Hide resolved
…t options Co-Authored-By: Claude <noreply@anthropic.com>
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>
Rename shutdownTimeout/sessionFlushTimeout to shutdownTimeoutMillis/sessionFlushTimeoutMillis for consistency with SentryOptions naming convention. Co-Authored-By: Claude <noreply@anthropic.com>
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>
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt
Show resolved
Hide resolved
List each configuration method separately for clarity. Co-Authored-By: Claude <noreply@anthropic.com>
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>
adinauer
changed the title
Contributor
Semver Impact of This PR⚪ None (no version bump detected) 📋 Changelog PreviewThis is how your changes will appear in the changelog. This PR will not appear in the changelog. 🤖 This preview updates automatically when you update the PR. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#skip-changelog
💡 Motivation and Context
Less waiting