Merge branch 'fix/kafka-consumer-interceptor-reflection' into fix/kafka-otel-agent-autoconfig

Author: adinauer

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/kafka/SentryKafkaConsumerBeanPostProcessor.java

@@ -21,6 +21,18 @@
 public final class SentryKafkaConsumerBeanPostProcessor
     implements BeanPostProcessor, PriorityOrdered {
 
+  private static final @NotNull String RECORD_INTERCEPTOR_FIELD_NAME = "recordInterceptor";
+
+  private final @NotNull String recordInterceptorFieldName;
+
+  public SentryKafkaConsumerBeanPostProcessor() {
+    this(RECORD_INTERCEPTOR_FIELD_NAME);
+  }
+
+  SentryKafkaConsumerBeanPostProcessor(final @NotNull String recordInterceptorFieldName) {
+    this.recordInterceptorFieldName = recordInterceptorFieldName;
+  }
+
   private static final class InterceptorReadFailedException extends Exception {
     private static final long serialVersionUID = 1L;
 
@@ -71,7 +83,7 @@ private static final class InterceptorReadFailedException extends Exception {
       throws InterceptorReadFailedException {
     try {
       final @NotNull Field field =
-          AbstractKafkaListenerContainerFactory.class.getDeclaredField("recordInterceptor");
+          AbstractKafkaListenerContainerFactory.class.getDeclaredField(recordInterceptorFieldName);
       field.setAccessible(true);
       return (RecordInterceptor<?, ?>) field.get(factory);
     } catch (NoSuchFieldException | IllegalAccessException | RuntimeException e) {

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

@@ -1,7 +1,6 @@
 package io.sentry.spring.jakarta.kafka
 
 import kotlin.test.Test
-import kotlin.test.assertEquals
 import kotlin.test.assertSame
 import kotlin.test.assertTrue
 import org.apache.kafka.clients.consumer.Consumer
@@ -97,14 +96,6 @@ class SentryKafkaConsumerBeanPostProcessorTest {
 
   @Test
   fun `skips installation when reflection fails and preserves customer interceptor`() {
-    // Subclass whose declared 'recordInterceptor' field does not exist on the
-    // AbstractKafkaListenerContainerFactory class lookup path — this simulates the
-    // future-spring-kafka case where the private field is renamed/removed.
-    // We can't easily corrupt JDK reflection, so we instead verify the chosen
-    // contract: when reflection succeeds and yields a non-Sentry interceptor,
-    // it is preserved as a delegate (covered above). The reflection-failure
-    // branch is logged at ERROR and returns the bean untouched; see
-    // SentryKafkaConsumerBeanPostProcessor#postProcessAfterInitialization.
     val consumerFactory = mock<ConsumerFactory<String, String>>()
     val factory = ConcurrentKafkaListenerContainerFactory<String, String>()
     factory.consumerFactory = consumerFactory
@@ -117,29 +108,17 @@ class SentryKafkaConsumerBeanPostProcessorTest {
       }
     factory.setRecordInterceptor(customerInterceptor)
 
-    // Sanity check: customer interceptor is set before BPP runs.
     val field = factory.javaClass.superclass.getDeclaredField("recordInterceptor")
     field.isAccessible = true
     assertSame(customerInterceptor, field.get(factory))
 
-    // After BPP runs the customer interceptor must still be reachable
-    // (either directly, or as the delegate of a SentryKafkaRecordInterceptor).
-    val processor = SentryKafkaConsumerBeanPostProcessor()
+    val processor = SentryKafkaConsumerBeanPostProcessor("missingRecordInterceptor")
     processor.postProcessAfterInitialization(factory, "kafkaListenerContainerFactory")
 
-    val installed = field.get(factory)
-    val effective =
-      if (installed is SentryKafkaRecordInterceptor<*, *>) {
-        val delegateField = SentryKafkaRecordInterceptor::class.java.getDeclaredField("delegate")
-        delegateField.isAccessible = true
-        delegateField.get(installed)
-      } else {
-        installed
-      }
-    assertEquals(
+    assertSame(
       customerInterceptor,
-      effective,
-      "customer interceptor must never be silently dropped",
+      field.get(factory),
+      "customer interceptor must remain installed when Sentry cannot read it",
     )
   }
 }