fix(send_with_retry): follow max retries of the strategy#2047
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intoJun 1, 2026
Conversation
Contributor
🎉 All green!🧪 All tests passed 🎯 Code Coverage (details) 🔗 Commit SHA: 13a1614 | Docs | Datadog PR Page | Give us feedback! |
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. |
1c1e007 to
b71cfaf
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b71cfaf68a
ℹ️ About Codex in GitHub
Codex has been enabled to automatically 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 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
81b23f4 to
4da486c
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #2047 +/- ##
==========================================
- Coverage 72.90% 72.86% -0.05%
==========================================
Files 460 460
Lines 76396 76394 -2
==========================================
- Hits 55696 55662 -34
- Misses 20700 20732 +32
🚀 New features to boost your workflow:
|
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
|
ekump
reviewed
May 28, 2026
ekump
approved these changes
May 28, 2026
hoolioh
approved these changes
Jun 1, 2026
0172960
into
main
100 of 105 checks passed
iunanua
added a commit
that referenced
this pull request
Jun 5, 2026
# Release proposal for libdd-sampling and its dependencies This PR contains version bumps based on public API changes and commits since last release. ## libdd-trace-utils **Next version:** `7.0.0` **Semver bump:** `major` **Tag:** `libdd-trace-utils-v7.0.0` ### Commits - feat(trace-utils)!: add dedup convenience to VecMap (#2049) - fix(trace-utils): match the Go trace agent when parsing `datadog-client-computed-*` bool headers (#2071) - revert!: add from_string to span text (#2011) (#2073) - fix(send_with_retry): follow max retries of the strategy (#2047) ## libdd-sampling (manually bumped due to breaking in #2073) **Next version:** ~~`2.1.1`~~ `3.0.0` **Semver bump:** ~~`patch`~~ `major` **Tag:** ~~`libdd-sampling-v2.1.1`~~ `libdd-sampling-v3.0.0` ### Commits - fix(sampling): format _dd.p.ksr to 6 decimal places, not 6 significant digits (#2086) - revert!: add from_string to span text (#2011) (#2073) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: iunanua <18325288+iunanua@users.noreply.github.com> Co-authored-by: iunanua <igor.unanua@datadoghq.com>
iunanua
added a commit
that referenced
this pull request
Jun 8, 2026
# Release proposal for libdd-data-pipeline and its dependencies This PR contains version bumps based on public API changes and commits since last release. ## libdd-trace-utils **Next version:** `8.0.0` **Semver bump:** `major` **Tag:** `libdd-trace-utils-v8.0.0` ### Commits - refactor(vecmap)!: avoid Clone bound from dedup (#2069) ## libdd-telemetry **Next version:** `5.0.1` **Semver bump:** `patch` **Tag:** `libdd-telemetry-v5.0.1` ### Commits - fix(libdd-telemetry): serialize Method::Other as "*" per OpenAPI spec (#1998) ## libdd-trace-obfuscation **Next version:** `4.0.0` **Semver bump:** `major` **Tag:** `libdd-trace-obfuscation-v4.0.0` ###⚠️ major bump forced due to: - `libdd-trace-utils`: ^5.0.0 → ^7.0.0 ### Commits - ci: bump msrv to 1.87.0 (#2017) ## libdd-trace-stats **Next version:** `5.0.0` **Semver bump:** `major` **Tag:** `libdd-trace-stats-v5.0.0` ###⚠️ major bump forced due to: - `libdd-trace-utils`: ^5.0.0 → ^7.0.0 ### Commits - revert!: add from_string to span text (#2011) (#2073) - fix(send_with_retry): follow max retries of the strategy (#2047) - ci: bump msrv to 1.87.0 (#2017) ## libdd-data-pipeline **Next version:** `6.0.0` **Semver bump:** `major` **Tag:** `libdd-data-pipeline-v6.0.0` ###⚠️ major bump forced due to: - `libdd-trace-utils`: ^5.0.0 → ^7.0.0 ### Commits - feat(data-pipeline)!: add fork safety hooks and cancellation token for trace exporter FFI (#2051) - revert!: add from_string to span text (#2011) (#2073) - feat(data-pipeline): move the async boundary up (#2064) - feat(trace-exporter): add fail-closed fallback to v04 (#2037) - fix(send_with_retry): follow max retries of the strategy (#2047) - refactor(trace-utils): replace use_v05_format bool and remove infallible expect (#1946) - ci: bump msrv to 1.87.0 (#2017) ## libdd-sampling (manually bumped as it wasn't included in the proposal) **Next version:** `4.0.0` **Semver bump:** `major` **Tag:** `libdd-sampling-v4.0.0` ###⚠️ major bump forced due to: - `libdd-trace-utils`: ^7.0.0 → ^8.0.0 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: iunanua <18325288+iunanua@users.noreply.github.com> Co-authored-by: iunanua <igor.unanua@datadoghq.com>
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
4 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?
Fix an off-by 1 error in
send_with_retryin the number of retries. Themax_retriesfield of the RetryStrategy was effectively used asmax_attempts.The default strategy has not been modified and will no do up to 5 retries so 6 attempts (previously 5 attempts). However the OTLP code indicates that the intent was to have 5 total attempts so the strategy has ben updated to keep the same total of attempts.
Motivation
There's an off by 1 error in the send_with_retry count of retries.
Additional Notes
Anything else we should know when reviewing?
How to test the change?
Describe here in detail how the change can be validated.