Skip to content

Prepare agent_with_custom_components.md for ddot. #28672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

ogaca-dd
Copy link
Contributor

@ogaca-dd ogaca-dd commented Apr 9, 2025

What does this PR do? What is the motivation?

This PR updates agent_with_custom_components to use the agent full image.

Merge instructions

Merge readiness:

  • Ready for merge

For Datadog employees:
Merge queue is enabled in this repo. Your branch name MUST follow the <name>/<description> convention and include the forward slash (/). Without this format, your pull request will not pass in CI, the GitLab pipeline will not run, and you won't get a branch preview. Getting a branch preview makes it easier for us to check any issues with your PR, such as broken links.

If your branch doesn't follow this format, rename it or create a new branch and PR.

To have your PR automatically merged after it receives the required reviews, add the following PR comment:

/merge

Additional notes

@ogaca-dd ogaca-dd added the Do Not Merge Just do not merge this PR :) label Apr 9, 2025
@ogaca-dd ogaca-dd marked this pull request as ready for review April 16, 2025 08:47
@ogaca-dd ogaca-dd requested review from a team as code owners April 16, 2025 08:47
@ogaca-dd ogaca-dd requested a review from truthbk April 16, 2025 08:48
Copy link
Member

@truthbk truthbk left a comment

Choose a reason for hiding this comment

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

Looks very good! Added a couple of comments before we can merge.

agent_tag: "7.65.0-full"
Copy link
Member

Choose a reason for hiding this comment

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

Since this file is not exclusive to the OTel telemetry docs, I would maybe call this agent_full_tag just to be explicit 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file is exclusive to the OTel telemetry docs.

--build-arg AGENT_BRANCH="{{< version key="agent_branch" >}}"
--build-arg AGENT_VERSION="{{< version key="agent_tag" >}}" \
--build-arg AGENT_BRANCH="{{< version key="agent_branch" >}}" \
--build-arg AGENT_REPO="datadog/agent"
Copy link
Member

Choose a reason for hiding this comment

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

As mentioned, since customers should use the release branch, I would maybe change the docs to indicate at step 0 to switch to the corresponding release branch/tag. We can use the agent_version or agent_branch variables for this, I think agent_version is better.

I would then remove the AGENT_REPO build arg, because it would be properly set in the Dockerfile, and should be transparent to the customer. I'd like to keep AGENT_REPO as a bit of a hidden feature.

Copy link
Contributor Author

@ogaca-dd ogaca-dd Apr 23, 2025

Choose a reason for hiding this comment

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

In this PR, AGENT_REPO=datadog/agent-dev. We have to set AGENT_REPO to datadog/agent when using tag, like 7.65.0-full because tags are defined in repo datadog/agent . Did I miss something?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Do Not Merge Just do not merge this PR :)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants