Merge 252061f into 3d5a001

Author: lbloder

sentry-samples/sentry-samples-console-opentelemetry-noagent/build.gradle.kts

@@ -34,6 +34,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
   implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentless)
+  implementation(projects.sentryAsyncProfiler)
 
   testImplementation(kotlin(Config.kotlinStdLib))
   testImplementation(projects.sentry)

sentry-samples/sentry-samples-console-opentelemetry-noagent/src/test/kotlin/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.systemtest
 
+import io.sentry.protocol.SentryId
 import io.sentry.systemtest.util.TestHelper
 import java.util.concurrent.TimeUnit
 import org.junit.Assert.assertEquals
@@ -24,10 +25,12 @@ class ConsoleApplicationSystemTest {
         jarFile,
         mapOf(
           "SENTRY_DSN" to testHelper.dsn,
-          //          "SENTRY_AUTO_INIT" to "false",
+          //                    "SENTRY_AUTO_INIT" to "true",
           "SENTRY_TRACES_SAMPLE_RATE" to "1.0",
           "SENTRY_ENABLE_PRETTY_SERIALIZATION_OUTPUT" to "false",
           "SENTRY_DEBUG" to "true",
+          "SENTRY_PROFILE_SESSION_SAMPLE_RATE" to "1.0",
+          "SENTRY_PROFILE_LIFECYCLE" to "TRACE",
           "OTEL_METRICS_EXPORTER" to "none",
           "OTEL_LOGS_EXPORTER" to "none",
           "OTEL_TRACES_EXPORTER" to "none",
@@ -42,6 +45,8 @@ class ConsoleApplicationSystemTest {
   }
 
   private fun verifyExpectedEvents() {
+    var profilerId: SentryId? = null
+
     // Verify we received a "Fatal message!" event
     testHelper.ensureErrorReceived { event ->
       event.message?.formatted == "Fatal message!" && event.level?.name == "FATAL"
@@ -67,10 +72,15 @@ class ConsoleApplicationSystemTest {
 
     // Verify we received transaction events
     testHelper.ensureTransactionReceived { transaction, _ ->
+      profilerId = transaction.contexts.profile?.profilerId
       transaction.transaction == "transaction name" &&
         transaction.spans?.any { span -> span.op == "child" } == true
     }
 
+    testHelper.ensureProfileChunkReceived { profileChunk, envelopeHeader ->
+      profileChunk.profilerId == profilerId
+    }
+
     // Verify we received the loop messages (should be 10 of them)
     var loopMessageCount = 0
     try {

sentry-samples/sentry-samples-console/build.gradle.kts

@@ -34,6 +34,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 dependencies {
   implementation(projects.sentry)
+  implementation(projects.sentryAsyncProfiler)
 
   testImplementation(kotlin(Config.kotlinStdLib))
   testImplementation(projects.sentry)

sentry-samples/sentry-samples-console/src/test/kotlin/io/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.systemtest
 
+import io.sentry.protocol.SentryId
 import io.sentry.systemtest.util.TestHelper
 import java.util.concurrent.TimeUnit
 import org.junit.Assert.assertEquals
@@ -27,6 +28,8 @@ class ConsoleApplicationSystemTest {
           "SENTRY_TRACES_SAMPLE_RATE" to "1.0",
           "SENTRY_ENABLE_PRETTY_SERIALIZATION_OUTPUT" to "false",
           "SENTRY_DEBUG" to "true",
+          "SENTRY_PROFILE_SESSION_SAMPLE_RATE" to "1.0",
+          "SENTRY_PROFILE_LIFECYCLE" to "TRACE",
         ),
       )
 
@@ -38,6 +41,7 @@ class ConsoleApplicationSystemTest {
   }
 
   private fun verifyExpectedEvents() {
+    var profilerId: SentryId? = null
     // Verify we received a "Fatal message!" event
     testHelper.ensureErrorReceived { event ->
       event.message?.formatted == "Fatal message!" && event.level?.name == "FATAL"
@@ -63,10 +67,15 @@ class ConsoleApplicationSystemTest {
 
     // Verify we received transaction events
     testHelper.ensureTransactionReceived { transaction, _ ->
+      profilerId = transaction.contexts.profile?.profilerId
       transaction.transaction == "transaction name" &&
         transaction.spans?.any { span -> span.op == "child" } == true
     }
 
+    testHelper.ensureProfileChunkReceived { profileChunk, envelopeHeader ->
+      profileChunk.profilerId == profilerId
+    }
+
     // Verify we received the loop messages (should be 10 of them)
     var loopMessageCount = 0
     try {

sentry-samples/sentry-samples-spring-7/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
   implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
   implementation(projects.sentrySpring7)
   implementation(projects.sentryLogback)
+  implementation(projects.sentryAsyncProfiler)
   implementation(libs.jackson.databind)
   implementation(libs.logback.classic)
   implementation(libs.servlet.jakarta.api)

sentry-samples/sentry-samples-spring-7/src/main/resources/sentry.properties

@@ -1,2 +1,5 @@
 debug=true
 in-app-includes="io.sentry.samples"
+profile-session-sample-rate=1.0
+profiling-traces-dir-path=tmp/sentry/profiling-traces
+profile-lifecycle=TRACE

sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.systemtest
 
+import io.sentry.protocol.SentryId
 import io.sentry.systemtest.util.TestHelper
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -48,4 +49,24 @@ class PersonSystemTest {
     assertEquals(person.firstName, returnedPerson!!.firstName)
     assertEquals(person.lastName, returnedPerson!!.lastName)
   }
+
+  @Test
+  fun `create person starts a profile linked to the transaction`() {
+    var profilerId: SentryId? = null
+    val restClient = testHelper.restClient
+    val person = Person("firstA", "lastB")
+    val returnedPerson = restClient.createPerson(person)
+    assertEquals(200, restClient.lastKnownStatusCode)
+
+    assertEquals(person.firstName, returnedPerson!!.firstName)
+    assertEquals(person.lastName, returnedPerson!!.lastName)
+
+    testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
+      profilerId = transaction.contexts.profile?.profilerId
+      transaction.transaction == "POST /person/"
+    }
+    testHelper.ensureProfileChunkReceived { profileChunk, envelopeHeader ->
+      profileChunk.profilerId == profilerId
+    }
+  }
 }

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

@@ -56,6 +56,7 @@ dependencies {
   implementation(projects.sentryGraphql22)
   implementation(projects.sentryQuartz)
   implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentlessSpring)
+  implementation(projects.sentryAsyncProfiler)
 
   // database query tracing
   implementation(projects.sentryJdbc)

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/resources/application.properties

@@ -16,7 +16,10 @@ sentry.enable-backpressure-handling=true
 sentry.enable-spotlight=true
 sentry.enablePrettySerializationOutput=false
 sentry.logs.enabled=true
-in-app-includes="io.sentry.samples"
+sentry.in-app-includes="io.sentry.samples"
+sentry.profile-session-sample-rate=1.0
+sentry.profiling-traces-dir-path=tmp/sentry/profiling-traces
+sentry.profile-lifecycle=TRACE
 
 # Uncomment and set to true to enable aot compatibility
 # This flag disables all AOP related features (i.e. @SentryTransaction, @SentrySpan)

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -1,6 +1,7 @@
 package io.sentry.systemtest
 
 import io.sentry.protocol.FeatureFlag
+import io.sentry.protocol.SentryId
 import io.sentry.systemtest.util.TestHelper
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -80,6 +81,26 @@ class PersonSystemTest {
     }
   }
 
+  @Test
+  fun `create person starts a profile linked to the transaction`() {
+    var profilerId: SentryId? = null
+    val restClient = testHelper.restClient
+    val person = Person("firstA", "lastB")
+    val returnedPerson = restClient.createPerson(person)
+    assertEquals(200, restClient.lastKnownStatusCode)
+
+    assertEquals(person.firstName, returnedPerson!!.firstName)
+    assertEquals(person.lastName, returnedPerson!!.lastName)
+
+    testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
+      profilerId = transaction.contexts.profile?.profilerId
+      transaction.transaction == "POST /person/"
+    }
+    testHelper.ensureProfileChunkReceived { profileChunk, envelopeHeader ->
+      profileChunk.profilerId == profilerId
+    }
+  }
+
   @Test
   fun `create person creates transaction if no sampled flag in sentry-trace header`() {
     val restClient = testHelper.restClient