chore: [SVLS-5973] draft of s3 logic refactor to remove exeptions

Author: apiarian-datadog

ddtrace/_trace/utils_botocore/span_pointers/s3.py

@@ -3,6 +3,7 @@
 from typing import Dict
 from typing import List
 from typing import NamedTuple
+from typing import Optional
 
 from ddtrace._trace._span_pointer import _SpanPointerDescription
 from ddtrace._trace._span_pointer import _SpanPointerDirection
@@ -94,47 +95,60 @@ def _extract_span_pointers_for_s3_response_with_helper(
         record_span_pointer_calculation_issue(operation=f"S3.{operation_name}", issue_tag="request_parameters")
         return []
 
-    try:
-        return [
-            _aws_s3_object_span_pointer_description(
-                pointer_direction=_SpanPointerDirection.DOWNSTREAM,
-                bucket=bucket,
-                key=key,
-                etag=etag,
-            )
-        ]
-    except Exception as e:
-        log.debug(
-            "failed to generate S3.%s span pointer: %s",
-            operation_name,
-            str(e),
-        )
-        record_span_pointer_calculation_issue(operation=f"S3.{operation_name}", issue_tag="calculation")
+    span_pointer_description = _aws_s3_object_span_pointer_description(
+        operation=f"S3.{operation_name}",
+        pointer_direction=_SpanPointerDirection.DOWNSTREAM,
+        bucket=bucket,
+        key=key,
+        etag=etag,
+    )
+    if span_pointer_description is None:
         return []
 
+    return [span_pointer_description]
+
 
 def _aws_s3_object_span_pointer_description(
+    operation: str,
     pointer_direction: _SpanPointerDirection,
     bucket: str,
     key: str,
     etag: str,
-) -> _SpanPointerDescription:
+) -> Optional[_SpanPointerDescription]:
+    pointer_hash = _aws_s3_object_span_pointer_hash(operation, bucket, key, etag)
+    if pointer_hash is None:
+        return None
+
     return _SpanPointerDescription(
         pointer_kind="aws.s3.object",
         pointer_direction=pointer_direction,
-        pointer_hash=_aws_s3_object_span_pointer_hash(bucket, key, etag),
+        pointer_hash=pointer_hash,
         extra_attributes={},
     )
 
 
-def _aws_s3_object_span_pointer_hash(bucket: str, key: str, etag: str) -> str:
+def _aws_s3_object_span_pointer_hash(operation: str, bucket: str, key: str, etag: str) -> Optional[str]:
     if '"' in etag:
         # Some AWS API endpoints put the ETag in double quotes. We expect the
         # calling code to have correctly fixed this already.
-        raise ValueError(f"ETag should not have double quotes: {etag}")
+        log.debug(
+            "ETag should not have double quotes: %s",
+            etag,
+        )
+        record_span_pointer_calculation_issue(operation=operation, issue_tag="etag_quotes")
+        return None
 
-    return _standard_hashing_function(
-        bucket.encode("ascii"),
-        key.encode("utf-8"),
-        etag.encode("ascii"),
-    )
+    try:
+        return _standard_hashing_function(
+            bucket.encode("ascii"),
+            key.encode("utf-8"),
+            etag.encode("ascii"),
+        )
+
+    except Exception as e:
+        log.debug(
+            "failed to hash S3 object span pointer: %s",
+            e,
+        )
+        record_span_pointer_calculation_issue(operation=operation, issue_tag="hashing")
+        return None