Skip to content

ci(spring): Run the Spring Boot matrix through the dependency matrix plugin - #6718

Open
sentry-junior[bot] wants to merge 1 commit into
mainfrom
ci/dependency-matrix-spring-boot
Open

sentry-junior[bot] wants to merge 1 commit into
mainfrom
ci/dependency-matrix-spring-boot

Conversation

@sentry-junior

@sentry-junior sentry-junior Bot commented Nov 20, 2026

Copy link
Copy Markdown
Contributor

📜 Description

Follow-up to #6638. SpringBootMatrixPlugin and the Compose UI DependencyMatrixPlugin did the same thing: read versions from a JSON file in gradle/, force a dependency group to each version, and run tests per version. This folds the Spring Boot matrix into io.sentry.dependency-matrix and deletes SpringBootMatrixPlugin.

The plugin now has two entry points that share the versions file format, the version forcing, and the task layout:

// Android library modules: one unit test variant per version (unchanged behavior).
dependencyMatrix {
  androidUnitTests(name = "composeUi", groups = listOf("androidx.compose.ui", ...), versionsFile = "compose-ui-versions.json")
}

// JVM modules: the listed test suites run on each version, without recompiling.
dependencyMatrix {
  jvmTestSuites(
    name = "springBoot",
    groups = listOf("org.springframework.boot"),
    versionsFile = "spring-boot-3-versions.json",
  ) {
    test("integrationTest")
    test("integrationTestWebflux")
    otelAgentTests()
  }
}
  • Both register <name>Test<version> per version and <name>Test for all versions, and run the versions one after another.
  • jvmTestSuites keeps how SpringBootMatrixPlugin worked: suites and SDK compile once against the catalog version, and each suite's compiled classes run on a runtime classpath resolved with the group forced to that version. otelAgentTests() moves onto the new receiver.
  • gradle/spring-boot-versions.json is split into spring-boot-{2,3,4}-versions.json, so every matrix reads a plain list in the same format as compose-ui-versions.json.
  • The spring-boot-{2,3,4}-matrix.yml workflows run every version of their line in one job and one Gradle invocation (:<module>:springBootTest --continue), like compose-ui-matrix.yml, instead of a jq step plus one job per version.

Task names change:

Before After
integrationTestWebfluxBoot3_2_12 integrationTestWebfluxSpringBoot3_2_12
allIntegrationTestsBoot3_2_12 springBootTest3_2_12
allIntegrationTestsBoot3 springBootTest
matrix(...) in sentry-android-replay androidUnitTests(...)

.cursor/rules/e2e_tests.mdc is updated to match.

💡 Motivation and Context

One plugin for dependency version matrices instead of two that differ only in how a test task gets its classpath.

📝 Checklist

  • No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
  • No breaking change or entry added to the changelog.
  • No breaking change for hybrid SDKs or communicated to hybrid SDKs.

#skip-changelog

via roman.

--

View Session [Sentry]

…plugin

Co-Authored-By: Roman Zavarnitsyn <roman.zavarnitsyn@sentry.io>
Co-Authored-By: Nelson Osacky <nelson.osacky@sentry.io>
@github-actions github-actions Bot added the risk: medium PR risk score: medium label Nov 20, 2026
@github-actions

Copy link
Copy Markdown
Contributor

PR risk: medium

For commit 2e45bff.

The model rated this change low. It was raised to medium because:

  • R5: dependencies or bundled SDK versions changed: gradle/spring-boot-versions.json
  • R6: build or release configuration changed: .github/workflows/spring-boot-2-matrix.yml, .github/workflows/spring-boot-3-matrix.yml, .github/workflows/spring-boot-4-matrix.yml, build-logic/build.gradle.kts, build-logic/src/main/kotlin/io/sentry/gradle/DependencyMatrixPlugin.kt and 13 more
  • R7: the model was not confident enough that the change is low

This label is a hint for reviewers, not an approval.

@sentry

sentry Bot commented Nov 20, 2026

Copy link
Copy Markdown

📲 Install Builds

Android

🔗 App Name App ID Version Configuration
SDK Size io.sentry.tests.size 8.65.0 (1) release

⚙️ sentry-android Build Distribution Settings

@romtsn
romtsn marked this pull request as ready for review November 20, 2026 16:19
@romtsn
romtsn requested review from a team and adinauer as code owners November 20, 2026 16:19
@romtsn
romtsn requested review from 0xadam-brown and markushi and removed request for a team November 20, 2026 16:19
@github-actions github-actions Bot removed the risk: medium PR risk score: medium label Nov 20, 2026
@romtsn romtsn added the sanity-check PR needs a lightweight review for obvious issues label Nov 20, 2026
@github-actions github-actions Bot added the risk: medium PR risk score: medium label Nov 20, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 2e45bff. Configure here.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk: medium PR risk score: medium sanity-check PR needs a lightweight review for obvious issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant