Merge 1675387 into 0b67b60

getsentry · Mar 6, 2025 · 3b5ce95 · 3b5ce95
2 parents 0b67b60 + 1675387
commit 3b5ce95
Show file tree

Hide file tree

Showing 117 changed files with 828 additions and 3,265 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -155,7 +155,7 @@ subprojects {
         }
     }
 
-    if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-test-support" && this.name != "sentry-compose-helper") {
+    if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-system-test-support" && this.name != "sentry-test-support" && this.name != "sentry-compose-helper") {
         apply<DistributionPlugin>()
         apply<com.vanniktech.maven.publish.MavenPublishPlugin>()
 

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -75,6 +75,7 @@ object Config {
         val log4j2Core = "org.apache.logging.log4j:log4j-core:$log4j2Version"
 
         val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind"
+        val jacksonKotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3"
 
         val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
         val springBootStarterGraphql = "org.springframework.boot:spring-boot-starter-graphql:$springBootVersion"

diff --git a/codecov.yml b/codecov.yml
@@ -16,5 +16,6 @@ coverage:
 ignore:
   - "**/src/test/*"
   - "sentry-android-integration-tests/*"
+  - "sentry-system-test-support/*"
   - "sentry-test-support/*"
   - "sentry-samples/*"
diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
     id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion
     kotlin("jvm")
     kotlin("plugin.spring") version Config.kotlinVersion
-    id("com.apollographql.apollo3") version "3.8.2"
 }
 
 group = "io.sentry.sample.spring-boot-jakarta"
@@ -57,6 +56,7 @@ dependencies {
     // database query tracing
     implementation(projects.sentryJdbc)
     runtimeOnly(Config.TestLibs.hsqldb)
+    testImplementation(projects.sentrySystemTestSupport)
     testImplementation(Config.Libs.springBoot3StarterTest) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
@@ -103,13 +103,3 @@ tasks.named("test").configure {
         excludeTestsMatching("io.sentry.systemtest.*")
     }
 }
-
-apollo {
-    service("service") {
-        srcDir("src/test/graphql")
-        packageName.set("io.sentry.samples.graphql")
-        outputDirConnection {
-            connectToKotlinSourceSet("test")
-        }
-    }
-}
diff --git a/...sentry-samples-spring-boot-jakarta-opentelemetry-noagent/src/test/graphql/schema.graphqls b/...sentry-samples-spring-boot-jakarta-opentelemetry-noagent/src/test/graphql/schema.graphqls
diff --git a/...pentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/DistributedTracingSystemTest.kt b/...pentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/DistributedTracingSystemTest.kt
@@ -1,10 +1,8 @@
 package io.sentry.systemtest
 
 import io.sentry.protocol.SentryId
-import io.sentry.samples.spring.boot.jakarta.Person
 import io.sentry.systemtest.util.TestHelper
 import org.junit.Before
-import org.springframework.http.HttpStatus
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
@@ -25,10 +23,12 @@ class DistributedTracingSystemTest {
         val restClient = testHelper.restClient
         restClient.getPersonDistributedTracing(
             1L,
-            "$traceId-424cffc8f94feeee-1",
-            "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            mapOf(
+                "sentry-trace" to "$traceId-424cffc8f94feeee-1",
+                "baggage" to "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            )
         )
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, restClient.lastKnownStatusCode)
+        assertEquals(500, restClient.lastKnownStatusCode)
 
         testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
             transaction.transaction == "GET /tracing/{id}" &&
@@ -47,10 +47,12 @@ class DistributedTracingSystemTest {
         val restClient = testHelper.restClient
         restClient.getPersonDistributedTracing(
             1L,
-            "$traceId-424cffc8f94feeee-0",
-            "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=false,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            mapOf(
+                "sentry-trace" to "$traceId-424cffc8f94feeee-0",
+                "baggage" to "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=false,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            )
         )
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, restClient.lastKnownStatusCode)
+        assertEquals(500, restClient.lastKnownStatusCode)
 
         testHelper.ensureNoTransactionReceived { transaction, envelopeHeader ->
             transaction.transaction == "GET /tracing/{id}"
@@ -67,10 +69,12 @@ class DistributedTracingSystemTest {
         val restClient = testHelper.restClient
         restClient.getPersonDistributedTracing(
             1L,
-            "$traceId-424cffc8f94feeee-1",
-            "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            mapOf(
+                "sentry-trace" to "$traceId-424cffc8f94feeee-1",
+                "baggage" to "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            )
         )
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, restClient.lastKnownStatusCode)
+        assertEquals(500, restClient.lastKnownStatusCode)
 
         var sampleRand1: String? = null
         var sampleRand2: String? = null
@@ -113,10 +117,12 @@ class DistributedTracingSystemTest {
         val restClient = testHelper.restClient
         restClient.getPersonDistributedTracing(
             1L,
-            "$traceId-424cffc8f94feeee",
-            "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=0.5,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            mapOf(
+                "sentry-trace" to "$traceId-424cffc8f94feeee",
+                "baggage" to "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rate=0.5,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            )
         )
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, restClient.lastKnownStatusCode)
+        assertEquals(500, restClient.lastKnownStatusCode)
 
         var sampleRate1: String? = null
         var sampleRate2: String? = null
@@ -161,10 +167,12 @@ class DistributedTracingSystemTest {
         val person = Person("firstA", "lastB")
         val returnedPerson = restClient.createPersonDistributedTracing(
             person,
-            "$traceId-424cffc8f94feeee-1",
-            "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            mapOf(
+                "sentry-trace" to "$traceId-424cffc8f94feeee-1",
+                "baggage" to "sentry-public_key=502f25099c204a2fbf4cb16edc5975d1,sentry-sample_rand=0.456789,sentry-sample_rate=0.5,sentry-sampled=true,sentry-trace_id=$traceId,sentry-transaction=HTTP%20GET"
+            )
         )
-        assertEquals(HttpStatus.OK, restClient.lastKnownStatusCode)
+        assertEquals(200, restClient.lastKnownStatusCode)
 
         assertEquals(person.firstName, returnedPerson!!.firstName)
         assertEquals(person.lastName, returnedPerson!!.lastName)

diff --git a/...ot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/...ot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
@@ -1,9 +1,7 @@
 package io.sentry.systemtest
 
-import io.sentry.samples.spring.boot.jakarta.Person
 import io.sentry.systemtest.util.TestHelper
 import org.junit.Before
-import org.springframework.http.HttpStatus
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -21,7 +19,7 @@ class PersonSystemTest {
     fun `get person fails`() {
         val restClient = testHelper.restClient
         restClient.getPerson(1L)
-        assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, restClient.lastKnownStatusCode)
+        assertEquals(500, restClient.lastKnownStatusCode)
 
         testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
             testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
@@ -34,7 +32,7 @@ class PersonSystemTest {
         val restClient = testHelper.restClient
         val person = Person("firstA", "lastB")
         val returnedPerson = restClient.createPerson(person)
-        assertEquals(HttpStatus.OK, restClient.lastKnownStatusCode)
+        assertEquals(200, restClient.lastKnownStatusCode)
 
         assertEquals(person.firstName, returnedPerson!!.firstName)
         assertEquals(person.lastName, returnedPerson!!.lastName)

diff --git a/...boot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/TodoSystemTest.kt b/...boot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/TodoSystemTest.kt
@@ -2,7 +2,6 @@ package io.sentry.systemtest
 
 import io.sentry.systemtest.util.TestHelper
 import org.junit.Before
-import org.springframework.http.HttpStatus
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -20,7 +19,7 @@ class TodoSystemTest {
     fun `get todo works`() {
         val restClient = testHelper.restClient
         restClient.getTodo(1L)
-        assertEquals(HttpStatus.OK, restClient.lastKnownStatusCode)
+        assertEquals(200, restClient.lastKnownStatusCode)
 
         testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
             testHelper.doesTransactionContainSpanWithOp(transaction, "todoSpanOtelApi") &&
@@ -33,7 +32,7 @@ class TodoSystemTest {
     fun `get todo webclient works`() {
         val restClient = testHelper.restClient
         restClient.getTodoWebclient(1L)
-        assertEquals(HttpStatus.OK, restClient.lastKnownStatusCode)
+        assertEquals(200, restClient.lastKnownStatusCode)
 
         testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
             testHelper.doesTransactionContainSpanWithOp(transaction, "http.client")
@@ -44,7 +43,7 @@ class TodoSystemTest {
     fun `get todo restclient works`() {
         val restClient = testHelper.restClient
         restClient.getTodoRestClient(1L)
-        assertEquals(HttpStatus.OK, restClient.lastKnownStatusCode)
+        assertEquals(200, restClient.lastKnownStatusCode)
 
         testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
             testHelper.doesTransactionContainSpanWithOp(transaction, "todoRestClientSpanOtelApi") &&

diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
     id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion
     kotlin("jvm")
     kotlin("plugin.spring") version Config.kotlinVersion
-    id("com.apollographql.apollo3") version "3.8.2"
 }
 
 group = "io.sentry.sample.spring-boot-jakarta"
@@ -58,6 +57,8 @@ dependencies {
     // database query tracing
     implementation(projects.sentryJdbc)
     runtimeOnly(Config.TestLibs.hsqldb)
+
+    testImplementation(projects.sentrySystemTestSupport)
     testImplementation(Config.Libs.springBoot3StarterTest) {
         exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
     }
@@ -123,13 +124,3 @@ tasks.named("test").configure {
         excludeTestsMatching("io.sentry.systemtest.*")
     }
 }
-
-apollo {
-    service("service") {
-        srcDir("src/test/graphql")
-        packageName.set("io.sentry.samples.graphql")
-        outputDirConnection {
-            connectToKotlinSourceSet("test")
-        }
-    }
-}
diff --git a/...amples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/greeting.graphql b/...amples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/greeting.graphql
diff --git a/...samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/project.graphql b/...samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/project.graphql
diff --git a/...samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/schema.graphqls b/...samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/graphql/schema.graphqls