Update AWS wrapper to not hide exceptions

Signed-off-by: Michael Honaker <[email protected]>

Author: HonakerM

src/instana/instrumentation/aws/s3.py

@@ -1,6 +1,9 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2020
 
+import contextlib
+
+
 try:
     from typing import TYPE_CHECKING, Any, Callable, Dict, Sequence, Type
 
@@ -57,16 +60,21 @@ def collect_s3_injected_attributes(
         with tracer.start_as_current_span("s3", span_context=parent_context) as span:
             try:
                 span.set_attribute("s3.op", operations[wrapped.__name__])
-                if wrapped.__name__ in ["download_file", "download_fileobj"]:
-                    span.set_attribute("s3.bucket", args[0])
-                else:
-                    span.set_attribute("s3.bucket", args[1])
+                # Suppress key/index errors to all the function to still happen
+                with contextlib.suppress(IndexError, KeyError):
+                    if "Bucket" in kwargs:
+                        span.set_attribute("s3.bucket", kwargs["Bucket"])
+                    elif wrapped.__name__ in ["download_file", "download_fileobj"]:
+                        span.set_attribute("s3.bucket", args[0])
+                    else:
+                        span.set_attribute("s3.bucket", args[1])
                 return wrapped(*args, **kwargs)
             except Exception as exc:
                 span.record_exception(exc)
                 logger.debug(
                     "collect_s3_injected_attributes: collect error", exc_info=True
                 )
+                raise exc
 
     for method in [
         "upload_file",