fix(sidecar/telemetry): retry FFI telemetry batches when session conifg not yet available#1929
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit intoApr 29, 2026
Conversation
Contributor
Clippy Allow Annotation ReportComparing clippy allow annotations between branches:
Summary by Rule
Annotation Counts by File
Annotation Stats by Crate
About This ReportThis report tracks Clippy allow annotations for specific rules, showing how they've changed in this PR. Decreasing the number of these annotations generally improves code quality. |
![chatgpt-codex-connector[bot]](https://avatars.github.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1873fcefb9
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
bwoebi
approved these changes
Apr 27, 2026
bwoebi
left a comment
bwoebi
left a comment
Contributor
There was a problem hiding this comment.
I suppose that's a good stop-gap until we unify communication over the sidecar socket.
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #1929 +/- ##
==========================================
- Coverage 71.80% 71.65% -0.16%
==========================================
Files 434 434
Lines 69978 70091 +113
==========================================
- Hits 50248 50222 -26
- Misses 19730 19869 +139
🚀 New features to boost your workflow:
|
Contributor
🎉 All green!❄️ No new flaky tests detected 🎯 Code Coverage (details) 🔗 Commit SHA: 44e71ac | Docs | Datadog PR Page | Give us feedback! |
Contributor
Artifact Size Benchmark Reportaarch64-alpine-linux-musl
aarch64-unknown-linux-gnu
libdatadog-x64-windows
libdatadog-x86-windows
x86_64-alpine-linux-musl
x86_64-unknown-linux-gnu
|
cataphract
force-pushed
the
glopes/sidecar-tel-retry
branch
2 times, most recently
from
811fb16 to
c933868
Compare
…ig not yet available
When the appsec helper posts telemetry via the in-process FFI path
before the PHP IPC set_session_config message is processed, the
telemetry client cache would be poisoned with a Config { endpoint: None
} worker. All subsequent IPC enqueue_actions calls (including
AddEndpoint) would reuse this bad client and never send HTTP requests to
the agent, causing the Laravel8xTests "Endpoints are sent" test to time
out.
Fix: when get_telemetry_client finds session_config is None, return None
instead of calling get_or_create with Config::default(). The receiver
task retries the batch up to 3 times with a 1.5 s delay before dropping.
In the normal case set_session_config arrives within milliseconds so the
first retry succeeds and no telemetry is lost.
cataphract
force-pushed
the
glopes/sidecar-tel-retry
branch
from
2eece2d to
44e71ac
Compare
Contributor
Author
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
|
gh-worker-dd-devflow-36fce6
Bot
added
mergequeue-status: queued
mergequeue-status: in_progress
and removed
mergequeue-status: queued
labels
gh-worker-dd-mergequeue-cf854d
Bot
merged commit 8165d17
into
main
92 of 94 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
When the appsec helper posts telemetry via the in-process FFI path before the PHP IPC set_session_config message is processed, the telemetry client cache would be poisoned with a Config { endpoint: None } worker. All subsequent IPC enqueue_actions calls (including AddEndpoint) would reuse this bad client and never send HTTP requests to the agent, causing the Laravel8xTests "Endpoints are sent" test to time out.
Fix: when get_telemetry_client finds session_config is None, return None instead of calling get_or_create with Config::default(). The receiver task retries the batch up to 3 times with a 1.5 s delay before dropping. In the normal case set_session_config arrives within milliseconds so the first retry succeeds and no telemetry is lost.
How to test the change?
Tested via
./gradlew test7.4-debug --tests "com.datadog.appsec.php.integration.Laravel8xTests.Endpoints are sent" -PuseHelperRust. The error reproduced reliably on my machine after at most 3 or 4 retries.