test(spring-boot): [Sample Tests 26] Move the Boot 2 OTel agent sample's tests

.github/workflows/spring-boot-2-matrix.yml

@@ -75,32 +75,17 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
-            :sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
             :sentry-samples:sentry-samples-spring:war \
-            :sentry-samples:sentry-samples-spring:testClasses \
-            :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
+            :sentry-samples:sentry-samples-spring:testClasses
 
       - name: Test sentry-spring-boot integration suites
         run: |
           ./gradlew \
             :sentry-spring-boot:integrationTest \
             :sentry-spring-boot:integrationTestWebflux \
-            :sentry-spring-boot:integrationTestOtelNoAgent
-
-      - name: Test sentry-samples-spring-boot-opentelemetry agent init true
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-opentelemetry" \
-            --agent true \
-            --auto-init "true"
-
-      - name: Test sentry-samples-spring-boot-opentelemetry agent init false
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-opentelemetry" \
-            --agent true \
-            --auto-init "false"
+            :sentry-spring-boot:integrationTestOtelNoAgent \
+            :sentry-spring-boot:integrationTestOtelAgent \
+            :sentry-spring-boot:integrationTestOtelAgentWithoutAutoInit
 
       - name: Test sentry-samples-spring
         run: |

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

@@ -28,12 +28,6 @@ jobs:
         agent: [ "false" ]
         agent-auto-init: [ "true" ]
         include:
-          - sample: "sentry-samples-spring-boot-opentelemetry"
-            agent: "true"
-            agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-opentelemetry"
-            agent: "true"
-            agent-auto-init: "false"
           - sample: "sentry-samples-console-otlp"
             agent: "false"
             agent-auto-init: "true"

build.gradle.kts

@@ -226,6 +226,8 @@ tasks.register("integrationTests") {
         ":sentry-spring-boot:integrationTest",
         ":sentry-spring-boot:integrationTestWebflux",
         ":sentry-spring-boot:integrationTestOtelNoAgent",
+        ":sentry-spring-boot:integrationTestOtelAgent",
+        ":sentry-spring-boot:integrationTestOtelAgentWithoutAutoInit",
         ":sentry-spring-boot-jakarta:integrationTest",
         ":sentry-spring-boot-jakarta:integrationTestWebflux",
         ":sentry-spring-boot-jakarta:integrationTestOtelNoAgent",

sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts

@@ -7,7 +7,6 @@ plugins {
   alias(libs.plugins.shadow)
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.kotlin.spring)
-  id("io.sentry.systemtest")
 }
 
 // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version
@@ -78,18 +77,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.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")
@@ -150,33 +137,3 @@ tasks.register<JavaExec>("bootRunWithAgent").configure {
 
   jvmArgs = listOf("-Dotel.javaagent.debug=true", "-javaagent:$agentJarPath")
 }
-
-// The runner launches this sample with -javaagent, so track the agent jar as a systemTest input.
-sentrySystemTest { usesOpenTelemetryAgent = true }
-
-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*")
-    }
-    if (!includeKafka) {
-      excludeTestsMatching("io.sentry.systemtest.Kafka*")
-    }
-  }
-}
-
-tasks.named("test").configure {
-  require(this is Test)
-
-  filter { excludeTestsMatching("io.sentry.systemtest.*") }
-}