From 36a2a4b712fedb51938d073615e72adbc1f4aa9d Mon Sep 17 00:00:00 2001 From: ansakharov Date: Thu, 30 Dec 2021 00:44:26 +0300 Subject: [PATCH 1/3] splunklog memleak fix --- plugin/output/elasticsearch/elasticsearch_test.go | 2 ++ plugin/output/splunk/splunk.go | 1 + 2 files changed, 3 insertions(+) diff --git a/plugin/output/elasticsearch/elasticsearch_test.go b/plugin/output/elasticsearch/elasticsearch_test.go index 8bb10c012..9cc870647 100644 --- a/plugin/output/elasticsearch/elasticsearch_test.go +++ b/plugin/output/elasticsearch/elasticsearch_test.go @@ -30,6 +30,8 @@ func TestAppendEvent(t *testing.T) { p.time = "6666-66-66" root, _ := insaneJSON.DecodeBytes([]byte(`{"field_a":"AAAA","field_b":"BBBB"}`)) + defer insaneJSON.Release(root) + result := p.appendEvent(nil, &pipeline.Event{Root: root}) expected := fmt.Sprintf("%s\n%s\n", `{"index":{"_index":"test-6666-66-66-index-AAAA-BBBB"}}`, `{"field_a":"AAAA","field_b":"BBBB"}`) diff --git a/plugin/output/splunk/splunk.go b/plugin/output/splunk/splunk.go index 70817e5f8..77e9d7089 100644 --- a/plugin/output/splunk/splunk.go +++ b/plugin/output/splunk/splunk.go @@ -180,6 +180,7 @@ func (p *Plugin) send(data []byte, timeout time.Duration) error { } root, err := insaneJSON.DecodeBytes(b) + defer insaneJSON.Release(root) if err != nil { return fmt.Errorf("can't decode response: %w", err) } From 87d04e691ab6e74ecf1c6a3ced35f4401eaa72a3 Mon Sep 17 00:00:00 2001 From: Vitkovskiy Vladimir Date: Wed, 12 Jan 2022 12:29:17 +0300 Subject: [PATCH 2/3] imports changed to ozontech --- Makefile | 2 +- cfg/config.go | 2 +- cmd/file.d.go | 70 +++++++++---------- cmd/file.d_test.go | 24 +++---- fd/file.d.go | 8 +-- fd/plugin_registry.go | 4 +- fd/util.go | 6 +- go.mod | 2 +- go.sum | 2 - longpanic/longpanic.go | 2 +- pipeline/antispamer.go | 2 +- pipeline/batch.go | 4 +- pipeline/batch_test.go | 2 +- pipeline/event.go | 2 +- pipeline/pipeline.go | 7 +- pipeline/processor.go | 4 +- pipeline/stream.go | 2 +- pipeline/streamer.go | 4 +- plugin/action/add_host/add_host.go | 4 +- plugin/action/add_host/add_host_test.go | 4 +- plugin/action/convert_date/convert_date.go | 6 +- .../action/convert_date/convert_date_test.go | 8 +-- plugin/action/debug/debug.go | 6 +- plugin/action/discard/discard.go | 4 +- plugin/action/discard/discard_test.go | 4 +- plugin/action/flatten/flatten.go | 6 +- plugin/action/flatten/flatten_test.go | 8 +-- plugin/action/join/join.go | 6 +- plugin/action/join/join_test.go | 10 ++- plugin/action/json_decode/json_decode.go | 6 +- plugin/action/json_decode/json_decode_test.go | 8 +-- plugin/action/keep_fields/keep_fields.go | 4 +- plugin/action/keep_fields/keep_fields_test.go | 4 +- plugin/action/mask/mask.go | 4 +- plugin/action/mask/mask_test.go | 4 +- plugin/action/modify/modify.go | 6 +- plugin/action/modify/modify_test.go | 4 +- plugin/action/parse_es/parse_es.go | 4 +- plugin/action/parse_es/parse_es_test.go | 2 +- plugin/action/parse_es/pipeline_test.go | 8 +-- plugin/action/parse_re2/parse_re2.go | 6 +- plugin/action/parse_re2/parse_re2_test.go | 8 +-- plugin/action/remove_fields/remove_fields.go | 6 +- .../remove_fields/remove_fields_test.go | 4 +- plugin/action/rename/rename.go | 6 +- plugin/action/rename/rename_test.go | 4 +- plugin/action/throttle/limiter.go | 4 +- plugin/action/throttle/rule.go | 2 +- plugin/action/throttle/throttle.go | 8 +-- plugin/action/throttle/throttle_test.go | 8 +-- plugin/input/dmesg/dmesg.go | 8 +-- plugin/input/fake/fake.go | 4 +- plugin/input/file/file.go | 6 +- plugin/input/file/file_test.go | 8 +-- plugin/input/file/offset.go | 4 +- plugin/input/file/offset_test.go | 2 +- plugin/input/file/provider.go | 6 +- plugin/input/file/resetter.go | 4 +- plugin/input/file/slicemap.go | 2 +- plugin/input/file/watcher.go | 2 +- plugin/input/file/worker.go | 4 +- plugin/input/file/worker_test.go | 2 +- plugin/input/http/elasticsearch.go | 2 +- plugin/input/http/http.go | 8 +-- plugin/input/http/http_test.go | 4 +- plugin/input/journalctl/journalctl.go | 6 +- plugin/input/journalctl/journalctl_test.go | 8 +-- plugin/input/journalctl/reader.go | 4 +- plugin/input/k8s/gatherer.go | 2 +- plugin/input/k8s/k8s.go | 8 +-- plugin/input/k8s/k8s_test.go | 8 +-- plugin/input/k8s/multiline_action.go | 4 +- plugin/input/kafka/kafka.go | 6 +- plugin/output/devnull/devnull.go | 4 +- plugin/output/elasticsearch/elasticsearch.go | 6 +- .../elasticsearch/elasticsearch_test.go | 8 +-- plugin/output/file/file.go | 10 +-- plugin/output/file/file_test.go | 6 +- plugin/output/file/helpers_test.go | 4 +- plugin/output/gelf/gelf.go | 6 +- plugin/output/gelf/gelf_test.go | 6 +- plugin/output/kafka/kafka.go | 6 +- plugin/output/s3/compress_test.go | 4 +- plugin/output/s3/s3.go | 8 +-- plugin/output/s3/s3_test.go | 12 ++-- plugin/output/splunk/splunk.go | 6 +- plugin/output/stdout/stdout.go | 4 +- test/file_base.go | 2 +- test/test.go | 10 +-- 89 files changed, 268 insertions(+), 271 deletions(-) diff --git a/Makefile b/Makefile index 3e0d39b7d..c4780e5f1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 0.1.15 +VERSION ?= 0.2.2 UPSTREAM_BRANCH ?= origin/master .PHONY: prepare diff --git a/cfg/config.go b/cfg/config.go index 523425dbd..6e32d77d2 100644 --- a/cfg/config.go +++ b/cfg/config.go @@ -12,7 +12,7 @@ import ( "github.com/bitly/go-simplejson" "github.com/ghodss/yaml" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" ) type Config struct { diff --git a/cmd/file.d.go b/cmd/file.d.go index d2f583535..0e9f5e504 100644 --- a/cmd/file.d.go +++ b/cmd/file.d.go @@ -7,44 +7,44 @@ import ( "syscall" "github.com/alecthomas/kingpin" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/automaxprocs/maxprocs" - _ "github.com/ozonru/file.d/plugin/action/add_host" - _ "github.com/ozonru/file.d/plugin/action/convert_date" - _ "github.com/ozonru/file.d/plugin/action/debug" - _ "github.com/ozonru/file.d/plugin/action/discard" - _ "github.com/ozonru/file.d/plugin/action/flatten" - _ "github.com/ozonru/file.d/plugin/action/join" - _ "github.com/ozonru/file.d/plugin/action/json_decode" - _ "github.com/ozonru/file.d/plugin/action/keep_fields" - _ "github.com/ozonru/file.d/plugin/action/mask" - _ "github.com/ozonru/file.d/plugin/action/modify" - _ "github.com/ozonru/file.d/plugin/action/parse_es" - _ "github.com/ozonru/file.d/plugin/action/parse_re2" - _ "github.com/ozonru/file.d/plugin/action/remove_fields" - _ "github.com/ozonru/file.d/plugin/action/rename" - _ "github.com/ozonru/file.d/plugin/action/throttle" - _ "github.com/ozonru/file.d/plugin/input/dmesg" - _ "github.com/ozonru/file.d/plugin/input/fake" - _ "github.com/ozonru/file.d/plugin/input/file" - _ "github.com/ozonru/file.d/plugin/input/http" - _ "github.com/ozonru/file.d/plugin/input/journalctl" - _ "github.com/ozonru/file.d/plugin/input/k8s" - _ "github.com/ozonru/file.d/plugin/input/kafka" - _ "github.com/ozonru/file.d/plugin/output/devnull" - _ "github.com/ozonru/file.d/plugin/output/elasticsearch" - _ "github.com/ozonru/file.d/plugin/output/file" - _ "github.com/ozonru/file.d/plugin/output/gelf" - _ "github.com/ozonru/file.d/plugin/output/kafka" - _ "github.com/ozonru/file.d/plugin/output/s3" - _ "github.com/ozonru/file.d/plugin/output/splunk" - _ "github.com/ozonru/file.d/plugin/output/stdout" + _ "github.com/ozontech/file.d/plugin/action/add_host" + _ "github.com/ozontech/file.d/plugin/action/convert_date" + _ "github.com/ozontech/file.d/plugin/action/debug" + _ "github.com/ozontech/file.d/plugin/action/discard" + _ "github.com/ozontech/file.d/plugin/action/flatten" + _ "github.com/ozontech/file.d/plugin/action/join" + _ "github.com/ozontech/file.d/plugin/action/json_decode" + _ "github.com/ozontech/file.d/plugin/action/keep_fields" + _ "github.com/ozontech/file.d/plugin/action/mask" + _ "github.com/ozontech/file.d/plugin/action/modify" + _ "github.com/ozontech/file.d/plugin/action/parse_es" + _ "github.com/ozontech/file.d/plugin/action/parse_re2" + _ "github.com/ozontech/file.d/plugin/action/remove_fields" + _ "github.com/ozontech/file.d/plugin/action/rename" + _ "github.com/ozontech/file.d/plugin/action/throttle" + _ "github.com/ozontech/file.d/plugin/input/dmesg" + _ "github.com/ozontech/file.d/plugin/input/fake" + _ "github.com/ozontech/file.d/plugin/input/file" + _ "github.com/ozontech/file.d/plugin/input/http" + _ "github.com/ozontech/file.d/plugin/input/journalctl" + _ "github.com/ozontech/file.d/plugin/input/k8s" + _ "github.com/ozontech/file.d/plugin/input/kafka" + _ "github.com/ozontech/file.d/plugin/output/devnull" + _ "github.com/ozontech/file.d/plugin/output/elasticsearch" + _ "github.com/ozontech/file.d/plugin/output/file" + _ "github.com/ozontech/file.d/plugin/output/gelf" + _ "github.com/ozontech/file.d/plugin/output/kafka" + _ "github.com/ozontech/file.d/plugin/output/s3" + _ "github.com/ozontech/file.d/plugin/output/splunk" + _ "github.com/ozontech/file.d/plugin/output/stdout" ) var ( diff --git a/cmd/file.d_test.go b/cmd/file.d_test.go index 245172905..4839215b3 100644 --- a/cmd/file.d_test.go +++ b/cmd/file.d_test.go @@ -13,18 +13,18 @@ import ( "testing" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - _ "github.com/ozonru/file.d/plugin/action/discard" - _ "github.com/ozonru/file.d/plugin/action/json_decode" - _ "github.com/ozonru/file.d/plugin/action/keep_fields" - _ "github.com/ozonru/file.d/plugin/action/rename" - _ "github.com/ozonru/file.d/plugin/action/throttle" - _ "github.com/ozonru/file.d/plugin/input/fake" - _ "github.com/ozonru/file.d/plugin/input/file" - k8s2 "github.com/ozonru/file.d/plugin/input/k8s" - _ "github.com/ozonru/file.d/plugin/output/devnull" - _ "github.com/ozonru/file.d/plugin/output/kafka" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + _ "github.com/ozontech/file.d/plugin/action/discard" + _ "github.com/ozontech/file.d/plugin/action/json_decode" + _ "github.com/ozontech/file.d/plugin/action/keep_fields" + _ "github.com/ozontech/file.d/plugin/action/rename" + _ "github.com/ozontech/file.d/plugin/action/throttle" + _ "github.com/ozontech/file.d/plugin/input/fake" + _ "github.com/ozontech/file.d/plugin/input/file" + k8s2 "github.com/ozontech/file.d/plugin/input/k8s" + _ "github.com/ozontech/file.d/plugin/output/devnull" + _ "github.com/ozontech/file.d/plugin/output/kafka" uuid "github.com/satori/go.uuid" ) diff --git a/fd/file.d.go b/fd/file.d.go index c6dd1c35c..a38f649b4 100644 --- a/fd/file.d.go +++ b/fd/file.d.go @@ -10,10 +10,10 @@ import ( "runtime/debug" "github.com/bitly/go-simplejson" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/fd/plugin_registry.go b/fd/plugin_registry.go index 9db78e52c..7c1e9933a 100644 --- a/fd/plugin_registry.go +++ b/fd/plugin_registry.go @@ -1,8 +1,8 @@ package fd import ( - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) var DefaultPluginRegistry = &PluginRegistry{ diff --git a/fd/util.go b/fd/util.go index 767c563dc..3c29efda0 100644 --- a/fd/util.go +++ b/fd/util.go @@ -5,9 +5,9 @@ import ( "time" "github.com/bitly/go-simplejson" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) func extractPipelineParams(settings *simplejson.Json) *pipeline.Settings { diff --git a/go.mod b/go.mod index 1bc5da226..931d902a1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ozonru/file.d +module github.com/ozontech/file.d go 1.17 diff --git a/go.sum b/go.sum index 1f26c646b..cbee73df7 100644 --- a/go.sum +++ b/go.sum @@ -316,8 +316,6 @@ github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLk github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8= -github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/rjeczalik/notify v0.9.3-0.20210809113154-3472d85e95cd h1:LHLg0gdpRUCvujg2Zol6e2Uknq5vHycLxqEzYwxt1vY= github.com/rjeczalik/notify v0.9.3-0.20210809113154-3472d85e95cd/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/longpanic/longpanic.go b/longpanic/longpanic.go index 647efb84d..37509f513 100644 --- a/longpanic/longpanic.go +++ b/longpanic/longpanic.go @@ -5,7 +5,7 @@ package longpanic import ( "time" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" "go.uber.org/atomic" ) diff --git a/pipeline/antispamer.go b/pipeline/antispamer.go index cf9b49ba5..859114b9e 100644 --- a/pipeline/antispamer.go +++ b/pipeline/antispamer.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" "go.uber.org/atomic" ) diff --git a/pipeline/batch.go b/pipeline/batch.go index f822c83d0..1cca090ff 100644 --- a/pipeline/batch.go +++ b/pipeline/batch.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" ) type Batch struct { diff --git a/pipeline/batch_test.go b/pipeline/batch_test.go index 7041bf563..567d3b09d 100644 --- a/pipeline/batch_test.go +++ b/pipeline/batch_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" "github.com/stretchr/testify/assert" "go.uber.org/atomic" ) diff --git a/pipeline/event.go b/pipeline/event.go index 36257c80e..700d0523e 100644 --- a/pipeline/event.go +++ b/pipeline/event.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/atomic" ) diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 90e582edd..0a4bcf542 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/ozonru/file.d/decoder" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/decoder" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" "go.uber.org/zap" @@ -263,6 +263,7 @@ func (p *Pipeline) GetOutput() OutputPlugin { func (p *Pipeline) In(sourceID SourceID, sourceName string, offset int64, bytes []byte, isNewSource bool) uint64 { length := len(bytes) + logger.Infof("in %s", bytes) // don't process shit isEmpty := length == 0 || (bytes[0] == '\n' && length == 1) diff --git a/pipeline/processor.go b/pipeline/processor.go index 4fafc261a..de5649d9d 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -1,8 +1,8 @@ package pipeline import ( - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pipeline/stream.go b/pipeline/stream.go index 5e75bcf44..b4cf661a3 100644 --- a/pipeline/stream.go +++ b/pipeline/stream.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" ) // stream is a queue of events diff --git a/pipeline/streamer.go b/pipeline/streamer.go index 0d9d89d71..b3dafd7f2 100644 --- a/pipeline/streamer.go +++ b/pipeline/streamer.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" ) type streamer struct { diff --git a/plugin/action/add_host/add_host.go b/plugin/action/add_host/add_host.go index 4a2097e1c..efd002670 100644 --- a/plugin/action/add_host/add_host.go +++ b/plugin/action/add_host/add_host.go @@ -3,8 +3,8 @@ package add_host import ( "os" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/add_host/add_host_test.go b/plugin/action/add_host/add_host_test.go index 2a8270545..e8e0685aa 100644 --- a/plugin/action/add_host/add_host_test.go +++ b/plugin/action/add_host/add_host_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/convert_date/convert_date.go b/plugin/action/convert_date/convert_date.go index 248e1c997..13f981db0 100644 --- a/plugin/action/convert_date/convert_date.go +++ b/plugin/action/convert_date/convert_date.go @@ -3,9 +3,9 @@ package convert_date import ( "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/convert_date/convert_date_test.go b/plugin/action/convert_date/convert_date_test.go index 5e54b17da..477f87be4 100644 --- a/plugin/action/convert_date/convert_date_test.go +++ b/plugin/action/convert_date/convert_date_test.go @@ -4,10 +4,10 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/debug/debug.go b/plugin/action/debug/debug.go index 174fbac58..44e1e72c1 100644 --- a/plugin/action/debug/debug.go +++ b/plugin/action/debug/debug.go @@ -1,9 +1,9 @@ package debug import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/discard/discard.go b/plugin/action/discard/discard.go index 920296466..60b55b0a2 100644 --- a/plugin/action/discard/discard.go +++ b/plugin/action/discard/discard.go @@ -1,8 +1,8 @@ package discard import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/discard/discard_test.go b/plugin/action/discard/discard_test.go index e2164ce63..a2e82a88e 100644 --- a/plugin/action/discard/discard_test.go +++ b/plugin/action/discard/discard_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/flatten/flatten.go b/plugin/action/flatten/flatten.go index 4c530514f..03e170862 100644 --- a/plugin/action/flatten/flatten.go +++ b/plugin/action/flatten/flatten.go @@ -1,9 +1,9 @@ package flatten import ( - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/flatten/flatten_test.go b/plugin/action/flatten/flatten_test.go index bc398038f..88c2cfc88 100644 --- a/plugin/action/flatten/flatten_test.go +++ b/plugin/action/flatten/flatten_test.go @@ -4,10 +4,10 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/join/join.go b/plugin/action/join/join.go index f3237739a..1b4eb316a 100644 --- a/plugin/action/join/join.go +++ b/plugin/action/join/join.go @@ -3,9 +3,9 @@ package join import ( "regexp" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/action/join/join_test.go b/plugin/action/join/join_test.go index 4182c0b2b..548635795 100644 --- a/plugin/action/join/join_test.go +++ b/plugin/action/join/join_test.go @@ -6,10 +6,10 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" "go.uber.org/atomic" ) @@ -252,7 +252,6 @@ func TestSimpleJoin(t *testing.T) { var a, b int input.SetInFn(func() { a++ - logger.Errorf("a=%#v", a) inEvents.Inc() }) @@ -260,7 +259,6 @@ func TestSimpleJoin(t *testing.T) { lastID := atomic.Uint64{} output.SetOutFn(func(e *pipeline.Event) { b++ - logger.Error("b=%#v", b) outEvents.Inc() wg.Done() id := lastID.Swap(e.SeqID) diff --git a/plugin/action/json_decode/json_decode.go b/plugin/action/json_decode/json_decode.go index e112f4316..5b18d371f 100644 --- a/plugin/action/json_decode/json_decode.go +++ b/plugin/action/json_decode/json_decode.go @@ -1,9 +1,9 @@ package json_decode import ( - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/json_decode/json_decode_test.go b/plugin/action/json_decode/json_decode_test.go index d5c51df6b..d80185605 100644 --- a/plugin/action/json_decode/json_decode_test.go +++ b/plugin/action/json_decode/json_decode_test.go @@ -4,10 +4,10 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/keep_fields/keep_fields.go b/plugin/action/keep_fields/keep_fields.go index 3f09f89e9..1404d072c 100644 --- a/plugin/action/keep_fields/keep_fields.go +++ b/plugin/action/keep_fields/keep_fields.go @@ -1,8 +1,8 @@ package keep_fields import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/keep_fields/keep_fields_test.go b/plugin/action/keep_fields/keep_fields_test.go index 9fd76299c..b352960ed 100644 --- a/plugin/action/keep_fields/keep_fields_test.go +++ b/plugin/action/keep_fields/keep_fields_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/mask/mask.go b/plugin/action/mask/mask.go index 701af6605..d4e79f74c 100644 --- a/plugin/action/mask/mask.go +++ b/plugin/action/mask/mask.go @@ -4,8 +4,8 @@ import ( "regexp" "unicode/utf8" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" ) diff --git a/plugin/action/mask/mask_test.go b/plugin/action/mask/mask_test.go index de68142a2..a11dea930 100644 --- a/plugin/action/mask/mask_test.go +++ b/plugin/action/mask/mask_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" diff --git a/plugin/action/modify/modify.go b/plugin/action/modify/modify.go index ff35efa17..df6dd009a 100644 --- a/plugin/action/modify/modify.go +++ b/plugin/action/modify/modify.go @@ -1,9 +1,9 @@ package modify import ( - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/action/modify/modify_test.go b/plugin/action/modify/modify_test.go index 160a8a1fd..5f8895d07 100644 --- a/plugin/action/modify/modify_test.go +++ b/plugin/action/modify/modify_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/parse_es/parse_es.go b/plugin/action/parse_es/parse_es.go index cce1950be..7db0b81c9 100644 --- a/plugin/action/parse_es/parse_es.go +++ b/plugin/action/parse_es/parse_es.go @@ -1,8 +1,8 @@ package parse_es import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/action/parse_es/parse_es_test.go b/plugin/action/parse_es/parse_es_test.go index be92e9050..426f7cb1c 100644 --- a/plugin/action/parse_es/parse_es_test.go +++ b/plugin/action/parse_es/parse_es_test.go @@ -7,7 +7,7 @@ import ( insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" ) func TestDoTimeout(t *testing.T) { diff --git a/plugin/action/parse_es/pipeline_test.go b/plugin/action/parse_es/pipeline_test.go index bf6b814ed..cfc11154c 100644 --- a/plugin/action/parse_es/pipeline_test.go +++ b/plugin/action/parse_es/pipeline_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" ) func TestPipeline(t *testing.T) { diff --git a/plugin/action/parse_re2/parse_re2.go b/plugin/action/parse_re2/parse_re2.go index 72641d06f..1ec5f67a3 100644 --- a/plugin/action/parse_re2/parse_re2.go +++ b/plugin/action/parse_re2/parse_re2.go @@ -3,9 +3,9 @@ package parse_re2 import ( "regexp" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" ) diff --git a/plugin/action/parse_re2/parse_re2_test.go b/plugin/action/parse_re2/parse_re2_test.go index 9766678ec..23dc5b0e7 100644 --- a/plugin/action/parse_re2/parse_re2_test.go +++ b/plugin/action/parse_re2/parse_re2_test.go @@ -4,10 +4,10 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/remove_fields/remove_fields.go b/plugin/action/remove_fields/remove_fields.go index cdb3324bc..1b11dd18b 100644 --- a/plugin/action/remove_fields/remove_fields.go +++ b/plugin/action/remove_fields/remove_fields.go @@ -1,9 +1,9 @@ package remove_fields import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/remove_fields/remove_fields_test.go b/plugin/action/remove_fields/remove_fields_test.go index 30e2c3667..01c8f4206 100644 --- a/plugin/action/remove_fields/remove_fields_test.go +++ b/plugin/action/remove_fields/remove_fields_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/rename/rename.go b/plugin/action/rename/rename.go index 30f1aff84..e2efe4fc2 100644 --- a/plugin/action/rename/rename.go +++ b/plugin/action/rename/rename.go @@ -1,9 +1,9 @@ package rename import ( - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/action/rename/rename_test.go b/plugin/action/rename/rename_test.go index 7858371cb..a0e8e8f15 100644 --- a/plugin/action/rename/rename_test.go +++ b/plugin/action/rename/rename_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/action/throttle/limiter.go b/plugin/action/throttle/limiter.go index f25c73d37..ecc01c76a 100644 --- a/plugin/action/throttle/limiter.go +++ b/plugin/action/throttle/limiter.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) type limiter struct { diff --git a/plugin/action/throttle/rule.go b/plugin/action/throttle/rule.go index e350ad229..be2764b6b 100644 --- a/plugin/action/throttle/rule.go +++ b/plugin/action/throttle/rule.go @@ -3,7 +3,7 @@ package throttle import ( "sort" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" ) type complexLimit struct { diff --git a/plugin/action/throttle/throttle.go b/plugin/action/throttle/throttle.go index b28b2edcf..b52b55a1a 100644 --- a/plugin/action/throttle/throttle.go +++ b/plugin/action/throttle/throttle.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" ) var ( diff --git a/plugin/action/throttle/throttle_test.go b/plugin/action/throttle/throttle_test.go index 86daf4a24..6ca5a6a4d 100644 --- a/plugin/action/throttle/throttle_test.go +++ b/plugin/action/throttle/throttle_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/plugin/input/dmesg/dmesg.go b/plugin/input/dmesg/dmesg.go index 98af6bf7a..3b1ddfa02 100644 --- a/plugin/input/dmesg/dmesg.go +++ b/plugin/input/dmesg/dmesg.go @@ -7,10 +7,10 @@ import ( "time" "github.com/euank/go-kmsg-parser/kmsgparser" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/offset" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/offset" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" ) diff --git a/plugin/input/fake/fake.go b/plugin/input/fake/fake.go index a73c4aea3..2c1472df4 100644 --- a/plugin/input/fake/fake.go +++ b/plugin/input/fake/fake.go @@ -1,8 +1,8 @@ package fake import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/input/file/file.go b/plugin/input/file/file.go index dea7b2f98..a5655fc8b 100644 --- a/plugin/input/file/file.go +++ b/plugin/input/file/file.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/input/file/file_test.go b/plugin/input/file/file_test.go index 487bd67b5..14db14b94 100644 --- a/plugin/input/file/file_test.go +++ b/plugin/input/file/file_test.go @@ -15,10 +15,10 @@ import ( "time" "github.com/alecthomas/units" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" uuid "github.com/satori/go.uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/plugin/input/file/offset.go b/plugin/input/file/offset.go index 34f715155..071669b95 100644 --- a/plugin/input/file/offset.go +++ b/plugin/input/file/offset.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" "go.uber.org/atomic" ) diff --git a/plugin/input/file/offset_test.go b/plugin/input/file/offset_test.go index 3943d9003..5c8649c79 100644 --- a/plugin/input/file/offset_test.go +++ b/plugin/input/file/offset_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/plugin/input/file/provider.go b/plugin/input/file/provider.go index e60b74b13..ba926fa8c 100644 --- a/plugin/input/file/provider.go +++ b/plugin/input/file/provider.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" "github.com/rjeczalik/notify" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/plugin/input/file/resetter.go b/plugin/input/file/resetter.go index 6cc188350..52c70adf3 100644 --- a/plugin/input/file/resetter.go +++ b/plugin/input/file/resetter.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" "gopkg.in/yaml.v3" ) diff --git a/plugin/input/file/slicemap.go b/plugin/input/file/slicemap.go index c0ce077ba..8b57978c5 100644 --- a/plugin/input/file/slicemap.go +++ b/plugin/input/file/slicemap.go @@ -1,7 +1,7 @@ package file import ( - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" ) // sliceMap is a map of streamName to offset. diff --git a/plugin/input/file/watcher.go b/plugin/input/file/watcher.go index af9133ac8..82aa578d4 100644 --- a/plugin/input/file/watcher.go +++ b/plugin/input/file/watcher.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/longpanic" "github.com/rjeczalik/notify" "go.uber.org/zap" ) diff --git a/plugin/input/file/worker.go b/plugin/input/file/worker.go index 0161b11a0..5266e6cae 100644 --- a/plugin/input/file/worker.go +++ b/plugin/input/file/worker.go @@ -4,8 +4,8 @@ import ( "bytes" "io" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/input/file/worker_test.go b/plugin/input/file/worker_test.go index d316498de..89a98c056 100644 --- a/plugin/input/file/worker_test.go +++ b/plugin/input/file/worker_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/plugin/input/http/elasticsearch.go b/plugin/input/http/elasticsearch.go index 36c0ec9e3..b620a36b4 100644 --- a/plugin/input/http/elasticsearch.go +++ b/plugin/input/http/elasticsearch.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "github.com/ozonru/file.d/logger" + "github.com/ozontech/file.d/logger" ) var info = []byte(`{ diff --git a/plugin/input/http/http.go b/plugin/input/http/http.go index aef3290e0..efda1bb5f 100644 --- a/plugin/input/http/http.go +++ b/plugin/input/http/http.go @@ -5,10 +5,10 @@ import ( "net/http" "sync" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/input/http/http_test.go b/plugin/input/http/http_test.go index 779fdf47c..84bb261fb 100644 --- a/plugin/input/http/http_test.go +++ b/plugin/input/http/http_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/input/journalctl/journalctl.go b/plugin/input/journalctl/journalctl.go index b389a3f34..ee832a8bb 100644 --- a/plugin/input/journalctl/journalctl.go +++ b/plugin/input/journalctl/journalctl.go @@ -3,9 +3,9 @@ package journalctl import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/offset" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/offset" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/input/journalctl/journalctl_test.go b/plugin/input/journalctl/journalctl_test.go index 4289ba672..9f118f958 100644 --- a/plugin/input/journalctl/journalctl_test.go +++ b/plugin/input/journalctl/journalctl_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/output/devnull" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/output/devnull" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/input/journalctl/reader.go b/plugin/input/journalctl/reader.go index e54656ad6..29fe6608c 100644 --- a/plugin/input/journalctl/reader.go +++ b/plugin/input/journalctl/reader.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" "go.uber.org/zap" ) diff --git a/plugin/input/k8s/gatherer.go b/plugin/input/k8s/gatherer.go index 92d890769..480574ec5 100644 --- a/plugin/input/k8s/gatherer.go +++ b/plugin/input/k8s/gatherer.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/ozonru/file.d/longpanic" + "github.com/ozontech/file.d/longpanic" "go.uber.org/atomic" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" diff --git a/plugin/input/k8s/k8s.go b/plugin/input/k8s/k8s.go index 590401aba..ac79a5f42 100644 --- a/plugin/input/k8s/k8s.go +++ b/plugin/input/k8s/k8s.go @@ -3,10 +3,10 @@ package k8s import ( "net/http" - "github.com/ozonru/file.d/decoder" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/input/file" + "github.com/ozontech/file.d/decoder" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/input/file" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/plugin/input/k8s/k8s_test.go b/plugin/input/k8s/k8s_test.go index 6da1c38a5..5632f5d1e 100644 --- a/plugin/input/k8s/k8s_test.go +++ b/plugin/input/k8s/k8s_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/plugin/input/k8s/multiline_action.go b/plugin/input/k8s/multiline_action.go index f83d97618..51805978e 100644 --- a/plugin/input/k8s/multiline_action.go +++ b/plugin/input/k8s/multiline_action.go @@ -1,8 +1,8 @@ package k8s import ( - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/input/kafka/kafka.go b/plugin/input/kafka/kafka.go index 19f2d9f23..687829a78 100644 --- a/plugin/input/kafka/kafka.go +++ b/plugin/input/kafka/kafka.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/Shopify/sarama" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" ) diff --git a/plugin/output/devnull/devnull.go b/plugin/output/devnull/devnull.go index b91d83b55..aa6f79558 100644 --- a/plugin/output/devnull/devnull.go +++ b/plugin/output/devnull/devnull.go @@ -1,8 +1,8 @@ package devnull import ( - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/atomic" ) diff --git a/plugin/output/elasticsearch/elasticsearch.go b/plugin/output/elasticsearch/elasticsearch.go index 9aec94adf..26a12d17a 100644 --- a/plugin/output/elasticsearch/elasticsearch.go +++ b/plugin/output/elasticsearch/elasticsearch.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/ozonru/file.d/cfg" + "github.com/ozontech/file.d/cfg" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/plugin/output/elasticsearch/elasticsearch_test.go b/plugin/output/elasticsearch/elasticsearch_test.go index 9cc870647..9fce2069c 100644 --- a/plugin/output/elasticsearch/elasticsearch_test.go +++ b/plugin/output/elasticsearch/elasticsearch_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" insaneJSON "github.com/vitkovskii/insane-json" ) diff --git a/plugin/output/file/file.go b/plugin/output/file/file.go index 048038ef0..4fc320fe0 100644 --- a/plugin/output/file/file.go +++ b/plugin/output/file/file.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" "golang.org/x/net/context" diff --git a/plugin/output/file/file_test.go b/plugin/output/file/file_test.go index 574cf328d..f05917c26 100644 --- a/plugin/output/file/file_test.go +++ b/plugin/output/file/file_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/plugin/output/file/helpers_test.go b/plugin/output/file/helpers_test.go index 0b0688129..6117a7279 100644 --- a/plugin/output/file/helpers_test.go +++ b/plugin/output/file/helpers_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/input/fake" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/input/fake" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" ) diff --git a/plugin/output/gelf/gelf.go b/plugin/output/gelf/gelf.go index 964d977e0..3e354de48 100644 --- a/plugin/output/gelf/gelf.go +++ b/plugin/output/gelf/gelf.go @@ -4,9 +4,9 @@ import ( "strings" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" ) diff --git a/plugin/output/gelf/gelf_test.go b/plugin/output/gelf/gelf_test.go index 3539d002f..a41e6a513 100644 --- a/plugin/output/gelf/gelf_test.go +++ b/plugin/output/gelf/gelf_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" "github.com/stretchr/testify/assert" insaneJSON "github.com/vitkovskii/insane-json" ) diff --git a/plugin/output/kafka/kafka.go b/plugin/output/kafka/kafka.go index 94ddba774..af90109b3 100644 --- a/plugin/output/kafka/kafka.go +++ b/plugin/output/kafka/kafka.go @@ -4,9 +4,9 @@ import ( "strings" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" "go.uber.org/zap" "github.com/Shopify/sarama" diff --git a/plugin/output/s3/compress_test.go b/plugin/output/s3/compress_test.go index 4c909fa19..3e5bcabcd 100644 --- a/plugin/output/s3/compress_test.go +++ b/plugin/output/s3/compress_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/test" "github.com/stretchr/testify/assert" ) diff --git a/plugin/output/s3/s3.go b/plugin/output/s3/s3.go index 46e679f3f..89b51467d 100644 --- a/plugin/output/s3/s3.go +++ b/plugin/output/s3/s3.go @@ -12,10 +12,10 @@ import ( "time" "github.com/minio/minio-go" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/longpanic" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/output/file" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/longpanic" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/output/file" "go.uber.org/zap" ) diff --git a/plugin/output/s3/s3_test.go b/plugin/output/s3/s3_test.go index ea746472d..b61bdccf9 100644 --- a/plugin/output/s3/s3_test.go +++ b/plugin/output/s3/s3_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/minio/minio-go" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/input/fake" - "github.com/ozonru/file.d/plugin/output/file" - "github.com/ozonru/file.d/test" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/input/fake" + "github.com/ozontech/file.d/plugin/output/file" + "github.com/ozontech/file.d/test" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "golang.org/x/net/context" diff --git a/plugin/output/splunk/splunk.go b/plugin/output/splunk/splunk.go index 77e9d7089..63784ab23 100644 --- a/plugin/output/splunk/splunk.go +++ b/plugin/output/splunk/splunk.go @@ -10,9 +10,9 @@ import ( "net/http" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" ) diff --git a/plugin/output/stdout/stdout.go b/plugin/output/stdout/stdout.go index 67751f3b7..d05e04ac7 100644 --- a/plugin/output/stdout/stdout.go +++ b/plugin/output/stdout/stdout.go @@ -3,8 +3,8 @@ package stdout import ( "fmt" - "github.com/ozonru/file.d/fd" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/fd" + "github.com/ozontech/file.d/pipeline" ) /*{ introduction diff --git a/test/file_base.go b/test/file_base.go index e0763de03..51649854f 100644 --- a/test/file_base.go +++ b/test/file_base.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/ozonru/file.d/pipeline" + "github.com/ozontech/file.d/pipeline" "github.com/stretchr/testify/assert" ) diff --git a/test/test.go b/test/test.go index 41efeab4f..3c7e522a5 100644 --- a/test/test.go +++ b/test/test.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/ozonru/file.d/cfg" - "github.com/ozonru/file.d/logger" - "github.com/ozonru/file.d/pipeline" - "github.com/ozonru/file.d/plugin/input/fake" - "github.com/ozonru/file.d/plugin/output/devnull" + "github.com/ozontech/file.d/cfg" + "github.com/ozontech/file.d/logger" + "github.com/ozontech/file.d/pipeline" + "github.com/ozontech/file.d/plugin/input/fake" + "github.com/ozontech/file.d/plugin/output/devnull" "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" "go.uber.org/zap" From e8aa301cc01adcf86788b2d1b05afc3546e0aef2 Mon Sep 17 00:00:00 2001 From: Vitkovskiy Vladimir Date: Wed, 12 Jan 2022 18:27:53 +0300 Subject: [PATCH 3/3] strange log removed --- pipeline/pipeline.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 0a4bcf542..903abe0e1 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -263,7 +263,6 @@ func (p *Pipeline) GetOutput() OutputPlugin { func (p *Pipeline) In(sourceID SourceID, sourceName string, offset int64, bytes []byte, isNewSource bool) uint64 { length := len(bytes) - logger.Infof("in %s", bytes) // don't process shit isEmpty := length == 0 || (bytes[0] == '\n' && length == 1)