Third attempt at fixing Kotlin 2.2 compat#4613
Merged
adinauer merged 1 commit into08-06-second_attempt_to_fix_kotlin_2.2from Aug 7, 2025
Merged
Conversation
This was referenced Aug 7, 2025
Member
Author
This was referenced Aug 7, 2025
Contributor
Instructions and example for changelogPlease add an entry to Example: ## Unreleased
- Third attempt at fixing Kotlin 2.2 compat ([#4613](https://github.com/getsentry/sentry-java/pull/4613))If none of the above apply, you can opt out of this check by adding |
adinauer
requested review from
lcian,
markushi,
romtsn and
stefanosiano
as code owners
adinauer
merged commit 1d5a803
into
08-06-second_attempt_to_fix_kotlin_2.2
18 of 37 checks passed
Member
Author
|
Merging this so we don't have to review changes in other PRs that were replaced in this PR |
adinauer
added a commit
that referenced
this pull request
Aug 7, 2025
* 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>
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| } | ||
|
|
||
| if (uri?.isNotBlank()) { | ||
| if (uri.isNotBlank()) { |
There was a problem hiding this comment.
Bug: Null URI Handling Error
A NullPointerException can occur because the null-safe call uri?.isNotBlank() was changed to uri.isNotBlank(). The uri variable is assigned from URI.rawPath, which can return null when the URI has no path component, removing the necessary null check.
adinauer
added a commit
that referenced
this pull request
Aug 11, 2025
* 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
added a commit
that referenced
this pull request
Aug 26, 2025
* 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>
adinauer
added a commit
that referenced
this pull request
Mar 4, 2026
…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 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
1 participant
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.
📜 Description
💡 Motivation and Context
💚 How did you test it?
📝 Checklist
sendDefaultPIIis enabled.🔮 Next steps