[installer] fix purge logging and telemetry (#24782)

* * Inject logger and telemetry client in purge command
* Propagate context and errors trhough purge command

* fix tests

cmd/installer/subcommands/purge/command.go

@@ -7,12 +7,21 @@
 package purge
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
 	"go.uber.org/fx"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 
 	"github.com/DataDog/datadog-agent/cmd/installer/command"
 	"github.com/DataDog/datadog-agent/comp/core"
+	"github.com/DataDog/datadog-agent/comp/core/config"
+	"github.com/DataDog/datadog-agent/comp/core/log"
 	"github.com/DataDog/datadog-agent/comp/core/log/logimpl"
+	"github.com/DataDog/datadog-agent/comp/core/secrets"
+	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
+	"github.com/DataDog/datadog-agent/comp/updater/telemetry"
+	"github.com/DataDog/datadog-agent/comp/updater/telemetry/telemetryimpl"
 	"github.com/DataDog/datadog-agent/pkg/installer"
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 )
@@ -30,7 +39,8 @@ func Commands(global *command.GlobalParams) []*cobra.Command {
 		Short: "Purge installer packages",
 		Long:  ``,
 		RunE: func(_ *cobra.Command, _ []string) error {
-			return purgeFxWrapper(&cliParams{
+			ctx := context.Background()
+			return purgeFxWrapper(ctx, &cliParams{
 				GlobalParams: *global,
 				pkg:          pkg,
 			})
@@ -40,21 +50,29 @@ func Commands(global *command.GlobalParams) []*cobra.Command {
 	return []*cobra.Command{purgeCmd}
 }
 
-func purgeFxWrapper(params *cliParams) error {
+func purgeFxWrapper(ctx context.Context, params *cliParams) error {
 	return fxutil.OneShot(purge,
+		fx.Provide(func() context.Context { return ctx }),
 		fx.Supply(params),
 		fx.Supply(core.BundleParams{
-			LogParams: logimpl.ForOneShot("INSTALLER", "info", true),
+			ConfigParams:         config.NewAgentParams(params.GlobalParams.ConfFilePath),
+			SecretParams:         secrets.NewEnabledParams(),
+			SysprobeConfigParams: sysprobeconfigimpl.NewParams(),
+			LogParams:            logimpl.ForOneShot("INSTALLER", "info", true),
 		}),
 		core.Bundle(),
+		telemetryimpl.Module(),
 	)
 }
 
-func purge(params *cliParams) error {
+func purge(ctx context.Context, params *cliParams, _ log.Component, _ telemetry.Component) (err error) {
+	span, ctx := tracer.StartSpanFromContext(ctx, "cmd/purge")
+	defer func() { span.Finish(tracer.WithError(err)) }()
+
+	span.SetTag("params.pkg", params.pkg)
+
 	if params.pkg != "" {
-		installer.PurgePackage(params.pkg)
-	} else {
-		installer.Purge()
+		return installer.PurgePackage(ctx, params.pkg)
 	}
-	return nil
+	return installer.Purge(ctx)
 }

pkg/installer/installer.go

@@ -122,42 +122,43 @@ func Bootstrap(ctx context.Context, config config.Reader) error {
 }
 
 // Purge removes files installed by the installer
-func Purge() {
-	purge(defaultLocksPath, defaultRepositoriesPath)
+func Purge(ctx context.Context) error {
+	return purge(ctx, defaultLocksPath, defaultRepositoriesPath)
 }
 
 // PurgePackage removes an individual package
-func PurgePackage(pkg string) {
-	purgePackage(pkg, defaultLocksPath, defaultRepositoriesPath)
+func PurgePackage(ctx context.Context, pkg string) error {
+	return purgePackage(ctx, pkg, defaultLocksPath, defaultRepositoriesPath)
 }
 
-func purgePackage(pkg string, locksPath, repositoryPath string) {
-	var err error
-	span, ctx := tracer.StartSpanFromContext(context.Background(), "purge_pkg")
+func purgePackage(ctx context.Context, pkg string, locksPath, repositoryPath string) (err error) {
+	span, ctx := tracer.StartSpanFromContext(ctx, "purge_pkg")
 	defer span.Finish(tracer.WithError(err))
-	span.SetTag("params.pkg", pkg)
 
 	switch pkg {
 	case "datadog-installer":
 		service.RemoveInstallerUnits(ctx)
 	case "datadog-agent":
 		service.RemoveAgentUnits(ctx)
 	case "datadog-apm-inject":
+		// todo(paullgdc): should we continue with removing the pkg directories if we failed here
+		// or should exit early?
 		if err = service.RemoveAPMInjector(ctx); err != nil {
 			log.Warnf("installer: could not remove APM injector: %v", err)
 		}
 	default:
 		log.Warnf("installer: unrecognized package purge")
-		return
+		return nil
 	}
 	if err = removePkgDirs(ctx, pkg, locksPath, repositoryPath); err != nil {
 		log.Warnf("installer: %v", err)
+		return err
 	}
+	return nil
 }
 
-func purge(locksPath, repositoryPath string) {
-	var err error
-	span, ctx := tracer.StartSpanFromContext(context.Background(), "purge")
+func purge(ctx context.Context, locksPath, repositoryPath string) (err error) {
+	span, ctx := tracer.StartSpanFromContext(ctx, "purge")
 	defer span.Finish(tracer.WithError(err))
 
 	service.RemoveInstallerUnits(ctx)
@@ -173,6 +174,7 @@ func purge(locksPath, repositoryPath string) {
 
 	cleanDir(locksPath, os.RemoveAll)
 	cleanDir(repositoryPath, func(path string) error { return service.RemoveAll(ctx, path) })
+	return nil
 }
 
 func removePkgDirs(ctx context.Context, pkg string, locksPath, repositoryPath string) (err error) {

pkg/installer/installer_test.go

@@ -154,7 +154,7 @@ func TestPurge(t *testing.T) {
 	assert.Nil(t, os.WriteFile(filepath.Join(locksPath, "not_empty"), []byte("morbier\n"), 0644))
 	assertDirNotEmpty(t, locksPath)
 	assertDirNotEmpty(t, rootPath)
-	purge(locksPath, rootPath)
+	purge(testCtx, locksPath, rootPath)
 	assertDirExistAndEmpty(t, locksPath)
 	assertDirExistAndEmpty(t, rootPath)
 	bootstrapAndAssert()