fix(spring-jakarta): [Queue Instrumentation 12] Add Kafka retry count attribute

[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 without real 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
• fix(test): [Queue Instrumentation 39] Remove stale Kafka container before startup #5347
• feat(spring): [Queue Instrumentation 40] Add Spring Boot 4 Kafka tracing #5348
• feat(spring): [Queue Instrumentation 41] Add Spring Boot 2 Kafka tracing #5352

---

📜 Description

Set messaging.message.retry.count on queue.process transactions when Spring Kafka provides the delivery attempt header. The retry count is derived as deliveryAttempt - 1 (attempt 1 → retry count 0).

If the header is missing, malformed, or non-positive, no retry count attribute is added.

💡 Motivation and Context

Kafka retries currently create multiple queue.process transactions for the same record. Adding retry-count metadata makes attempts distinguishable in traces and aligns with Sentry conventions.

💚 How did you test it?

• Ran ./gradlew :sentry-spring-jakarta:test --tests='*SentryKafkaRecordInterceptorTest*'
• Added tests:
  • sets retry count from delivery attempt header
  • does not set retry count when delivery attempt header is missing

📝 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

None.

#skip-changelog

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

[github-actions]

Semver Impact of This PR

🟢 Patch (bug fixes)

📋 Changelog Preview

This is how your changes will appear in the changelog.
Entries from this PR are highlighted with a left border (blockquote style).

---

This PR will not appear in the changelog.

---

_{🤖 This preview updates automatically when you update the PR.}

[sentry]

Sentry Build Distribution

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

Configure sentry-android build distribution settings

[github-actions]

Performance metrics 🚀

	Plain	With Sentry	Diff
Startup time	316.72 ms	373.91 ms	57.19 ms
Size	0 B	0 B	0 B

Baseline results on branch: fix/queue-instrumentation-producer-guard

Startup times

Revision	Plain	With Sentry	Diff
8bb14c7	347.98 ms	413.21 ms	65.23 ms

App size

Revision	Plain	With Sentry	Diff
8bb14c7	0 B	0 B	0 B