Skip to content

Conversation

@tbavelier
Copy link
Member

@tbavelier tbavelier commented Nov 10, 2025

What does this PR do ?

  • Removes installation and configuration of the deprecated standalone datadog-installer deb/rpm package: mostly 7beaf9b
    • Removes associated tests from .circleci/config.yml
  • Adds a Linux task to remove deprecated installs if preview/older version: a436bf7 and b591578
  • Same as install script, use install-ssi.sh script for APM SSI

Files help

  • Removing older deprecated installs to support smooth upgrade: tasks/remove-legacy-installer.yml
  • SSI support with the script: tasks/apm-single-step-instrumentation.yml and tasks/main.yml
  • All other files: removes installation and configuration of datadog-installer

QA

  • Done manually: ensured Agent is installed/restarted if config changes, ensured APM SSI is enabled by reviewing datadog-installer status
  • Existing tests for APM injection show no regression

Notes:

On some distros like AL2023, with Python3, we hit the "classic":

fatal: [127.0.0.1]: FAILED! => {"changed": false, "msg": "The Python 2 yum module is needed for this module. If you require Python 3 support use the `dnf` Ansible module instead."}

when using ansible.builtin.package. While we could use the specific correct module (example in 090196c), it adds complexity/is ugly and more error-prone. Instead, let's ignore errors and treat it as best-effort -> it will fail on AL2023 depending on the Ansible version, but it's fine as we treat it as best-effort removal, it should impact less and less customers (only those who were in preview)

@tbavelier tbavelier marked this pull request as ready for review November 12, 2025 13:35
@tbavelier tbavelier requested review from a team as code owners November 12, 2025 13:35
Copy link
Member Author

Choose a reason for hiding this comment

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

Auto YAML formatting and removal of standalone installer tests


# Configure APM host injection. Possible values are: "all", "host" or "docker".
datadog_apm_instrumentation_enabled: ""
# datadog_apm_instrumentation_enabled: ""
Copy link
Member Author

Choose a reason for hiding this comment

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

APM SSI is opt-in: users should specifically set a value. There is validation later down the line

datadog_apm_instrumentation_libraries: []

# Used to send telemetry data to datadog on installation
datadog_apm_telemetry_endpoint: "https://instrumentation-telemetry-intake.{{ datadog_site | default('datadoghq.com') }}/api/v2/apmtelemetry"
Copy link
Member Author

Choose a reason for hiding this comment

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

No tasks to send installer telemetry, so let's remove this un-used variable

Comment on lines -202 to -209
# Registry, auth, and version for the datadog installer
datadog_installer_registry: ""
datadog_installer_auth: ""
datadog_installer_version: ""
installer_registry_config: {}

# Version for the datadog apm inject package
datadog_apm_inject_version: ""
Copy link
Member Author

Choose a reason for hiding this comment

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

Moved higher up

owner: "{{ agent_dd_user }}"
group: "{{ agent_dd_group }}"
mode: "0644"
when: datadog_apm_instrumentation_enabled is defined
Copy link
Member Author

Choose a reason for hiding this comment

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

Required by removing the default empty string value for datadog_apm_instrumentation_enabled while it was being used in telemetry rendering. install.json is only used when APM SSI is enabled, so no need to create the file if not enabled.

- name: Set plain includepkgs variable
ansible.builtin.set_fact:
agent_datadog_includepkgs: "{{ datadog_agent_flavor }}
{{ agent_dd_apm_install_pkgs | default([], true) | join(' ') }}"
Copy link
Member Author

Choose a reason for hiding this comment

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

This should have been removed as part of a previous clean-up PR when removing legacy legacy APM libraries (pre-OCI, we'd install them as deb/rpm)

@tbavelier tbavelier merged commit 8218ea5 into main Nov 14, 2025
86 checks passed
@tbavelier tbavelier deleted the tbavelier/agentonb-2675-disable-legacy-apm-path branch November 14, 2025 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants