Skip to content

Conversation

@justin-lesko
Copy link
Contributor

@justin-lesko justin-lesko commented Nov 20, 2025

What does this PR do?

Adds container metric support for any CRI compliant runtime provided as a cri_socket_path.

Motivation

Despite allowing custom cri_socket_path values, we actually only allow containerd or crio. We want to support metric collection for any runtime if it is CRI compliant.

Describe how you validated your changes

  1. Stand up an environment running a nonstandard runtime (for example, pouch)
$ kubectl get nodes -o wide
NAME       STATUS   ROLES           AGE    VERSION    INTERNAL-IP     EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION     CONTAINER-RUNTIME
pouch-qa   Ready    control-plane   5d2h   v1.25.16   192.168.64.50   <none>        Ubuntu 24.04.3 LTS   6.8.0-87-generic   pouch://1.3.1-ba854f2d
  1. Deploy an agent built off of this feature branch and specify the custom socket
datadog:
  ...
  criSocketPath: /var/run/pouchcri.sock
agents:
  ...
  volumes:
    - name: pouchcri-sock
      hostPath:
        path: /var/run/pouchcri.sock  # path on the node
        type: Socket

  volumeMounts:
    - name: pouchcri-sock
      mountPath: /var/run/pouchcri.sock
      readOnly: true
  1. Exec onto the agent and validate that the nonstandard-cri-runtime feature was detected by executing agent status
$ agent status
...
=============
Autodiscovery
=============

  Enabled Features
  ================
    cri
    kube_orchestratorexplorer
    kubernetes
    nonstandard-cri-runtime
...
  1. Validate that container metrics work in the UI:
Screenshot 2025-11-24 at 3 42 10 PM Screenshot 2025-11-24 at 3 40 51 PM

Additional Notes

