Merge pull request #5345 from getsentry/fix/kafka-interceptor-lifecycle-token

fix(spring-jakarta): [Queue Instrumentation 38] Close leaked Kafka interceptor scope

Author: adinauer

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

@@ -5,6 +5,7 @@
 import io.sentry.IScopes;
 import io.sentry.ISentryLifecycleToken;
 import io.sentry.ITransaction;
+import io.sentry.SentryLevel;
 import io.sentry.SentryTraceHeader;
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanStatus;
@@ -57,18 +58,21 @@ public SentryKafkaRecordInterceptor(
       return delegateIntercept(record, consumer);
     }
 
-    finishStaleContext();
-
-    final @NotNull IScopes forkedScopes = scopes.forkedRootScopes("SentryKafkaRecordInterceptor");
-    final @NotNull ISentryLifecycleToken lifecycleToken = forkedScopes.makeCurrent();
-    currentContext.set(new SentryRecordContext(lifecycleToken, null));
+    try {
+      finishStaleContext();
 
-    final @Nullable TransactionContext transactionContext = continueTrace(forkedScopes, record);
+      final @NotNull IScopes forkedScopes = scopes.forkedRootScopes("SentryKafkaRecordInterceptor");
+      final @NotNull ISentryLifecycleToken lifecycleToken = forkedScopes.makeCurrent();
+      currentContext.set(new SentryRecordContext(lifecycleToken, null));
 
-    final @Nullable ITransaction transaction =
-        startTransaction(forkedScopes, record, transactionContext);
-    currentContext.set(new SentryRecordContext(lifecycleToken, transaction));
+      final @Nullable TransactionContext transactionContext = continueTrace(forkedScopes, record);
 
+      final @Nullable ITransaction transaction =
+          startTransaction(forkedScopes, record, transactionContext);
+      currentContext.set(new SentryRecordContext(lifecycleToken, transaction));
+    } catch (Throwable t) {
+      scopes.getOptions().getLogger().log(SentryLevel.ERROR, "Unable to wrap Kafka consumer.", t);
+    }
     return delegateIntercept(record, consumer);
   }