Skip to content

[v2.1-dd] Cherry-picks #17

Merged
jaredledvina merged 2 commits into
v2.1-ddfrom
jared.ledvina/v2.1-patches
Sep 15, 2025
Merged

[v2.1-dd] Cherry-picks #17
jaredledvina merged 2 commits into
v2.1-ddfrom
jared.ledvina/v2.1-patches

Conversation

@jaredledvina
Copy link
Copy Markdown
Member

In an attempt to simplify the maintenance of our fork, I've created a new branch v2.1-dd to act as a long lived version of release/2.1 + our changes. Currently, it was created off of upstreams v2.1.4 tag.

As such, this PR cherry-picks the following commits that are not present in the upstream v2.1.4 release:

Notably, containerd#12036 was cherry-picked upstream to 2.1 via containerd#12054 and is included in the 2.1.4 release.

Once merged, I'll tag and push v2.1.4-dd.0`. Future releases can be incorporated by simply:

# Assumes you have a remote `upstream` for containerd/containerd and `fork` for Datadog/containerd

git fetch --all 
git checkout v2.1-dd
git merge v2.1.X 
git tag v2.1.X-dd.X
git push --tags fork v2.1-dd

EricMountain and others added 2 commits September 12, 2025 13:33
* [tracing] Create NameSampler

Simple sampler that samples every span having a certain name.
It's best used in conjunction with the ParentBased sampler so that the child spans are also sampled.

* [tracing] Configure otlp plugin to use NameSampler

Allow the plugin to use the custom NameSampler if specified in the usual env vars used to specify the sampler `OTEL_TRACES_SAMPLER` and `OTEL_TRACES_SAMPLER_ARG`. This sampler will allow to avoid emitting a lot of the noisy traces to only keep a subset of meaningful traces.

Co-authored-by: Baptiste Girard-Carrabin <baptiste.girardcarrabin@datadoghq.com>
Co-authored-by: Justin Bera <justin.bera@datadoghq.com>
@jaredledvina jaredledvina requested a review from a team September 12, 2025 17:48
@jaredledvina jaredledvina merged commit 1bec762 into v2.1-dd Sep 15, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants