Skip to content

feat(boto3): Add SQS/SNS trace propagation - #8145

Merged
sentrivana merged 23 commits into
major/3.0from
pablo/boto3-add-sqs/sns-propagation
Nov 11, 2026
Merged

sentrivana merged 23 commits into
major/3.0from
pablo/boto3-add-sqs/sns-propagation

Conversation

@pabloDeputter

@pabloDeputter pabloDeputter commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Description

Propagates the trace through SQS and SNS messages, so the consumer can be linked back to the request that sent the message.

Send side (SendMessage, SendMessageBatch, Publish, PublishBatch):

  • Adds sentry-trace and baggage as String message attributes, on the message or on each batch entry.
  • Only when trace_propagation_targets match the endpoint.
  • Skips a message if the caller already set these attributes, if it would go over the 10-attribute limit, or if it would go over 256 KiB. AWS would reject the message otherwise.
  • Works on a copy of the params. The caller's dict isn't changed.

Receive side (ReceiveMessage):

  • Adds sentry-trace and baggage to MessageAttributeNames, so SQS returns them. Only when the span is recorded, and not when the caller already asks for All or .*.
  • Adds a span link to each distinct producer context in the received messages, with sentry.link.type: message_origin.
  • Reads the context from SQS message attributes, and from the JSON envelope of an SNS notification without raw message delivery.

Tests: injection and extraction for single and batch calls, the limits above, and a round-trip test: send a message, receive what was injected, and check that the link points at the send span.

Stacked on #8142 (SNS), which is stacked on #8137 (SQS).

Issues

  • resolves: PY-3008

via @dingsdax.

--

View Session [Sentry]

@github-actions

github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Coverage Results 📊

✅ 58786 passed | ⏭️ 3071 skipped | Total: 61857 | Pass Rate: 95.04% | Execution Time: 162m 7s

📊 Comparison with Base Branch

Metric Change
Total Tests 📉 -85018
Passed Tests 📉 -80324
Failed Tests —
Skipped Tests 📉 -4694

All tests are passing successfully.

✅ Patch coverage is 94.44% (68 of 72 changed executable lines covered; target 80%).
Project statement coverage is 90.45% (up 0.21 percentage points from base (49473c4) to head (73b5bf7)).

Changed files with executable lines (4)
File Patch coverage Changed executable lines
sentry_sdk/integrations/boto3/_utils.py 92.86% 26/28 covered; missed: 114, 115; partial branches: 111, 113
sentry_sdk/integrations/boto3/_services/sqs.py 94.74% 36/38 covered; missed: 53, 54
sentry_sdk/consts.py 100.00% 2/2 covered
sentry_sdk/integrations/boto3/_services/sns.py 100.00% 4/4 covered
Coverage diff
@@            Coverage Diff             @@
##        master     #8145       +/-##
==========================================
+ Coverage    90.24%    90.45%    +0.21%
==========================================
  Files          203       199        -4
  Tracked lines     27125     21786     -5339
  Branches     10142      7582     -2560
==========================================
- Hits         24478     19705     -4773
+ Misses        2647      2081      -566
+ Partials      1541      1254      -287

Generated by Coverage Action

pabloDeputter and others added 5 commits October 30, 2026 13:55
- stop reading operation type from attributes in `get_span_name()` so that failure in `get_request_attributes()` can't make this fail as well
- wrap URL parsing in `get_request_attributes()` so failure just loses the attributes that come from url
…sqs-extension

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>
…-extension

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>
Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>

# Conflicts:
#	sentry_sdk/integrations/boto3/_services/sqs.py
Send a message, receive what was injected, and check that the receive
span links to the send span. Covers SQS and an SNS notification
delivered to SQS without raw message delivery.

Co-Authored-By: johdax <114897+dingsdax@users.noreply.github.com>
@sentry-junior
sentry-junior Bot marked this pull request as ready for review November 9, 2026 12:05
@sentry-junior
sentry-junior Bot requested a review from a team as a code owner November 9, 2026 12:05
@linear-code

linear-code Bot commented Nov 9, 2026

Copy link
Copy Markdown

PY-3008

sentry-junior Bot and others added 4 commits November 9, 2026 12:31
Botocore validates params after our hook, so a bad Entries or ARN value
now only loses that attribute, not every SQS request attribute. Move the
batch error.type code to _utils so SNS can share it, and link the SQS
docs for BatchResultErrorEntry.

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>
…-extension

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>
Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>
…/sns-propagation

Co-Authored-By: Johannes Daxböck <114897+dingsdax@users.noreply.github.com>

# Conflicts:
#	sentry_sdk/integrations/boto3/_services/sns.py
#	sentry_sdk/integrations/boto3/_services/sqs.py
#	sentry_sdk/integrations/boto3/_utils.py
Base automatically changed from pablo/boto3-add-sns-extension to major/3.0 November 11, 2026 12:50
@sentrivana sentrivana self-assigned this Nov 11, 2026

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 7d93a71. Configure here.

Co-Authored-By: Ivana Kellyer <131587164+sentrivana@users.noreply.github.com>
@sentry-junior
sentry-junior Bot added this pull request to stack #8245 November 11, 2026 13:30
@sentry-junior
sentry-junior Bot removed this pull request from stack #8245 November 11, 2026 13:32
@sentry-junior
sentry-junior Bot added this pull request to stack #8246 November 11, 2026 13:32
@sentry-junior
sentry-junior Bot removed this pull request from stack #8246 November 11, 2026 13:35
sentrivana added a commit that referenced this pull request Nov 11, 2026
### Description

Adds `Boto3Integration(propagate_traces=True)`. Setting it to `False`
stops the integration from changing the request params of AWS calls:

- Lambda `Invoke` no longer gets trace data in `ClientContext`.
- Once #8145 lands: SQS `SendMessage` / `SendMessageBatch` and SNS
`Publish` / `PublishBatch` no longer get `sentry-trace` / `baggage`
message attributes, and SQS `ReceiveMessage` no longer appends our names
to `MessageAttributeNames`.

The option gates the shared `get_request_params` hook, so it covers
every extension that uses it without per-service changes. Spans are
still created as before.

This is an escape hatch for setups where the added data breaks calls,
e.g. a queue or topic whose `MaximumMessageSize` is set below the 256
KiB the #8145 size check assumes, or consumers that reject unknown
attributes. The name matches `CeleryIntegration(propagate_traces=...)`.

HTTP `sentry-trace` / `baggage` headers on AWS requests are not
affected. They're also added by the stdlib integration and are already
controlled by `trace_propagation_targets`.

Independent of #8145. The SQS/SNS test cases pass trivially until #8145
is merged, and guard the option after that. Whichever PR merges second
needs a small conflict fix at the end of `test_trace_propagation.py`,
since both append tests there.

<!-- junior-request-attribution:start -->
via @sentrivana.
<!-- junior-request-attribution:end -->

<!-- junior-session-footer:start -->
<!-- junior-conversation-id:slack%3AC0BTREZTS2Z%3A1794401901.814229 -->

--

[View
Session](https://junior-prod.sentry.dev/conversations/slack%3AC0BTREZTS2Z%3A1794401901.814229)
[[Sentry]](https://sentry.sentry.io/explore/conversations/slack%3AC0BTREZTS2Z%3A1794401901.814229/?project=4510944073809921)

<!-- junior-session-footer:end -->

---------

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Ivana Kellyer <131587164+sentrivana@users.noreply.github.com>
Co-authored-by: Ivana Kellyer <ivana.kellyer@sentry.io>
…sqs/sns-propagation

Co-Authored-By: Ivana Kellyer <131587164+sentrivana@users.noreply.github.com>

# Conflicts:
#	tests/integrations/boto3/test_trace_propagation.py
@sentrivana
sentrivana merged commit 8abf619 into major/3.0 Nov 11, 2026
156 checks passed
@sentrivana
sentrivana deleted the pablo/boto3-add-sqs/sns-propagation branch November 11, 2026 14:41
sentry-junior Bot added a commit that referenced this pull request Nov 11, 2026
sentrivana added a commit that referenced this pull request Nov 12, 2026
)

### Description

Since #8137, #8142, and #8145, boto3 puts `sentry-trace` in SQS and SNS
message attributes, but nothing reads it on the Lambda side. This PR is
the smallest change that closes the loop for SQS- and SNS-triggered
functions. The Lambda integration now reads `sentry-trace` from each
record and adds a `message_origin` link from the invocation span to each
distinct producer span. This matches what the boto3 `ReceiveMessage`
span already does. Messages never become the invocation's parent.

It reads:
- SQS records: `messageAttributes["sentry-trace"].stringValue`
- SNS records: `Sns.MessageAttributes["sentry-trace"].Value`
- SNS → SQS without raw message delivery: the SNS envelope in the SQS
`body`, the same as boto3 does

Links are deduplicated, because a batch send gives many messages the
same producer span, and capped at 128, OTel's default, because Lambda
can deliver up to 10,000 SQS messages at once.

**Scope.** This is intentionally kept separate from the stretch stack.
It doesn't add `faas.trigger` (#8222) or `queue.process` spans (#8223),
and it doesn't touch `messaging.batch.message_count` (#8229). The
invocation span is otherwise unchanged. Synchronous `Invoke` propagation
through `ClientContext` is #8221. That PR changes the `continue_trace`
call and this one only adds `links=`, so the two are independent.

The link-building code repeats boto3's `_message_link` in a Lambda-event
shape: Lambda records use `messageAttributes` / `stringValue` / `body`,
while the boto3 response uses `MessageAttributes` / `StringValue` /
`Body`. Importing from the boto3 integration would make `aws_lambda`
depend on botocore.

**Testing.** `test_producer_links` sends SQS, SNS, and SNS-to-SQS events
to `BasicOkSpanStreaming`. It asserts the segment span's `links` and
that the segment span has no parent. It passes in CI's Cloud (Lambda)
jobs, and `ruff` and `mypy sentry_sdk` pass. `codecov/patch` is red
because the Lambda tests run in `sam local` containers, so their
coverage isn't counted.

#### Issues
* Part of #8081

<!-- junior-request-attribution:start -->
via **webb**, @sentrivana.
<!-- junior-request-attribution:end -->

<!-- junior-session-footer:start -->
<!-- junior-conversation-id:slack%3AC09M26BC6A1%3A1794211222.463239 -->

--

[View
Session](https://junior-prod.sentry.dev/conversations/slack%3AC09M26BC6A1%3A1794211222.463239)
[[Sentry]](https://sentry.sentry.io/explore/conversations/slack%3AC09M26BC6A1%3A1794211222.463239/?project=4510944073809921)

<!-- junior-session-footer:end -->

---------

Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
Co-authored-by: Alexander Webb <alexander.webb@sentry.io>
Co-authored-by: Ivana Kellyer <131587164+sentrivana@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants