Skip to content

Revert "feat: Add APM to DatadogInstrumentation CRD (#2984)"#3015

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
mainfrom
mathew.estafanous/revert-ddi-apm-section
May 14, 2026
Merged

Revert "feat: Add APM to DatadogInstrumentation CRD (#2984)"#3015
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits into
mainfrom
mathew.estafanous/revert-ddi-apm-section

Conversation

@Mathew-Estafanous
Copy link
Copy Markdown
Contributor

@Mathew-Estafanous Mathew-Estafanous commented May 14, 2026

What does this PR do?

Reverts #2984 & #2995

Reverting the APM section in the DDI CRD spec since it'll likely not being used in the next Agent release (7.80)

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

Minimum Agent Versions

Are there minimum versions of the Datadog Agent and/or Cluster Agent required?

  • Agent: vX.Y.Z
  • Cluster Agent: vX.Y.Z

Describe your test plan

Write there any instructions and details you may have to test your PR.

Checklist

  • PR has at least one valid label: bug, enhancement, refactoring, documentation, tooling, and/or dependencies
  • PR has a milestone or the qa/skip-qa label
  • All commits are signed (see: signing commits)

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e36ea5833b

ℹ️ 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".

Comment thread config/crd/bases/v1/datadoghq.com_datadoginstrumentations.yaml
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 14, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 40.90%. Comparing base (7f86fa0) to head (1f59178).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #3015   +/-   ##
=======================================
  Coverage   40.90%   40.90%           
=======================================
  Files         333      333           
  Lines       28327    28327           
=======================================
  Hits        11588    11588           
  Misses      15960    15960           
  Partials      779      779           
Flag Coverage Δ
unittests 40.90% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7f86fa0...1f59178. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@datadog-prod-us1-6

This comment has been minimized.

@Mathew-Estafanous Mathew-Estafanous force-pushed the mathew.estafanous/revert-ddi-apm-section branch from e36ea58 to 1f59178 Compare May 14, 2026 15:25
@Mathew-Estafanous Mathew-Estafanous requested a review from a team as a code owner May 14, 2026 15:25
@Mathew-Estafanous Mathew-Estafanous self-assigned this May 14, 2026
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 6d3740a into main May 14, 2026
53 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the mathew.estafanous/revert-ddi-apm-section branch May 14, 2026 19:34
@dd-octo-sts
Copy link
Copy Markdown

dd-octo-sts Bot commented May 14, 2026

The backport to v1.27 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v1.27 v1.27
# Navigate to the new working tree
cd .worktrees/backport-v1.27
# Create a new branch
git switch --create backport-3015-to-v1.27
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6d3740ad41bd664fc11024784672c48f6174e82f
# Push it to GitHub
git push --set-upstream origin backport-3015-to-v1.27
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.27

Then, create a pull request where the base branch is v1.27 and the compare/head branch is backport-3015-to-v1.27.

Mathew-Estafanous added a commit that referenced this pull request May 14, 2026
…3017)

Revert "fix: make apm config a pointer (#2995)"

This reverts commit 6416ca2.

Revert "feat: Add APM to DatadogInstrumentation CRD (#2984)"

This reverts commit d97a3dc.

Co-authored-by: mathew.estafanous <mathew.estafanous@datadoghq.com>

(cherry picked from commit 6d3740a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants