diff --git a/tests/debugger/test_debugger_pii.py b/tests/debugger/test_debugger_pii.py index 4e46f17b5d8..a7d58e0ba8b 100644 --- a/tests/debugger/test_debugger_pii.py +++ b/tests/debugger/test_debugger_pii.py @@ -129,6 +129,7 @@ def _setup(self, *, line_probe: bool = False): while not snapshot_found and retries < self._max_retries: self.send_weblog_request("/debugger/pii", reset=(retries == 0)) + self.wait_for_all_probes(statuses=["EMITTING"]) snapshot_found = self.wait_for_all_snapshots(timeout=timeout) timeout = self._timeout_next retries += 1 @@ -154,6 +155,13 @@ def _validate_pii_keyword_redaction(self, excluded_identifiers: list[str] | None improperly_redacted = [] excluded_identifiers = excluded_identifiers if excluded_identifiers else [] + missing = [pid for pid in self.probe_ids if pid not in self.probe_snapshots] + if missing: + raise AssertionError( + f"Expected snapshots for probes {missing} not found. " + f"Got snapshots for: {list(self.probe_snapshots.keys())}" + ) + for probe_id in self.probe_ids: base = self.probe_snapshots[probe_id][0] snapshot = base.get("debugger", {}).get("snapshot") or base["debugger.snapshot"] diff --git a/tests/debugger/test_debugger_telemetry.py b/tests/debugger/test_debugger_telemetry.py index d3605db9473..acf1b244cd0 100644 --- a/tests/debugger/test_debugger_telemetry.py +++ b/tests/debugger/test_debugger_telemetry.py @@ -24,11 +24,14 @@ def _setup(self): if not Test_Debugger_Telemetry.telemetry_data: telemetry_type = "app-started" + timeout = 5 if self.get_tracer()["language"] == "dotnet": telemetry_type = "app-client-configuration-change" + # Dotnet needs more time: RC fetch + apply + send app-client-configuration-change + timeout = 25 - Test_Debugger_Telemetry.telemetry_data = self.wait_for_telemetry(telemetry_type) + Test_Debugger_Telemetry.telemetry_data = self.wait_for_telemetry(telemetry_type, timeout=timeout) self.telemetry = Test_Debugger_Telemetry.telemetry_data diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py index 555e574f30f..9f4a5150c79 100644 --- a/utils/_context/_scenarios/__init__.py +++ b/utils/_context/_scenarios/__init__.py @@ -790,7 +790,7 @@ class _Scenarios: "DD_EXCEPTION_REPLAY_ENABLED": "1", "DD_SYMBOL_DATABASE_UPLOAD_ENABLED": "1", }, - library_interface_timeout=5, + library_interface_timeout=20, # 20s: dotnet needs more time for RC + telemetry (reduced flakes) doc="Test scenario for checking debugger telemetry.", scenario_groups=[scenario_groups.debugger, scenario_groups.telemetry], ) diff --git a/utils/_context/_scenarios/debugger.py b/utils/_context/_scenarios/debugger.py index ea73cba088a..bf899d7eb15 100644 --- a/utils/_context/_scenarios/debugger.py +++ b/utils/_context/_scenarios/debugger.py @@ -20,7 +20,7 @@ def __init__(self, name: str, doc: str, weblog_env: dict[str, str | None]) -> No doc=doc, rc_api_enabled=True, rc_backend_enabled=True, - library_interface_timeout=5, + library_interface_timeout=15, # 15s: debugger snapshots can be slow (reduced flakes) weblog_env=base_weblog_env, scenario_groups=[scenario_groups.debugger], )