Autodiscover: pass paths through builders instead of global paths

filebeat/autodiscover/builder/hints/logs.go

@@ -59,17 +59,17 @@ type logHints struct {
 
 // InitializeModule initializes this module.
 func InitializeModule() {
-	_ = autodiscover.Registry.AddBuilder("hints", NewLogHints)
+	_ = autodiscover.Registry.AddBuilder("hints", newLogHints)
 }
 
-// NewLogHints builds a log hints builder
-func NewLogHints(cfg *conf.C, logger *logp.Logger) (autodiscover.Builder, error) {
+// newLogHints builds a log hints builder
+func newLogHints(cfg *conf.C, logger *logp.Logger, paths *paths.Path) (autodiscover.Builder, error) {
 	config := defaultConfig()
 	if err := cfg.Unpack(&config); err != nil {
 		return nil, fmt.Errorf("unable to unpack hints config due to error: %w", err)
 	}
 
-	moduleRegistry, err := fileset.NewModuleRegistry(nil, beat.Info{Logger: logger}, false, fileset.FilesetOverrides{}, paths.Paths)
+	moduleRegistry, err := fileset.NewModuleRegistry(nil, beat.Info{Logger: logger}, false, fileset.FilesetOverrides{}, paths)
 	if err != nil {
 		return nil, err
 	}

filebeat/autodiscover/builder/hints/logs_test.go

@@ -1205,12 +1205,13 @@ func TestGenerateHints(t *testing.T) {
 		t.Run(test.msg, func(t *testing.T) {
 			// Configure path for modules access
 			abs, _ := filepath.Abs("../../..")
-			require.NoError(t, paths.InitPaths(&paths.Path{
+			p := paths.New()
+			require.NoError(t, p.InitPaths(&paths.Path{
 				Home: abs,
 			}))
 
 			logger := logptest.NewTestingLogger(t, "")
-			l, err := NewLogHints(test.config, logger)
+			l, err := newLogHints(test.config, logger, p)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -1442,11 +1443,12 @@ func TestGenerateHintsWithPaths(t *testing.T) {
 
 		// Configure path for modules access
 		abs, _ := filepath.Abs("../../..")
-		require.NoError(t, paths.InitPaths(&paths.Path{
+		p := paths.New()
+		require.NoError(t, p.InitPaths(&paths.Path{
 			Home: abs,
 		}))
 		logger := logptest.NewTestingLogger(t, "")
-		l, err := NewLogHints(cfg, logger)
+		l, err := newLogHints(cfg, logger, p)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -1487,7 +1489,7 @@ func TestCreateConfigResolvesVariablesFromOptions(t *testing.T) {
 		"hints":      mapstr.M{"logs": mapstr.M{"raw": `[{"type":"docker","containers":{"ids":["${data.container.id}"]},"password":"${PASSWORD}"}]`}},
 	}
 
-	l, err := NewLogHints(cfg, logptest.NewTestingLogger(t, ""))
+	l, err := newLogHints(cfg, logptest.NewTestingLogger(t, ""), paths.New())
 	require.NoError(t, err)
 	cfgs := l.CreateConfig(event, opts...)
 	require.Len(t, cfgs, 1)

filebeat/beater/filebeat.go

@@ -499,6 +499,7 @@ func (fb *Filebeat) Run(b *beat.Beat) error {
 			config.Autodiscover,
 			b.Keystore,
 			fb.logger,
+			b.Paths,
 		)
 		if err != nil {
 			return err

heartbeat/autodiscover/builder/hints/monitors.go

@@ -32,6 +32,7 @@ import (
 	conf "github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
+	"github.com/elastic/elastic-agent-libs/paths"
 )
 
 const (
@@ -55,7 +56,7 @@ func InitializeModule() {
 }
 
 // NewHeartbeatHints builds a heartbeat hints builder
-func NewHeartbeatHints(cfg *conf.C, logger *logp.Logger) (autodiscover.Builder, error) {
+func NewHeartbeatHints(cfg *conf.C, logger *logp.Logger, p *paths.Path) (autodiscover.Builder, error) {
 	config := defaultConfig()
 	err := cfg.Unpack(config)
 

heartbeat/beater/heartbeat.go

@@ -74,12 +74,12 @@
 	if stConfig != nil {
 		// Note this, intentionally, blocks until connected to the trace endpoint
 		var err error
 		logp.L().Infof("Setting up sock tracer at %s (wait: %s)", stConfig.Path, stConfig.Wait)
 		sockTrace, err := tracer.NewSockTracer(stConfig.Path, stConfig.Wait)
 		if err == nil {
 			trace = sockTrace
 		} else {
 			logp.L().Warnf("could not connect to socket trace at path %s after %s timeout: %v", stConfig.Path, stConfig.Wait, err)
 		}
 	}
 
@@ -94,7 +94,7 @@
 				trace.Abort()
 				return nil, fmt.Errorf("run_once mode fatal error: %w", err)
 			} else {
 				logp.L().Warnf("skipping monitor state management: %v", err)
 			}
 		} else {
 			replaceStateLoader(monitorstate.MakeESLoader(esClient, monitorstate.DefaultDataStreams, parsedConfig.RunFrom))
@@ -194,7 +194,7 @@
 	}
 	// Configure the beats Manager to start after all the reloadable hooks are initialized
 	// and shutdown when the function return.
 	if err := b.Manager.Start(); err != nil {
 		return err
 	}
 	defer b.Manager.Stop()
@@ -304,15 +304,7 @@
 
 // makeAutodiscover creates an autodiscover object ready to be started.
 func (bt *Heartbeat) makeAutodiscover(b *beat.Beat) (*autodiscover.Autodiscover, error) {
-	ad, err := autodiscover.NewAutodiscover(
-		"heartbeat",
-		b.Publisher,
-		bt.monitorFactory,
-		autodiscover.QueryConfig(),
-		bt.config.Autodiscover,
-		b.Keystore,
-		b.Info.Logger,
-	)
+	ad, err := autodiscover.NewAutodiscover("heartbeat", b.Publisher, bt.monitorFactory, autodiscover.QueryConfig(), bt.config.Autodiscover, b.Keystore, b.Info.Logger, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -355,7 +347,7 @@
 
 	for i := 0; i < attempts; i++ {
 		// TODO: use local logger here
 		esClient, err = eslegclient.NewConnectedClient(ctx, newCfg, "Heartbeat", logp.NewLogger(""))
 		if err == nil {
 			connectDelay.Reset()
 			return esClient, nil

libbeat/autodiscover/autodiscover.go

@@ -31,6 +31,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/keystore"
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
+	"github.com/elastic/elastic-agent-libs/paths"
 )
 
 const (
@@ -68,15 +69,7 @@ type Autodiscover struct {
 }
 
 // NewAutodiscover instantiates and returns a new Autodiscover manager
-func NewAutodiscover(
-	name string,
-	pipeline beat.PipelineConnector,
-	factory cfgfile.RunnerFactory,
-	configurer EventConfigurer,
-	c *Config,
-	keystore keystore.Keystore,
-	logger *logp.Logger,
-) (*Autodiscover, error) {
+func NewAutodiscover(name string, pipeline beat.PipelineConnector, factory cfgfile.RunnerFactory, configurer EventConfigurer, c *Config, keystore keystore.Keystore, logger *logp.Logger, path *paths.Path) (*Autodiscover, error) {
 	logger = logger.Named("autodiscover")
 
 	// Init Event bus
@@ -85,7 +78,7 @@ func NewAutodiscover(
 	// Init providers
 	var providers []Provider
 	for _, providerCfg := range c.Providers {
-		provider, err := Registry.BuildProvider(name, bus, providerCfg, keystore)
+		provider, err := Registry.BuildProvider(name, bus, providerCfg, keystore, path)
 		if err != nil {
 			return nil, fmt.Errorf("error in autodiscover provider settings: %w", err)
 		}

libbeat/autodiscover/autodiscover_test.go

@@ -41,6 +41,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/logp/logptest"
 	"github.com/elastic/elastic-agent-libs/mapstr"
+	"github.com/elastic/elastic-agent-libs/paths"
 )
 
 type mockRunner struct {
@@ -181,7 +182,7 @@ func TestAutodiscover(t *testing.T) {
 	busChan := make(chan bus.Bus, 1)
 	Registry = NewRegistry()
 	err := Registry.AddProvider("mock",
-		func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+		func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 			// intercept bus to mock events
 			busChan <- b
 
@@ -209,7 +210,7 @@ func TestAutodiscover(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	// Create autodiscover manager
 	logger := logptest.NewTestingLogger(t, "")
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -333,7 +334,7 @@ func TestAutodiscoverHash(t *testing.T) {
 	busChan := make(chan bus.Bus, 1)
 
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		// intercept bus to mock events
 		busChan <- b
 
@@ -364,7 +365,7 @@ func TestAutodiscoverHash(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	logger := logptest.NewTestingLogger(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -402,7 +403,7 @@ func TestAutodiscoverDuplicatedConfigConfigCheckCalledOnce(t *testing.T) {
 	busChan := make(chan bus.Bus, 1)
 
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		// intercept bus to mock events
 		busChan <- b
 
@@ -429,7 +430,7 @@ func TestAutodiscoverDuplicatedConfigConfigCheckCalledOnce(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	logger := logptest.NewTestingLogger(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -467,7 +468,7 @@ func TestAutodiscoverWithConfigCheckFailures(t *testing.T) {
 	// Register mock autodiscover provider
 	busChan := make(chan bus.Bus, 1)
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		// intercept bus to mock events
 		busChan <- b
 
@@ -498,7 +499,7 @@ func TestAutodiscoverWithConfigCheckFailures(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	logger := logptest.NewTestingLogger(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -530,7 +531,7 @@ func TestAutodiscoverWithMutlipleEntries(t *testing.T) {
 	// Register mock autodiscover provider
 	busChan := make(chan bus.Bus, 1)
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		// intercept bus to mock events
 		busChan <- b
 
@@ -558,7 +559,7 @@ func TestAutodiscoverWithMutlipleEntries(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	logger := logptest.NewTestingLogger(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -653,7 +654,7 @@ func TestAutodiscoverDebounce(t *testing.T) {
 	// Register mock autodiscover provider
 	busChan := make(chan bus.Bus, 1)
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		// intercept bus to mock events
 		busChan <- b
 
@@ -674,7 +675,7 @@ func TestAutodiscoverDebounce(t *testing.T) {
 	adapter := mockAdapter{}
 	logger := logptest.NewTestingLogger(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -810,7 +811,8 @@ func TestErrNonReloadableIsNotRetried(t *testing.T) {
 			uuid uuid.UUID,
 			c *conf.C,
 			k keystore.Keystore,
-			l *logp.Logger) (Provider, error) {
+			l *logp.Logger,
+			p *paths.Path) (Provider, error) {
 
 			// intercept bus to mock events
 			busChan <- b
@@ -841,7 +843,7 @@ func TestErrNonReloadableIsNotRetried(t *testing.T) {
 	k, _ := keystore.NewFileKeystore(filepath.Join(t.TempDir(), "keystore"))
 	logger, observedLogs := logptest.NewTestingLoggerWithObserver(t, "")
 	// Create autodiscover manager
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -903,7 +905,7 @@ func TestAutodiscoverMetadataCleanup(t *testing.T) {
 
 	busChan := make(chan bus.Bus, 1)
 	Registry = NewRegistry()
-	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger) (Provider, error) {
+	err := Registry.AddProvider("mock", func(beatName string, b bus.Bus, uuid uuid.UUID, c *conf.C, k keystore.Keystore, l *logp.Logger, p *paths.Path) (Provider, error) {
 		busChan <- b
 		return &mockProvider{}, nil
 	})
@@ -919,7 +921,7 @@ func TestAutodiscoverMetadataCleanup(t *testing.T) {
 	k, _ := keystore.NewFileKeystore("test")
 	logger := logptest.NewTestingLogger(t, "")
 
-	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger)
+	autodiscover, err := NewAutodiscover("test", nil, &adapter, &adapter, &config, k, logger, nil)
 	require.NoError(t, err)
 
 	autodiscover.debouncePeriod = 50 * time.Millisecond

libbeat/autodiscover/builder.go

@@ -26,6 +26,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/keystore"
 	"github.com/elastic/elastic-agent-libs/logp"
+	"github.com/elastic/elastic-agent-libs/paths"
 	"github.com/elastic/go-ucfg"
 )
 
@@ -43,7 +44,7 @@ type Builders struct {
 }
 
 // BuilderConstructor is a func used to generate a Builder object
-type BuilderConstructor func(c *config.C, logger *logp.Logger) (Builder, error)
+type BuilderConstructor func(c *config.C, logger *logp.Logger, paths *paths.Path) (Builder, error)
 
 // AddBuilder registers a new BuilderConstructor
 func (r *registry) AddBuilder(name string, builder BuilderConstructor) error {
@@ -78,7 +79,7 @@ func (r *registry) GetBuilder(name string) BuilderConstructor {
 }
 
 // BuildBuilder reads provider configuration and instantiate one
-func (r *registry) BuildBuilder(c *config.C) (Builder, error) {
+func (r *registry) BuildBuilder(c *config.C, paths *paths.Path) (Builder, error) {
 	var config BuilderConfig
 	err := c.Unpack(&config)
 	if err != nil {
@@ -90,7 +91,7 @@ func (r *registry) BuildBuilder(c *config.C) (Builder, error) {
 		return nil, fmt.Errorf("unknown autodiscover builder %s", config.Type)
 	}
 
-	return builder(c, r.logger)
+	return builder(c, r.logger, paths)
 }
 
 // GetConfig creates configs for all builders initialized.
@@ -121,6 +122,7 @@ func NewBuilders(
 	bConfigs []*config.C,
 	hintsCfg *config.C,
 	keystoreProvider bus.KeystoreProvider,
+	paths *paths.Path,
 ) (Builders, error) {
 	var builders Builders
 	if hintsCfg.Enabled() {
@@ -137,7 +139,7 @@ func NewBuilders(
 	}
 
 	for _, bcfg := range bConfigs {
-		builder, err := Registry.BuildBuilder(bcfg)
+		builder, err := Registry.BuildBuilder(bcfg, paths)
 		if err != nil {
 			return Builders{}, err
 		}

libbeat/autodiscover/builder_test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/elastic/elastic-agent-autodiscover/bus"
 	conf "github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
+	"github.com/elastic/elastic-agent-libs/paths"
 	"github.com/elastic/go-ucfg"
 )
 
@@ -35,7 +36,7 @@ func (f *fakeBuilder) CreateConfig(event bus.Event, options ...ucfg.Option) []*c
 	return []*conf.C{conf.NewConfig()}
 }
 
-func newFakeBuilder(_ *conf.C, logger *logp.Logger) (Builder, error) {
+func newFakeBuilder(_ *conf.C, logger *logp.Logger, _ *paths.Path) (Builder, error) {
 	return &fakeBuilder{}, nil
 }
 
@@ -59,7 +60,7 @@ func TestBuilderRegistry(t *testing.T) {
 	// Make sure that config building doesn't fail
 	assert.NoError(t, err)
 
-	builder, err := reg.BuildBuilder(cfg)
+	builder, err := reg.BuildBuilder(cfg, nil)
 	assert.NoError(t, err)
 	assert.NotNil(t, builder)