feat(boto3): Add common OTel AWS client attributes - #7481
Merged
pabloDeputter merged 6 commits intoSep 30, 2026
Merged
pabloDeputter merged 6 commits into
pabloDeputter merged 6 commits into
Conversation
Contributor
Codecov Results 📊✅ 132565 passed | ⏭️ 7220 skipped | Total: 139785 | Pass Rate: 94.83% | Execution Time: 446m 31s 📊 Comparison with Base Branch
➖ Removed Tests (60)View removed tests
All tests are passing successfully. ✅ Patch coverage is 92.98%. Project has 2561 uncovered lines. Files with missing lines (2)
Coverage diff@@ Coverage Diff @@
## master #PR +/-##
==========================================
+ Coverage 90.30% 90.32% +0.02%
==========================================
Files 195 199 +4
Lines 26261 26469 +208
Branches 9798 9846 +48
==========================================
+ Hits 23714 23908 +194
- Misses 2547 2561 +14
- Partials 1485 1493 +8Generated by Codecov Action |
pabloDeputter
changed the title
![sentry-warden[bot]](https://avatars.githubusercontent.com/in/2755838?s=60&v=4){kind=small}
pabloDeputter
marked this pull request as ready for review
September 14, 2026 09:26
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
pabloDeputter
added this pull request to stack #7500
September 14, 2026 12:53
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 14, 2026 14:42
9fe9acf to
4e8f427
Compare
| except BaseException as exc: | ||
| if span is not None: | ||
| with capture_internal_exceptions(): | ||
| _finish_active_http_child_span(span) |
Contributor
There was a problem hiding this comment.
Why are we ending the stdlib span here?
Member
Author
There was a problem hiding this comment.
We finish the HTTP span before the parent boto3 span so that the correct order is preserved. Otherwise the HTTP span would be kept active until the whole response is read, while the parent boto3 span finishes first; afterwards when the HTTP span finishes, it will restore the already-finished parent as current, causing subsequent calls to be parented incorrectly.
Member
Author
There was a problem hiding this comment.
I can send a screenshot from sentry maybe to show against latest release
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 15, 2026 12:58
aa1d65a to
939a3f8
Compare
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
2 times, most recently
from
September 17, 2026 15:50
ddf5deb to
351e3b6
Compare
pabloDeputter
changed the title
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 21, 2026 16:07
3412f9b to
64d7159
Compare
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 64d7159. Configure here.
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
2 times, most recently
from
September 22, 2026 09:18
1824d8f to
3d95ef4
Compare
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 22, 2026 14:53
3d95ef4 to
f3ed486
Compare
pabloDeputter
removed this pull request from stack #7541
September 22, 2026 14:57
pabloDeputter
added this pull request to stack #7618
September 22, 2026 14:57
ericapisani
approved these changes
Sep 28, 2026
| ) -> "Attributes": | ||
| attributes: "Attributes" = {} | ||
|
|
||
| # `rpc.service` is deprecated in OTel, but js still uses it. |
Member
There was a problem hiding this comment.
They likely still use it because it's listed as a valid attribute in our conventions.
Not something for this pull request, but it might be worth raising this in our Slack channel for the conventions to see if this is something that we should look to deprecate as well.
Member
Author
There was a problem hiding this comment.
I was gonna make a collection of all new attributes that will be added during this project (including all the service-specific as well) to check which ones contain sensitive data and whether they already map to existing data collection categories. So I'll add rpc.service to that document as well.
| assert span["name" if span_streaming else "description"] == span_name | ||
| assert attributes[SPANDATA.RPC_SERVICE] == rpc_service | ||
| assert attributes[SPANDATA.RPC_METHOD] == rpc_method | ||
| assert attributes[SPANDATA.RPC_SYSTEM_NAME] == "aws-api" |
Member
There was a problem hiding this comment.
A small nitpick here (feel free to ignore): you could update the hard-coded string here to be the constant that you created in the other file.
Suggested change
| assert attributes[SPANDATA.RPC_SYSTEM_NAME] == "aws-api" | |
| assert attributes[SPANDATA.RPC_SYSTEM_NAME] == _AWS_RPC_SYSTEM_NAME |
Member
Author
There was a problem hiding this comment.
Yupp, I'll move that to consts.py as well
Comment on lines
+647
to
+648
| if span_streaming: | ||
| _assert_one_failed_span(client_spans, span_streaming=True) |
Member
There was a problem hiding this comment.
Small cleanup suggestion: you could remove this conditional and the extra line inside the block by assigning the span_streaming variable to equal span_streaming:
Suggested change
| if span_streaming: | |
| _assert_one_failed_span(client_spans, span_streaming=True) | |
| if span_streaming: | |
| _assert_one_failed_span(client_spans, span_streaming=span_streaming) |
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 29, 2026 08:34
4562898 to
dca0a7b
Compare
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 30, 2026 12:04
dca0a7b to
4a23000
Compare
pabloDeputter
removed this pull request from stack #7618
September 30, 2026 12:05
pabloDeputter
added this pull request to stack #7792
September 30, 2026 12:05
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 30, 2026 13:31
4a23000 to
8b758b2
Compare
pabloDeputter
force-pushed
the
pablo/improve-boto3-call-lifecycle
branch
from
September 30, 2026 14:05
8b758b2 to
6868ffd
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Implements #7475 by adding common OTel attributes to boto client spans.
Changes
rpc.system.name,rpc.service,rpc.method,cloud.region,server.address,server.port.rpc.system.nametoaws-apiService.Operation(now it'saws.<service>.<Operation>), e.g.S3.HeadObjectfollowing OTel is a breaking change and will be done in major.rpc.service; not supported anymore by OTel, but JS keeps this too.rpc.method.AwsCallContextto carry extra client metadata for instrumentation.Issues
Resolves #7475