refactor(core): migrate comp/core/flare to V2 component architecture

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.

Author: louis-cqrl

BUILD.bazel

@@ -122,8 +122,6 @@ exports_files(glob(
 # gazelle:exclude comp/core/diagnose/fx
 # gazelle:exclude comp/core/diagnose/impl
 # gazelle:exclude comp/core/diagnose/local
-# gazelle:exclude comp/core/flare/flareimpl
-# gazelle:exclude comp/core/flare/helpers
 # gazelle:exclude comp/core/gui/fx
 # gazelle:exclude comp/core/gui/impl
 # gazelle:exclude comp/core/hostname/remotehostnameimpl

cmd/agent/subcommands/flare/command.go

@@ -34,8 +34,8 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/diagnose/format"
 	diagnosefx "github.com/DataDog/datadog-agent/comp/core/diagnose/fx"
 	diagnoseLocal "github.com/DataDog/datadog-agent/comp/core/diagnose/local"
-	"github.com/DataDog/datadog-agent/comp/core/flare"
-	"github.com/DataDog/datadog-agent/comp/core/flare/helpers"
+	flare "github.com/DataDog/datadog-agent/comp/core/flare/def"
+	flarfx "github.com/DataDog/datadog-agent/comp/core/flare/fx"
 	flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types"
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameimpl"
 	ipc "github.com/DataDog/datadog-agent/comp/core/ipc/def"
@@ -135,7 +135,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 					SysprobeConfigParams: sysprobeconfigimpl.NewParams(sysprobeconfigimpl.WithSysProbeConfFilePath(globalParams.SysProbeConfFilePath), sysprobeconfigimpl.WithFleetPoliciesDirPath(globalParams.FleetPoliciesDirPath)),
 					LogParams:            log.ForOneShot(command.LoggerName, cliParams.logLevelDefaultOff.Value(), false),
 				}),
-				flare.Module(flareParams),
+				flarfx.Module(flareParams),
 				flareprofilerfx.Module(),
 				// workloadmeta setup
 				wmcatalog.GetCatalog(),
@@ -320,7 +320,7 @@ func makeFlare(flareComp flare.Component,
 		}
 	}
 
-	response, e := flareComp.Send(filePath, caseID, customerEmail, helpers.NewLocalFlareSource())
+	response, e := flareComp.Send(filePath, caseID, customerEmail, flaretypes.NewLocalFlareSource())
 	fmt.Println(response)
 	return e
 }

cmd/agent/subcommands/run/command.go

