ft: add fup support for dynamodb

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

Author: CagriYonca

src/instana/agent/host.py

@@ -22,6 +22,7 @@
 from instana.options import StandardOptions
 from instana.util import to_json
 from instana.util.runtime import get_py_source
+from instana.util.span_utils import get_operation_specifier
 from instana.version import VERSION
 
 
@@ -346,14 +347,16 @@ def report_spans(self, payload: Dict[str, Any]) -> Optional[Response]:
         return
 
     def filter_spans(self, spans: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
-        from instana.util.traceutils import is_service_or_endpoint_ignored
-
+        """
+        Filters given span list using ignore-endpoint variable and returns the list of filtered spans.
+        """
         filtered_spans = []
         for span in spans:
             if (hasattr(span, "n") or hasattr(span, "name")) and hasattr(span, "data"):
                 service = span.n
-                endpoint = span.data[service]["command"]
-                if isinstance(endpoint, str) and is_service_or_endpoint_ignored(
+                operation_specifier = get_operation_specifier(service)
+                endpoint = span.data[service][operation_specifier]
+                if isinstance(endpoint, str) and self.__is_service_or_endpoint_ignored(
                     service, endpoint
                 ):
                     continue
@@ -363,6 +366,16 @@ def filter_spans(self, spans: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
                 filtered_spans.append(span)
         return filtered_spans
 
+    def __is_service_or_endpoint_ignored(
+        self, service: str, endpoint: str = ""
+    ) -> bool:
+        """Check if the given service and endpoint combination should be ignored."""
+
+        return (
+            service.lower() in self.options.ignore_endpoints
+            or f"{service.lower()}.{endpoint.lower()}" in self.options.ignore_endpoints
+        )
+
     def handle_agent_tasks(self, task: Dict[str, Any]) -> None:
         """
         When request(s) are received by the host agent, it is sent here

src/instana/util/span_utils.py

@@ -0,0 +1,13 @@
+# (c) Copyright IBM Corp. 2025
+
+from typing import Optional
+
+
+def get_operation_specifier(span_name: str) -> Optional[str]:
+    """Get the specific operation specifier for the given span."""
+    operation_specifier = ""
+    if span_name == "redis":
+        operation_specifier = "command"
+    elif span_name == "dynamodb":
+        operation_specifier = "op"
+    return operation_specifier

src/instana/util/traceutils.py

@@ -15,10 +15,10 @@
 from instana.log import logger
 from instana.singletons import agent, tracer
 from instana.span.span import get_current_span
-from instana.tracer import InstanaTracer
 
 if TYPE_CHECKING:
     from instana.span.span import InstanaSpan
+    from instana.tracer import InstanaTracer
 
 
 def extract_custom_headers(
@@ -61,7 +61,7 @@ def extract_custom_headers(
         logger.debug("extract_custom_headers: ", exc_info=True)
 
 
-def get_active_tracer() -> Optional[InstanaTracer]:
+def get_active_tracer() -> Optional["InstanaTracer"]:
     """Get the currently active tracer if one exists."""
     try:
         current_span = get_current_span()
@@ -78,7 +78,11 @@ def get_active_tracer() -> Optional[InstanaTracer]:
 
 
 def get_tracer_tuple() -> (
-    Tuple[Optional[InstanaTracer], Optional["InstanaSpan"], Optional[str]]
+    Tuple[
+        Optional["InstanaTracer"],
+        Optional["InstanaSpan"],
+        Optional[str],
+    ]
 ):
     """Get a tuple of (tracer, span, span_name) for the current context."""
     active_tracer = get_active_tracer()
@@ -93,14 +97,3 @@ def get_tracer_tuple() -> (
 def tracing_is_off() -> bool:
     """Check if tracing is currently disabled."""
     return not (bool(get_active_tracer()) or agent.options.allow_exit_as_root)
-
-
-def is_service_or_endpoint_ignored(
-    service: str,
-    endpoint: str = "",
-) -> bool:
-    """Check if the given service and endpoint combination should be ignored."""
-    return (
-        service.lower() in agent.options.ignore_endpoints
-        or f"{service.lower()}.{endpoint.lower()}" in agent.options.ignore_endpoints
-    )

tests/agent/test_host.py

@@ -690,3 +690,33 @@ def test_diagnostics(self, caplog: pytest.LogCaptureFixture) -> None:
         assert "reporting_thread: None" in caplog.messages
         assert f"report_interval: {agent.collector.report_interval}" in caplog.messages
         assert "should_send_snapshot_data: True" in caplog.messages
+
+    def test_is_service_or_endpoint_ignored(self) -> None:
+        self.agent.options.ignore_endpoints.append("service1")
+        self.agent.options.ignore_endpoints.append("service2.endpoint1")
+
+        # ignore all endpoints of service1
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored("service1")
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored(
+            "service1", "endpoint1"
+        )
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored(
+            "service1", "endpoint2"
+        )
+
+        # case-insensitive
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored("SERVICE1")
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored(
+            "service1", "ENDPOINT1"
+        )
+
+        # ignore only endpoint1 of service2
+        assert self.agent._HostAgent__is_service_or_endpoint_ignored(
+            "service2", "endpoint1"
+        )
+        assert not self.agent._HostAgent__is_service_or_endpoint_ignored(
+            "service2", "endpoint2"
+        )
+
+        # don't ignore other services
+        assert not self.agent._HostAgent__is_service_or_endpoint_ignored("service3")

tests/clients/boto3/test_boto3_dynamodb.py

@@ -1,12 +1,14 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2020
 
+import os
 from typing import Generator
 
 import boto3
 import pytest
 from moto import mock_aws
 
+from instana.options import StandardOptions
 from instana.singletons import agent, tracer
 from tests.helpers import get_first_span_by_filter
 
@@ -67,6 +69,55 @@ def test_dynamodb_create_table(self) -> None:
         assert dynamodb_span.data["dynamodb"]["region"] == "us-west-2"
         assert dynamodb_span.data["dynamodb"]["table"] == "dynamodb-table"
 
+    def test_ignore_dynamodb(self) -> None:
+        os.environ["INSTANA_IGNORE_ENDPOINTS"] = "dynamodb"
+        agent.options = StandardOptions()
+
+        with tracer.start_as_current_span("test"):
+            self.dynamodb.create_table(
+                TableName="dynamodb-table",
+                KeySchema=[{"AttributeName": "id", "KeyType": "HASH"}],
+                AttributeDefinitions=[{"AttributeName": "id", "AttributeType": "S"}],
+                ProvisionedThroughput={"ReadCapacityUnits": 1, "WriteCapacityUnits": 1},
+            )
+
+        spans = self.recorder.queued_spans()
+        assert len(spans) == 2
+
+        filter = lambda span: span.n == "dynamodb"  # noqa: E731
+        dynamodb_span = get_first_span_by_filter(spans, filter)
+        assert dynamodb_span
+
+        filtered_spans = agent.filter_spans(spans)
+        assert len(filtered_spans) == 1
+
+        assert dynamodb_span not in filtered_spans
+
+    def test_ignore_create_table(self) -> None:
+        os.environ["INSTANA_IGNORE_ENDPOINTS"] = "dynamodb.createtable"
+        agent.options = StandardOptions()
+
+        with tracer.start_as_current_span("test"):
+            self.dynamodb.create_table(
+                TableName="dynamodb-table",
+                KeySchema=[{"AttributeName": "id", "KeyType": "HASH"}],
+                AttributeDefinitions=[{"AttributeName": "id", "AttributeType": "S"}],
+                ProvisionedThroughput={"ReadCapacityUnits": 1, "WriteCapacityUnits": 1},
+            )
+            self.dynamodb.list_tables()
+
+        spans = self.recorder.queued_spans()
+        assert len(spans) == 3
+
+        filtered_spans = agent.filter_spans(spans)
+        assert len(filtered_spans) == 2
+
+        filter = lambda span: span.n == "dynamodb"  # noqa: E731
+        dynamodb_span = get_first_span_by_filter(filtered_spans, filter)
+
+        assert dynamodb_span.n == "dynamodb"
+        assert dynamodb_span.data["dynamodb"]["op"] == "ListTables"
+
     def test_dynamodb_create_table_as_root_exit_span(self) -> None:
         agent.options.allow_exit_as_root = True
         self.dynamodb.create_table(

tests/util/test_span_utils.py

@@ -0,0 +1,15 @@
+from typing import Optional
+import pytest
+
+from instana.util.span_utils import get_operation_specifier
+
+
+@pytest.mark.parametrize(
+    "span_name, expected_result",
+    [("something", ""), ("redis", "command"), ("dynamodb", "op")],
+)
+def test_get_operation_specifier(
+    span_name: str, expected_result: Optional[str]
+) -> None:
+    response_redis = get_operation_specifier(span_name)
+    assert response_redis == expected_result

tests/util/test_traceutils.py

@@ -8,7 +8,6 @@
     extract_custom_headers,
     get_active_tracer,
     get_tracer_tuple,
-    is_service_or_endpoint_ignored,
     tracing_is_off,
 )
 
@@ -96,24 +95,3 @@ def test_tracing_is_off() -> None:
     response = tracing_is_off()
     assert not response
     agent.options.allow_exit_as_root = False
-
-
-def test_is_service_or_endpoint_ignored() -> None:
-    agent.options.ignore_endpoints.append("service1")
-    agent.options.ignore_endpoints.append("service2.endpoint1")
-
-    # ignore all endpoints of service1
-    assert is_service_or_endpoint_ignored("service1")
-    assert is_service_or_endpoint_ignored("service1", "endpoint1")
-    assert is_service_or_endpoint_ignored("service1", "endpoint2")
-
-    # case-insensitive
-    assert is_service_or_endpoint_ignored("SERVICE1")
-    assert is_service_or_endpoint_ignored("service1", "ENDPOINT1")
-
-    # ignore only endpoint1 of service2
-    assert is_service_or_endpoint_ignored("service2", "endpoint1")
-    assert not is_service_or_endpoint_ignored("service2", "endpoint2")
-
-    # don't ignore other services
-    assert not is_service_or_endpoint_ignored("service3")