Skip to content

test(spring-boot): [Sample Tests 19] Move the Boot 2 WebFlux sample's tests into the module #6311

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

Merged
runningcode merged 4 commits into from
Oct 23, 2026
+5,037 −3,754
Merged

test(spring-boot): [Sample Tests 19] Move the Boot 2 WebFlux sample's tests into the module #6311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3dda1d
test(spring-boot): Move the Boot 2 WebFlux sample's tests into the mo…
runningcode Oct 20, 2026
5543171
test(spring-boot): Tighten the Boot 2 WebFlux tracing checks and rest…
runningcode Oct 20, 2026
897815a
test(spring-boot): Return a Mono from the Boot 2 WebFlux GraphQL reso…
runningcode Oct 23, 2026
899f63a
test(spring-boot): [Sample Tests 20] Move the Boot 3 OTel no-agent sa…
runningcode Oct 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
24 changes: 5 additions & 19 deletions .github/workflows/spring-boot-2-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,18 @@ jobs:
- name: Build sample artifacts
run: |
./gradlew \
:sentry-samples:sentry-samples-spring-boot-webflux:shadowJar \
:sentry-samples:sentry-samples-spring-boot-webflux:testClasses \
:sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
:sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:shadowJar \
:sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:testClasses \
:sentry-samples:sentry-samples-spring:war \
:sentry-samples:sentry-samples-spring:testClasses \
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble

- name: Test sentry-spring-boot integration suite
run: ./gradlew :sentry-spring-boot:integrationTest

- name: Test sentry-samples-spring-boot-webflux
- name: Test sentry-spring-boot integration suites
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-webflux" \
--agent false \
--auto-init "true"
./gradlew \
:sentry-spring-boot:integrationTest \
:sentry-spring-boot:integrationTestWebflux \
:sentry-spring-boot:integrationTestOtelNoAgent

- name: Test sentry-samples-spring-boot-opentelemetry agent init true
run: |
Expand All @@ -109,13 +102,6 @@ jobs:
--agent true \
--auto-init "false"

- name: Test sentry-samples-spring-boot-opentelemetry-noagent
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-opentelemetry-noagent" \
--agent false \
--auto-init "true"

- name: Test sentry-samples-spring
run: |
python3 test/system-test-runner.py test \
Expand Down
32 changes: 4 additions & 28 deletions .github/workflows/spring-boot-3-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,42 +71,18 @@ jobs:
- name: Build sample artifacts
run: |
./gradlew \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:testClasses \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:bootJar \
:sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:testClasses \
:sentry-samples:sentry-samples-spring-jakarta:war \
:sentry-samples:sentry-samples-spring-jakarta:testClasses \
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
:sentry-samples:sentry-samples-spring-jakarta:testClasses

- name: Test sentry-spring-boot-jakarta integration suites
run: |
./gradlew \
:sentry-spring-boot-jakarta:integrationTest \
:sentry-spring-boot-jakarta:integrationTestWebflux \
:sentry-spring-boot-jakarta:integrationTestOtelNoAgent \
:sentry-spring-boot-jakarta:integrationTestLog4j2 \
:sentry-spring-boot-jakarta:integrationTestOtelAgent

- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init true
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
--agent true \
--auto-init "true"

- name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init false
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-jakarta-opentelemetry" \
--agent true \
--auto-init "false"

- name: Test sentry-samples-spring-boot-jakarta-opentelemetry-noagent
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" \
--agent false \
--auto-init "true"
:sentry-spring-boot-jakarta:integrationTestOtelAgent \
:sentry-spring-boot-jakarta:integrationTestOtelAgentWithoutAutoInit

- name: Test sentry-samples-spring-jakarta
run: |
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/spring-boot-4-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ jobs:
./gradlew \
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry:testClasses \
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:bootJar \
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:testClasses \
:sentry-samples:sentry-samples-spring-7:war \
:sentry-samples:sentry-samples-spring-7:testClasses \
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
Expand All @@ -84,6 +82,7 @@ jobs:
./gradlew \
:sentry-spring-boot-4:integrationTest \
:sentry-spring-boot-4:integrationTestWebflux \
:sentry-spring-boot-4:integrationTestOtelNoAgent \
:sentry-spring-boot-4:integrationTestLog4j2

- name: Run sentry-samples-spring-boot-4-opentelemetry agent init true
Expand All @@ -100,13 +99,6 @@ jobs:
--agent true \
--auto-init "false"

- name: Run sentry-samples-spring-boot-4-opentelemetry-noagent
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-4-opentelemetry-noagent" \
--agent false \
--auto-init "true"

- name: Run sentry-samples-spring-7
run: |
python3 test/system-test-runner.py test \
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/system-tests-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
sample: [ "sentry-samples-spring-boot-opentelemetry-noagent" ]
sample: [ "sentry-samples-console" ]
agent: [ "false" ]
agent-auto-init: [ "true" ]
include:
Expand All @@ -34,21 +34,6 @@ jobs:
- sample: "sentry-samples-spring-boot-opentelemetry"
agent: "true"
agent-auto-init: "false"
- sample: "sentry-samples-spring-boot-webflux"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-jakarta-opentelemetry-noagent"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
agent: "true"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
agent: "true"
agent-auto-init: "false"
- sample: "sentry-samples-console"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-console-otlp"
agent: "false"
agent-auto-init: "true"
Expand All @@ -58,9 +43,6 @@ jobs:
- sample: "sentry-samples-jul"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
agent: "false"
agent-auto-init: "true"
- sample: "sentry-samples-spring-boot-4-opentelemetry"
agent: "true"
agent-auto-init: "true"
Expand Down
31 changes: 0 additions & 31 deletions sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
alias(libs.plugins.spring.dependency.management)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
id("io.sentry.systemtest")
}

group = "io.sentry.sample.spring-boot-4"
Expand Down Expand Up @@ -54,36 +53,6 @@ dependencies {
// database query tracing
implementation(projects.sentryJdbc)
runtimeOnly(libs.hsqldb)

testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(projects.sentrySystemTestSupport)
testImplementation(libs.apollo3.kotlin)
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.slf4j2.api)
testImplementation(libs.springboot4.starter.test) {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation("ch.qos.logback:logback-classic:1.5.16")
testImplementation("ch.qos.logback:logback-core:1.5.16")
}

dependencyManagement { imports { mavenBom(libs.otel.instrumentation.bom.get().toString()) } }

tasks.register<Test>("systemTest").configure {
group = "verification"
description = "Runs the System tests"

val test = project.extensions.getByType<SourceSetContainer>()["test"]
testClassesDirs = test.output.classesDirs
classpath = test.runtimeClasspath

maxParallelForks = 1

filter { includeTestsMatching("io.sentry.systemtest*") }
}

tasks.named("test").configure {
require(this is Test)

filter { excludeTestsMatching("io.sentry.systemtest.*") }
}
12 changes: 0 additions & 12 deletions ...sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/DummyTest.kt
View file
Open in desktop

This file was deleted.

Loading
Loading