From b128d79e78df398c3722493f6410f6f28b57f387 Mon Sep 17 00:00:00 2001 From: Dmitry Smolonogov Date: Thu, 27 Oct 2022 16:16:58 +0300 Subject: [PATCH] after review --- plugin/action/discard/discard.go | 6 +++--- plugin/action/discard/discard_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin/action/discard/discard.go b/plugin/action/discard/discard.go index d9012f671..c36746f6a 100644 --- a/plugin/action/discard/discard.go +++ b/plugin/action/discard/discard.go @@ -1,12 +1,13 @@ package discard import ( + "time" + "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/plugin" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "time" ) /*{ introduction @@ -26,7 +27,7 @@ pipelines: }*/ const ( - tickTime = 1 * time.Second + tickTime = time.Second first = 1 ) @@ -55,7 +56,6 @@ func factory() (pipeline.AnyPlugin, pipeline.AnyConfig) { func (p *Plugin) Start(config pipeline.AnyConfig, params *pipeline.ActionPluginParams) { p.config = config.(*Config) - // new logger with sampler p.logger = zap.New( zapcore.NewSamplerWithOptions(params.Logger.Desugar().Core(), tickTime, first, p.config.Thereafter), ).Named("fd").Named("action").Named("discard").Sugar() diff --git a/plugin/action/discard/discard_test.go b/plugin/action/discard/discard_test.go index a2e82a88e..aeddacbca 100644 --- a/plugin/action/discard/discard_test.go +++ b/plugin/action/discard/discard_test.go @@ -22,7 +22,7 @@ func TestDiscardAnd(t *testing.T) { }, } - p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, nil, pipeline.MatchModeAnd, conds, false)) + p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, &Config{}, pipeline.MatchModeAnd, conds, false)) wg := &sync.WaitGroup{} wg.Add(10) @@ -66,7 +66,7 @@ func TestDiscardOr(t *testing.T) { }, } - p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, nil, pipeline.MatchModeOr, conds, false)) + p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, &Config{}, pipeline.MatchModeOr, conds, false)) wg := &sync.WaitGroup{} wg.Add(8) @@ -110,7 +110,7 @@ func TestDiscardRegex(t *testing.T) { }, } - p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, nil, pipeline.MatchModeOr, conds, false)) + p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, &Config{}, pipeline.MatchModeOr, conds, false)) wg := &sync.WaitGroup{} wg.Add(11) @@ -151,7 +151,7 @@ func TestDiscardMatchInvert(t *testing.T) { }, } - p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, nil, pipeline.MatchModeAnd, conds, true)) + p, input, output := test.NewPipelineMock(test.NewActionPluginStaticInfo(factory, &Config{}, pipeline.MatchModeAnd, conds, true)) wg := &sync.WaitGroup{} wg.Add(9)