Support table queue and requests attributes

Author: NathanielRN

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py

@@ -54,6 +54,7 @@
 import logging
 
 from botocore.client import BaseClient
+from botocore.exceptions import ClientError
 from wrapt import ObjectProxy, wrap_function_wrapper
 
 from opentelemetry.instrumentation.botocore.version import __version__
@@ -91,23 +92,49 @@ def _patched_api_call(self, original_func, instance, args, kwargs):
 
         # pylint: disable=protected-access
         service_name = instance._service_model.service_name
-        operation_name, _ = args
+        operation_name, api_params = args
 
         with self._tracer.start_as_current_span(
             "{}".format(service_name), kind=SpanKind.CLIENT,
         ) as span:
+            error = None
+            result = None
+
+            try:
+                result = original_func(*args, **kwargs)
+            except ClientError as e:
+                error = e
+
+            if error:
+                result = error.response
 
             if span.is_recording():
                 span.set_attribute("aws.operation", operation_name)
                 span.set_attribute("aws.region", instance.meta.region_name)
                 span.set_attribute("aws.service", service_name)
-
-            result = original_func(*args, **kwargs)
-
-            if span.is_recording():
-                span.set_attribute(
-                    "http.status_code",
-                    result["ResponseMetadata"]["HTTPStatusCode"],
-                )
+                if "QueueUrl" in api_params:
+                    span.set_attribute(
+                        "aws.queue_url",
+                        api_params["QueueUrl"]
+                    )
+                if "TableName" in api_params:
+                    span.set_attribute(
+                        "aws.table_name",
+                        api_params["TableName"]
+                    )
+                if "ResponseMetadata" in result:
+                    if "RequestId" in result["ResponseMetadata"]:
+                        span.set_attribute(
+                            "aws.request_id",
+                            result["ResponseMetadata"]["RequestId"],
+                        )
+                    if "HTTPStatusCode" in result["ResponseMetadata"]:
+                        span.set_attribute(
+                            "http.status_code",
+                            result["ResponseMetadata"]["HTTPStatusCode"],
+                        )
+
+            if error:
+                raise error
 
             return result