Merge branch 'feat/queue-instrumentation-e2e' into feat/queue-instrumentation-otel-samples

Author: adinauer

sentry-spring-jakarta/api/sentry-spring-jakarta.api

@@ -256,14 +256,6 @@ public final class io/sentry/spring/jakarta/kafka/SentryKafkaProducerBeanPostPro
 	public fun postProcessAfterInitialization (Ljava/lang/Object;Ljava/lang/String;)Ljava/lang/Object;
 }
 
-public final class io/sentry/spring/jakarta/kafka/SentryProducerInterceptor : org/apache/kafka/clients/producer/ProducerInterceptor {
-	public fun <init> (Lio/sentry/IScopes;)V
-	public fun close ()V
-	public fun configure (Ljava/util/Map;)V
-	public fun onAcknowledgement (Lorg/apache/kafka/clients/producer/RecordMetadata;Ljava/lang/Exception;)V
-	public fun onSend (Lorg/apache/kafka/clients/producer/ProducerRecord;)Lorg/apache/kafka/clients/producer/ProducerRecord;
-}
-
 public final class io/sentry/spring/jakarta/kafka/SentryKafkaRecordInterceptor : org/springframework/kafka/listener/RecordInterceptor {
 	public fun <init> (Lio/sentry/IScopes;)V
 	public fun <init> (Lio/sentry/IScopes;Lorg/springframework/kafka/listener/RecordInterceptor;)V
@@ -273,6 +265,14 @@ public final class io/sentry/spring/jakarta/kafka/SentryKafkaRecordInterceptor :
 	public fun success (Lorg/apache/kafka/clients/consumer/ConsumerRecord;Lorg/apache/kafka/clients/consumer/Consumer;)V
 }
 
+public final class io/sentry/spring/jakarta/kafka/SentryProducerInterceptor : org/apache/kafka/clients/producer/ProducerInterceptor {
+	public fun <init> (Lio/sentry/IScopes;)V
+	public fun close ()V
+	public fun configure (Ljava/util/Map;)V
+	public fun onAcknowledgement (Lorg/apache/kafka/clients/producer/RecordMetadata;Ljava/lang/Exception;)V
+	public fun onSend (Lorg/apache/kafka/clients/producer/ProducerRecord;)Lorg/apache/kafka/clients/producer/ProducerRecord;
+}
+
 public class io/sentry/spring/jakarta/opentelemetry/SentryOpenTelemetryAgentWithoutAutoInitConfiguration {
 	public fun <init> ()V
 	public fun sentryOpenTelemetryOptionsConfiguration ()Lio/sentry/Sentry$OptionsConfiguration;

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/kafka/SentryKafkaRecordInterceptorTest.kt

@@ -3,11 +3,14 @@ package io.sentry.spring.jakarta.kafka
 import io.sentry.BaggageHeader
 import io.sentry.IScopes
 import io.sentry.ISentryLifecycleToken
+import io.sentry.Sentry
 import io.sentry.SentryOptions
 import io.sentry.SentryTraceHeader
 import io.sentry.SentryTracer
 import io.sentry.TransactionContext
+import io.sentry.test.initForTest
 import java.nio.charset.StandardCharsets
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -30,6 +33,7 @@ class SentryKafkaRecordInterceptorTest {
 
   @BeforeTest
   fun setup() {
+    initForTest { it.dsn = "https://key@sentry.io/proj" }
     scopes = mock()
     consumer = mock()
     lifecycleToken = mock()
@@ -51,6 +55,11 @@ class SentryKafkaRecordInterceptorTest {
     whenever(forkedScopes.startTransaction(any<TransactionContext>(), any())).thenReturn(tx)
   }
 
+  @AfterTest
+  fun teardown() {
+    Sentry.close()
+  }
+
   private fun createRecord(
     topic: String = "my-topic",
     headers: RecordHeaders = RecordHeaders(),

sentry-spring-jakarta/src/test/kotlin/io/sentry/spring/jakarta/kafka/SentryProducerInterceptorTest.kt

@@ -1,11 +1,14 @@
 package io.sentry.spring.jakarta.kafka
 
 import io.sentry.IScopes
+import io.sentry.Sentry
 import io.sentry.SentryOptions
 import io.sentry.SentryTraceHeader
 import io.sentry.SentryTracer
 import io.sentry.TransactionContext
+import io.sentry.test.initForTest
 import java.nio.charset.StandardCharsets
+import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -25,6 +28,7 @@ class SentryProducerInterceptorTest {
 
   @BeforeTest
   fun setup() {
+    initForTest { it.dsn = "https://key@sentry.io/proj" }
     scopes = mock()
     options =
       SentryOptions().apply {
@@ -34,6 +38,11 @@ class SentryProducerInterceptorTest {
     whenever(scopes.options).thenReturn(options)
   }
 
+  @AfterTest
+  fun teardown() {
+    Sentry.close()
+  }
+
   private fun createTransaction(): SentryTracer {
     val tx = SentryTracer(TransactionContext("tx", "op"), scopes)
     whenever(scopes.span).thenReturn(tx)