Skip to content

Commit a3bfcd7

Browse files
thiemantobz
andauthored
fix(integration): extend Windows assertion timeouts (#1859)
## Summary - Extend assertion-level timeouts to 60s for Windows-enabled integration tests. - Leave per-test suite timeouts, stability durations, and negative observation windows unchanged. - Reduces Windows CI flakes where the Core Agent service startup takes longer than short assertion budgets. ## Test plan - `python3` check: verified all Windows-enabled integration configs have non-top-level `timeout:` values set to `60s` - `git diff --check` - `cargo run --bin panoramic -- list -d test/integration/cases` - Commit hook checks, including formatting, Clippy, license/advisory checks, Vale, and API docs build ## Notes - Investigated GitLab job 1763487876: `adp-cmd-port` failed because the first `log_contains` assertion had a 10s timeout while ADP was still retrying the configured `https://127.0.0.1:7777/` endpoint before the Windows Datadog Agent service had finished starting. - The Windows integration job should provide final end-to-end validation. Co-authored-by: toby.lawrence <toby.lawrence@datadoghq.com>
1 parent 559d98c commit a3bfcd7

26 files changed

Lines changed: 47 additions & 47 deletions

File tree

test/integration/cases/adp-cmd-port/config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ assertions:
3131
# ADP should reach out for config from the core agent on the correct port.
3232
- type: log_contains
3333
pattern: "Waiting for initial configuration from Datadog Agent"
34-
timeout: 10s
34+
timeout: 60s
3535
# The core agent should start its CMD API server on the non-default port.
3636
- type: log_contains
3737
pattern: "Started HTTP server 'CMD API Server' on 127.0.0.1:7777"
38-
timeout: 15s
38+
timeout: 60s
3939
# ADP should successfully register with the core agent on that port.
4040
- type: log_contains
4141
pattern: "Successfully registered with the Datadog Agent."
42-
timeout: 15s
42+
timeout: 60s
4343
# ADP should become healthy and stay up.
4444
- parallel:
4545
- type: process_stable_for
4646
duration: 10s
4747
- type: log_contains
4848
pattern: "Topology healthy"
49-
timeout: 10s
49+
timeout: 60s
5050
- type: log_not_contains
5151
pattern: "panic|PANIC"
5252
regex: true

test/integration/cases/adp-config-check-exit/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ env:
2525
assertions:
2626
- type: log_contains
2727
pattern: "Unsupported configuration key with non-default value"
28-
timeout: 30s
28+
timeout: 60s
2929
- type: log_contains
3030
pattern: "incompatible configuration detected"
31-
timeout: 30s
31+
timeout: 60s
3232
# Verify ADP actually exited (not just logged the error and continued). On docker this
3333
# observes the s6 supervisor's exit log; on mac it observes the process exit code
3434
# directly. Expected code is 1 because the high-severity check returns a non-zero status.
3535
- type: adp_exits_with
3636
expected_code: 1
37-
timeout: 30s
37+
timeout: 60s

test/integration/cases/adp-config-check-warn/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ assertions:
2323
- type: log_contains
2424
pattern: 'key:"dogstatsd_telemetry_enabled_listener_id" | Unsupported configuration key. Proceeding.'
2525
regex: true
26-
timeout: 30s
26+
timeout: 60s
2727
- parallel:
2828
- type: process_stable_for
2929
duration: 10s

test/integration/cases/adp-config-stream/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ assertions:
2020
# Make sure we initially see ADP try to reach out to the Core Agent for its configuration.
2121
- type: log_contains
2222
pattern: "Waiting for initial configuration from Datadog Agent"
23-
timeout: 10s
23+
timeout: 60s
2424
# Make sure the process becomes healthy, and stays up without errors, for ~10 seconds after.
2525
- parallel:
2626
- type: process_stable_for
2727
duration: 10s
2828
- type: log_contains
2929
pattern: "Topology healthy"
30-
timeout: 10s
30+
timeout: 60s
3131
- type: log_not_contains
3232
pattern: "Error while reading config event stream"
3333
during: 10s

test/integration/cases/adp-disabled-exit/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ assertions:
1515
# ADP should log that it's not enabled and exit.
1616
- type: log_contains
1717
pattern: "Agent Data Plane is not enabled. Exiting."
18-
timeout: 15s
18+
timeout: 60s

test/integration/cases/adp-logging-windows-default-path/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ container:
1818
assertions:
1919
- type: log_contains
2020
pattern: "Initial configuration received."
21-
timeout: 30s
21+
timeout: 60s
2222
- type: file_contains
2323
path: "C:\\ProgramData\\Datadog\\logs\\agent-data-plane.log"
2424
pattern: "DATAPLANE"
25-
timeout: 30s
25+
timeout: 60s

test/integration/cases/adp-logging-windows-ignores-core-agent-log-file/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ container:
2020
assertions:
2121
- type: log_contains
2222
pattern: "Initial configuration received."
23-
timeout: 30s
23+
timeout: 60s
2424
- type: file_contains
2525
path: "C:\\adp\\adp-ignores-core-agent-log-file.log"
2626
pattern: "DATAPLANE"
27-
timeout: 30s
27+
timeout: 60s
2828
- type: file_contains
2929
path: "C:\\adp\\coreagent-only.log"
3030
pattern: "CORE"
31-
timeout: 30s
31+
timeout: 60s

test/integration/cases/adp-logging-windows-respects-data-plane-log-file/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ container:
1919
assertions:
2020
- type: log_contains
2121
pattern: "Initial configuration received."
22-
timeout: 30s
22+
timeout: 60s
2323
- type: file_contains
2424
path: "C:\\adp\\adp-custom.log"
2525
pattern: "DATAPLANE"
26-
timeout: 30s
26+
timeout: 60s

test/integration/cases/adp-memory-mode-disabled/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
assertions:
1919
- type: log_contains
2020
pattern: "Memory limiting disabled."
21-
timeout: 15s
21+
timeout: 60s
2222
- parallel:
2323
- type: process_stable_for
2424
duration: 10s

test/integration/cases/adp-memory-mode-permissive-exceeds-limit/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
assertions:
2020
- type: log_contains
2121
pattern: "Memory limiting behavior will be best effort."
22-
timeout: 15s
22+
timeout: 60s
2323
- parallel:
2424
- type: process_stable_for
2525
duration: 10s

0 commit comments

Comments
 (0)