[AGTHEAL-115] refactor(core): migrate comp/core/flare to V2 component architecture by louis-cqrl · Pull Request #49769 · DataDog/datadog-agent

louis-cqrl · 2026-04-23T12:43:20Z

What does this PR do?

Fully migrates `comp/core/flare` from the V1 component architecture to V2:

`comp/core/flare/def/component.go` — `Component` interface, `Params` struct, `NewParams`/`NewLocalParams` constructors
`comp/core/flare/impl/` — full implementation moved from root package: `flareImpl` struct, `NewComponent` constructor, all flare creation/send logic, provider collection
`comp/core/flare/fx/fx.go` — uses `fxutil.ProvideComponentConstructor(impl.NewComponent)`
`comp/core/flare/mock/` — new V2 mock replacing the old `flareimpl/mock.go`
`comp/core/flare/types/` — `FlareSource` moved here from `helpers/` (types package is explicitly designed for "types without implementation dependencies"); all callers updated
Deleted all V1 root-level files: `flare.go`, `component.go`, `params.go`, `providers.go`, `flare_test.go`, and the entire `flareimpl/` directory
All external callers updated to import from `def/`, `fx/`, and `mock/` directly (no backward-compat shims)

Motivation

Align `comp/core/flare` with the V2 component architecture used across the codebase. This is a complete migration — no V1 relics remain.

Describe how you validated your changes

All pre-commit hooks pass (go-fmt, go-linter, go-mod-tidy)
Implementation is a direct move of existing logic with only package/naming changes required by the V2 pattern
All callers across `cmd/`, `comp/`, and `pkg/` updated to new import paths

Additional Notes

`FlareSource` was moved from `comp/core/flare/helpers` to `comp/core/flare/types` as part of this migration — `types` is the correct home for types that should be usable without pulling in implementation dependencies.

hush-hush · 2026-06-09T09:22:47Z

+				fx.Supply(flareParams),
+				flarfx.Module(),


Do not use Supply please ! It divide the init for params into two calls that can be widely apart in different helpers making troubleshooting the init very complicated. The idea of taking the params in the module init is intentional.

hush-hush · 2026-06-09T09:24:02Z

