Skip to content

Commit 8ba225a

Browse files
[pr-shepherd] Merge origin/main into refactor/apply-plugins-per-module
Resolve plugins {} conflict in sentry-samples-spring-boot-4/build.gradle.kts: keep io.sentry.spotless and io.sentry.jdk-target from this branch, drop io.sentry.systemtest as removed on main (#6298).
2 parents cfd11d5 + 0693115 commit 8ba225a

34 files changed

Lines changed: 1066 additions & 839 deletions

‎.github/workflows/spring-boot-4-matrix.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ jobs:
7171
- name: Build sample artifacts
7272
run: |
7373
./gradlew \
74-
:sentry-samples:sentry-samples-spring-boot-4:bootJar \
75-
:sentry-samples:sentry-samples-spring-boot-4:testClasses \
7674
:sentry-samples:sentry-samples-spring-boot-4-webflux:bootJar \
7775
:sentry-samples:sentry-samples-spring-boot-4-webflux:testClasses \
7876
:sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
@@ -83,12 +81,8 @@ jobs:
8381
:sentry-samples:sentry-samples-spring-7:testClasses \
8482
:sentry-opentelemetry:sentry-opentelemetry-agent:assemble
8583
86-
- name: Run sentry-samples-spring-boot-4
87-
run: |
88-
python3 test/system-test-runner.py test \
89-
--module "sentry-samples-spring-boot-4" \
90-
--agent false \
91-
--auto-init "true"
84+
- name: Test sentry-spring-boot-4 integration suite
85+
run: ./gradlew :sentry-spring-boot-4:integrationTest
9286

9387
- name: Run sentry-samples-spring-boot-4-webflux
9488
run: |

‎.github/workflows/system-tests-backend.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ jobs:
6767
- sample: "sentry-samples-jul"
6868
agent: "false"
6969
agent-auto-init: "true"
70-
- sample: "sentry-samples-spring-boot-4"
71-
agent: "false"
72-
agent-auto-init: "true"
7370
- sample: "sentry-samples-spring-boot-4-log4j2"
7471
agent: "false"
7572
agent-auto-init: "true"

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ spring-kafka2 = { module = "org.springframework.kafka:spring-kafka", version = "
228228
spring-kafka3 = { module = "org.springframework.kafka:spring-kafka", version.ref = "springKafka3" }
229229
spring-kafka3-test = { module = "org.springframework.kafka:spring-kafka-test", version.ref = "springKafka3" }
230230
spring-kafka4 = { module = "org.springframework.kafka:spring-kafka" }
231+
spring-kafka4-test = { module = "org.springframework.kafka:spring-kafka-test" }
231232
kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.8.1" }
232233
springboot4-otel = { module = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter", version.ref = "otelInstrumentation" }
233234
springboot4-resttestclient = { module = "org.springframework.boot:spring-boot-resttestclient", version.ref = "springboot4" }

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
alias(libs.plugins.spring.dependency.management)
77
alias(libs.plugins.kotlin.jvm)
88
alias(libs.plugins.kotlin.spring)
9-
id("io.sentry.systemtest")
109
id("io.sentry.spotless")
1110
id("io.sentry.jdk-target")
1211
}
@@ -63,35 +62,4 @@ dependencies {
6362
// database query tracing
6463
implementation(projects.sentryJdbc)
6564
runtimeOnly(libs.hsqldb)
66-
67-
testImplementation(kotlin(Config.kotlinStdLib))
68-
testImplementation(projects.sentry)
69-
testImplementation(projects.sentrySystemTestSupport)
70-
testImplementation(libs.apollo3.kotlin)
71-
testImplementation(libs.kotlin.test.junit)
72-
testImplementation(libs.slf4j2.api)
73-
testImplementation(libs.springboot4.starter.test) {
74-
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
75-
}
76-
testImplementation("ch.qos.logback:logback-classic:1.5.16")
77-
testImplementation("ch.qos.logback:logback-core:1.5.16")
78-
}
79-
80-
tasks.register<Test>("systemTest").configure {
81-
group = "verification"
82-
description = "Runs the System tests"
83-
84-
val test = project.extensions.getByType<SourceSetContainer>()["test"]
85-
testClassesDirs = test.output.classesDirs
86-
classpath = test.runtimeClasspath
87-
88-
maxParallelForks = 1
89-
90-
filter { includeTestsMatching("io.sentry.systemtest*") }
91-
}
92-
93-
tasks.named("test").configure {
94-
require(this is Test)
95-
96-
filter { excludeTestsMatching("io.sentry.systemtest.*") }
9765
}

‎sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/DummyTest.kt‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/CacheSystemTest.kt‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/DistributedTracingSystemTest.kt‎

Lines changed: 0 additions & 197 deletions
This file was deleted.

‎sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/GraphqlGreetingSystemTest.kt‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)