Skip to content

Commit 8a57d29

Browse files
committed
fix(regression): use built-in json variant + seed filters for log-filtering cases
The logs_filter_baseline/ottl/jq cases crashed on every replicate because the templated_json lading variant requires an external template file (/etc/lading/templated_json.yaml) that the SMP execution path does not deliver to the lading container, so lading exited non-zero at startup. Switch all three cases to lading's built-in `json` variant (no external file) and filter on the built-in `seed` field (~50% selectivity) using each engine's idiom: regex "seed":\d*[02468], / OTTL attributes["seed"] < 32768 / jq select(.seed < 32768). Each case now processes the identical stream and keeps ~half, keeping the per-engine CPU comparison fair. Also removes the logs_filter_diag_apache crash-isolation case, which confirmed the crash was specific to the templated_json path.
1 parent 00ae891 commit 8a57d29

13 files changed

Lines changed: 6 additions & 127 deletions

File tree

test/regression/cases/logs_filter_baseline/datadog-agent/conf.d/logs.d/conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ logs:
66
log_processing_rules:
77
- type: include_at_match
88
name: baseline_only
9-
pattern: '"name":"baseline"'
9+
pattern: '"seed":\d*[02468],'

test/regression/cases/logs_filter_baseline/lading/lading.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ generator:
99
maximum_bytes_per_log: 50MiB
1010
total_rotations: 5
1111
max_depth: 0
12-
variant:
13-
templated_json:
14-
template_path: "/etc/lading/templated_json.yaml"
12+
variant: json
1513
maximum_prebuild_cache_size_bytes: 300MiB
1614
mount_point: /smp-shared
1715

test/regression/cases/logs_filter_baseline/lading/templated_json.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/regression/cases/logs_filter_diag_apache/datadog-agent/conf.d/logs.d/conf.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/regression/cases/logs_filter_diag_apache/datadog-agent/datadog.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

test/regression/cases/logs_filter_diag_apache/experiment.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/regression/cases/logs_filter_diag_apache/lading/lading.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/regression/cases/logs_filter_jq/datadog-agent/conf.d/logs.d/conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ logs:
66
log_processing_rules:
77
- type: include_at_jq_match
88
name: jq_only
9-
pattern: select(.name == "jq")
9+
pattern: select(.seed < 32768)

test/regression/cases/logs_filter_jq/lading/lading.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ generator:
99
maximum_bytes_per_log: 50MiB
1010
total_rotations: 5
1111
max_depth: 0
12-
variant:
13-
templated_json:
14-
template_path: "/etc/lading/templated_json.yaml"
12+
variant: json
1513
maximum_prebuild_cache_size_bytes: 300MiB
1614
mount_point: /smp-shared
1715

test/regression/cases/logs_filter_jq/lading/templated_json.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)