From 2b3ddd0c5ee70fdabb2b4c8a1d7a02b67d9c5a9a Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Tue, 17 Mar 2026 14:06:27 +0100 Subject: [PATCH 01/10] Add otelcollector.installation_method and set for bare-metal --- comp/otelcol/converter/impl/autoconfigure.go | 3 +- comp/otelcol/converter/impl/converter_test.go | 6 ++++ .../ddflare-and-dd/datadog/config-result.yaml | 1 + .../datadog/config-result.yaml | 1 + .../datadog-gateway/config-result.yaml | 1 + .../datadog-installation-method/acfg.yaml | 5 +++ .../config-result.yaml | 36 +++++++++++++++++++ .../datadog-installation-method/config.yaml | 17 +++++++++ .../no-extensions/datadog/config-result.yaml | 1 + .../datadog-site/config-result.yaml | 1 + .../datadog/config-result.yaml | 1 + .../features/all-features/config-result.yaml | 1 + .../no-defined-features/config-result.yaml | 1 + .../packages/datadog_agent_ddot_windows.go | 27 ++++++++++++++ .../tmpl/datadog-agent-ddot.service.tmpl | 1 + .../datadog-agent-ddot-exp.service | 1 + .../debrpm-nocap/datadog-agent-ddot.service | 1 + .../gen/debrpm/datadog-agent-ddot-exp.service | 1 + .../gen/debrpm/datadog-agent-ddot.service | 1 + .../oci-nocap/datadog-agent-ddot-exp.service | 1 + .../gen/oci-nocap/datadog-agent-ddot.service | 1 + .../gen/oci/datadog-agent-ddot-exp.service | 1 + .../tmpl/gen/oci/datadog-agent-ddot.service | 1 + 23 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml create mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml create mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml diff --git a/comp/otelcol/converter/impl/autoconfigure.go b/comp/otelcol/converter/impl/autoconfigure.go index 7f647f5c4db5..69b0d2b8aaf5 100644 --- a/comp/otelcol/converter/impl/autoconfigure.go +++ b/comp/otelcol/converter/impl/autoconfigure.go @@ -60,7 +60,8 @@ func (c *ddConverter) enhanceConfig(conf *confmap.Conf) { "key": c.coreConfig.GetString("api_key"), "site": site, }, - "deployment_type": deploymentType, + "deployment_type": deploymentType, + "installation_method": c.coreConfig.GetString("otelcollector.installation_method"), } } addComponentToConfig(conf, extension) diff --git a/comp/otelcol/converter/impl/converter_test.go b/comp/otelcol/converter/impl/converter_test.go index dfe0dcf2abde..6e29ee31be10 100644 --- a/comp/otelcol/converter/impl/converter_test.go +++ b/comp/otelcol/converter/impl/converter_test.go @@ -109,6 +109,12 @@ func TestConvert(t *testing.T) { expectedResult: "extensions/no-extensions/datadog-gateway/config-result.yaml", agentConfig: "extensions/no-extensions/datadog-gateway/acfg.yaml", }, + { + name: "extensions/no-extensions/datadog-installation-method", + provided: "extensions/no-extensions/datadog-installation-method/config.yaml", + expectedResult: "extensions/no-extensions/datadog-installation-method/config-result.yaml", + agentConfig: "extensions/no-extensions/datadog-installation-method/acfg.yaml", + }, { name: "extensions/other-extensions/datadog", provided: "extensions/other-extensions/datadog/config.yaml", diff --git a/comp/otelcol/converter/impl/testdata/extensions/ddflare-and-dd/datadog/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/ddflare-and-dd/datadog/config-result.yaml index e870fac611b5..6c89f5f856e7 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/ddflare-and-dd/datadog/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/ddflare-and-dd/datadog/config-result.yaml @@ -14,6 +14,7 @@ extensions: key: "ggggg77777" site: "datadoghq.com" deployment_type: daemonset + installation_method: "" ddflare/dd-autoconfigured: service: diff --git a/comp/otelcol/converter/impl/testdata/extensions/empty-extensions/datadog/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/empty-extensions/datadog/config-result.yaml index 160fdf2fb172..1dd43643a447 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/empty-extensions/datadog/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/empty-extensions/datadog/config-result.yaml @@ -14,6 +14,7 @@ extensions: key: ggggg77777 site: "datadoghq.com" deployment_type: daemonset + installation_method: "" service: extensions: diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-gateway/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-gateway/config-result.yaml index 635b414d5c2a..9f926b2d6cf0 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-gateway/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-gateway/config-result.yaml @@ -14,6 +14,7 @@ extensions: key: ggggg77777 site: "datadoghq.com" deployment_type: gateway + installation_method: "" service: extensions: diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml new file mode 100644 index 000000000000..6786006ef80c --- /dev/null +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml @@ -0,0 +1,5 @@ +api_key: ggggg77777 +otelcollector: + converter: + features: [pprof, zpages, health_check, datadog] + installation_method: bare-metal diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml new file mode 100644 index 000000000000..fe71c2f2584d --- /dev/null +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml @@ -0,0 +1,36 @@ +receivers: + otlp: + +exporters: + nop: + +extensions: + pprof/dd-autoconfigured: + health_check/dd-autoconfigured: + zpages/dd-autoconfigured: + endpoint: "localhost:55679" + datadog/dd-autoconfigured: + api: + key: ggggg77777 + site: "datadoghq.com" + deployment_type: daemonset + installation_method: bare-metal + +service: + extensions: + [ + pprof/dd-autoconfigured, + zpages/dd-autoconfigured, + health_check/dd-autoconfigured, + datadog/dd-autoconfigured, + ] + pipelines: + traces: + receivers: [nop] + exporters: [nop] + metrics: + receivers: [nop] + exporters: [nop] + logs: + receivers: [nop] + exporters: [nop] diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml new file mode 100644 index 000000000000..00d3531eea2a --- /dev/null +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml @@ -0,0 +1,17 @@ +receivers: + otlp: + +exporters: + nop: + +service: + pipelines: + traces: + receivers: [nop] + exporters: [nop] + metrics: + receivers: [nop] + exporters: [nop] + logs: + receivers: [nop] + exporters: [nop] \ No newline at end of file diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml index 160fdf2fb172..1dd43643a447 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml @@ -14,6 +14,7 @@ extensions: key: ggggg77777 site: "datadoghq.com" deployment_type: daemonset + installation_method: "" service: extensions: diff --git a/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog-site/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog-site/config-result.yaml index ef39e8f46899..bb7c191f52d3 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog-site/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog-site/config-result.yaml @@ -16,6 +16,7 @@ extensions: key: ggggg77777 site: "us5.datadoghq.com" deployment_type: daemonset + installation_method: "" service: extensions: diff --git a/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog/config-result.yaml index b54e135780ff..1ff3868bcd92 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog/config-result.yaml @@ -16,6 +16,7 @@ extensions: key: ggggg77777 site: "datadoghq.com" deployment_type: daemonset + installation_method: "" service: extensions: diff --git a/comp/otelcol/converter/impl/testdata/features/all-features/config-result.yaml b/comp/otelcol/converter/impl/testdata/features/all-features/config-result.yaml index 8128a98209f4..aabf97869c1d 100644 --- a/comp/otelcol/converter/impl/testdata/features/all-features/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/features/all-features/config-result.yaml @@ -10,6 +10,7 @@ extensions: key: "ggggg77777" site: "datadoghq.eu" deployment_type: daemonset + installation_method: "" ddflare/dd-autoconfigured: health_check/dd-autoconfigured: pprof/dd-autoconfigured: diff --git a/comp/otelcol/converter/impl/testdata/features/no-defined-features/config-result.yaml b/comp/otelcol/converter/impl/testdata/features/no-defined-features/config-result.yaml index 08ff2484271f..1e9203624445 100644 --- a/comp/otelcol/converter/impl/testdata/features/no-defined-features/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/features/no-defined-features/config-result.yaml @@ -10,6 +10,7 @@ extensions: key: "ggggg77777" site: "datadoghq.eu" deployment_type: daemonset + installation_method: "" ddflare/dd-autoconfigured: health_check/dd-autoconfigured: pprof/dd-autoconfigured: diff --git a/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go b/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go index 77a67c5cacaf..0117de5a9d6e 100644 --- a/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go +++ b/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go @@ -24,6 +24,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/winutil" "golang.org/x/sys/windows" + "golang.org/x/sys/windows/registry" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/mgr" ) @@ -204,6 +205,9 @@ func ensureDDOTService() error { } // Best-effort: align service DACL to allow the core Agent user to control OTEL service configureDDOTServicePermissions(s) + if err := setDDOTServiceEnvVars(); err != nil { + return err + } return nil } @@ -223,6 +227,9 @@ func ensureDDOTService() error { } // Best-effort: align service DACL to allow the core Agent user to control OTEL service configureDDOTServicePermissions(s) + if err := setDDOTServiceEnvVars(); err != nil { + return err + } return nil } @@ -337,6 +344,20 @@ func configureDDOTServicePermissions(s *mgr.Service) { } } +// setDDOTServiceEnvVars writes the DDOT service environment variables to the registry. +func setDDOTServiceEnvVars() error { + key, _, err := registry.CreateKey( + registry.LOCAL_MACHINE, + `SYSTEM\CurrentControlSet\Services\`+otelServiceName+`\Environment`, + registry.SET_VALUE, + ) + if err != nil { + return fmt.Errorf("failed to open service environment registry key: %w", err) + } + defer key.Close() + return key.SetStringsValue("", []string{"DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal"}) +} + // stopServiceIfExists stops the service if it exists func stopServiceIfExists(name string) error { // Use robust stop; ignore 'service does not exist' @@ -481,6 +502,9 @@ func ensureDDOTServiceForExtension(binaryPath string) error { return err } configureDDOTServicePermissions(s) + if err := setDDOTServiceEnvVars(); err != nil { + return err + } return nil } @@ -498,5 +522,8 @@ func ensureDDOTServiceForExtension(binaryPath string) error { return err } configureDDOTServicePermissions(s) + if err := setDDOTServiceEnvVars(); err != nil { + return err + } return nil } diff --git a/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.service.tmpl b/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.service.tmpl index 83829ffcc20c..b6ecb6646783 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.service.tmpl +++ b/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.service.tmpl @@ -21,6 +21,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-{{.EtcDir}}/environment Environment="DD_FLEET_POLICIES_DIR={{.FleetPoliciesDir}}" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" {{- if not .Stable}} Environment="DD_INVENTORIES_FIRST_RUN_DELAY=5" {{- end}} diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.service index 2e17c4e1e531..0a88f014b130 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent-exp/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent-exp/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" Environment="DD_INVENTORIES_FIRST_RUN_DELAY=5" ExecStart=/opt/datadog-agent/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent-exp/otel-config.yaml --core-config /etc/datadog-agent-exp/datadog.yaml --pidfile /opt/datadog-agent/run/otel-agent.pid StartLimitInterval=10 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.service index 6d456f81d8fb..36c9b8874405 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" ExecStart=/opt/datadog-agent/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent/otel-config.yaml --core-config /etc/datadog-agent/datadog.yaml --pidfile /opt/datadog-agent/run/otel-agent.pid StartLimitInterval=10 StartLimitBurst=5 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.service index 2e17c4e1e531..0a88f014b130 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent-exp/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent-exp/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" Environment="DD_INVENTORIES_FIRST_RUN_DELAY=5" ExecStart=/opt/datadog-agent/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent-exp/otel-config.yaml --core-config /etc/datadog-agent-exp/datadog.yaml --pidfile /opt/datadog-agent/run/otel-agent.pid StartLimitInterval=10 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.service index 6d456f81d8fb..36c9b8874405 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" ExecStart=/opt/datadog-agent/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent/otel-config.yaml --core-config /etc/datadog-agent/datadog.yaml --pidfile /opt/datadog-agent/run/otel-agent.pid StartLimitInterval=10 StartLimitBurst=5 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.service index a66ee024587e..475bec8a1e35 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent-exp/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent-exp/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" Environment="DD_INVENTORIES_FIRST_RUN_DELAY=5" ExecStart=/opt/datadog-packages/datadog-agent/experiment/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent-exp/otel-config.yaml --core-config /etc/datadog-agent-exp/datadog.yaml --pidfile /opt/datadog-packages/datadog-agent/experiment/run/otel-agent.pid StartLimitInterval=10 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.service index 5cbb906973ec..14fd40505f76 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" ExecStart=/opt/datadog-packages/datadog-agent/stable/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent/otel-config.yaml --core-config /etc/datadog-agent/datadog.yaml --pidfile /opt/datadog-packages/datadog-agent/stable/run/otel-agent.pid StartLimitInterval=10 StartLimitBurst=5 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.service index a66ee024587e..475bec8a1e35 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent-exp/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent-exp/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" Environment="DD_INVENTORIES_FIRST_RUN_DELAY=5" ExecStart=/opt/datadog-packages/datadog-agent/experiment/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent-exp/otel-config.yaml --core-config /etc/datadog-agent-exp/datadog.yaml --pidfile /opt/datadog-packages/datadog-agent/experiment/run/otel-agent.pid StartLimitInterval=10 diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.service b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.service index 5cbb906973ec..14fd40505f76 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.service +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.service @@ -14,6 +14,7 @@ Restart=on-failure RestartSec=2 EnvironmentFile=-/etc/datadog-agent/environment Environment="DD_FLEET_POLICIES_DIR=/etc/datadog-agent/managed/datadog-agent/stable" +Environment="DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal" ExecStart=/opt/datadog-packages/datadog-agent/stable/ext/ddot/embedded/bin/otel-agent run --config /etc/datadog-agent/otel-config.yaml --core-config /etc/datadog-agent/datadog.yaml --pidfile /opt/datadog-packages/datadog-agent/stable/run/otel-agent.pid StartLimitInterval=10 StartLimitBurst=5 From 9d55971af3a4bab043863c6cdc15005b07b00b89 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Tue, 17 Mar 2026 14:26:09 +0100 Subject: [PATCH 02/10] Fix lint --- .../datadog-installation-method/acfg.yaml | 5 --- .../config-result.yaml | 36 ------------------- .../datadog-installation-method/config.yaml | 17 --------- .../no-extensions/datadog/acfg.yaml | 3 +- .../no-extensions/datadog/config-result.yaml | 2 +- pkg/config/setup/config.go | 1 + 6 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml delete mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml delete mode 100644 comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml deleted file mode 100644 index 6786006ef80c..000000000000 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/acfg.yaml +++ /dev/null @@ -1,5 +0,0 @@ -api_key: ggggg77777 -otelcollector: - converter: - features: [pprof, zpages, health_check, datadog] - installation_method: bare-metal diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml deleted file mode 100644 index fe71c2f2584d..000000000000 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config-result.yaml +++ /dev/null @@ -1,36 +0,0 @@ -receivers: - otlp: - -exporters: - nop: - -extensions: - pprof/dd-autoconfigured: - health_check/dd-autoconfigured: - zpages/dd-autoconfigured: - endpoint: "localhost:55679" - datadog/dd-autoconfigured: - api: - key: ggggg77777 - site: "datadoghq.com" - deployment_type: daemonset - installation_method: bare-metal - -service: - extensions: - [ - pprof/dd-autoconfigured, - zpages/dd-autoconfigured, - health_check/dd-autoconfigured, - datadog/dd-autoconfigured, - ] - pipelines: - traces: - receivers: [nop] - exporters: [nop] - metrics: - receivers: [nop] - exporters: [nop] - logs: - receivers: [nop] - exporters: [nop] diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml deleted file mode 100644 index 00d3531eea2a..000000000000 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-installation-method/config.yaml +++ /dev/null @@ -1,17 +0,0 @@ -receivers: - otlp: - -exporters: - nop: - -service: - pipelines: - traces: - receivers: [nop] - exporters: [nop] - metrics: - receivers: [nop] - exporters: [nop] - logs: - receivers: [nop] - exporters: [nop] \ No newline at end of file diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/acfg.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/acfg.yaml index 5f395b13abe4..6786006ef80c 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/acfg.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/acfg.yaml @@ -1,4 +1,5 @@ api_key: ggggg77777 otelcollector: converter: - features: [pprof, zpages, health_check, datadog] \ No newline at end of file + features: [pprof, zpages, health_check, datadog] + installation_method: bare-metal diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml index 1dd43643a447..a247c1a5b566 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml @@ -14,7 +14,7 @@ extensions: key: ggggg77777 site: "datadoghq.com" deployment_type: daemonset - installation_method: "" + installation_method: "bare-metal" service: extensions: diff --git a/pkg/config/setup/config.go b/pkg/config/setup/config.go index b30bb72d4c8d..13f328b8cce6 100644 --- a/pkg/config/setup/config.go +++ b/pkg/config/setup/config.go @@ -1145,6 +1145,7 @@ func InitConfig(config pkgconfigmodel.Setup) { }) }) config.BindEnvAndSetDefault("otelcollector.gateway.mode", false) + config.BindEnvAndSetDefault("otelcollector.installation_method", "") // inventories config.BindEnvAndSetDefault("inventories_enabled", true) From dd2b791fa3ce6b0cd81eb1b55065c8c406a892b5 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 11:54:50 +0100 Subject: [PATCH 03/10] Add fork replace --- comp/otelcol/collector-contrib/impl/go.mod | 3 +++ comp/otelcol/collector-contrib/impl/go.sum | 4 ++-- go.mod | 3 +++ go.sum | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index 4cdb33830d47..0f1def41b9d7 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -548,6 +548,9 @@ replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec +// TODO: Remove this replace once v0.148.0 is released +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca + // This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually replace ( diff --git a/comp/otelcol/collector-contrib/impl/go.sum b/comp/otelcol/collector-contrib/impl/go.sum index cef7cbadb337..1ea50a1f27d4 100644 --- a/comp/otelcol/collector-contrib/impl/go.sum +++ b/comp/otelcol/collector-contrib/impl/go.sum @@ -482,6 +482,8 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= @@ -578,8 +580,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= diff --git a/go.mod b/go.mod index ef6ca811e336..097405775f0d 100644 --- a/go.mod +++ b/go.mod @@ -1251,6 +1251,9 @@ replace github.com/iceber/iouring-go => github.com/lebauce/iouring-go v0.0.0-202 // Fork to remove some text/template usage, https://github.com/DataDog/opa/tree/lightweight-1.7.1 replace github.com/open-policy-agent/opa => github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816 +// TODO: Remove this replace once v0.148.0 is released +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca + // This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually replace ( diff --git a/go.sum b/go.sum index f1a8bd23e62c..3f18eea9d2fc 100644 --- a/go.sum +++ b/go.sum @@ -1695,6 +1695,8 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lorenzosaino/go-sysctl v0.3.1 h1:3phX80tdITw2fJjZlwbXQnDWs4S30beNcMbw0cn0HtY= github.com/lorenzosaino/go-sysctl v0.3.1/go.mod h1:5grcsBRpspKknNS1qzt1eIeRDLrhpKZAtz8Fcuvs1Rc= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1947,8 +1949,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= From 2ee3591e054e0a2ea6a29c0ae5d009f984cf26e7 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 13:40:16 +0100 Subject: [PATCH 04/10] go mod tidy --- comp/otelcol/collector-contrib/impl/go.sum | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.sum b/comp/otelcol/collector-contrib/impl/go.sum index 6a317500e932..fe41c63451a6 100644 --- a/comp/otelcol/collector-contrib/impl/go.sum +++ b/comp/otelcol/collector-contrib/impl/go.sum @@ -482,6 +482,8 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= @@ -578,8 +580,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= diff --git a/go.sum b/go.sum index 30861c62b02d..6b3cb22b0d05 100644 --- a/go.sum +++ b/go.sum @@ -1695,6 +1695,8 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= +github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lorenzosaino/go-sysctl v0.3.1 h1:3phX80tdITw2fJjZlwbXQnDWs4S30beNcMbw0cn0HtY= github.com/lorenzosaino/go-sysctl v0.3.1/go.mod h1:5grcsBRpspKknNS1qzt1eIeRDLrhpKZAtz8Fcuvs1Rc= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -1947,8 +1949,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= From 7342f65e9f19d5c465a1fc2852a601a080bf846d Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 13:56:19 +0100 Subject: [PATCH 05/10] Change to Datadog fork --- comp/otelcol/collector-contrib/impl/go.mod | 2 +- comp/otelcol/collector-contrib/impl/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.mod b/comp/otelcol/collector-contrib/impl/go.mod index c2ef70429d10..498ecb04ef33 100644 --- a/comp/otelcol/collector-contrib/impl/go.mod +++ b/comp/otelcol/collector-contrib/impl/go.mod @@ -551,7 +551,7 @@ replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1 replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230726162818-81f778f3b3ec // TODO: Remove this replace once v0.148.0 is released -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca // This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually diff --git a/comp/otelcol/collector-contrib/impl/go.sum b/comp/otelcol/collector-contrib/impl/go.sum index fe41c63451a6..0b3a5d4d911d 100644 --- a/comp/otelcol/collector-contrib/impl/go.sum +++ b/comp/otelcol/collector-contrib/impl/go.sum @@ -44,6 +44,8 @@ github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJK github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:zGGt6/Ylp7+i4xop9XpOyC1LCv+TLVARo6TFMqpvMjY= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/DataDog/sketches-go v1.4.8 h1:pFk9BNn+Rzv8IMIoPUttoOpOr3bJOqU3P6EP5wK+Lv8= github.com/DataDog/sketches-go v1.4.8/go.mod h1:a/wjRUqzqtGS8qRHRPDCs4EAQfmvPDZGDlMIF5mxXOE= github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= @@ -482,8 +484,6 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= -github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= -github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k= github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= diff --git a/go.mod b/go.mod index fdb877ac729e..041059638434 100644 --- a/go.mod +++ b/go.mod @@ -1254,7 +1254,7 @@ replace github.com/iceber/iouring-go => github.com/lebauce/iouring-go v0.0.0-202 replace github.com/open-policy-agent/opa => github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816 // TODO: Remove this replace once v0.148.0 is released -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 => github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca // This section was automatically added by 'dda inv modules.add-all-replace' command, do not edit manually diff --git a/go.sum b/go.sum index 6b3cb22b0d05..abe5ea9b6477 100644 --- a/go.sum +++ b/go.sum @@ -234,6 +234,8 @@ github.com/DataDog/nikos v1.12.12 h1:72YrdzMeQT3wcXIDgiS1ClU53SzUdR7uAbp5FSSpo5k github.com/DataDog/nikos v1.12.12/go.mod h1:kZGOhfE76+nXS7V5PAlIw3MRxWKM70ynET4VeuZ4U4k= github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816 h1:8diKw2aLYE6LsjWfYxDEqx0ZmcyMMmqB+qapRJrGtys= github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816/go.mod h1:7cPuErOAt7k/oVWAVJnxqAC6mwArrAazkvk0RXiih2A= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:zGGt6/Ylp7+i4xop9XpOyC1LCv+TLVARo6TFMqpvMjY= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20260311144928-7f4e7dbdb6e0 h1:/dTftiM6ZY8WztP5BPrzDOICSW3Y/3rBe7xG8hFdXfg= github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20260311144928-7f4e7dbdb6e0/go.mod h1:YcOGWpHl5DRZQxxSLH9P2a4MI51eexSeSWODzPY5FTc= github.com/DataDog/sketches-go v1.4.8 h1:pFk9BNn+Rzv8IMIoPUttoOpOr3bJOqU3P6EP5wK+Lv8= @@ -1695,8 +1697,6 @@ github.com/linode/go-metadata v0.2.4 h1:iif+14PN5T0u/wRnu6i/UlLQrlaFlWvDJzm0Wl9R github.com/linode/go-metadata v0.2.4/go.mod h1:h6yHiRupdKvyPkydU9g8kUA3QKdAgj3WX2wrF+mUv1c= github.com/linode/linodego v1.63.0 h1:MdjizfXNJDVJU6ggoJmMO5O9h4KGPGivNX0fzrAnstk= github.com/linode/linodego v1.63.0/go.mod h1:GoiwLVuLdBQcAebxAVKVL3mMYUgJZR/puOUSla04xBE= -github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:cvhpIVbFRXK1c7lEG/rKlbFpi0MAzAJwrylyNC9j7Ek= -github.com/liustanley/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/lorenzosaino/go-sysctl v0.3.1 h1:3phX80tdITw2fJjZlwbXQnDWs4S30beNcMbw0cn0HtY= github.com/lorenzosaino/go-sysctl v0.3.1/go.mod h1:5grcsBRpspKknNS1qzt1eIeRDLrhpKZAtz8Fcuvs1Rc= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= From 86de4bafaf3b22f7cb40de875e3b5cccde7665ff Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 14:17:36 +0100 Subject: [PATCH 06/10] Fix tests, add back config setup, go mod tidy --- comp/otelcol/collector-contrib/impl/go.sum | 4 ++-- comp/otelcol/converter/impl/autoconfigure.go | 4 ++-- comp/otelcol/converter/impl/converter_test.go | 6 ------ go.sum | 4 ++-- pkg/config/setup/common_settings.go | 1 + .../testdata/minimal-full-config-datadogextension.yml | 1 + .../tests/otel/otel-agent/testdata/minimal-full-config.yml | 1 + .../otel/otel-agent/testdata/no-dd-exporter-full-config.yml | 1 + 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/comp/otelcol/collector-contrib/impl/go.sum b/comp/otelcol/collector-contrib/impl/go.sum index 0b538400bc13..f97217486767 100644 --- a/comp/otelcol/collector-contrib/impl/go.sum +++ b/comp/otelcol/collector-contrib/impl/go.sum @@ -44,6 +44,8 @@ github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJK github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49 h1:EbzDX8HPk5uE2FsJYxD74QmMw0/3CqSKhEr6teh0ncQ= github.com/DataDog/mmh3 v0.0.0-20210722141835-012dc69a9e49/go.mod h1:SvsjzyJlSg0rKsqYgdcFxeEVflx3ZNAyFfkUHP0TxXg= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:zGGt6/Ylp7+i4xop9XpOyC1LCv+TLVARo6TFMqpvMjY= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/DataDog/sketches-go v1.4.8 h1:pFk9BNn+Rzv8IMIoPUttoOpOr3bJOqU3P6EP5wK+Lv8= github.com/DataDog/sketches-go v1.4.8/go.mod h1:a/wjRUqzqtGS8qRHRPDCs4EAQfmvPDZGDlMIF5mxXOE= github.com/DataDog/viper v1.15.1 h1:kcdFE+qPndlWkhU4iEf/WpWQMCyVYHTv5HqvVf+SYJs= @@ -578,8 +580,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= diff --git a/comp/otelcol/converter/impl/autoconfigure.go b/comp/otelcol/converter/impl/autoconfigure.go index 897026b81347..4303da345991 100644 --- a/comp/otelcol/converter/impl/autoconfigure.go +++ b/comp/otelcol/converter/impl/autoconfigure.go @@ -67,8 +67,8 @@ func (c *ddConverter) enhanceConfig(ctx context.Context, conf *confmap.Conf) { "key": c.coreConfig.GetString("api_key"), "site": site, }, - "deployment_type": deploymentType, - "hostname": resolvedHostname, + "deployment_type": deploymentType, + "hostname": resolvedHostname, "installation_method": c.coreConfig.GetString("otelcollector.installation_method"), } } diff --git a/comp/otelcol/converter/impl/converter_test.go b/comp/otelcol/converter/impl/converter_test.go index 793c2269415a..4c9b6195e18f 100644 --- a/comp/otelcol/converter/impl/converter_test.go +++ b/comp/otelcol/converter/impl/converter_test.go @@ -129,12 +129,6 @@ func TestConvert(t *testing.T) { expectedResult: "extensions/no-extensions/datadog-gateway/config-result.yaml", agentConfig: "extensions/no-extensions/datadog-gateway/acfg.yaml", }, - { - name: "extensions/no-extensions/datadog-installation-method", - provided: "extensions/no-extensions/datadog-installation-method/config.yaml", - expectedResult: "extensions/no-extensions/datadog-installation-method/config-result.yaml", - agentConfig: "extensions/no-extensions/datadog-installation-method/acfg.yaml", - }, { name: "extensions/other-extensions/datadog", provided: "extensions/other-extensions/datadog/config.yaml", diff --git a/go.sum b/go.sum index e3cf6c840017..2c7e6547e54d 100644 --- a/go.sum +++ b/go.sum @@ -234,6 +234,8 @@ github.com/DataDog/nikos v1.12.12 h1:72YrdzMeQT3wcXIDgiS1ClU53SzUdR7uAbp5FSSpo5k github.com/DataDog/nikos v1.12.12/go.mod h1:kZGOhfE76+nXS7V5PAlIw3MRxWKM70ynET4VeuZ4U4k= github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816 h1:8diKw2aLYE6LsjWfYxDEqx0ZmcyMMmqB+qapRJrGtys= github.com/DataDog/opa v0.0.0-20251126100856-d2e1e78e0816/go.mod h1:7cPuErOAt7k/oVWAVJnxqAC6mwArrAazkvk0RXiih2A= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca h1:zGGt6/Ylp7+i4xop9XpOyC1LCv+TLVARo6TFMqpvMjY= +github.com/DataDog/opentelemetry-collector-contrib/extension/datadogextension v0.147.1-0.20260319095942-6b90e15b61ca/go.mod h1:X2RsZAzB4956LB2UFWcz6GG9MF3X/paAZtIEnzmkL4c= github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20260317195537-817b91eb7dd4 h1:9+K8vjF7sQSLjVJporNyv6nw46cMg/Q8ogxbBZmrf+A= github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20260317195537-817b91eb7dd4/go.mod h1:KEBv+q78RzBcDPNFm1WB0V0za14gY95E/Atp3dJZ/8M= github.com/DataDog/sketches-go v1.4.8 h1:pFk9BNn+Rzv8IMIoPUttoOpOr3bJOqU3P6EP5wK+Lv8= @@ -1947,8 +1949,6 @@ github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusrem github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.147.0/go.mod h1:D3DB/PjNFYlR55EedzK2GIOUzpiBjPuvp4B4ykABPIA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0 h1:sd8NTDoFHhjyo8MApx5f7KPNMyQZIZ7uyWwymPoKIKA= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.147.0/go.mod h1:aVmsD2wCy0mf5ip57XJDLxg/V0JuSU/ON/SBgp7pz5U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0 h1:ko9NECw/NvfijhXuF4Jlg/E4vrhIilQW5Qq7qRUmGc0= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/datadogextension v0.147.0/go.mod h1:oEtnx72ZTngBi9ZRg/peukG8v6PZ95qunECMuzOesYA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0 h1:pfSn3AhNXu+YWDPidCVWRAZcjAk0rPImioBF9P/Uv7M= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.147.0/go.mod h1:m6GGqZbwf2okyQtylKTU/0cT56E6xdftYAkg3TE9jWE= github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.147.0 h1:6tIXAmOQQvTa/e323EPhetYIWWbNZ3ABKrVzqseqVnA= diff --git a/pkg/config/setup/common_settings.go b/pkg/config/setup/common_settings.go index 6d03f000540f..a0b72a0a5570 100644 --- a/pkg/config/setup/common_settings.go +++ b/pkg/config/setup/common_settings.go @@ -818,6 +818,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { }) }) config.BindEnvAndSetDefault("otelcollector.gateway.mode", false) + config.BindEnvAndSetDefault("otelcollector.installation_method", "") // inventories config.BindEnvAndSetDefault("inventories_enabled", true) diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config-datadogextension.yml b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config-datadogextension.yml index 8ad04c97b6f0..b0a2774083c9 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config-datadogextension.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config-datadogextension.yml @@ -91,6 +91,7 @@ extensions: deployment_type: daemonset force_attempt_http2: true hostname: "" + installation_method: "" # TODO: change to "helm" after helm chart version bump http: cors: null endpoint: localhost:9875 diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml index 487e55d7d9c2..6bd5de0deb99 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/minimal-full-config.yml @@ -91,6 +91,7 @@ extensions: deployment_type: daemonset force_attempt_http2: true hostname: "" + installation_method: "" # TODO: change to "helm" after helm chart version bump http: cors: null endpoint: localhost:9875 diff --git a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml index 7c09063cfad6..43ae530511d5 100644 --- a/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml +++ b/test/new-e2e/tests/otel/otel-agent/testdata/no-dd-exporter-full-config.yml @@ -78,6 +78,7 @@ extensions: deployment_type: daemonset force_attempt_http2: true hostname: "" + installation_method: "" # TODO: change to "helm" after helm chart version bump http: cors: null endpoint: localhost:9875 From 7227f63ee5be234b9c834465eec233d499c39138 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 14:45:24 +0100 Subject: [PATCH 07/10] Fix unit test --- .../extensions/no-extensions/dd-no-hostname/config-result.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/dd-no-hostname/config-result.yaml b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/dd-no-hostname/config-result.yaml index b93a085e50de..bccb323af3b9 100644 --- a/comp/otelcol/converter/impl/testdata/extensions/no-extensions/dd-no-hostname/config-result.yaml +++ b/comp/otelcol/converter/impl/testdata/extensions/no-extensions/dd-no-hostname/config-result.yaml @@ -15,6 +15,7 @@ extensions: site: "datadoghq.com" deployment_type: daemonset hostname: "" + installation_method: "" service: extensions: From f63a5b9f32fae005b2cf9cca1333775a6f31feec Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 14:58:36 +0100 Subject: [PATCH 08/10] Address codex comment --- .../packages/embedded/tmpl/datadog-agent-ddot.yaml.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.yaml.tmpl b/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.yaml.tmpl index 253fb1798f09..a1bbf6e605f7 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.yaml.tmpl +++ b/pkg/fleet/installer/packages/embedded/tmpl/datadog-agent-ddot.yaml.tmpl @@ -17,6 +17,7 @@ start_limit_burst: 5 environment_file: -{{.EtcDir}}/environment env: DD_FLEET_POLICIES_DIR: {{.FleetPoliciesDir}} + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal {{- if not .Stable}} DD_INVENTORIES_FIRST_RUN_DELAY: "5" {{- end}} From 4761da1c4ff83703f2485e2bb3848e5c35304ca8 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 15:52:02 +0100 Subject: [PATCH 09/10] Update yaml service files --- .../embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.yaml | 1 + .../embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.yaml | 1 + .../embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.yaml | 1 + .../packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.yaml | 1 + .../embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.yaml | 1 + .../packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.yaml | 1 + .../packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.yaml | 1 + .../packages/embedded/tmpl/gen/oci/datadog-agent-ddot.yaml | 1 + 8 files changed, 8 insertions(+) diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.yaml index 12a5c0c94806..17593d3a96f2 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot-exp.yaml @@ -17,6 +17,7 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent-exp/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent-exp/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal DD_INVENTORIES_FIRST_RUN_DELAY: "5" stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.yaml index 4e159cd4ee85..b06c6c253e01 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm-nocap/datadog-agent-ddot.yaml @@ -17,5 +17,6 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.yaml index 12a5c0c94806..17593d3a96f2 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot-exp.yaml @@ -17,6 +17,7 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent-exp/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent-exp/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal DD_INVENTORIES_FIRST_RUN_DELAY: "5" stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.yaml index 4e159cd4ee85..b06c6c253e01 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/debrpm/datadog-agent-ddot.yaml @@ -17,5 +17,6 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.yaml index 3b6342cb4453..06755549e6fd 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot-exp.yaml @@ -17,6 +17,7 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent-exp/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent-exp/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal DD_INVENTORIES_FIRST_RUN_DELAY: "5" stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.yaml index 0e10ee88c239..1280e8e74295 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci-nocap/datadog-agent-ddot.yaml @@ -17,5 +17,6 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.yaml index 3b6342cb4453..06755549e6fd 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot-exp.yaml @@ -17,6 +17,7 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent-exp/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent-exp/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal DD_INVENTORIES_FIRST_RUN_DELAY: "5" stdout: inherit stderr: inherit diff --git a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.yaml b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.yaml index 0e10ee88c239..1280e8e74295 100644 --- a/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.yaml +++ b/pkg/fleet/installer/packages/embedded/tmpl/gen/oci/datadog-agent-ddot.yaml @@ -17,5 +17,6 @@ start_limit_burst: 5 environment_file: -/etc/datadog-agent/environment env: DD_FLEET_POLICIES_DIR: /etc/datadog-agent/managed/datadog-agent/stable + DD_OTELCOLLECTOR_INSTALLATION_METHOD: bare-metal stdout: inherit stderr: inherit From 44b4de694aaf0c2e7095048075c028b9d4f3df4e Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Thu, 19 Mar 2026 16:37:46 +0100 Subject: [PATCH 10/10] Address codex comment --- .../installer/packages/datadog_agent_ddot_windows.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go b/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go index 0117de5a9d6e..b7548667df37 100644 --- a/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go +++ b/pkg/fleet/installer/packages/datadog_agent_ddot_windows.go @@ -346,16 +346,16 @@ func configureDDOTServicePermissions(s *mgr.Service) { // setDDOTServiceEnvVars writes the DDOT service environment variables to the registry. func setDDOTServiceEnvVars() error { - key, _, err := registry.CreateKey( + key, err := registry.OpenKey( registry.LOCAL_MACHINE, - `SYSTEM\CurrentControlSet\Services\`+otelServiceName+`\Environment`, + `SYSTEM\CurrentControlSet\Services\`+otelServiceName, registry.SET_VALUE, ) if err != nil { - return fmt.Errorf("failed to open service environment registry key: %w", err) + return fmt.Errorf("failed to open service registry key: %w", err) } defer key.Close() - return key.SetStringsValue("", []string{"DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal"}) + return key.SetStringsValue("Environment", []string{"DD_OTELCOLLECTOR_INSTALLATION_METHOD=bare-metal"}) } // stopServiceIfExists stops the service if it exists