Fix tests for Spring 7 and Spring Boot 4 by adinauer · Pull Request #4614 · getsentry/sentry-java

adinauer · 2025-08-07T13:02:22Z

📜 Description

Fix tests that require updating due to the Kotlin/Spring/Boot update.
Fix tests that check for SDK name to test for the new names.

💡 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-07T13:02:40Z

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

github-actions · 2025-08-07T13:02:51Z

	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 tests for Spring 7 and Spring Boot 4 ([#4614](https://github.com/getsentry/sentry-java/pull/4614))

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

Generated by 🚫 dangerJS against 03eda66

lcian

The test changes look good to me.
It seems that this unfortunately got intertwined with the Kotlin fixes. I've pointed out the places where the build files look odd, so let's please remember to address those before merging.

lcian · 2025-08-08T09:21:18Z

build.gradle.kts

+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+//    alias(libs.plugins.kotlin.jvm.spring7) apply false
+    alias(libs.plugins.kotlin.spring) apply false
+//    alias(libs.plugins.kotlin.spring7) apply false


Something to update?

lcian · 2025-08-08T09:21:54Z

sentry-spring-boot-4/build.gradle.kts

  `java-library`
  id("io.sentry.javadoc")
-  kotlin("jvm")
+  //  alias(libs.plugins.kotlin.jvm)


Suggested change

// alias(libs.plugins.kotlin.jvm)

lcian · 2025-08-08T09:24:32Z

sentry-samples/sentry-samples-android/build.gradle.kts

  id("com.android.application")
-  kotlin("android")
+  alias(libs.plugins.kotlin.android)
+  //  alias(libs.plugins.kotlin.compose)


Suggested change

// alias(libs.plugins.kotlin.compose)

lcian · 2025-08-08T09:25:20Z

sentry-android-replay/build.gradle.kts

  id("com.android.library")
-  kotlin("android")
+  alias(libs.plugins.kotlin.android)
+  //  alias(libs.plugins.kotlin.compose)


Suggested change

// alias(libs.plugins.kotlin.compose)

lcian · 2025-08-08T09:25:31Z

sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts

  id("com.android.application")
-  kotlin("android")
+  alias(libs.plugins.kotlin.android)
+  //  alias(libs.plugins.kotlin.compose)


Suggested change

// alias(libs.plugins.kotlin.compose)

lcian · 2025-08-08T09:25:40Z

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

  id("com.android.application")
-  kotlin("android")
+  alias(libs.plugins.kotlin.android)
+  //  alias(libs.plugins.kotlin.compose)


Suggested change

// alias(libs.plugins.kotlin.compose)

* Move Spring 7 and Spring Boot 4 packages * Fix class not found due to OTel not supporting spring boot 4 yet (#4616)

…ests_for_spring_7_and_spring_boot_4

github-actions · 2025-08-08T10:31:21Z

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	426.96 ms	466.45 ms	39.49 ms
Size	1.58 MiB	2.09 MiB	524.27 KiB

Baseline results on branch: 08-04-attempt_to_fix_kotlin_2.2_issue

Startup times

Revision	Plain	With Sentry	Diff
`1e0ee95`	509.08 ms	530.81 ms	21.73 ms

App size

Revision	Plain	With Sentry	Diff
`1e0ee95`	1.58 MiB	2.09 MiB	524.25 KiB

Previous results on branch: 08-07-fix_tests_for_spring_7_and_spring_boot_4

Startup times

Revision	Plain	With Sentry	Diff
`9b0eec4`	405.47 ms	429.46 ms	23.99 ms
`18325a0`	362.44 ms	425.54 ms	63.10 ms
`4eba82f`	385.85 ms	419.45 ms	33.60 ms
`623480f`	420.67 ms	453.50 ms	32.83 ms

App size

Revision	Plain	With Sentry	Diff
`9b0eec4`	1.58 MiB	2.09 MiB	524.25 KiB
`18325a0`	1.58 MiB	2.09 MiB	524.25 KiB
`4eba82f`	1.58 MiB	2.09 MiB	524.25 KiB
`623480f`	1.58 MiB	2.09 MiB	524.26 KiB

* 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>

* 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 and others added 4 commits August 7, 2025 14:55

Second attempt to fix Kotlin 2.2

35e4789

Format code

6a8b15d

Third attempt at fixing Kotlin 2.2 compat

8d5bfcf

Fix tests for Spring 7 and Spring Boot 4

b589acb

This was referenced Aug 7, 2025

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

Merged

Fix Spring 7 and Spring Boot 4 modules #4602

Merged

Attempt to fix kotlin 2.2 issue #4603

Merged

Second attempt to fix Kotlin 2.2 #4610

Merged

Third attempt at fixing Kotlin 2.2 compat #4613

Merged

adinauer mentioned this pull request Aug 7, 2025

Move Spring 7 and Spring Boot 4 packages #4615

Merged

7 tasks

adinauer mentioned this pull request Aug 7, 2025

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

Merged

7 tasks

Base automatically changed from 08-07-third_attempt_at_fixing_kotlin_2.2_compat to 08-06-second_attempt_to_fix_kotlin_2.2 August 7, 2025 14:34

Base automatically changed from 08-06-second_attempt_to_fix_kotlin_2.2 to 08-04-attempt_to_fix_kotlin_2.2_issue August 7, 2025 14:35

lcian approved these changes Aug 8, 2025

View reviewed changes

adinauer and others added 3 commits August 8, 2025 12:01

Move Spring 7 and Spring Boot 4 packages (#4615)

b76a0ce

* Move Spring 7 and Spring Boot 4 packages * Fix class not found due to OTel not supporting spring boot 4 yet (#4616)

Merge branch '08-04-attempt_to_fix_kotlin_2.2_issue' into 08-07-fix_t…

15f9b19

…ests_for_spring_7_and_spring_boot_4

Format code

e8c30c2

adinauer added 3 commits August 8, 2025 12:39

some fixes

b5f7966

change kotlin 1.8 to 1.9 and some cleanup

810f976

ignore warnings about api level that is not relevant

38f6bd2

adinauer marked this pull request as ready for review August 8, 2025 12:36

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

adinauer added 2 commits August 11, 2025 08:36

fix optional dependencies in SentryAutoConfiguration

a656caa

Update trace origin

9148666

adinauer mentioned this pull request Aug 11, 2025

Update trace origins for Spring 7 and Spring Boot 4 #4620

Closed

adinauer added 3 commits August 11, 2025 09:24

Remove duplicate e2e test config

847958a

Update Strings for Spring 7 and Spring Boot 4

42fe02a

Disable Spring Boot 4 agentless e2e tests for now

03eda66

adinauer merged commit 1ae8108 into 08-04-attempt_to_fix_kotlin_2.2_issue Aug 11, 2025
37 of 39 checks passed

adinauer deleted the 08-07-fix_tests_for_spring_7_and_spring_boot_4 branch August 11, 2025 12:12

Uh oh!

Conversation

adinauer commented Aug 7, 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 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Instructions and example for changelog

Uh oh!

lcian left a comment

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

lcian Aug 8, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 8, 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-attempt_to_fix_kotlin_2.2_issue

Startup times

App size

Previous results on branch: 08-07-fix_tests_for_spring_7_and_spring_boot_4

Startup times

App size

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

adinauer commented Aug 7, 2025 •

edited by lcian

Loading

adinauer commented Aug 7, 2025 •

edited

Loading

github-actions bot commented Aug 7, 2025 •

edited

Loading

github-actions bot commented Aug 8, 2025 •

edited

Loading