merge conflict

DataDog · Jan 23, 2024 · 3461741 · 3461741
1 parent 8b45de6
commit 3461741
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/pkg/collector/corechecks/containers/docker/check_test.go b/pkg/collector/corechecks/containers/docker/check_test.go
@@ -11,8 +11,6 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/DataDog/datadog-agent/pkg/util/containers/metrics"
-	"github.com/DataDog/datadog-agent/pkg/util/pointer"
 	dockerTypes "github.com/docker/docker/api/types"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/fx"

diff --git a/test/integration/corechecks/docker/main_test.go b/test/integration/corechecks/docker/main_test.go
@@ -100,6 +100,12 @@ func TestMain(m *testing.M) {
 	}
 }
 
+type testDeps struct {
+	fx.In
+	store      workloadmeta.Component
+	taggerComp tagger.Component
+}
+
 // Called before for first test run: compose up
 func setup() (workloadmeta.Component, error) {
 	// Setup global conf
@@ -111,7 +117,8 @@ func setup() (workloadmeta.Component, error) {
 	config.SetFeaturesNoCleanup(config.Docker)
 
 	// Note: workloadmeta will be started by fx with the App
-	fxApp, _, err = fxutil.TestApp[tagger.Component](fx.Options(
+	var deps testDeps
+	fxApp, deps, err = fxutil.TestApp[testDeps](fx.Options(
 		fx.Supply(compcfg.NewAgentParams(
 			"", compcfg.WithConfigMissingOK(true))),
 		compcfg.Module(),
@@ -123,6 +130,8 @@ func setup() (workloadmeta.Component, error) {
 		tagger.Module(),
 		fx.Supply(tagger.NewTaggerParams()),
 	))
+	store := deps.store
+	workloadmeta.SetGlobalStore(store)
 
 	// Start compose recipes
 	for projectName, file := range defaultCatalog.composeFilesByProjects {