Merge branch 'feat/queue-instrumentation-spring-boot-4' into feat/queue-instrumentation-spring-boot-2

Author: adinauer

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

@@ -3,8 +3,6 @@ package io.sentry.spring7.kafka
 import kotlin.test.Test
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
-import org.apache.kafka.clients.consumer.Consumer
-import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.mockito.kotlin.mock
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
 import org.springframework.kafka.core.ConsumerFactory
@@ -65,13 +63,7 @@ class SentryKafkaConsumerBeanPostProcessorTest {
     val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
     factory.setConsumerFactory(consumerFactory)
 
-    val customerInterceptor =
-      object : RecordInterceptor<String, String> {
-        override fun intercept(
-          record: ConsumerRecord<String, String>,
-          consumer: Consumer<String, String>,
-        ): ConsumerRecord<String, String>? = record
-      }
+    val customerInterceptor = RecordInterceptor<String, String> { record, _ -> record }
     factory.setRecordInterceptor(customerInterceptor)
 
     val processor = SentryKafkaConsumerBeanPostProcessor()
@@ -99,13 +91,7 @@ class SentryKafkaConsumerBeanPostProcessorTest {
     val consumerFactory = mock<ConsumerFactory<String, String>>()
     val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
     factory.setConsumerFactory(consumerFactory)
-    val customerInterceptor =
-      object : RecordInterceptor<String, String> {
-        override fun intercept(
-          record: ConsumerRecord<String, String>,
-          consumer: Consumer<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-7/src/test/kotlin/io/sentry/spring7/kafka/SentryKafkaRecordInterceptorTest.kt

@@ -122,7 +122,7 @@ class SentryKafkaRecordInterceptorTest {
         ByteBuffer.allocate(Int.SIZE_BYTES).putInt(it).array(),
       )
     }
-    val record = ConsumerRecord<String, String>("my-topic", 0, 0L, "key", "value")
+    val record = ConsumerRecord("my-topic", 0, 0L, "key", "value")
     headers.forEach { record.headers().add(it) }
     return record
   }

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

@@ -3,8 +3,6 @@ package io.sentry.spring.jakarta.kafka
 import kotlin.test.Test
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
-import org.apache.kafka.clients.consumer.Consumer
-import org.apache.kafka.clients.consumer.ConsumerRecord
 import org.mockito.kotlin.mock
 import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory
 import org.springframework.kafka.core.ConsumerFactory
@@ -65,13 +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>,
-          consumer: Consumer<String, String>,
-        ): ConsumerRecord<String, String>? = record
-      }
+    val customerInterceptor = RecordInterceptor<String, String> { record, _ -> record }
     factory.setRecordInterceptor(customerInterceptor)
 
     val processor = SentryKafkaConsumerBeanPostProcessor()
@@ -99,13 +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>,
-          consumer: Consumer<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-jakarta/src/test/kotlin/io/sentry/spring/jakarta/kafka/SentryKafkaRecordInterceptorTest.kt

@@ -122,7 +122,7 @@ class SentryKafkaRecordInterceptorTest {
         ByteBuffer.allocate(Int.SIZE_BYTES).putInt(it).array(),
       )
     }
-    val record = ConsumerRecord<String, String>("my-topic", 0, 0L, "key", "value")
+    val record = ConsumerRecord("my-topic", 0, 0L, "key", "value")
     headers.forEach { record.headers().add(it) }
     return record
   }