Merge branch 'feat/queue-instrumentation-spring-boot-2' into fix/queue-instrumentation-review-changes

Author: adinauer

sentry-spring/src/test/kotlin/io/sentry/spring/kafka/SentryKafkaConsumerBeanPostProcessorTest.kt

@@ -3,7 +3,6 @@ package io.sentry.spring.kafka
 import kotlin.test.Test
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
-import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.mockito.kotlin.mock
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
 import org.springframework.kafka.core.ConsumerFactory
@@ -64,12 +63,7 @@ class SentryKafkaConsumerBeanPostProcessorTest {
     val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
     factory.consumerFactory = consumerFactory
 
-    val customerInterceptor =
-      object : RecordInterceptor<String, String> {
-        override fun intercept(
-          record: ConsumerRecord<String, String>
-        ): ConsumerRecord<String, String>? = record
-      }
+    val customerInterceptor = RecordInterceptor<String, String> { record -> record }
     factory.setRecordInterceptor(customerInterceptor)
 
     val processor = SentryKafkaConsumerBeanPostProcessor()
@@ -97,12 +91,7 @@ class SentryKafkaConsumerBeanPostProcessorTest {
     val consumerFactory = mock<ConsumerFactory<String, String>>()
     val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
     factory.consumerFactory = consumerFactory
-    val customerInterceptor =
-      object : RecordInterceptor<String, String> {
-        override fun intercept(
-          record: ConsumerRecord<String, String>
-        ): ConsumerRecord<String, String>? = record
-      }
+    val customerInterceptor = RecordInterceptor<String, String> { record -> record }
     factory.setRecordInterceptor(customerInterceptor)
 
     val field = factory.javaClass.superclass.getDeclaredField("recordInterceptor")

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

@@ -277,6 +277,19 @@ class SentryKafkaRecordInterceptorTest {
     verify(delegate).intercept(record, consumer)
   }
 
+  @Test
+  fun `delegates to existing interceptor when consumer is null`() {
+    val delegate = mock<RecordInterceptor<String, String>>()
+    val record = createRecord()
+    whenever(delegate.intercept(record)).thenReturn(record)
+
+    val interceptor = SentryKafkaRecordInterceptor(scopes, delegate)
+    val result = interceptor.intercept(record)
+
+    assertEquals(record, result)
+    verify(delegate).intercept(record)
+  }
+
   @Test
   fun `success finishes transaction and delegates`() {
     val delegate = mock<RecordInterceptor<String, String>>()