Merge branch 'main' into upgrade-latest-mako-version

DataDog · Dec 19, 2024 · 4e45735 · 4e45735
2 parents 1183446 + 315a48f
commit 4e45735
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 11 deletions.
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
@@ -213,6 +213,10 @@ jobs:
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh IAST_STANDALONE
 
+      - name: Run SCA_STANDALONE
+        if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
+        run: ./run.sh SCA_STANDALONE
+
       - name: Run APPSEC_RUNTIME_ACTIVATION
         if: always() && steps.docker_load.outcome == 'success' && matrix.scenario == 'appsec-1'
         run: ./run.sh APPSEC_RUNTIME_ACTIVATION

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,12 +93,11 @@ check_new_flaky_tests:
   stage: quality-gate
   extends: .testrunner
   script:
-    - curl -L --fail "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
     - export DD_SITE=datadoghq.com
     - export DD_API_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.${CI_PROJECT_NAME}.dd-api-key-qualitygate --with-decryption --query "Parameter.Value" --out text)
     - export DD_APP_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.${CI_PROJECT_NAME}.dd-app-key-qualitygate --with-decryption --query "Parameter.Value" --out text)
     - datadog-ci gate evaluate
   except:
     - main
     - '[0-9].[0-9]*'
-    - 'mq-working-branch**'
+    - 'mq-working-branch**'
diff --git a/ddtrace/debugging/_exception/replay.py b/ddtrace/debugging/_exception/replay.py
@@ -40,7 +40,8 @@
 CAPTURE_TRACE_TAG = "_dd.debug.error.trace_captured"
 
 # unique exception id
-EXCEPTION_ID_TAG = "_dd.debug.error.exception_id"
+EXCEPTION_HASH_TAG = "_dd.debug.error.exception_hash"
+EXCEPTION_ID_TAG = "_dd.debug.error.exception_capture_id"
 
 # link to matching snapshot for every frame in the traceback
 FRAME_SNAPSHOT_ID_TAG = "_dd.debug.error.%d.snapshot_id"
@@ -80,9 +81,8 @@ def exception_chain_ident(chain: ExceptionChain) -> int:
     return h
 
 
-def limit_exception(chain: ExceptionChain) -> bool:
+def limit_exception(exc_ident: int) -> bool:
     try:
-        exc_ident = exception_chain_ident(chain)
         hg = EXCEPTION_IDENT_LIMITER.get(exc_ident)
         if hg is None:
             # We haven't seen this exception yet, or it's been evicted
@@ -170,7 +170,7 @@ class SpanExceptionSnapshot(Snapshot):
     @property
     def data(self) -> t.Dict[str, t.Any]:
         data = super().data
-        data.update({"exception-id": str(self.exc_id)})
+        data.update({"exceptionId": str(self.exc_id)})
         return data
 
 
@@ -218,7 +218,8 @@ def on_span_exception(
             # No exceptions to capture
             return
 
-        if limit_exception(chain):
+        exc_ident = exception_chain_ident(chain)
+        if limit_exception(exc_ident):
             # We have seen this exception recently
             return
 
@@ -272,6 +273,7 @@ def on_span_exception(
                 _tb = _tb.tb_next
 
             span.set_tag_str(DEBUG_INFO_TAG, "true")
+            span.set_tag_str(EXCEPTION_HASH_TAG, str(exc_ident))
             span.set_tag_str(EXCEPTION_ID_TAG, str(exc_id))
 
     @classmethod

diff --git a/ddtrace/debugging/_signal/utils.py b/ddtrace/debugging/_signal/utils.py
@@ -304,6 +304,15 @@ def capture_value(
         }
 
     fields = get_fields(value)
+
+    # Capture exception chain for exceptions
+    if _isinstance(value, BaseException):
+        for attr in ("args", "__cause__", "__context__", "__suppress_context__"):
+            try:
+                fields[attr] = object.__getattribute__(value, attr)
+            except AttributeError:
+                pass
+
     captured_fields = {
         n: (
             capture_value(v, level=level - 1, maxlen=maxlen, maxsize=maxsize, maxfields=maxfields, stopping_cond=cond)

diff --git a/tests/debugging/exception/test_replay.py b/tests/debugging/exception/test_replay.py
@@ -161,8 +161,8 @@ def b_chain(bar):
                 m = 4
                 try:
                     a(bar % m)
-                except ValueError:
-                    raise KeyError("chain it")
+                except ValueError as exc:
+                    raise KeyError("chain it") from exc
 
         def c(foo=42):
             with self.trace("c"):

diff --git a/tests/debugging/test_debugger.py b/tests/debugging/test_debugger.py
@@ -210,7 +210,25 @@ def test_debugger_function_probe_on_function_with_exception():
 
     return_capture = snapshot_data["captures"]["return"]
     assert return_capture["arguments"] == {}
-    assert return_capture["locals"] == {"@exception": {"fields": {}, "type": "Exception"}}
+    assert return_capture["locals"] == {
+        "@exception": {
+            "type": "Exception",
+            "fields": {
+                "args": {
+                    "type": "tuple",
+                    "elements": [
+                        {"type": "str", "value": "'Hello'"},
+                        {"type": "str", "value": "'world!'"},
+                        {"type": "int", "value": "42"},
+                    ],
+                    "size": 3,
+                },
+                "__cause__": {"type": "NoneType", "isNull": True},
+                "__context__": {"type": "NoneType", "isNull": True},
+                "__suppress_context__": {"type": "bool", "value": "False"},
+            },
+        }
+    }
     assert return_capture["throwable"]["message"] == "'Hello', 'world!', 42"
     assert return_capture["throwable"]["type"] == "Exception"
 

diff --git a/tests/debugging/test_encoding.py b/tests/debugging/test_encoding.py
@@ -191,7 +191,21 @@ def _():
 
         exc = context.pop("throwable")
         assert context["arguments"] == {}
-        assert context["locals"] == {"@exception": {"type": "Exception", "fields": {}}}
+        assert context["locals"] == {
+            "@exception": {
+                "type": "Exception",
+                "fields": {
+                    "args": {
+                        "type": "tuple",
+                        "elements": [{"type": "str", "value": "'test'"}, {"type": "str", "value": "'me'"}],
+                        "size": 2,
+                    },
+                    "__cause__": {"type": "NoneType", "isNull": True},
+                    "__context__": {"type": "NoneType", "isNull": True},
+                    "__suppress_context__": {"type": "bool", "value": "False"},
+                },
+            }
+        }
         assert exc["message"] == "'test', 'me'"
         assert exc["type"] == "Exception"