Add otelcollector.installation_method and set for DDOT bare-metal

comp/otelcol/collector-contrib/impl/go.mod

@@ -550,6 +550,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/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
 
 replace (

comp/otelcol/converter/impl/autoconfigure.go

@@ -67,8 +67,9 @@ 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"),
 			}
 		}
 		addComponentToConfig(conf, extension)

comp/otelcol/converter/impl/testdata/extensions/ddflare-and-dd/datadog/config-result.yaml

@@ -15,6 +15,7 @@ extensions:
       site: "datadoghq.com"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
   ddflare/dd-autoconfigured:
 
 service:

comp/otelcol/converter/impl/testdata/extensions/empty-extensions/datadog/config-result.yaml

@@ -15,6 +15,7 @@ extensions:
       site: "datadoghq.com"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
 
 service:
   extensions:

comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog-gateway/config-result.yaml

@@ -15,6 +15,7 @@ extensions:
       site: "datadoghq.com"
     deployment_type: gateway
     hostname: test-host
+    installation_method: ""
 
 service:
   extensions:

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]
+    features: [pprof, zpages, health_check, datadog]
+  installation_method: bare-metal

comp/otelcol/converter/impl/testdata/extensions/no-extensions/datadog/config-result.yaml

@@ -15,6 +15,7 @@ extensions:
       site: "datadoghq.com"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: "bare-metal"
 
 service:
   extensions:

comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog-site/config-result.yaml

@@ -17,6 +17,7 @@ extensions:
       site: "us5.datadoghq.com"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
 
 service:
   extensions:

comp/otelcol/converter/impl/testdata/extensions/other-extensions/datadog/config-result.yaml

@@ -17,6 +17,7 @@ extensions:
       site: "datadoghq.com"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
 
 service:
   extensions:

comp/otelcol/converter/impl/testdata/features/all-features/config-result.yaml

@@ -11,6 +11,7 @@ extensions:
       site: "datadoghq.eu"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
   ddflare/dd-autoconfigured:
   health_check/dd-autoconfigured:
   pprof/dd-autoconfigured:

comp/otelcol/converter/impl/testdata/features/no-defined-features/config-result.yaml

@@ -11,6 +11,7 @@ extensions:
       site: "datadoghq.eu"
     deployment_type: daemonset
     hostname: test-host
+    installation_method: ""
   ddflare/dd-autoconfigured:
   health_check/dd-autoconfigured:
   pprof/dd-autoconfigured:

go.mod

@@ -1253,6 +1253,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/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
 
 replace (

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)

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
 }

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}}

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

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

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

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

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

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

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

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

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

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

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