restore span name/description to aws.<service-hyphenized>.<Operation>, e.g. aws.s3.GetObject

Author: pabloDeputter

sentry_sdk/integrations/boto3/_instrumentation.py

@@ -92,9 +92,7 @@ def _start_client_span(
     if client.get_integration(Boto3Integration) is None:
         return None
 
-    # OTel define `rpc.service` as `Service.Operation`, e.g. `DynamoDB.GetItem`.
-    # https://opentelemetry.io/docs/specs/semconv/cloud-providers/aws-sdk/#aws-sdk-spans
-    span_name = "%s.%s" % (ctx.service_id, ctx.operation_name)
+    span_name = "aws.%s.%s" % (ctx.service_id_hyphenized, ctx.operation_name)
     attributes = _get_client_attributes(ctx)
     span_op = OP.HTTP_CLIENT
     span_origin = Boto3Integration.origin

tests/integrations/boto3/test_client.py

@@ -153,7 +153,7 @@ def _span_attributes(span, span_streaming):
             "s3",
             "head_object",
             {"Bucket": "bucket", "Key": "foo"},
-            "S3.HeadObject",
+            "aws.s3.HeadObject",
             "S3",
             "HeadObject",
             "http://localhost:4566",
@@ -164,7 +164,7 @@ def _span_attributes(span, span_streaming):
             "events",
             "list_event_buses",
             {},
-            "EventBridge.ListEventBuses",
+            "aws.eventbridge.ListEventBuses",
             "EventBridge",
             "ListEventBuses",
             None,