dont use redriveCount of 0

Author: avedmala

datadog_lambda/tracing.py

@@ -396,8 +396,10 @@ def _generate_sfn_parent_id(context: dict) -> int:
     state_name = context.get("State").get("Name")
     state_entered_time = context.get("State").get("EnteredTime")
 
+    redrive_postfix = "" if redrive_count == "0" else f"#{redrive_count}"
+
     return _deterministic_sha256_hash(
-        f"{execution_id}#{state_name}#{state_entered_time}#{redrive_count}",
+        f"{execution_id}#{state_name}#{state_entered_time}{redrive_postfix}",
         HIGHER_64_BITS,
     )
 

tests/test_tracing.py

@@ -620,6 +620,7 @@ def test_step_function_trace_data(self):
         sfn_event = {
             "Execution": {
                 "Id": "665c417c-1237-4742-aaca-8b3becbb9e75",
+                "RedriveCount": "0",
             },
             "StateMachine": {},
             "State": {
@@ -631,7 +632,45 @@ def test_step_function_trace_data(self):
         self.assertEqual(source, "event")
         expected_context = Context(
             trace_id=3675572987363469717,
-            span_id=4929949072763648481,
+            span_id=6880978411788117524,
+            sampling_priority=1,
+            meta={"_dd.p.tid": "e987c84b36b11ab"},
+        )
+        self.assertEqual(ctx, expected_context)
+        self.assertEqual(
+            get_dd_trace_context(),
+            {
+                TraceHeader.TRACE_ID: "3675572987363469717",
+                TraceHeader.PARENT_ID: "10713633173203262661",
+                TraceHeader.SAMPLING_PRIORITY: "1",
+                TraceHeader.TAGS: "_dd.p.tid=e987c84b36b11ab",
+            },
+        )
+        create_dd_dummy_metadata_subsegment(ctx, XraySubsegment.TRACE_KEY)
+        self.mock_send_segment.assert_called_with(
+            XraySubsegment.TRACE_KEY,
+            expected_context,
+        )
+
+    @with_trace_propagation_style("datadog")
+    def test_step_function_trace_data_redrive(self):
+        lambda_ctx = get_mock_context()
+        sfn_event = {
+            "Execution": {
+                "Id": "665c417c-1237-4742-aaca-8b3becbb9e75",
+                "RedriveCount": "1",
+            },
+            "StateMachine": {},
+            "State": {
+                "Name": "my-awesome-state",
+                "EnteredTime": "Mon Nov 13 12:43:33 PST 2023",
+            },
+        }
+        ctx, source, event_source = extract_dd_trace_context(sfn_event, lambda_ctx)
+        self.assertEqual(source, "event")
+        expected_context = Context(
+            trace_id=3675572987363469717,
+            span_id=1201185214297576513,
             sampling_priority=1,
             meta={"_dd.p.tid": "e987c84b36b11ab"},
         )
@@ -658,6 +697,7 @@ def test_step_function_trace_data_lambda_root(self):
             "_datadog": {
                 "Execution": {
                     "Id": "665c417c-1237-4742-aaca-8b3becbb9e75",
+                    "RedriveCount": "0",
                 },
                 "StateMachine": {},
                 "State": {
@@ -673,7 +713,7 @@ def test_step_function_trace_data_lambda_root(self):
         self.assertEqual(source, "event")
         expected_context = Context(
             trace_id=5821803790426892636,
-            span_id=4929949072763648481,
+            span_id=6880978411788117524,
             sampling_priority=1,
             meta={"_dd.p.tid": "672a7cb100000000"},
         )
@@ -700,6 +740,7 @@ def test_step_function_trace_data_sfn_root(self):
             "_datadog": {
                 "Execution": {
                     "Id": "665c417c-1237-4742-aaca-8b3becbb9e75",
+                    "RedriveCount": "0",
                 },
                 "StateMachine": {},
                 "State": {
@@ -714,7 +755,7 @@ def test_step_function_trace_data_sfn_root(self):
         self.assertEqual(source, "event")
         expected_context = Context(
             trace_id=4521899030418994483,
-            span_id=4929949072763648481,
+            span_id=6880978411788117524,
             sampling_priority=1,
             meta={"_dd.p.tid": "12d1270d99cc5e03"},
         )