Skip to content

Add patches to upstream 2.1.3#14

Merged
EricMountain merged 5 commits into
v2.1.3-ddfrom
eric.mountain/v2.1.3-dd-patches-2
Jul 15, 2025
Merged

Add patches to upstream 2.1.3#14
EricMountain merged 5 commits into
v2.1.3-ddfrom
eric.mountain/v2.1.3-dd-patches-2

Conversation

@EricMountain
Copy link
Copy Markdown
Member

No description provided.

EricMountain and others added 5 commits July 15, 2025 10:50
* [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>
Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
The runtimeHandlers list in the response to `crictl info` has unstable ordering
since commit 97eb1cd (underlying switch from list to map) that was shipped in
v2.1.0.

On Kubernetes nodes this causes the kubelet to update node status subresources
every time the order of runtime handlers changes in the status response from
containerd. The lieklihood increases with the number of runtime handlers present
on nodes. In some clusters this leads to every single node sending a status update
every few seconds leading to excessive Kube API server load.

This change enforces stable ordering on runtime handler names.

Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
Signed-off-by: Eric Mountain <eric.mountain@datadoghq.com>
@EricMountain EricMountain merged commit 23c2c71 into v2.1.3-dd Jul 15, 2025
5 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.

2 participants