Skip to content

fix(spring): Support Spring Boot 4.1 #5573

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

Open
adinauer wants to merge 5 commits into
base: main
Choose a base branch
from
+10 −13
Open

fix(spring): Support Spring Boot 4.1 #5573

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5712c5e
fix(spring): Support Spring Boot 4.1
adinauer Jun 22, 2026
3d11862
changelog
adinauer Jun 22, 2026
687a8e6
Merge branch 'main' into fix/spring-boot-4-1-otel
adinauer Jun 22, 2026
c1d9f89
build: Bump Kotlin to 2.3.21
adinauer Jun 22, 2026
971b0a4
Merge remote-tracking branch 'origin/fix/spring-boot-4-1-otel' into f…
adinauer Jun 23, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/spring-boot-4-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
springboot-version: [ '4.0.0', '4.0.5' ]
springboot-version: [ '4.0.0', '4.0.5', '4.1.0' ]
Comment thread
adinauer marked this conversation as resolved.

name: Spring Boot ${{ matrix.springboot-version }}
env:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

### Dependencies

- Bump Spring Boot 4 and OpenTelemetry dependencies ([#5573](https://github.com/getsentry/sentry-java/pull/5573))

@github-actions github-actions Bot Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 🚫 The changelog entry seems to be part of an already released section ## 8.44.1.
    Consider moving the entry to the ## Unreleased section, please.

- Bump Native SDK from v0.15.0 to v0.15.1 ([#5570](https://github.com/getsentry/sentry-java/pull/5570))
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0151)
- [diff](https://github.com/getsentry/sentry-native/compare/0.15.0...0.15.1)
Expand Down
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ nopen = "1.0.1"
# see https://developer.android.com/jetpack/androidx/releases/compose-kotlin
okhttp = "4.9.2"
openfeature = "1.18.2"
otel = "1.60.1"
otelInstrumentation = "2.26.0"
otelInstrumentationAlpha = "2.26.0-alpha"
otel = "1.63.0"
otelInstrumentation = "2.29.0"
otelInstrumentationAlpha = "2.29.0-alpha"
# check https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/dependencyManagement/build.gradle.kts#L49 for release version above to find a compatible version
otelSemanticConventions = "1.40.0"
otelSemanticConventionsAlpha = "1.40.0-alpha"
otelSemanticConventions = "1.42.0"
otelSemanticConventionsAlpha = "1.42.0-alpha"
retrofit = "2.9.0"
room2 = "2.8.4"
room3 = "3.0.0-alpha06"
sagp = "6.10.0"
sqlite = "2.6.2"
sqliteAlpha = "2.7.0-alpha06" # Required by Room3 3.0.0-alpha*
slf4j = "1.7.30"
spotless = "8.4.0"
spotless = "8.6.0"

@runningcode runningcode Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use 8.7.0?

@adinauer adinauer Jun 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gonna bump this in a separate PR since it also causes a ton of reformatting that'd make this PR harder to read.

springboot2 = "2.7.18"
springboot3 = "3.5.0"
springboot4 = "4.0.0"
springboot4 = "4.1.0"
sqldelight = "2.3.2"

# Android
Expand Down
2 changes: 2 additions & 0 deletions sentry-samples/sentry-samples-spring-7/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ java.targetCompatibility = JavaVersion.VERSION_17

repositories { mavenCentral() }

extra["kotlin.version"] = KotlinCompilerVersion.VERSION

@runningcode runningcode Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this do/who consumes this?

@adinauer adinauer Jun 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note sure, can we just globally bump the kotlin version instead @runningcode ?

@runningcode runningcode Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I won't be against bumping a kotlin version. I just don't know what this line of code does or how it is consumed.

@adinauer adinauer Jun 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be spring boot plugin that consumes it, let me check.

@adinauer adinauer Jun 22, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's what's happening, we're telling Spring Boot dependency management plugin to use our kotlin version instead of what Spring Boot BOM says.

@runningcode runningcode Jun 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh interesting. i didn't know that's how the versions are read from spring boot dependency management. sounds good then! might be worth a comment.


dependencyManagement { imports { mavenBom(SpringBootPlugin.BOM_COORDINATES) } }

dependencies {
Expand Down
Loading