Consider nil tag processor in wmeta collector for tests

DataDog · Jan 10, 2025 · 8530b0e · 8530b0e
1 parent aaecb0a
commit 8530b0e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 243 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -466,7 +466,6 @@
 /pkg/util/kubernetes/                   @DataDog/container-integrations @DataDog/container-platform @DataDog/container-app
 /pkg/util/podman/                       @DataDog/container-integrations
 /pkg/util/prometheus                    @DataDog/container-integrations
-/pkg/util/tags/                         @DataDog/container-platform
 /pkg/util/trivy/                        @DataDog/container-integrations @DataDog/agent-security
 /pkg/util/uuid/                         @DataDog/agent-shared-components
 /pkg/util/cgroups/                      @DataDog/container-integrations

diff --git a/comp/core/tagger/collectors/workloadmeta_main.go b/comp/core/tagger/collectors/workloadmeta_main.go
@@ -173,7 +173,9 @@ func NewWorkloadMetaCollector(ctx context.Context, cfg config.Component, store w
 	c.initK8sResourcesMetaAsTags(metadataAsTags.GetResourcesLabelsAsTags(), metadataAsTags.GetResourcesAnnotationsAsTags())
 
 	// initializes with the static global tags
-	c.collectStaticGlobalTags(ctx, cfg)
+	if c.tagProcessor != nil {
+		c.collectStaticGlobalTags(ctx, cfg)
+	}
 
 	return c
 }

diff --git a/comp/dogstatsd/server/server_util_test.go b/comp/dogstatsd/server/server_util_test.go
@@ -91,6 +91,7 @@ func fulfillDepsWithConfigOverride(t testing.TB, overrides map[string]interface{
 		demultiplexerimpl.FakeSamplerMockModule(),
 		workloadmetafxmock.MockModule(workloadmeta.NewParams()),
 		taggermock.Module(),
+		fx.Provide(func(mock taggermock.Mock) tagger.Component { return mock }),
 		Module(Params{Serverless: false}),
 	))
 }
@@ -108,6 +109,7 @@ func fulfillDepsWithConfigYaml(t testing.TB, yaml string) serverDeps {
 		demultiplexerimpl.FakeSamplerMockModule(),
 		workloadmetafxmock.MockModule(workloadmeta.NewParams()),
 		taggermock.Module(),
+		fx.Provide(func(mock taggermock.Mock) tagger.Component { return mock }),
 		Module(Params{Serverless: false}),
 	))
 }
@@ -128,6 +130,7 @@ func fulfillDepsWithInactiveServer(t *testing.T, cfg map[string]interface{}) (de
 		demultiplexerimpl.FakeSamplerMockModule(),
 		workloadmetafxmock.MockModule(workloadmeta.NewParams()),
 		taggermock.Module(),
+		fx.Provide(func(mock taggermock.Mock) tagger.Component { return mock }),
 	))
 
 	s := newServerCompat(deps.Config, deps.Log, deps.Replay, deps.Debug, false, deps.Demultiplexer, deps.WMeta, deps.PidMap, deps.Telemetry, deps.Tagger)

diff --git a/pkg/util/tags/static_tags.go b/pkg/util/tags/static_tags.go
diff --git a/pkg/util/tags/static_tags_test.go b/pkg/util/tags/static_tags_test.go