-	fillerModule := fxutil.Component(fillers...)
+// testDeps mirrors Requires but embeds fx.In so fxutil.Test can populate it field-by-field.
+type testDeps struct {
+	fx.In


Let's not use FX in the tests. FX should remain contained to the fx* folders.

louis-cqrl · 2026-06-09T14:05:55Z

@@ -15,12 +15,16 @@ import (
 	"go.uber.org/fx"


mock/ must not import go.uber.org/fx. From the component docs: fx/ must be the only folder importing and referencing Fx. MockModule() and MockProvides{fx.Out ...} belong in fx/, not in mock/. The mock/ folder should only implement flare.Component and expose a plain New(t *testing.T) Provides constructor.

Fixed — removed go.uber.org/fx, fxutil, MockModule(), and MockProvides{fx.Out} from mock/mock.go. The mock package now has zero fx dependency.

louis-cqrl · 2026-06-09T14:08:24Z

+}
+
 // MockModule defines the fx options for the mock component.
 func MockModule() fxutil.Module {


MockModule() belongs in fx/ (or a fx-mock/ sub-package), not in mock/. The mock/ package should have zero fx dependency.

Also: NewMock() has no *testing.T parameter. The component docs require the standalone constructor to be:

func New(t *testing.T) Provides { return Provides{Comp: &MockFlare{}} }

This lets impl/ tests call flaremock.New(t) directly without going through fx.

Fixed — MockModule() removed entirely (no callers). NewMock() renamed to New(t \*testing.T) Provides with a plain Provides struct (no fx.Out). The single caller in agentprofiling_test.go updated to flaremock.New(t).Comp.

louis-cqrl · 2026-06-09T14:09:19Z

-
 	api "github.com/DataDog/datadog-agent/comp/api/api/def"
 	apiutils "github.com/DataDog/datadog-agent/comp/api/api/utils"
 	"github.com/DataDog/datadog-agent/comp/core/config"


This imports the root comp/core/config package instead of comp/core/config/def.

Per the component import graph rules: impl/ must depend on other components only through their def/ package — never the root package or impl/. Change to:

config "github.com/DataDog/datadog-agent/comp/core/config/def"

Acknowledged — comp/core/config/def doesn't exist on main yet (it's in a separate pending PR #49787). Added a TODO comment in impl.go to migrate to config/def once that PR is merged. Will update this import then.

Split comp/core/flare into def/impl/mock/fx sub-packages following the V2 component pattern, removing fx.In/fx.Out from impl and exporting Requires/Provides structs. Update all callers to import from the new sub-packages.

hush-hush · 2026-06-10T15:57:08Z

 		log:       deps.Log,
 		config:    deps.Config,
 		params:    deps.Params,
-		providers: fxutil.GetAndFilterGroup(deps.Providers),


Why replace the function by an internal helper ?

hush-hush · 2026-06-10T15:59:52Z

+
+// Module returns an fxutil.Module that registers the extra flare providers
+// (providers not owned by a specific component) into the flare group.
+func Module() fxutil.Module {
+	return fxutil.Component(
+		fx.Provide(
+			fx.Annotate(
+				func(wm option.Option[workloadmeta.Component], ipcComp ipc.Component) []*flaretypes.FlareFiller {
+					return ExtraFlareProviders(wm, ipcComp)
+				},
+				fx.ResultTags(`group:"flare,flatten"`),
+			),
+		),
+	)
+}


Using FX within pkg should be avoided. We want to move toward a state where pkg is a bunch of stateless helpers.

Why can't we move this within the flare comp ? This is the legacy part of the flare that will, maybe one day, be migrated by each teams in within their comp.

nathan-b

ARUN files look clean. I like that you pulled the tests along on this one.

dd-octo-sts · 2026-07-04T05:22:08Z

This pull request has been automatically marked as stale because it has not had activity in the past 15 days.

It will be closed in 30 days if no further activity occurs. If this pull request is still relevant, adding a comment or pushing new commits will keep it open. Also, you can always reopen the pull request if you missed the window.

Thank you for your contributions!

dd-octo-sts · 2026-07-31T10:58:33Z

This pull request has been automatically marked as stale because it has not had activity in the past 15 days.

It will be closed in 30 days if no further activity occurs. If this pull request is still relevant, adding a comment or pushing new commits will keep it open. Also, you can always reopen the pull request if you missed the window.

Thank you for your contributions!

dd-octo-sts Bot added internal Identify a non-fork PR team/agent-configuration team/agent-build labels Apr 23, 2026

github-actions Bot added the medium review PR review might take time label Apr 23, 2026

dd-octo-sts Bot added the team/agent-devx label Apr 23, 2026

github-actions Bot removed the medium review PR review might take time label Apr 23, 2026

dd-octo-sts Bot added the team/agent-runtimes label Apr 23, 2026

github-actions Bot added the long review PR is complex, plan time to review it label Apr 23, 2026

dd-octo-sts Bot added the team/ebpf-platform label Apr 23, 2026

github-actions Bot added the component/system-probe label Apr 23, 2026

dd-octo-sts Bot added the team/agent-log-pipelines label Apr 23, 2026

louis-cqrl added changelog/no-changelog No changelog entry needed qa/done QA done before merge and regressions are covered by tests labels Apr 24, 2026

dd-octo-sts Bot added team/agent-security team/windows-products labels Apr 24, 2026

louis-cqrl changed the title ~~refactor(core): migrate comp/core/flare to V2 component architecture~~ [AGTHEAL-115] refactor(core): migrate comp/core/flare to V2 component architecture Apr 24, 2026

This comment was marked as resolved.

Sign in to view

dd-octo-sts Bot added stale and removed stale labels May 9, 2026

louis-cqrl force-pushed the louis-cqrl/refactor-core-flare-to-v2 branch 2 times, most recently from 442b4ed to c033c2d Compare May 12, 2026 15:58

DataDog deleted a comment from dd-octo-sts Bot May 13, 2026

DataDog deleted a comment from datadog-datadog-prod-us1-2 Bot May 13, 2026

DataDog deleted a comment from dd-octo-sts Bot May 13, 2026

DataDog deleted a comment from cit-pr-commenter-54b7da Bot May 13, 2026

DataDog deleted a comment from dd-octo-sts Bot May 13, 2026

louis-cqrl requested review from NouhaManai96 and mackjmr and removed request for a team June 8, 2026 12:46

github-actions Bot deleted a comment from chatgpt-codex-connector Bot Jun 8, 2026

KevinFairise2 approved these changes Jun 8, 2026

View reviewed changes

github-actions Bot deleted a comment from chatgpt-codex-connector Bot Jun 8, 2026

Pierre-L42 approved these changes Jun 8, 2026

View reviewed changes

mackjmr approved these changes Jun 8, 2026

View reviewed changes

clarkb7 approved these changes Jun 8, 2026

View reviewed changes

RiantZ approved these changes Jun 8, 2026

View reviewed changes

aiuto approved these changes Jun 8, 2026

View reviewed changes

gh123man approved these changes Jun 8, 2026

View reviewed changes

kkhor-datadog approved these changes Jun 8, 2026

View reviewed changes

hush-hush requested changes Jun 9, 2026

View reviewed changes

louis-cqrl force-pushed the louis-cqrl/refactor-core-flare-to-v2 branch from 8892dbb to 0a73cc0 Compare June 9, 2026 09:45

louis-cqrl commented Jun 9, 2026

View reviewed changes

hush-hush requested changes Jun 10, 2026

View reviewed changes

nathan-b approved these changes Jun 18, 2026

View reviewed changes

Uh oh!

Conversation

louis-cqrl commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Motivation

Describe how you validated your changes

Additional Notes

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nathan-b left a comment

Choose a reason for hiding this comment

Uh oh!

dd-octo-sts Bot commented Jul 4, 2026

Uh oh!

dd-octo-sts Bot commented Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

louis-cqrl commented Apr 23, 2026 •

edited

Loading