From a501def5d5d419d5d9bc3d195e862ef5ab3d20ce Mon Sep 17 00:00:00 2001 From: Adrien Boitreaud <72934368+aboitreaud@users.noreply.github.com> Date: Tue, 4 Mar 2025 16:56:36 +0100 Subject: [PATCH] [DJM] Enable DSM on DD_DATA_STREAMS_ENABLED (#34688) Co-authored-by: Paul Laffon --- pkg/fleet/installer/setup/djm/emr.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkg/fleet/installer/setup/djm/emr.go b/pkg/fleet/installer/setup/djm/emr.go index be561dd22204dc..ef06f99c58bcab 100644 --- a/pkg/fleet/installer/setup/djm/emr.go +++ b/pkg/fleet/installer/setup/djm/emr.go @@ -86,6 +86,15 @@ func SetupEmr(s *common.Setup) error { s.Config.DatadogYAML.DJM.Enabled = true s.Config.InjectTracerYAML.AdditionalEnvironmentVariables = tracerEnvConfigEmr + if os.Getenv("DD_DATA_STREAMS_ENABLED") == "true" { + s.Out.WriteString("Propagating variable DD_DATA_STREAMS_ENABLED=true to tracer configuration\n") + DSMEnabled := common.InjectTracerConfigEnvVar{ + Key: "DD_DATA_STREAMS_ENABLED", + Value: "true", + } + s.Config.InjectTracerYAML.AdditionalEnvironmentVariables = append(tracerEnvConfigEmr, DSMEnabled) + } + // Ensure tags are always attached with the metrics s.Config.DatadogYAML.ExpectedTagsDuration = "10m" isMaster, clusterName, err := setupCommonEmrHostTags(s) @@ -100,7 +109,6 @@ func SetupEmr(s *common.Setup) error { if os.Getenv("DD_EMR_LOGS_ENABLED") == "true" { s.Out.WriteString("Enabling EMR logs collection based on env variable DD_EMR_LOGS_ENABLED=true\n") enableEmrLogs(s) - } else { s.Out.WriteString("EMR logs collection not enabled. To enable it, set DD_EMR_LOGS_ENABLED=true\n") }