add sns -> lambda support

Author: michael-zhao459

datadog_lambda/dsm.py

@@ -1,5 +1,7 @@
 import logging
 import json
+import base64
+
 from datadog_lambda.trigger import EventTypes
 
 logger = logging.getLogger(__name__)
@@ -8,6 +10,8 @@
 def set_dsm_context(event, event_source):
     if event_source.equals(EventTypes.SQS):
         _dsm_set_sqs_context(event)
+    elif event_source.equals(EventTypes.SNS):
+        _dsm_set_sns_context(event)
 
 
 def _dsm_set_sqs_context(event):
@@ -28,13 +32,43 @@ def _dsm_set_sqs_context(event):
         set_consume_checkpoint("sqs", arn, carrier_get)
 
 
+def _dsm_set_sns_context(event):
+    from ddtrace.data_streams import set_consume_checkpoint
+
+    records = event.get("Records")
+    if records is None:
+        return
+
+    for record in records:
+        sns_data = record.get("Sns")
+        if not sns_data:
+            return
+        arn = sns_data.get("TopicArn", "")
+        context_json = _get_dsm_context_from_lambda(sns_data)
+        if not context_json:
+            logger.debug("DataStreams skipped lambda message: %r", sns_data)
+            return None
+
+        carrier_get = _create_carrier_get(context_json)
+        set_consume_checkpoint("sns", arn, carrier_get)
+
+
 def _get_dsm_context_from_lambda(message):
     """
     Lambda-specific message formats:
         - message.messageAttributes._datadog.stringValue (SQS -> lambda)
+        - message.Sns.MessageAttributes._datadog.Value.decode() (SNS -> lambda)
     """
     context_json = None
-    message_attributes = message.get("messageAttributes")
+    message_body = message
+
+    if "Sns" in message:
+        message_body = message["Sns"]
+
+    message_attributes = message_body.get("MessageAttributes") or message_body.get(
+        "messageAttributes"
+    )
+
     if not message_attributes:
         logger.debug("DataStreams skipped lambda message: %r", message)
         return None
@@ -45,7 +79,11 @@ def _get_dsm_context_from_lambda(message):
 
     datadog_attr = message_attributes["_datadog"]
 
-    if "stringValue" in datadog_attr:
+    if message_body.get("Type") == "Notification":
+        # SNS -> lambda notification
+        if datadog_attr.get("Type") == "Binary":
+            context_json = json.loads(base64.b64decode(datadog_attr["Value"]).decode())
+    elif "stringValue" in datadog_attr:
         # SQS -> lambda
         context_json = json.loads(datadog_attr["stringValue"])
     else:

layers/datadog_lambda_py-amd64-3.13.zip

@@ -1,10 +1,12 @@
 import unittest
+import base64
 import json
 from unittest.mock import patch
 
 from datadog_lambda.dsm import (
     set_dsm_context,
     _dsm_set_sqs_context,
+    _dsm_set_sns_context,
     _get_dsm_context_from_lambda,
 )
 from datadog_lambda.trigger import EventTypes, _EventSource
@@ -16,14 +18,18 @@ def setUp(self):
         self.mock_dsm_set_sqs_context = patcher.start()
         self.addCleanup(patcher.stop)
 
-        # Patch set_consume_checkpoint for testing DSM functionality
         patcher = patch("ddtrace.data_streams.set_consume_checkpoint")
         self.mock_set_consume_checkpoint = patcher.start()
         self.addCleanup(patcher.stop)
 
-        # Patch _get_dsm_context_from_lambda for testing DSM context extraction
         patcher = patch("datadog_lambda.dsm._get_dsm_context_from_lambda")
         self.mock_get_dsm_context_from_lambda = patcher.start()
+        patcher = patch("datadog_lambda.dsm._dsm_set_sns_context")
+        self.mock_dsm_set_sns_context = patcher.start()
+        self.addCleanup(patcher.stop)
+
+        patcher = patch("ddtrace.internal.datastreams.data_streams_processor")
+        self.mock_data_streams_processor = patcher.start()
         self.addCleanup(patcher.stop)
 
     def test_non_sqs_event_source_does_nothing(self):
@@ -134,6 +140,123 @@ def test_sqs_multiple_records_process_each_record(self):
             pathway_ctx = carrier_get_func("dd-pathway-ctx-base64")
             self.assertEqual(pathway_ctx, expected_contexts[i])
 
+    def test_sns_event_with_no_records_does_nothing(self):
+        """Test that events where Records is None don't trigger DSM processing"""
+        events_with_no_records = [
+            {},
+            {"Records": None},
+            {"someOtherField": "value"},
+        ]
+
+        for event in events_with_no_records:
+            _dsm_set_sns_context(event)
+            self.mock_set_consume_checkpoint.assert_not_called()
+
+    def test_sns_event_triggers_dsm_sns_context(self):
+        """Test that SNS event sources trigger the SNS-specific DSM context function"""
+        sns_event = {
+            "Records": [
+                {
+                    "EventSource": "aws:sns",
+                    "Sns": {
+                        "TopicArn": "arn:aws:sns:us-east-1:123456789012:my-topic",
+                        "Message": "Hello from SNS!",
+                    },
+                }
+            ]
+        }
+
+        event_source = _EventSource(EventTypes.SNS)
+        set_dsm_context(sns_event, event_source)
+
+        self.mock_dsm_set_sns_context.assert_called_once_with(sns_event)
+
+    def test_sns_multiple_records_process_each_record(self):
+        """Test that each record in an SNS event gets processed individually"""
+        multi_record_event = {
+            "Records": [
+                {
+                    "EventSource": "aws:sns",
+                    "Sns": {
+                        "TopicArn": "arn:aws:sns:us-east-1:123456789012:topic1",
+                        "Message": "Message 1",
+                        "MessageAttributes": {
+                            "_datadog": {
+                                "Type": "Binary",
+                                "Value": base64.b64encode(
+                                    json.dumps({"dd-pathway-ctx-base64": "context1"})
+                                    .encode("utf-8")
+                                ).decode("utf-8")
+                            }
+                        },
+                    }
+                },
+                {
+                    "EventSource": "aws:sns",
+                    "Sns": {
+                        "TopicArn": "arn:aws:sns:us-east-1:123456789012:topic2",
+                        "Message": "Message 2",
+                        "MessageAttributes": {
+                            "_datadog": {
+                                "Type": "Binary",
+                                "Value": base64.b64encode(
+                                    json.dumps({"dd-pathway-ctx-base64": "context2"})
+                                    .encode("utf-8")
+                                ).decode("utf-8")
+                            }
+                        },
+                    }
+                },
+                {
+                    "EventSource": "aws:sns",
+                    "Sns": {
+                        "TopicArn": "arn:aws:sns:us-east-1:123456789012:topic3",
+                        "Message": "Message 3",
+                        "MessageAttributes": {
+                            "_datadog": {
+                                "Type": "Binary",
+                                "Value": base64.b64encode(
+                                    json.dumps({"dd-pathway-ctx-base64": "context3"})
+                                    .encode("utf-8")
+                                ).decode("utf-8")
+                            }
+                        },
+                    }
+                },
+            ]
+        }
+
+        self.mock_get_dsm_context_from_lambda.side_effect = [
+            {"dd-pathway-ctx-base64": "context1"},
+            {"dd-pathway-ctx-base64": "context2"},
+            {"dd-pathway-ctx-base64": "context3"},
+        ]
+
+        _dsm_set_sns_context(multi_record_event)
+
+        self.assertEqual(self.mock_set_consume_checkpoint.call_count, 3)
+
+        calls = self.mock_set_consume_checkpoint.call_args_list
+        expected_arns = [
+            "arn:aws:sns:us-east-1:123456789012:topic1",
+            "arn:aws:sns:us-east-1:123456789012:topic2",
+            "arn:aws:sns:us-east-1:123456789012:topic3",
+        ]
+        expected_contexts = ["context1", "context2", "context3"]
+
+        for i, call in enumerate(calls):
+            args, kwargs = call
+            service_type = args[0]
+            arn = args[1]
+            carrier_get_func = args[2]
+
+            self.assertEqual(service_type, "sns")
+
+            self.assertEqual(arn, expected_arns[i])
+
+            pathway_ctx = carrier_get_func("dd-pathway-ctx-base64")
+            self.assertEqual(pathway_ctx, expected_contexts[i])
+
 
 class TestGetDSMContext(unittest.TestCase):
     def test_sqs_to_lambda_string_value_format(self):
@@ -182,6 +305,43 @@ def test_sqs_to_lambda_string_value_format(self):
         assert result["x-datadog-parent-id"] == "321987654"
         assert result["dd-pathway-ctx"] == "test-pathway-ctx"
 
+    def test_sns_to_lambda_format(self):
+        """Test format: message.Sns.MessageAttributes._datadog.Value.decode() (SNS -> lambda)"""
+        trace_context = {
+            "x-datadog-trace-id": "111111111",
+            "x-datadog-parent-id": "222222222",
+            "dd-pathway-ctx": "test-pathway-ctx",
+        }
+        binary_data = base64.b64encode(
+            json.dumps(trace_context).encode("utf-8")
+        ).decode("utf-8")
+
+        sns_lambda_record = {
+            "EventSource": "aws:sns",
+            "EventSubscriptionArn": (
+                "arn:aws:sns:us-east-1:123456789012:sns-topic:12345678-1234-1234-1234-123456789012"
+            ),
+            "Sns": {
+                "Type": "Notification",
+                "MessageId": "95df01b4-ee98-5cb9-9903-4c221d41eb5e",
+                "TopicArn": "arn:aws:sns:us-east-1:123456789012:sns-topic",
+                "Subject": "Test Subject",
+                "Message": "Hello from SNS!",
+                "Timestamp": "2023-01-01T12:00:00.000Z",
+                "MessageAttributes": {
+                    "_datadog": {"Type": "Binary", "Value": binary_data}
+                },
+            },
+        }
+
+        result = _get_dsm_context_from_lambda(sns_lambda_record)
+
+        assert result is not None
+        assert result == trace_context
+        assert result["x-datadog-trace-id"] == "111111111"
+        assert result["x-datadog-parent-id"] == "222222222"
+        assert result["dd-pathway-ctx"] == "test-pathway-ctx"
+
     def test_no_message_attributes(self):
         """Test message without MessageAttributes returns None."""
         message = {