Skip to content

feat(boto3): align span names with OTel conventions #7800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pabloDeputter merged 1 commit into from
Oct 1, 2026
Merged

feat(boto3): align span names with OTel conventions #7800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions sentry_sdk/integrations/boto3/_instrumentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,9 @@ def _start_client_span(
if sentry_sdk.get_current_span() is None:
return None

# use "unknown" if `service_id_hyphenized` is not set so span name can still be created.
# e.g. "aws.unknown.GetObject"
service_name = ctx.service_id_hyphenized or "unknown"
span_name = f"aws.{service_name}.{ctx.operation_name}"
# https://opentelemetry.io/docs/specs/semconv/cloud-providers/aws-sdk/#aws-sdk-spans
service_name = ctx.service_id or "unknown"
span_name = f"{service_name}.{ctx.operation_name}"
attributes: "Attributes" = {
SPANDATA.RPC_METHOD: ctx.operation_name,
SPANDATA.RPC_SYSTEM_NAME: AWS_RPC_SYSTEM_NAME,
Expand Down
19 changes: 15 additions & 4 deletions tests/integrations/boto3/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def record_client_span(request, **kwargs):
client_spans = [
span
for span in spans
if span["name"] == "aws.s3.GetObject"
if span["name"] == "S3.GetObject"
and (
span["attributes"].get(SPANDATA.SENTRY_ORIGIN) == ORIGIN
and span["attributes"].get(SPANDATA.SENTRY_OP) == OP.HTTP_CLIENT
Expand All @@ -139,7 +139,7 @@ def record_client_span(request, **kwargs):
stream_spans = [
span
for span in spans
if span["name"] == "aws.s3.GetObject"
if span["name"] == "S3.GetObject"
and (span["attributes"].get(SPANDATA.SENTRY_OP) == OP.HTTP_CLIENT_STREAM)
]
assert len(client_spans) == 1
Expand Down Expand Up @@ -366,7 +366,7 @@ def get_response_attributes(self, ctx, response):
"s3",
"head_object",
{"Bucket": "bucket", "Key": "foo"},
"aws.s3.HeadObject",
"S3.HeadObject",
"S3",
"HeadObject",
"http://localhost:4566",
Expand All @@ -377,13 +377,24 @@ def get_response_attributes(self, ctx, response):
"events",
"list_event_buses",
{},
"aws.eventbridge.ListEventBuses",
"EventBridge.ListEventBuses",
"EventBridge",
"ListEventBuses",
None,
"events.eu-north-1.amazonaws.com",
443,
),
(
"apigateway",
"get_rest_apis",
{},
"API Gateway.GetRestApis",
"API Gateway",
"GetRestApis",
None,
"apigateway.eu-north-1.amazonaws.com",
443,
),
],
)
def test_client_call_has_common_attributes(
Expand Down
10 changes: 5 additions & 5 deletions tests/integrations/boto3/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_basic(
assert len(spans) == 2
span = spans[0]
assert span["attributes"]["sentry.op"] == "http.client"
assert span["name"] == "aws.s3.ListObjects"
assert span["name"] == "S3.ListObjects"


def test_streaming(sentry_init, capture_items):
Expand Down Expand Up @@ -79,11 +79,11 @@ def test_streaming(sentry_init, capture_items):

stream_span, client_span, parent_span = spans
assert stream_span["attributes"]["sentry.op"] == "http.client.stream"
assert stream_span["name"] == "aws.s3.GetObject"
assert stream_span["name"] == "S3.GetObject"
assert stream_span["parent_span_id"] == client_span["span_id"]

assert client_span["attributes"]["sentry.op"] == "http.client"
assert client_span["name"] == "aws.s3.GetObject"
assert client_span["name"] == "S3.GetObject"
assert client_span["parent_span_id"] == parent_span["span_id"]

assert parent_span["name"] == "custom parent"
Expand Down Expand Up @@ -137,11 +137,11 @@ def test_streaming_close(sentry_init, capture_items):

stream_span, client_span, parent_span = spans
assert stream_span["attributes"]["sentry.op"] == "http.client.stream"
assert stream_span["name"] == "aws.s3.GetObject"
assert stream_span["name"] == "S3.GetObject"
assert stream_span["parent_span_id"] == client_span["span_id"]

assert client_span["attributes"]["sentry.op"] == "http.client"
assert client_span["name"] == "aws.s3.GetObject"
assert client_span["name"] == "S3.GetObject"
assert client_span["parent_span_id"] == parent_span["span_id"]

assert parent_span["name"] == "custom parent"
Expand Down
Loading