diff --git a/libbeat/outputs/elasticsearch/client_integration_test.go b/libbeat/outputs/elasticsearch/client_integration_test.go index 7a8a06beccaf..58f813af7fa6 100644 --- a/libbeat/outputs/elasticsearch/client_integration_test.go +++ b/libbeat/outputs/elasticsearch/client_integration_test.go @@ -422,7 +422,7 @@ func connectTestEs(t *testing.T, cfg interface{}, stats outputs.Observer) (outpu info := beat.Info{Beat: "libbeat"} // disable ILM if using specified index name im, _ := idxmgmt.DefaultSupport(nil, info, conf.MustNewConfigFrom(map[string]interface{}{"setup.ilm.enabled": "false"})) - output, err := makeES(im, info, stats, config) + output, err := makeES(im, info, stats, config, logp.Config{}) if err != nil { t.Fatal(err) } diff --git a/libbeat/outputs/elasticsearch/client_proxy_test.go b/libbeat/outputs/elasticsearch/client_proxy_test.go index e3fd914bbe7d..9898e38c58df 100644 --- a/libbeat/outputs/elasticsearch/client_proxy_test.go +++ b/libbeat/outputs/elasticsearch/client_proxy_test.go @@ -36,6 +36,7 @@ import ( "github.com/elastic/beats/v7/libbeat/common/atomic" "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" "github.com/elastic/beats/v7/libbeat/outputs/outil" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/transport/httpcommon" ) @@ -204,7 +205,7 @@ func doClientPing(t *testing.T) { clientSettings.Transport.Proxy.URL = &proxyURL } - client, err := NewClient(clientSettings, nil) + client, err := NewClient(logp.L(), logp.L(), clientSettings, nil) require.NoError(t, err) // This ping won't succeed; we aren't testing end-to-end communication diff --git a/libbeat/outputs/elasticsearch/elasticsearch_test.go b/libbeat/outputs/elasticsearch/elasticsearch_test.go index 45db313d903c..1b5dcafc1e99 100644 --- a/libbeat/outputs/elasticsearch/elasticsearch_test.go +++ b/libbeat/outputs/elasticsearch/elasticsearch_test.go @@ -26,6 +26,7 @@ import ( "github.com/elastic/beats/v7/libbeat/beat" "github.com/elastic/beats/v7/libbeat/esleg/eslegclient" "github.com/elastic/elastic-agent-libs/config" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -125,6 +126,7 @@ func TestPipelineSelection(t *testing.T) { Pipeline: &selector, }, nil, + logp.Config{}, ) assert.NoError(t, err) diff --git a/libbeat/outputs/kafka/kafka_integration_test.go b/libbeat/outputs/kafka/kafka_integration_test.go index 29fc72ac8590..b6e5be46d0ab 100644 --- a/libbeat/outputs/kafka/kafka_integration_test.go +++ b/libbeat/outputs/kafka/kafka_integration_test.go @@ -258,7 +258,7 @@ func TestKafkaPublish(t *testing.T) { } t.Run(name, func(t *testing.T) { - grp, err := makeKafka(nil, beat.Info{Beat: "libbeat", IndexPrefix: "testbeat"}, outputs.NewNilObserver(), cfg) + grp, err := makeKafka(nil, beat.Info{Beat: "libbeat", IndexPrefix: "testbeat"}, outputs.NewNilObserver(), cfg, logp.Config{}) if err != nil { t.Fatal(err) } diff --git a/libbeat/outputs/logstash/logstash_integration_test.go b/libbeat/outputs/logstash/logstash_integration_test.go index 2cfbcd03974c..fe44ff92bf03 100644 --- a/libbeat/outputs/logstash/logstash_integration_test.go +++ b/libbeat/outputs/logstash/logstash_integration_test.go @@ -39,6 +39,7 @@ import ( "github.com/elastic/beats/v7/libbeat/outputs/outest" "github.com/elastic/beats/v7/libbeat/outputs/outil" 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/transport/httpcommon" ) @@ -193,7 +194,7 @@ func newTestElasticsearchOutput(t *testing.T, test string) *testOutputer { t.Fatal("init index management:", err) } - grp, err := plugin(im, info, outputs.NewNilObserver(), config) + grp, err := plugin(im, info, outputs.NewNilObserver(), config, logp.Config{}) if err != nil { t.Fatalf("init elasticsearch output plugin failed: %v", err) } diff --git a/libbeat/outputs/logstash/logstash_test.go b/libbeat/outputs/logstash/logstash_test.go index fa1b57fb841b..226515d10363 100644 --- a/libbeat/outputs/logstash/logstash_test.go +++ b/libbeat/outputs/logstash/logstash_test.go @@ -32,6 +32,7 @@ import ( "github.com/elastic/beats/v7/libbeat/outputs" "github.com/elastic/beats/v7/libbeat/outputs/outest" conf "github.com/elastic/elastic-agent-libs/config" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" v2 "github.com/elastic/go-lumber/server/v2" ) @@ -181,7 +182,7 @@ func newTestLumberjackOutput( } cfg, _ := conf.NewConfigFrom(config) - grp, err := outputs.Load(nil, beat.Info{}, nil, "logstash", cfg) + grp, err := outputs.Load(nil, beat.Info{}, nil, "logstash", cfg, logp.Config{}) if err != nil { t.Fatalf("init logstash output plugin failed: %v", err) } diff --git a/libbeat/outputs/redis/redis_integration_test.go b/libbeat/outputs/redis/redis_integration_test.go index dfd48dc75d23..3627203f7c1e 100644 --- a/libbeat/outputs/redis/redis_integration_test.go +++ b/libbeat/outputs/redis/redis_integration_test.go @@ -37,6 +37,7 @@ import ( _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" "github.com/elastic/beats/v7/libbeat/outputs/outest" conf "github.com/elastic/elastic-agent-libs/config" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -330,7 +331,7 @@ func newRedisTestingOutput(t *testing.T, cfg map[string]interface{}) outputs.Cli t.Fatalf("redis output module not registered") } - out, err := plugin(nil, beat.Info{Beat: testBeatname, Version: testBeatversion}, outputs.NewNilObserver(), config) + out, err := plugin(nil, beat.Info{Beat: testBeatname, Version: testBeatversion}, outputs.NewNilObserver(), config, logp.Config{}) if err != nil { t.Fatalf("Failed to initialize redis output: %v", err) } diff --git a/libbeat/outputs/redis/redis_test.go b/libbeat/outputs/redis/redis_test.go index 6e9d70f57860..7640a2957c06 100644 --- a/libbeat/outputs/redis/redis_test.go +++ b/libbeat/outputs/redis/redis_test.go @@ -26,6 +26,7 @@ import ( "github.com/elastic/beats/v7/libbeat/outputs" _ "github.com/elastic/beats/v7/libbeat/outputs/codec/json" "github.com/elastic/elastic-agent-libs/config" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent-libs/mapstr" ) @@ -108,7 +109,7 @@ func TestMakeRedis(t *testing.T) { t.Run(name, func(t *testing.T) { cfg, err := config.NewConfigFrom(test.config) assert.NoError(t, err) - groups, err := makeRedis(nil, beatInfo, outputs.NewNilObserver(), cfg) + groups, err := makeRedis(nil, beatInfo, outputs.NewNilObserver(), cfg, logp.Config{}) assert.Equal(t, err == nil, test.valid) if err != nil && test.valid { t.Log(err) diff --git a/libbeat/outputs/shipper/shipper_test.go b/libbeat/outputs/shipper/shipper_test.go index ef6b628ba8c9..6ae3d3cb6144 100644 --- a/libbeat/outputs/shipper/shipper_test.go +++ b/libbeat/outputs/shipper/shipper_test.go @@ -42,6 +42,7 @@ import ( "github.com/elastic/beats/v7/libbeat/publisher" "github.com/elastic/beats/v7/libbeat/publisher/pipeline" "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-shipper-client/pkg/helpers" pb "github.com/elastic/elastic-agent-shipper-client/pkg/proto" @@ -583,6 +584,7 @@ func createShipperClient(t *testing.T, cfg *config.C, observer outputs.Observer) beat.Info{Beat: "libbeat", IndexPrefix: "testbeat"}, observer, cfg, + logp.Config{}, ) require.NoError(t, err) require.Len(t, group.Clients, 1) diff --git a/libbeat/publisher/pipeline/stress/run.go b/libbeat/publisher/pipeline/stress/run.go index ee118d502eba..622f303173df 100644 --- a/libbeat/publisher/pipeline/stress/run.go +++ b/libbeat/publisher/pipeline/stress/run.go @@ -76,7 +76,7 @@ func RunTests( processing, func(stat outputs.Observer) (string, outputs.Group, error) { cfg := config.Output - out, err := outputs.Load(nil, info, stat, cfg.Name(), cfg.Config()) + out, err := outputs.Load(nil, info, stat, cfg.Name(), cfg.Config(), logp.Config{}) return cfg.Name(), out, err }, )