Cleanup exception handling code

Author: HonakerM

src/instana/instrumentation/aws/s3.py

@@ -2,7 +2,6 @@
 # (c) Copyright Instana Inc. 2020
 
 try:
-    import contextlib
     from typing import TYPE_CHECKING, Any, Callable, Dict, Sequence, Type
 
     from instana.span_context import SpanContext
@@ -58,21 +57,19 @@ 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__])
-                # 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)
+                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])
             except Exception as exc:
                 span.record_exception(exc)
                 logger.debug(
                     "collect_s3_injected_attributes: collect error", exc_info=True
                 )
-                raise exc
+
+            return wrapped(*args, **kwargs)
 
     for method in [
         "upload_file",