Skip to content

tests(appsec): wait for sidecar telemetry ready before TelemetryTests #3816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Leiyks wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

tests(appsec): wait for sidecar telemetry ready before TelemetryTests #3816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ...ests/integration/src/test/groovy/com/datadog/appsec/php/integration/TelemetryTests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@ class TelemetryTests {
export DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS=1;
php-fpm -y /etc/php-fpm.conf -c /etc/php/php-rc.ini''')
assert res.exitCode == 0

// Wait for the helper/sidecar to fully connect and flush its initial waf.init
// telemetry before releasing any test. Without this, a slow sidecar startup
// exhausts the first test's 60s polling window before any metric arrives,
// causing all 9 ordered tests to fail in sequence.
log.info('Waiting for sidecar to emit waf.init telemetry (up to 60s)...')
TelemetryHelpers.waitForMetrics(CONTAINER, 60) { List<TelemetryHelpers.GenerateMetrics> messages ->
def allSeries = messages.collectMany { it.series }
allSeries.any { it.name == 'waf.init' }
}
log.info('Sidecar telemetry ready — waf.init received.')
}

/**
Expand Down Expand Up @@ -118,7 +129,9 @@ class TelemetryTests {
TelemetryHelpers.Metric workerCount


TelemetryHelpers.waitForMetrics(CONTAINER, 30) { List<TelemetryHelpers.GenerateMetrics> messages ->
// 60s: @BeforeAll may have consumed the first waf.init batch (10s metric interval),
// so this test needs enough headroom to catch the next emission cycle.
TelemetryHelpers.waitForMetrics(CONTAINER, 60) { List<TelemetryHelpers.GenerateMetrics> messages ->
def allSeries = messages.collectMany { it.series }
wafInit = allSeries.find { it.name == 'waf.init' }
// Rust helper has +1 tag (helper_runtime), C++ doesn't
Expand Down
Loading