@github-actions github-actions bot added the medium review PR review might take time label Nov 20, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Nov 20, 2025

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 29bdf94

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${+0.07}$$ $${703.31}$$ < $${717.44}$$ $${+0.03}$$ $${172.42}$$ < $${177.37}$$
agent_deb_amd64_fips $${+0.07}$$ $${697.36}$$ < $${711.66}$$ $${+0.03}$$ $${171.0}$$ < $${174.84}$$
agent_heroku_amd64 $${+0.02}$$ $${327.5}$$ < $${337.57}$$ $${+0}$$ $${87.4}$$ < $${90.78}$$
agent_msi $${+0.4}$$ $${1000.27}$$ < $${1015.38}$$ $${+0}$$ $${144.43}$$ < $${149.42}$$
agent_rpm_amd64 $${+0.07}$$ $${703.3}$$ < $${717.41}$$ $${+0.03}$$ $${175.53}$$ < $${178.01}$$
agent_rpm_amd64_fips $${+0.07}$$ $${697.34}$$ < $${711.64}$$ $${+0.01}$$ $${173.28}$$ < $${177.26}$$
agent_rpm_arm64 $${+0.07}$$ $${688.6}$$ < $${702.19}$$ $${-0.05}$$ $${159.2}$$ < $${163.22}$$
agent_rpm_arm64_fips $${+0.14}$$ $${683.84}$$ < $${697.6}$$ $${+0.02}$$ $${158.64}$$ < $${162.68}$$
agent_suse_amd64 $${+0.07}$$ $${703.3}$$ < $${717.41}$$ $${+0.03}$$ $${175.53}$$ < $${178.01}$$
agent_suse_amd64_fips $${+0.07}$$ $${697.34}$$ < $${711.64}$$ $${+0.01}$$ $${173.28}$$ < $${177.26}$$
agent_suse_arm64 $${+0.07}$$ $${688.6}$$ < $${702.19}$$ $${-0.05}$$ $${159.2}$$ < $${163.22}$$
agent_suse_arm64_fips $${+0.14}$$ $${683.84}$$ < $${697.6}$$ $${+0.02}$$ $${158.64}$$ < $${162.68}$$
docker_agent_amd64 $${+0.07}$$ $${765.68}$$ < $${769.92}$$ $${+0.02}$$ $${260.07}$$ < $${261.52}$$
docker_agent_arm64 $${+0.07}$$ $${775.34}$$ < $${779.46}$$ $${+0.01}$$ $${250.32}$$ < $${251.72}$$
docker_agent_jmx_amd64 $${+0.07}$$ $${956.56}$$ < $${960.8}$$ $${+0.04}$$ $${328.72}$$ < $${330.15}$$
docker_agent_jmx_arm64 $${+0.07}$$ $${954.94}$$ < $${958.93}$$ $${+0.01}$$ $${314.94}$$ < $${316.35}$$
docker_cluster_agent_amd64 $${-0}$$ $${178.28}$$ < $${207.49}$$ $${-0}$$ $${63.0}$$ < $${70.2}$$
docker_cluster_agent_arm64 $${-0}$$ $${195.77}$$ < $${223.38}$$ $${-0}$$ $${59.73}$$ < $${66.42}$$
docker_cws_instrumentation_amd64 $${0}$$ $${7.07}$$ < $${7.12}$$ $${+0}$$ $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${0}$$ $${6.69}$$ < $${6.92}$$ $${-0}$$ $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${0}$$ $${38.54}$$ < $${39.3}$$ $${-0}$$ $${14.9}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${0}$$ $${37.24}$$ < $${37.94}$$ $${+0}$$ $${14.34}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${29.76}$$ < $${30.53}$$ $${-0}$$ $${7.85}$$ < $${8.75}$$
dogstatsd_deb_arm64 $${0}$$ $${28.28}$$ < $${29.11}$$ $${+0}$$ $${6.79}$$ < $${7.71}$$
dogstatsd_rpm_amd64 $${0}$$ $${29.76}$$ < $${30.53}$$ $${+0}$$ $${7.87}$$ < $${8.76}$$
dogstatsd_suse_amd64 $${0}$$ $${29.76}$$ < $${30.53}$$ $${+0}$$ $${7.87}$$ < $${8.76}$$
iot_agent_deb_amd64 $${+0.02}$$ $${42.52}$$ < $${43.19}$$ $${+0.01}$$ $${11.11}$$ < $${11.98}$$
iot_agent_deb_arm64 $${+0.02}$$ $${40.25}$$ < $${40.92}$$ $${+0.01}$$ $${9.57}$$ < $${10.45}$$
iot_agent_deb_armhf $${+0.02}$$ $${40.17}$$ < $${40.86}$$ $${+0}$$ $${9.68}$$ < $${10.56}$$
iot_agent_rpm_amd64 $${+0.02}$$ $${42.52}$$ < $${43.19}$$ $${+0.01}$$ $${11.12}$$ < $${12.0}$$
iot_agent_suse_amd64 $${+0.02}$$ $${42.52}$$ < $${43.19}$$ $${+0.01}$$ $${11.12}$$ < $${12.0}$$

@cit-pr-commenter
Copy link

cit-pr-commenter bot commented Nov 20, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 719f7696-7dc9-4358-85ab-8978b777312c

Baseline: 716b81c
Comparison: 480f723
Diff

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Regressions in experiments with settings containing erratic: true are ignored.

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +0.46 [-2.51, +3.43] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
ddot_logs memory utilization +0.55 [+0.48, +0.61] 1 Logs
docker_containers_cpu % cpu utilization +0.46 [-2.51, +3.43] 1 Logs
ddot_metrics memory utilization +0.43 [+0.22, +0.65] 1 Logs
quality_gate_idle_all_features memory utilization +0.32 [+0.27, +0.38] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization +0.30 [+0.22, +0.39] 1 Logs
otlp_ingest_logs memory utilization +0.26 [+0.17, +0.35] 1 Logs
quality_gate_idle memory utilization +0.19 [+0.14, +0.24] 1 Logs bounds checks dashboard
otlp_ingest_metrics memory utilization +0.16 [+0.02, +0.30] 1 Logs
ddot_metrics_sum_delta memory utilization +0.09 [-0.11, +0.30] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.04 [-0.35, +0.43] 1 Logs
ddot_metrics_sum_cumulative memory utilization +0.02 [-0.12, +0.17] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.07, +0.07] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.00 [-0.12, +0.12] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.01 [-0.14, +0.13] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.02 [-0.39, +0.36] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.04 [-0.46, +0.38] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.06 [-0.11, -0.01] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.07 [-0.31, +0.17] 1 Logs
file_tree memory utilization -0.11 [-0.16, -0.06] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.24 [-0.30, -0.19] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.74 [-0.82, -0.66] 1 Logs
quality_gate_metrics_logs memory utilization -1.17 [-1.38, -0.97] 1 Logs bounds checks dashboard
quality_gate_logs % cpu utilization -3.42 [-4.86, -1.98] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
docker_containers_cpu simple_check_run 10/10
docker_containers_memory memory_usage 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency lost_bytes 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 bounds checks dashboard
quality_gate_metrics_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@justin-lesko justin-lesko marked this pull request as ready for review November 24, 2025 20:50
@justin-lesko justin-lesko requested review from a team as code owners November 24, 2025 20:50
@justin-lesko justin-lesko requested a review from dustmop November 24, 2025 20:50
@justin-lesko justin-lesko added the qa/done QA done before merge and regressions are covered by tests label Nov 24, 2025
@justin-lesko justin-lesko changed the title Add support for generic runtime socket Add container metric support for all CRI compliant runtimes Nov 24, 2025
@justin-lesko justin-lesko changed the title Add container metric support for all CRI compliant runtimes Add container metric support for any CRI compliant runtime Nov 24, 2025
criSocket = checkCriSocket(criSocket)
}

// If a valid CRI socket path was found, determine the runtime (containerd or crio)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// If a valid CRI socket path was found, determine the runtime

mergeContainerdNamespaces(cfg)
} else if strings.Contains(criSocket, "crio") {
features[Crio] = struct{}{}
} else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also want to apply the NonstandardCRIRuntime feature when the Docker feature is present? I think the code will currently apply both features when using the docker container runtime.

@justin-lesko justin-lesko changed the title Add container metric support for any CRI compliant runtime [CONTINT-4898] Add container metric support for any CRI compliant runtime Nov 25, 2025
@dd-devflow-routing-codex
Copy link

View all feedbacks in Devflow UI.

2025-11-25 16:04:47 UTC ℹ️ Start processing command /trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on
If you need support, contact us on Slack #devflow!


2025-11-25 16:07:51 UTC 🚨 Devflow

Post "https://gitlab.ddbuild.io/api/v4/projects/DataDog%2Fdatadog-agent/pipeline": net/http: request canceled (Client.Timeout exceeded while awaiting headers)

Details
child workflow execution error (type: devtools.Devtools_TriggerCiFromPr, workflowID: 76b5c045-152d-4072-b159-652deaa21a9a_36, runID: a1b4ead6-5117-4f97-b057-78a4243a3193, initiatedEventID: 36, startedEventID: 37): child workflow execution error (type: devtools.Devtools_TriggerCi, workflowID: a1b4ead6-5117-4f97-b057-78a4243a3193_14, runID: e3854c3c-3d83-467c-b5cc-92072c903c27, initiatedEventID: 14, startedEventID: 15): activity error (type: gitlab.GitlabService_CreatePipeline, scheduledEventID: 26, startedEventID: 27, identity: ): activity ScheduleToClose timeout (type: ScheduleToClose): Post "https://gitlab.ddbuild.io/api/v4/projects/DataDog%2Fdatadog-agent/pipeline": net/http: request canceled (Client.Timeout exceeded while awaiting headers) (type: Error, retryable: true): net/http: request canceled (Client.Timeout exceeded while awaiting headers) (type: timeoutError, retryable: true)

If you need support, contact us on Slack #devflow with those details!

@justin-lesko
Copy link
Contributor Author

/merge

@dd-devflow-routing-codex
Copy link

dd-devflow-routing-codex bot commented Nov 26, 2025

View all feedbacks in Devflow UI.

2025-11-26 19:45:48 UTC ℹ️ Start processing command /merge


2025-11-26 19:45:52 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 41m (p90).


2025-11-26 20:13:44 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit d2e41e0 into main Nov 26, 2025
292 checks passed
@dd-mergequeue dd-mergequeue bot deleted the justin-lesko/nonstandard-cri-support branch November 26, 2025 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

medium review PR review might take time qa/done QA done before merge and regressions are covered by tests team/container-integrations

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants