Skip to content

Conversation

@iamluc
Copy link
Contributor

@iamluc iamluc commented Jan 19, 2026

What this PR does / why we need it:

This PR adds a new datadog.apm.instrumentation.injectionMode option to configure how tracing libraries are injected into application pods.

Supported modes:

  • auto (default): Automatically selects the best injection method
  • init_container: Uses init containers to inject libraries
  • csi: Uses the Datadog CSI Driver to inject libraries (experimental)

The CSI injection mode is experimental and requires Cluster Agent 7.76.0+ with the Datadog CSI Driver installed.

Changes:

  • Add injectionMode option in values.yaml with default value "auto"
  • Pass DD_APM_INSTRUMENTATION_INJECTION_MODE env var to Cluster Agent when set
  • Update values.schema.json with the new field and allowed values

Related PRs:

Which issue this PR fixes

(optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged)

  • fixes #

Special notes for your reviewer:

Checklist

[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]

  • All commits are signed (see: signing commits)
  • Chart Version semver bump label has been added (use <chartName>/minor-version, <chartName>/patch-version, or <chartName>/no-version-bump)
  • For datadog or datadog-operator chart or value changes, update the test baselines (run: make update-test-baselines)

GitHub CI takes care of the below, but are still required:

  • Documentation has been updated with helm-docs (run: .github/helm-docs.sh)
  • CHANGELOG.md has been updated
  • Variables are documented in the README.md

@iamluc iamluc requested a review from a team as a code owner January 19, 2026 15:01
@github-actions github-actions bot added the chart/datadog This issue or pull request is related to the datadog chart label Jan 19, 2026
Copy link
Contributor

@Mathew-Estafanous Mathew-Estafanous left a comment

Choose a reason for hiding this comment

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

Everything looks good.

One ask. Can you add a check in NOTES.txt that warns or errors when datadog.apm.instrumentation.injectMode is set to csi without datadog.csi.enabled set to true?

I think that should prevent customers attempting to use CSI injection without first setting up the driver itself.

},
"injectionMode": {
"type": "string",
"enum": ["auto", "init_container", "csi"],
Copy link
Member

Choose a reason for hiding this comment

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

👌

@iamluc iamluc force-pushed the luc/apm-instrumentation-injectionMode branch from 8bfa71e to f610a00 Compare January 21, 2026 09:09
@iamluc iamluc force-pushed the luc/apm-instrumentation-injectionMode branch from f610a00 to 6a557f4 Compare January 22, 2026 08:49
@iamluc
Copy link
Contributor Author

iamluc commented Jan 26, 2026

/merge

@gh-worker-devflow-routing-ef8351
Copy link

gh-worker-devflow-routing-ef8351 bot commented Jan 26, 2026

View all feedbacks in Devflow UI.

2026-01-26 14:01:24 UTC ℹ️ Start processing command /merge


2026-01-26 14:01:31 UTC ❌ MergeQueue

You are not allowed to use the merge queue towards main. User is not part of the authorized users or teams.
The authorized teams (including their child teams) are: action-platform, agent-all, container-app, container-ecosystems, container-helm-chart-maintainers, container-integrations, container-t2, logs-cloudprem, synthetics, documentation, observability-pipelines, telemetry-and-analytics, vector.
The authorized users are: cahillsf, clamoriniere, hkaj.

@adel121 adel121 enabled auto-merge (squash) January 26, 2026 14:22
@adel121 adel121 merged commit 9931f56 into main Jan 26, 2026
10 of 12 checks passed
@adel121 adel121 deleted the luc/apm-instrumentation-injectionMode branch January 26, 2026 14:29
@fanny-jiang fanny-jiang mentioned this pull request Jan 26, 2026
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

chart/datadog This issue or pull request is related to the datadog chart

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants