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

Draft
runningcode wants to merge 3 commits into
base: no/boot4-webflux-integration-test
Choose a base branch
from
+590 −500
Draft

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
3 commits
Select commit Hold shift + click to select a range
a55017a
test(spring-boot): Move the Boot 2 WebFlux sample's tests into the mo…
runningcode Oct 20, 2026
ec0d126
Merge the audit fixes from the branches below
runningcode Oct 20, 2026
384e41a
test(spring-boot): Tighten the Boot 2 WebFlux tracing checks and rest…
runningcode Oct 20, 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
13 changes: 2 additions & 11 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,8 +75,6 @@ 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 \
Expand All @@ -85,15 +83,8 @@ jobs:
: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
run: |
python3 test/system-test-runner.py test \
--module "sentry-samples-spring-boot-webflux" \
--agent false \
--auto-init "true"
- name: Test sentry-spring-boot integration suites
run: ./gradlew :sentry-spring-boot:integrationTest :sentry-spring-boot:integrationTestWebflux

- name: Test sentry-samples-spring-boot-opentelemetry agent init true
run: |
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/system-tests-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +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"
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ tasks.register("integrationTests") {
description = "Runs the integration test suites of every module."
dependsOn(
":sentry-spring-boot:integrationTest",
":sentry-spring-boot:integrationTestWebflux",
":sentry-spring-boot-jakarta:integrationTest",
":sentry-spring-boot-jakarta:integrationTestWebflux",
":sentry-spring-boot-jakarta:integrationTestLog4j2",
Expand Down
37 changes: 0 additions & 37 deletions sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ plugins {
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
id("io.sentry.systemtest")
}

application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }
Expand Down Expand Up @@ -46,18 +45,6 @@ dependencies {
implementation(projects.sentryGraphql)
}
implementation(projects.sentryAsyncProfiler)

testImplementation(kotlin(Config.kotlinStdLib))
testImplementation(projects.sentrySystemTestSupport)
testImplementation(libs.apollo3.kotlin)
testImplementation(libs.kotlin.test.junit)
testImplementation(libs.slf4j2.api)
testImplementation(libs.springboot.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")
testImplementation("org.apache.httpcomponents:httpclient")
}

val runtimeClasspath = configurations.named("runtimeClasspath")
Expand Down Expand Up @@ -97,27 +84,3 @@ tasks.withType<KotlinCompile>().configureEach {
compilerOptions.jvmTarget = JvmTarget.JVM_11
}
}

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*")
if (!includeGraphql) {
excludeTestsMatching("io.sentry.systemtest.Graphql*")
}
}
}

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

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

This file was deleted.

197 changes: 0 additions & 197 deletions ...-spring-boot-webflux/src/test/kotlin/io/sentry/systemtest/DistributedTracingSystemTest.kt
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...les-spring-boot-webflux/src/test/kotlin/io/sentry/systemtest/GraphqlGreetingSystemTest.kt
View file
Open in desktop

This file was deleted.

Loading
Loading