Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions .github/workflows/spring-boot-4-matrix.yml
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
3 changes: 0 additions & 3 deletions .github/workflows/system-tests-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ tasks.register("integrationTests") {
":sentry-spring-boot-jakarta:integrationTestOtelAgent",
":sentry-spring-boot-4:integrationTest",
":sentry-spring-boot-4:integrationTestWebflux",
":sentry-spring-boot-4:integrationTestOtelNoAgent",
":sentry-spring-boot-4:integrationTestLog4j2",
)
}
Expand Down
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 @@ -64,36 +63,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.*") }
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading