fix(crashtracker): fix payload from v1 into v2 (#6275)

Co-authored-by: anais.raison <anais.raison@datadoghq.com>

Author: anais-raison

tests/parametric/test_crashtracking.py

@@ -17,9 +17,15 @@ def test_report_crash(self, test_agent: TestAgentAPI, test_library: APMLibrary):
 
         while True:
             event = test_agent.wait_for_telemetry_event("logs", wait_loops=400)
-            if event is None or "is_crash_ping:true" not in event["payload"][0]["tags"]:
+            # Handling both v1 and v2 of the crashtracking payload so that we can
+            # update to v2 without breaking the test.
+            if isinstance(event.get("payload"), list):
+                if "is_crash_ping:true" not in event["payload"][0]["tags"]:
+                    self.assert_crash_report_v1(test_library, event)
+                    break
+            elif "is_crash_ping:true" not in event["payload"]["logs"][0]["tags"]:
+                self.assert_crash_report_v2(test_library, event)
                 break
-        self.assert_crash_report(test_library, event)
 
     @pytest.mark.parametrize("library_env", [{"DD_CRASHTRACKING_ENABLED": "false"}])
     def test_disable_crashtracking(self, test_agent: TestAgentAPI, test_library: APMLibrary):
@@ -31,8 +37,12 @@ def test_disable_crashtracking(self, test_agent: TestAgentAPI, test_library: APM
             event = json.loads(base64.b64decode(req["body"]))
 
             if event["request_type"] == "logs":
-                with pytest.raises(AssertionError):
-                    self.assert_crash_report(test_library, event)
+                if isinstance(event.get("payload"), list):
+                    with pytest.raises(AssertionError):
+                        self.assert_crash_report_v1(test_library, event)
+                else:  # If payload is a dict
+                    with pytest.raises(AssertionError):
+                        self.assert_crash_report_v2(test_library, event)
 
     @pytest.mark.parametrize("library_env", [{"DD_CRASHTRACKING_ENABLED": "true"}])
     def test_telemetry_timeout(self, test_agent: TestAgentAPI, test_library: APMLibrary):
@@ -46,7 +56,7 @@ def test_telemetry_timeout(self, test_agent: TestAgentAPI, test_library: APMLibr
         finally:
             test_agent.set_trace_delay(0)
 
-    def assert_crash_report(self, test_library: APMLibrary, event: dict):
+    def assert_crash_report_v1(self, test_library: APMLibrary, event: dict):
         logger.debug(f"event: {json.dumps(event, indent=2)}")
 
         assert isinstance(event.get("payload"), list), event.get("payload")
@@ -79,3 +89,38 @@ def assert_crash_report(self, test_library: APMLibrary, event: dict):
                 assert tags_dict["si_signo"] == expected_signal_value
             else:
                 raise AssertionError("signum/si_signo not found in tags_dict")
+
+    def assert_crash_report_v2(self, test_library: APMLibrary, event: dict):
+        logger.debug(f"event: {json.dumps(event, indent=2)}")
+
+        assert isinstance(event.get("payload"), dict), event.get("payload")
+        assert isinstance(event["payload"].get("logs"), list), event["payload"].get("logs")
+        assert event["payload"]["logs"], event["payload"]["logs"]
+        assert isinstance(event["payload"]["logs"][0], dict), event["payload"]["logs"][0]
+        assert "tags" in event["payload"]["logs"][0]
+
+        tags = event["payload"]["logs"][0]["tags"]
+        tags_dict = dict(item.split(":") for item in tags.split(","))
+        logger.debug(f"tags_dict: {json.dumps(tags_dict, indent=2)}")
+
+        # Until the crash tracking RFC is out, there is no standard way to identify crash reports.
+        # Most client libraries are using libdatadog so tesing signum tag would work,
+        # but Java isn't so we end up with testing for severity tag.
+        if test_library.lang == "java":
+            assert "severity" in tags_dict, tags_dict
+            assert tags_dict["severity"] == "crash", tags_dict
+        else:
+            # those values are defined in python's module signal. But it's more clear to have this defined here
+            SIGABRT = 6  # noqa: N806
+            SIGSEGV = 11  # noqa: N806
+
+            # According to the RFC, si_signo should be set to 11 for SIGSEGV
+            # though, it's difficult for .NET to simulate a segfault, so SIGABRT is used instead
+            expected_signal_value = f"{SIGABRT}" if test_library.lang == "dotnet" else f"{SIGSEGV}"
+
+            if "signum" in tags_dict:
+                assert tags_dict["signum"] == expected_signal_value
+            elif "si_signo" in tags_dict:
+                assert tags_dict["si_signo"] == expected_signal_value
+            else:
+                raise AssertionError("signum/si_signo not found in tags_dict")