@@ -80,7 +80,8 @@ import (
 	configstreamfx "github.com/DataDog/datadog-agent/comp/core/configstream/fx"
 	diagnose "github.com/DataDog/datadog-agent/comp/core/diagnose/def"
 	diagnosefx "github.com/DataDog/datadog-agent/comp/core/diagnose/fx"
-	"github.com/DataDog/datadog-agent/comp/core/flare"
+	flare "github.com/DataDog/datadog-agent/comp/core/flare/def"
+	flarfx "github.com/DataDog/datadog-agent/comp/core/flare/fx"
 	flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types"
 	guidef "github.com/DataDog/datadog-agent/comp/core/gui/def"
 	guifx "github.com/DataDog/datadog-agent/comp/core/gui/fx"
@@ -411,7 +412,7 @@ func run(log log.Component,
 
 func getSharedFxOption() fx.Option {
 	return fx.Options(
-		flare.Module(flare.NewParams(
+		flarfx.Module(flare.NewParams(
 			defaultpaths.GetDistPath(),
 			defaultpaths.PyChecksPath,
 			defaultpaths.LogFile,

cmd/agent/subcommands/run/command_windows.go

@@ -49,7 +49,7 @@ import (
 	agenttelemetry "github.com/DataDog/datadog-agent/comp/core/agenttelemetry/def"
 	autodiscovery "github.com/DataDog/datadog-agent/comp/core/autodiscovery/def"
 	"github.com/DataDog/datadog-agent/comp/core/config"
-	"github.com/DataDog/datadog-agent/comp/core/flare"
+	flare "github.com/DataDog/datadog-agent/comp/core/flare/def"
 	guidef "github.com/DataDog/datadog-agent/comp/core/gui/def"
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface/def"
 	ipc "github.com/DataDog/datadog-agent/comp/core/ipc/def"

cmd/otel-agent/subcommands/flare/command.go

@@ -32,8 +32,9 @@ import (
 	"github.com/DataDog/datadog-agent/cmd/otel-agent/subcommands"
 	"github.com/DataDog/datadog-agent/comp/core"
 	"github.com/DataDog/datadog-agent/comp/core/config"
-	"github.com/DataDog/datadog-agent/comp/core/flare"
-	"github.com/DataDog/datadog-agent/comp/core/flare/helpers"
+	flare "github.com/DataDog/datadog-agent/comp/core/flare/def"
+	flarfx "github.com/DataDog/datadog-agent/comp/core/flare/fx"
+	flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types"
 	ipcfx "github.com/DataDog/datadog-agent/comp/core/ipc/fx"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
@@ -85,7 +86,7 @@ func MakeCommand(globalConfGetter func() *subcommands.GlobalParams) *cobra.Comma
 					ConfigParams: config.NewAgentParams("", config.WithConfigName(globalParams.ConfigName)),
 					LogParams:    log.ForOneShot(globalParams.LoggerName, "info", false),
 				}),
-				flare.Module(flareParams),
+				flarfx.Module(flareParams),
 				core.Bundle(),
 				// Provide empty option for workloadmeta (optional dependency)
 				fx.Supply(option.None[workloadmeta.Component]()),
@@ -150,7 +151,7 @@ func makeFlare(
 	}
 
 	// Upload flare
-	response, e := flareComp.Send(filePath, caseID, customerEmail, helpers.NewLocalFlareSource())
+	response, e := flareComp.Send(filePath, caseID, customerEmail, flaretypes.NewLocalFlareSource())
 	fmt.Println(response)
 	return e
 }

cmd/security-agent/subcommands/flare/command.go

@@ -17,7 +17,8 @@ import (
 	"github.com/DataDog/datadog-agent/cmd/security-agent/command"
 	"github.com/DataDog/datadog-agent/comp/core"
 	"github.com/DataDog/datadog-agent/comp/core/config"
-	"github.com/DataDog/datadog-agent/comp/core/flare/helpers"
+	flareimpl "github.com/DataDog/datadog-agent/comp/core/flare/impl"
+	flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types"
 	ipc "github.com/DataDog/datadog-agent/comp/core/ipc/def"
 	ipcfx "github.com/DataDog/datadog-agent/comp/core/ipc/fx"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
@@ -117,7 +118,7 @@ func requestFlare(_ log.Component, config config.Component, _ secrets.Component,
 		}
 	}
 
-	response, e := helpers.SendFlare(config, filePath, params.caseID, params.customerEmail, helpers.NewLocalFlareSource())
+	response, e := flareimpl.SendFlare(config, filePath, params.caseID, params.customerEmail, flaretypes.NewLocalFlareSource())
 	fmt.Println(response)
 	if e != nil {
 		return e

cmd/systray/command/command.go

@@ -21,7 +21,8 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core"
 	"github.com/DataDog/datadog-agent/comp/core/config"
 	diagnosefx "github.com/DataDog/datadog-agent/comp/core/diagnose/fx"
-	"github.com/DataDog/datadog-agent/comp/core/flare"
+	flare "github.com/DataDog/datadog-agent/comp/core/flare/def"
+	flarfx "github.com/DataDog/datadog-agent/comp/core/flare/fx"
 	"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameimpl"
 	ipcfx "github.com/DataDog/datadog-agent/comp/core/ipc/fx"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
@@ -100,7 +101,7 @@ func MakeCommand() *cobra.Command {
 				core.Bundle(),
 				hostnameimpl.Module(),
 				// flare
-				flare.Module(flare.NewParams(
+				flarfx.Module(flare.NewParams(
 					defaultpaths.GetDistPath(),
 					defaultpaths.PyChecksPath,
 					defaultpaths.LogFile,

comp/core/diagnose/impl/diagnose_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	diagnose "github.com/DataDog/datadog-agent/comp/core/diagnose/def"
-	flarehelpers "github.com/DataDog/datadog-agent/comp/core/flare/helpers"
+	flarehelpers "github.com/DataDog/datadog-agent/comp/core/flare/impl"
 )
 
 const runSuitetextresult = `=== Starting diagnose ===

comp/core/flare/BUILD.bazel

@@ -1 +1,8 @@
-# gazelle:ignore
+load("@rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "flare",
+    srcs = ["doc.go"],
+    importpath = "github.com/DataDog/datadog-agent/comp/core/flare",
+    visibility = ["//visibility:public"],
+)