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

[adinauer]

PR Stack (Queue Instrumentation)

• feat(core): Queue Instrumentation #5249
• feat(core): [Queue Instrumentation 1] Add enableQueueTracing option and messaging span data conventions #5250
• feat(samples): [Queue Instrumentation 2] Add Kafka to Spring Boot 3 sample app #5253
• feat(spring-jakarta): [Queue Instrumentation 3] Add Kafka producer instrumentation #5254
• feat(spring-jakarta): [Queue Instrumentation 4] Add Kafka consumer instrumentation #5255
• feat(spring-boot-jakarta): [Queue Instrumentation 5] Add Kafka queue auto-configuration #5259
• test(samples): [Queue Instrumentation 6] Add Kafka queue system tests #5260
• feat(samples): [Queue Instrumentation 7] Add Kafka to Spring Boot 3 OTel sample apps #5265
• fix(spring-boot-jakarta): [Queue Instrumentation 8] Disable Sentry Kafka spans when OTel is active #5274
• fix(spring-jakarta): [Queue Instrumentation 9] Clean up stale ThreadLocal context in Kafka consumer interceptor #5279
• fix(spring-jakarta): [Queue Instrumentation 10] Fork root scopes and skip when OTel is active in Kafka consumer #5280
• fix(spring-jakarta): [Queue Instrumentation 11] Guard entire span lifecycle in Kafka producer interceptor #5281
• fix(spring-jakarta): [Queue Instrumentation 12] Add Kafka retry count attribute #5282
• fix(spring-jakarta): [Queue Instrumentation 13] Align enqueue time with Python #5283
• ref(kafka): [Queue Instrumentation 14] Extract sentry-kafka module #5288
• feat(samples): [Queue Instrumentation 15] Add opt-in Kafka console e2e coverage #5289
• fix(test): [Queue Instrumentation 16] Enable Kafka profile in system runner #5291
• feat(kafka): [Queue Instrumentation 17] Add manual consumer tracing helper #5312
• ref(samples): [Queue Instrumentation 18] Move Kafka sources into queues.kafka package #5313
• ref(samples): [Queue Instrumentation 19] Drop Kafka auto-config exclude from Spring Boot samples #5314
• ref(kafka): [Queue Instrumentation 20] Log Kafka instrumentation failures #5315
• fix(kafka): [Queue Instrumentation 21] Preserve third-party baggage on Kafka producer records #5316
• test(spring-boot-jakarta): [Queue Instrumentation 22] Cover spring-kafka class-absence gate #5318
• fix(spring-jakarta): [Queue Instrumentation 23] Install Kafka context before trace setup #5319
• fix(kafka): [Queue Instrumentation 24] Read all baggage headers on consumers #5320
• fix(kafka): [Queue Instrumentation 25] Finish producer spans on failures #5321
• fix(kafka): [Queue Instrumentation 26] Mark producer interceptor experimental #5322
• fix(spring-jakarta): [Queue Instrumentation 27] Delegate Kafka record thread-state hooks #5323
• test(samples): [Queue Instrumentation 28] Cover OTel Jakarta Kafka coexistence in CI #5324
• fix(spring-jakarta): [Queue Instrumentation 29] Set body_size on Spring Kafka consumer transaction #5325
• test(spring-jakarta): [Queue Instrumentation 30] Cover Kafka record interceptor lifecycle edge cases #5327
• fix(kafka): [Queue Instrumentation 31] Write enqueued-time header as plain decimal #5328
• test(spring-boot-jakarta): [Queue Instrumentation 32] Filter OTel in Kafka auto-config negative tests #5330
• fix(otel): [Queue Instrumentation 34] Fix OTel messaging span mapping correctness #5337
• fix(kafka): [Queue Instrumentation 35] Inject trace headers even without active span #5338
• fix(kafka): [Queue Instrumentation 36] Avoid dropping customer interceptor #5341
• fix(spring-boot-jakarta): [Queue Instrumentation 37] Skip Kafka autoconfig for OTel agent #5343
• fix(spring-jakarta): [Queue Instrumentation 38] Close leaked Kafka interceptor scope #5345

---

📜 Description

Ensure SentryKafkaRecordInterceptor does not leak its forked scopes when interceptor setup throws.

The interceptor now stores the lifecycle token in currentContext immediately after makeCurrent(), before continueTrace() or startTransaction() can fail. If setup fails, the existing cleanup path can still close the token instead of leaving the forked scopes current on the consumer thread.

💡 Motivation and Context

A review comment pointed out that continueTrace() or startTransaction() could throw after makeCurrent() succeeded but before the lifecycle token was saved into the thread-local. In that case failure() and clearThreadState() would see no context to finish, and the lifecycle token would never be closed.

This change keeps the cleanup path intact and logs setup failures without breaking Kafka consumer processing.

💚 How did you test it?

• Ran ./gradlew spotlessApply apiDump
• Ran ./gradlew :sentry-spring-jakarta:test --tests='*SentryKafkaRecordInterceptorTest*'

📝 Checklist

• I added GH Issue ID & Linear ID
• I added tests to verify the changes.
• No new PII added or SDK only sends newly added PII if sendDefaultPII is enabled.
• I updated the docs if needed.
• I updated the wizard if needed.
• Review from the native team if needed.
• No breaking change or entry added to the changelog.
• No breaking change for hybrid SDKs or communicated to hybrid SDKs.

🔮 Next steps

Continue tightening the remaining Queue Instrumentation error paths.

#skip-changelog

⚠️ Merge this PR using a merge commit (not squash). Only the collection branch is squash-merged into main.

[sentry]

📲 Install Builds

Android

🔗 App Name	App ID	Version	Configuration
SDK Size	io.sentry.tests.size	8.37.1 (1)	release

⚙️ sentry-android Build Distribution Settings

[github-actions]

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	291.52 ms	362.06 ms	70.54 ms
Size	0 B	0 B	0 B

Baseline results on branch: fix/kafka-otel-agent-autoconfig

Startup times

Revision	Plain	With Sentry	Diff
f1a44de	339.15 ms	390.35 ms	51.19 ms

App size

Revision	Plain	With Sentry	Diff
f1a44de	0 B	0 B	0 B