refactor(s3): Fix exception handling and logging

Signed-off-by: Varsha GS <[email protected]>

Author: GSVarsha

src/instana/instrumentation/aws/s3.py

@@ -59,17 +59,24 @@ def collect_s3_injected_attributes(
                 span.set_attribute("s3.op", operations[wrapped.__name__])
                 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])
+                elif len(args) > 1:
+                    if wrapped.__name__ in ["download_file", "download_fileobj"]:
+                        span.set_attribute("s3.bucket", args[0])
+                    else:
+                        span.set_attribute("s3.bucket", args[1])
+            except Exception:
+                logger.debug(
+                    f"collect_s3_injected_attributes collect error: {wrapped.__name__}", exc_info=True
+                )
+
+            try:
+                return wrapped(*args, **kwargs)
             except Exception as exc:
                 span.record_exception(exc)
                 logger.debug(
-                    "collect_s3_injected_attributes: collect error", exc_info=True
+                    f"collect_s3_injected_attributes error: {wrapped.__name__}", exc_info=True
                 )
-
-            return wrapped(*args, **kwargs)
+                raise
 
     for method in [
         "upload_file",