ft: add instrumentation to dynamodb

Signed-off-by: Cagri Yonca <[email protected]>

Author: CagriYonca

src/instana/instrumentation/aws/boto3.py

@@ -1,16 +1,18 @@
 # (c) Copyright IBM Corp. 2025
+try:
+    from typing import TYPE_CHECKING, Any, Callable, Dict, Sequence, Tuple, Type
 
-from typing import TYPE_CHECKING, Any, Callable, Dict, Sequence, Tuple, Type
+    from opentelemetry.semconv.trace import SpanAttributes
 
-from opentelemetry.semconv.trace import SpanAttributes
+    from instana.instrumentation.aws.dynamodb import create_dynamodb_span
+    from instana.instrumentation.aws.s3 import create_s3_span
 
-if TYPE_CHECKING:
-    from botocore.auth import SigV4Auth
-    from botocore.client import BaseClient
+    if TYPE_CHECKING:
+        from botocore.auth import SigV4Auth
+        from botocore.client import BaseClient
 
-    from instana.span.span import InstanaSpan
+        from instana.span.span import InstanaSpan
 
-try:
     import json
 
     import wrapt
@@ -69,37 +71,34 @@ def make_api_call_with_instana(
 
         parent_context = parent_span.get_span_context() if parent_span else None
 
-        try:
+        if instance.meta.service_model.service_name == "dynamodb":
+            create_dynamodb_span(wrapped, instance, args, kwargs, parent_context)
+        elif instance.meta.service_model.service_name == "s3":
+            create_s3_span(wrapped, instance, args, kwargs, parent_context)
+        else:
             with tracer.start_as_current_span(
                 "boto3", span_context=parent_context
             ) as span:
-                try:
-                    operation = args[0]
-                    payload = args[1]
+                operation = args[0]
+                payload = args[1]
 
-                    span.set_attribute("op", operation)
-                    span.set_attribute("ep", instance._endpoint.host)
-                    span.set_attribute("reg", instance._client_config.region_name)
+                span.set_attribute("op", operation)
+                span.set_attribute("ep", instance._endpoint.host)
+                span.set_attribute("reg", instance._client_config.region_name)
 
-                    span.set_attribute(
-                        SpanAttributes.HTTP_URL,
-                        instance._endpoint.host + ":443/" + args[0],
-                    )
-                    span.set_attribute(SpanAttributes.HTTP_METHOD, "POST")
+                span.set_attribute(
+                    SpanAttributes.HTTP_URL,
+                    instance._endpoint.host + ":443/" + args[0],
+                )
+                span.set_attribute(SpanAttributes.HTTP_METHOD, "POST")
 
-                    # Don't collect payload for SecretsManager
-                    if not hasattr(instance, "get_secret_value"):
-                        span.set_attribute("payload", payload)
+                # Don't collect payload for SecretsManager
+                if not hasattr(instance, "get_secret_value"):
+                    span.set_attribute("payload", payload)
 
-                    # Inject context when invoking lambdas
-                    if "lambda" in instance._endpoint.host and operation == "Invoke":
-                        lambda_inject_context(payload, span)
-
-                except Exception:
-                    logger.debug(
-                        "make_api_call_with_instana: collect error",
-                        exc_info=True,
-                    )
+                # Inject context when invoking lambdas
+                if "lambda" in instance._endpoint.host and operation == "Invoke":
+                    lambda_inject_context(payload, span)
 
                 try:
                     result = wrapped(*args, **kwargs)
@@ -117,10 +116,7 @@ def make_api_call_with_instana(
                 except Exception as exc:
                     span.mark_as_errored({"error": exc})
                     raise
-        except Exception:
-            logger.debug("make_api_call_with_instana: collect error", exc_info=True)
-        else:
-            return wrapped(*args, **kwargs)
+        return wrapped(*args, **kwargs)
 
 except ImportError:
     pass

src/instana/instrumentation/aws/dynamodb.py

@@ -0,0 +1,31 @@
+# (c) Copyright IBM Corp. 2025
+
+from typing import TYPE_CHECKING, Any, Callable, Dict, Sequence, Type
+
+if TYPE_CHECKING:
+    from botocore.client import BaseClient
+
+from instana.log import logger
+from instana.singletons import tracer
+from instana.span_context import SpanContext
+
+
+def create_dynamodb_span(
+    wrapped: Callable[..., Dict[str, Any]],
+    instance: Type["BaseClient"],
+    args: Sequence[Dict[str, Any]],
+    kwargs: Dict[str, Any],
+    parent_context: SpanContext,
+) -> None:
+    with tracer.start_as_current_span("dynamodb", span_context=parent_context) as span:
+        try:
+            span.set_attribute("dynamodb.op", args[0])
+            span.set_attribute("dynamodb.region", instance._client_config.region_name)
+            if "TableName" in args[1].keys():
+                span.set_attribute("dynamodb.table", args[1]["TableName"])
+        except Exception as exc:
+            span.record_exception(exc)
+            logger.debug("create_dynamodb_span: collect error", exc_info=True)
+
+
+logger.debug("Instrumenting DynamoDB")

src/instana/span/kind.py

@@ -40,6 +40,7 @@
     "cassandra",
     "celery-client",
     "couchbase",
+    "dynamodb",
     "log",
     "memcache",
     "mongo",
@@ -49,6 +50,7 @@
     "redis",
     "rpc-client",
     "sqlalchemy",
+    "s3",
     "tornado-client",
     "urllib3",
     "pymongo",

src/instana/span/registered_span.py

@@ -229,6 +229,13 @@ def _populate_exit_span_data(self, span: "InstanaSpan") -> None:
             )
             self.data["couchbase"]["sql"] = span.attributes.pop("couchbase.sql", None)
 
+        elif span.name == "dynamodb":
+            self.data["dynamodb"]["op"] = span.attributes.pop("dynamodb.op", None)
+            self.data["dynamodb"]["region"] = span.attributes.pop(
+                "dynamodb.region", None
+            )
+            self.data["dynamodb"]["table"] = span.attributes.pop("dynamodb.table", None)
+
         elif span.name == "rabbitmq":
             self.data["rabbitmq"]["exchange"] = span.attributes.pop("exchange", None)
             self.data["rabbitmq"]["queue"] = span.attributes.pop("queue", None)
@@ -253,6 +260,10 @@ def _populate_exit_span_data(self, span: "InstanaSpan") -> None:
             # self.data["rpc"]["baggage"] = span.attributes.pop("rpc.baggage", None)
             self.data["rpc"]["error"] = span.attributes.pop("rpc.error", None)
 
+        elif span.name == "s3":
+            self.data["s3"]["op"] = span.attributes.pop("s3.op", None)
+            self.data["s3"]["bucket"] = span.attributes.pop("s3.bucket", None)
+
         elif span.name == "sqlalchemy":
             self.data["sqlalchemy"]["sql"] = span.attributes.pop("sqlalchemy.sql", None)
             self.data["sqlalchemy"]["eng"] = span.attributes.pop("sqlalchemy.eng", None)