after review

ozontech · Oct 27, 2022 · b128d79 · b128d79
1 parent 7af8c1d
commit b128d79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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)