test(spring-jakarta): [Queue Instrumentation 30] Cover Kafka record interceptor lifecycle edge cases

[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

---

📜 Description

Add three regression tests for SentryKafkaRecordInterceptor that pin down the lifecycle contract around clearThreadState cleanup.

Scenarios covered:

• Full happy-path lifecycle — setupThreadState → intercept → success → clearThreadState closes the forked scope's lifecycle token exactly once and does not double-finish the transaction. Also verifies all three delegate hooks are invoked.
• Delegate intercept returns null — per Spring Kafka's contract, success/failure are not invoked when the record is filtered. The safety net in clearThreadState → finishStaleContext still finishes the transaction (with UNKNOWN status) and closes the lifecycle token, and the delegating interceptor's clearThreadState is still called.
• Delegate intercept throws — the exception propagates out of SentryKafkaRecordInterceptor.intercept. A subsequent clearThreadState call still finishes the transaction and closes the lifecycle token via the same safety net. (Note: in the real Spring Kafka container, KafkaMessageListenerContainer.doInvokeRecordListener also catches this and invokes failure — this test focuses on the interceptor's own fallback path.)

No source changes. The existing clearThreadState safety net already guarantees cleanup on all three paths; these tests lock the guarantee in place against future refactors.

💡 Motivation and Context

Addresses review finding R6-F001: prior tests verified setupThreadState and clearThreadState delegation in isolation, but nothing exercised the full Spring Kafka listener lifecycle end to end. A future refactor of finishSpan or finishStaleContext could silently introduce a double-finish (or break the safety-net cleanup when success/failure are not invoked) without any test failing.

These tests make the "intercept-exits-abnormally still gets cleaned up exactly once" contract explicit.

💚 How did you test it?

• ./gradlew :sentry-spring-jakarta:test --tests "*SentryKafkaRecordInterceptorTest*" — all 26 tests pass (23 prior + 3 new).
• ./gradlew spotlessApply apiDump — clean, no API changes.

📝 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

Remaining open review findings from review6.md:

• R6-F002 — KafkaOtelCoexistenceSystemTest negative assertion not anchored to observable activity
• R6-F003 — Exception suppression in clearThreadState when both Sentry cleanup and delegate cleanup throw (P3)

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

#skip-changelog

[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	314.51 ms	347.13 ms	32.62 ms
Size	0 B	0 B	0 B

Baseline results on branch: fix/queue-instrumentation-spring-kafka-body-size

Startup times

Revision	Plain	With Sentry	Diff
f4d8e76	320.00 ms	358.56 ms	38.56 ms

App size

Revision	Plain	With Sentry	Diff
f4d8e76	0 B	0 B	0 B