[AGTHEAL-97] refactor(metadata): migrate resources component to v2 (#49823)

louis-cqrl · web-flow · commit 2c3c2828c73c · 2026-04-27T11:20:06.000Z
### What does this PR do?

Migrates `comp/metadata/resources` from V1 to V2 component architecture.

- `component.go` → `def/component.go` (interface only)
- `resourcesimpl/` → `impl/` (renamed, `Module()` removed from params.go)
- New `fx/fx.go` using `fxutil.ProvideComponentConstructor`
- `component_mock.go` + `resourcesimpl/resources_mock.go` → `mock/mock.go` (`MockParams` moved to mock package)
- All callers updated: `bundle.go`, `hostimpl`, `dogstatsd/start`, `flare`

### Motivation

Align `comp/metadata/resources` with the V2 component conventions used across the rest of the codebase (e.g. `hostgpu`, `hostsysteminfo`, `haagent`).

### Describe how you validated your changes

Existing tests migrated alongside the implementation. `params_test.go` and `resources_test.go` updated to use `NewComponent`/`Requires` instead of `newResourcesProvider`/`dependencies`.

### Additional Notes

`Params` keeps `optional:"true"` via `fx.In` embedding in `Requires` — callers that need to disable resources (e.g. dogstatsd) still use `fx.Supply(resourcesimpl.Disabled())`.

Co-authored-by: louis.coquerelle &lt;louis.coquerelle@datadoghq.com&gt;
diff --git a/cmd/agent/subcommands/flare/command.go b/cmd/agent/subcommands/flare/command.go
@@ -62,7 +62,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/metadata/host/hostimpl"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryagent/inventoryagentimpl"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryhost/inventoryhostimpl"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources/resourcesimpl"
+	resourcesfx "github.com/DataDog/datadog-agent/comp/metadata/resources/fx"
 	logscompressorfx "github.com/DataDog/datadog-agent/comp/serializer/logscompression/fx"
 	metricscompressorfx "github.com/DataDog/datadog-agent/comp/serializer/metricscompression/fx"
 	"github.com/DataDog/datadog-agent/pkg/config/settings"
@@ -163,7 +163,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 				hostimpl.Module(),
 				inventoryhostimpl.Module(),
 				haagentmetadatafx.Module(),
-				resourcesimpl.Module(),
+				resourcesfx.Module(),
 				// inventoryagent require a serializer. Since we're not actually sending the payload to
 				// the backend a nil will work.
 				fx.Provide(func() serializer.MetricSerializer {
diff --git a/cmd/dogstatsd/subcommands/start/command.go b/cmd/dogstatsd/subcommands/start/command.go
@@ -52,8 +52,9 @@ import (
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryagent/inventoryagentimpl"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryhost"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryhost/inventoryhostimpl"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources/resourcesimpl"
+	resources "github.com/DataDog/datadog-agent/comp/metadata/resources/def"
+	resourcesfx "github.com/DataDog/datadog-agent/comp/metadata/resources/fx"
+	resourcesimpl "github.com/DataDog/datadog-agent/comp/metadata/resources/impl"
 	"github.com/DataDog/datadog-agent/comp/metadata/runner"
 	metadatarunnerimpl "github.com/DataDog/datadog-agent/comp/metadata/runner/runnerimpl"
 	logscompressionfx "github.com/DataDog/datadog-agent/comp/serializer/logscompression/fx"
@@ -160,7 +161,7 @@ func RunDogstatsdFct(cliParams *CLIParams, defaultConfPath string, defaultLogFil
 		}),
 		fx.Supply(resourcesimpl.Disabled()),
 		metadatarunnerimpl.Module(),
-		resourcesimpl.Module(),
+		resourcesfx.Module(),
 		hostimpl.Module(),
 		inventoryagentimpl.Module(),
 		ipcfx.ModuleReadWrite(),
diff --git a/comp/metadata/bundle.go b/comp/metadata/bundle.go
@@ -16,7 +16,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/metadata/inventorychecks/inventorychecksimpl"
 	"github.com/DataDog/datadog-agent/comp/metadata/inventoryhost/inventoryhostimpl"
 	packagesigningfx "github.com/DataDog/datadog-agent/comp/metadata/packagesigning/fx"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources/resourcesimpl"
+	resourcesfx "github.com/DataDog/datadog-agent/comp/metadata/resources/fx"
 	"github.com/DataDog/datadog-agent/comp/metadata/runner/runnerimpl"
 	securityagent "github.com/DataDog/datadog-agent/comp/metadata/securityagent/fx"
 	systemprobe "github.com/DataDog/datadog-agent/comp/metadata/systemprobe/fx"
@@ -29,7 +29,7 @@ import (
 func Bundle() fxutil.BundleOptions {
 	return fxutil.Bundle(
 		runnerimpl.Module(),
-		resourcesimpl.Module(),
+		resourcesfx.Module(),
 		hostimpl.Module(),
 		inventoryagentimpl.Module(),
 		inventoryhostimpl.Module(),
diff --git a/comp/metadata/host/hostimpl/host.go b/comp/metadata/host/hostimpl/host.go
@@ -23,7 +23,7 @@ import (
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	"github.com/DataDog/datadog-agent/comp/core/status"
 	hostComp "github.com/DataDog/datadog-agent/comp/metadata/host"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources"
+	resources "github.com/DataDog/datadog-agent/comp/metadata/resources/def"
 	"github.com/DataDog/datadog-agent/comp/metadata/runner/runnerimpl"
 	"github.com/DataDog/datadog-agent/pkg/config/env"
 	configUtils "github.com/DataDog/datadog-agent/pkg/config/utils"
diff --git a/comp/metadata/host/hostimpl/host_test.go b/comp/metadata/host/hostimpl/host_test.go
@@ -21,8 +21,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameimpl"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	logmock "github.com/DataDog/datadog-agent/comp/core/log/mock"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources/resourcesimpl"
+	resourcesmock "github.com/DataDog/datadog-agent/comp/metadata/resources/mock"
 	"github.com/DataDog/datadog-agent/pkg/serializer"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 )
@@ -33,8 +32,8 @@ func TestNewHostProviderDefaultIntervals(t *testing.T) {
 			t,
 			fx.Provide(func() log.Component { return logmock.New(t) }),
 			fx.Provide(func() config.Component { return config.NewMock(t) }),
-			resourcesimpl.MockModule(),
-			fx.Replace(resources.MockParams{Data: nil}),
+			resourcesmock.MockModule(),
+			fx.Replace(resourcesmock.MockParams{Data: nil}),
 			fx.Provide(func() serializer.MetricSerializer { return nil }),
 			hostnameimpl.MockModule(),
 		),
@@ -120,8 +119,8 @@ func TestNewHostProviderIntervalValidation(t *testing.T) {
 					t,
 					fx.Provide(func() log.Component { return logmock.New(t) }),
 					fx.Provide(func() config.Component { return config.NewMockWithOverrides(t, overrides) }),
-					resourcesimpl.MockModule(),
-					fx.Replace(resources.MockParams{Data: nil}),
+					resourcesmock.MockModule(),
+					fx.Replace(resourcesmock.MockParams{Data: nil}),
 					fx.Provide(func() serializer.MetricSerializer { return nil }),
 					hostnameimpl.MockModule(),
 				),
@@ -147,8 +146,8 @@ func TestBackoffWhenEarlyIntervalEqualsCollectionInterval(t *testing.T) {
 	ret := newHostProvider(fxutil.Test[dependencies](t,
 		fx.Provide(func() log.Component { return logmock.New(t) }),
 		fx.Provide(func() config.Component { return config.NewMockWithOverrides(t, overrides) }),
-		resourcesimpl.MockModule(),
-		fx.Replace(resources.MockParams{Data: nil}),
+		resourcesmock.MockModule(),
+		fx.Replace(resourcesmock.MockParams{Data: nil}),
 		fx.Provide(func() serializer.MetricSerializer { return nil }),
 		hostnameimpl.MockModule(),
 	))
@@ -166,8 +165,8 @@ func TestFlareProvider(t *testing.T) {
 			t,
 			fx.Provide(func() log.Component { return logmock.New(t) }),
 			fx.Provide(func() config.Component { return config.NewMock(t) }),
-			resourcesimpl.MockModule(),
-			fx.Replace(resources.MockParams{Data: nil}),
+			resourcesmock.MockModule(),
+			fx.Replace(resourcesmock.MockParams{Data: nil}),
 			fx.Provide(func() serializer.MetricSerializer { return nil }),
 			hostnameimpl.MockModule(),
 		),
@@ -186,8 +185,8 @@ func TestStatusHeaderProvider(t *testing.T) {
 			t,
 			fx.Provide(func() log.Component { return logmock.New(t) }),
 			fx.Provide(func() config.Component { return config.NewMock(t) }),
-			resourcesimpl.MockModule(),
-			fx.Replace(resources.MockParams{Data: nil}),
+			resourcesmock.MockModule(),
+			fx.Replace(resourcesmock.MockParams{Data: nil}),
 			fx.Provide(func() serializer.MetricSerializer { return nil }),
 			hostnameimpl.MockModule(),
 		),
diff --git a/comp/metadata/resources/component_mock.go b/comp/metadata/resources/component_mock.go
diff --git a/comp/metadata/resources/def/BUILD.bazel b/comp/metadata/resources/def/BUILD.bazel
@@ -1,11 +1,8 @@
 load("@rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "resources",
-    srcs = [
-        "component.go",
-        "component_mock.go",
-    ],
-    importpath = "github.com/DataDog/datadog-agent/comp/metadata/resources",
+    name = "def",
+    srcs = ["component.go"],
+    importpath = "github.com/DataDog/datadog-agent/comp/metadata/resources/def",
     visibility = ["//visibility:public"],
 )
diff --git a/comp/metadata/resources/def/component.go b/comp/metadata/resources/def/component.go
diff --git a/comp/metadata/resources/fx/fx.go b/comp/metadata/resources/fx/fx.go
@@ -0,0 +1,19 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
+// Package fx provides the fx module for the resources metadata component
+package fx
+
+import (
+	resourcesimpl "github.com/DataDog/datadog-agent/comp/metadata/resources/impl"
+	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
+)
+
+// Module defines the fx options for this component.
+func Module() fxutil.Module {
+	return fxutil.Component(
+		fxutil.ProvideComponentConstructor(resourcesimpl.NewComponent),
+	)
+}
diff --git a/comp/metadata/resources/impl/params.go b/comp/metadata/resources/impl/params.go
@@ -5,11 +5,6 @@
 
 package resourcesimpl
 
-import (
-	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
-	"go.uber.org/fx"
-)
-
 // Params defines the parameters for the metadata resources component.
 type Params struct {
 	// Disabled determines if the resources payload will be sent. When disabled, the Get method is still available.
@@ -22,9 +17,3 @@ func Disabled() *Params {
 		Disabled: true,
 	}
 }
-
-// Module defines the fx options for this component.
-func Module() fxutil.Module {
-	return fxutil.Component(
-		fx.Provide(newResourcesProvider))
-}
diff --git a/comp/metadata/resources/impl/params_test.go b/comp/metadata/resources/impl/params_test.go
diff --git a/comp/metadata/resources/impl/resources.go b/comp/metadata/resources/impl/resources.go
@@ -12,12 +12,12 @@ import (
 	"runtime"
 	"time"
 
-	"go.uber.org/fx"
+	compdef "github.com/DataDog/datadog-agent/comp/def"
 
 	"github.com/DataDog/datadog-agent/comp/core/config"
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources"
+	resources "github.com/DataDog/datadog-agent/comp/metadata/resources/def"
 	"github.com/DataDog/datadog-agent/comp/metadata/runner/runnerimpl"
 	configUtils "github.com/DataDog/datadog-agent/pkg/config/utils"
 	"github.com/DataDog/datadog-agent/pkg/gohai/processes"
@@ -35,16 +35,18 @@ type resourcesImpl struct {
 	serializer      serializer.MetricSerializer
 }
 
-type dependencies struct {
-	fx.In
+// Requires defines the dependencies for the resources metadata component.
+//
+// Resources is enabled by default for most binaries. But even for binaries where we don't want to send the
+// 'resources' paylod, like dogstatsd, we still need the resources Component. This is because the resources data
+// is embedded in other metadata payload like 'host'. This means that even if resources is disabled it might be
+// required in the build in order for the `Get` method to be available.
+//
+// This is why we have a Params struct for resources. It's `optional` so most of the binaries don't have to
+// supply a Params struct but only need to import the metadata.Bundle.
+type Requires struct {
+	compdef.In
 
-	// Resources is enabled by default for most binaries. But even for binaries where we don't want to send the
-	// 'resources' paylod, like dogstatsd, we still need the resources Component. This is because the resources data
-	// is embedded in other metadata payload like 'host'. This means that even if resources is disabled it might be
-	// required in the build in order for the `Get` method to be available.
-	//
-	// This is why we have a Params struct for resources. It's `optional` so most of the binaries don't have to
-	// supply a Params struct but only need to import the metadata.Bundle.
 	Params *Params `optional:"true"`
 
 	Log        log.Component
@@ -53,14 +55,16 @@ type dependencies struct {
 	Hostname   hostnameinterface.Component
 }
 
-type provides struct {
-	fx.Out
+// Provides defines the output of the resources metadata component.
+type Provides struct {
+	compdef.Out
 
 	Comp     resources.Component
 	Provider runnerimpl.Provider
 }
 
-func newResourcesProvider(deps dependencies) provides {
+// NewComponent creates a new resources metadata component.
+func NewComponent(deps Requires) Provides {
 	// By default, the 'resources' metadata is only enabled on Linux. Users can manually enable it on darwin
 	// platform. This is legacy behavior from Agent V5.
 	enabled := runtime.GOOS == "linux"
@@ -87,7 +91,7 @@ func newResourcesProvider(deps dependencies) provides {
 		collectInterval: collectInterval,
 		serializer:      deps.Serializer,
 	}
-	res := provides{
+	res := Provides{
 		Comp: &r,
 	}
 
diff --git a/comp/metadata/resources/impl/resources_non_supported.go b/comp/metadata/resources/impl/resources_non_supported.go
@@ -8,22 +8,33 @@
 package resourcesimpl
 
 import (
+	compdef "github.com/DataDog/datadog-agent/comp/def"
+
 	"github.com/DataDog/datadog-agent/comp/core/config"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
-	"github.com/DataDog/datadog-agent/comp/metadata/resources"
-	"go.uber.org/fx"
+	resources "github.com/DataDog/datadog-agent/comp/metadata/resources/def"
 )
 
 type resourcesImpl struct{}
 
-type provides struct {
-	fx.Out
+// Requires defines the dependencies for the resources metadata component (non-supported platforms).
+type Requires struct {
+	compdef.In
+
+	Log    log.Component
+	Config config.Component
+}
+
+// Provides defines the output of the resources metadata component (non-supported platforms).
+type Provides struct {
+	compdef.Out
 
 	Comp resources.Component
 }
 
-func newResourcesProvider(_ log.Component, _ config.Component) provides {
-	return provides{
+// NewComponent creates a new resources metadata component for non-supported platforms.
+func NewComponent(_ Requires) Provides {
+	return Provides{
 		// We return a dummy Component
 		Comp: &resourcesImpl{},
 	}
diff --git a/comp/metadata/resources/impl/resources_test.go b/comp/metadata/resources/impl/resources_test.go
diff --git a/comp/metadata/resources/mock/mock.go b/comp/metadata/resources/mock/mock.go
