Remove ddot install if version >=7.78 (installer side)#415
Open
Stanislas167 wants to merge 11 commits intomainfrom
Open
Remove ddot install if version >=7.78 (installer side)#415Stanislas167 wants to merge 11 commits intomainfrom
Stanislas167 wants to merge 11 commits intomainfrom
Conversation
swang392
approved these changes
Mar 31, 2026
san-jos
approved these changes
Apr 1, 2026
…age and prevent errors
…ean package and prevent errors" This reverts commit 8ee994e.
swang392
reviewed
Apr 2, 2026
swang392
reviewed
Apr 2, 2026
| DD_OTELCOLLECTOR_ENABLED="${DD_OTELCOLLECTOR_ENABLED}" DD_API_KEY="${apikey}" DD_SITE="${site}" DD_INSTALLER_REGISTRY_URL="${DD_INSTALLER_REGISTRY_URL}" ZYPP_RPM_DEBUG="${ZYPP_RPM_DEBUG:-0}" SYSTEMD_OFFLINE=${SYSTEMD_OFFLINE:-0} zypper --non-interactive --no-refresh install "${packages[@]}" 2> >($sudo_cmd tee /tmp/ddog_install_error_msg >&2) ||: | ||
| else | ||
| $sudo_cmd ZYPP_RPM_DEBUG="${ZYPP_RPM_DEBUG:-0}" SYSTEMD_OFFLINE="${SYSTEMD_OFFLINE:-0}" zypper --non-interactive --no-refresh install "${packages[@]}" 2> >($sudo_cmd tee /tmp/ddog_install_error_msg >&2) ||: | ||
| $sudo_cmd DD_OTELCOLLECTOR_ENABLED="${DD_OTELCOLLECTOR_ENABLED}" DD_API_KEY="${apikey}" DD_SITE="${site}" DD_INSTALLER_REGISTRY_URL="${DD_INSTALLER_REGISTRY_URL}" ZYPP_RPM_DEBUG="${ZYPP_RPM_DEBUG:-0}" SYSTEMD_OFFLINE="${SYSTEMD_OFFLINE:-0}" zypper --non-interactive --no-refresh install "${packages[@]}" 2> >($sudo_cmd tee /tmp/ddog_install_error_msg >&2) ||: |
Contributor
There was a problem hiding this comment.
The install here passes env vars directly, but the yum and apt install paths use a bash -c wrapper for the env vars. Should that be aligned here too for consistency?
Author
There was a problem hiding this comment.
I don't want to change that, this has probably been done on purpose...
Co-authored-by: Sarah Wang <sarah.wang@datadoghq.com>
liustanley
approved these changes
Apr 8, 2026
Contributor
liustanley
left a comment
There was a problem hiding this comment.
Validated this install script works with rc.7
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For agent version >= 7.78, DDOT is installed by the installer from the DD_OTELCOLLECTOR_ENABLED flag. There is no need to install it separately.
It was done before by unsetting the DD_OTELCOLLECTOR_ENABLED variable but this was causing issues.
This PR keep DD_OTELCOLLECTOR_ENABLED set and add a ddot_installed_by_agent variable to check if we need to install ddot manually in the script or not. ddot_installed_by_agent is false for 7.69 <= version < 7.78, and true above. DDOT is then gated by [ -n "$DD_OTELCOLLECTOR_ENABLED" ] && [ "$ddot_installed_by_agent" = false ]