From 3fe1b89105c46ea6fc1e28fac081ea22e07c102a Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Fri, 20 Sep 2024 12:48:00 +0300 Subject: [PATCH 01/14] release pool memory on spawn --- pipeline/processor.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pipeline/processor.go b/pipeline/processor.go index de4cd0eaa..4d243e672 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -414,6 +414,7 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { child.stage = eventStageOutput p.output.Out(child) } + child.Root.ReleasePoolMem() } if p.busyActionsTotal == 0 { From c32af4e935c58464b9ef5e4df3e278080d1af91a Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Thu, 26 Sep 2024 19:05:05 +0700 Subject: [PATCH 02/14] Revert "release pool memory on spawn" This reverts commit 977e63ead9063a40f1fcc686742869c3b8be18d0. --- pipeline/processor.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pipeline/processor.go b/pipeline/processor.go index 4d243e672..de4cd0eaa 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -414,7 +414,6 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { child.stage = eventStageOutput p.output.Out(child) } - child.Root.ReleasePoolMem() } if p.busyActionsTotal == 0 { From 2355b7742acd866c7f0a55fa413c1ee3c3e4e2ad Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Thu, 26 Sep 2024 19:58:53 +0700 Subject: [PATCH 03/14] decoderPoolSize metric --- go.mod | 2 ++ go.sum | 4 ++-- pipeline/pipeline.go | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index db3e904ba..23cf6d97b 100644 --- a/go.mod +++ b/go.mod @@ -51,6 +51,8 @@ require ( sigs.k8s.io/yaml v1.3.0 ) +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e + require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect diff --git a/go.sum b/go.sum index 1a46bcbb8..a2ac63617 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= +github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e h1:RSaL4V1x1McvmpbZDcGF1i03q9ZiwT0yJ6NYEl5ipxA= +github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -391,8 +393,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/vitkovskii/insane-json v0.1.7 h1:A84WpQ/xGw8SSzzbLTkTI6PD2IYAVWjTlgaxN/rCAnw= -github.com/vitkovskii/insane-json v0.1.7/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 03a49440e..56ee70b83 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -115,6 +115,7 @@ type Pipeline struct { // all pipeline`s metrics inUseEventsMetric prometheus.Gauge + decoderPoolSize prometheus.Gauge eventPoolCapacityMetric prometheus.Gauge inputEventsCountMetric prometheus.Counter inputEventSizeMetric prometheus.Counter @@ -230,6 +231,7 @@ func (p *Pipeline) IncMaxEventSizeExceeded() { func (p *Pipeline) registerMetrics() { m := p.actionParams.MetricCtl p.inUseEventsMetric = m.RegisterGauge("event_pool_in_use_events", "Count of pool events which is used for processing") + p.decoderPoolSize = m.RegisterGauge("decoder_pool_size", "Size of decoder pool") p.eventPoolCapacityMetric = m.RegisterGauge("event_pool_capacity", "Pool capacity value") p.inputEventsCountMetric = m.RegisterCounter("input_events_count", "Count of events on pipeline input") p.inputEventSizeMetric = m.RegisterCounter("input_events_size", "Size of events on pipeline input") @@ -807,6 +809,8 @@ func (p *Pipeline) maintenance() { myDeltas := p.incMetrics(inputEvents, inputSize, outputEvents, outputSize, readOps) p.setMetrics(p.eventPool.inUseEvents.Load()) p.logChanges(myDeltas) + + p.decoderPoolSize.Set(float64(insaneJSON.LenghtDecoderPool())) } } From 1deaa8803e00ab3cc8642376148fd5198f48b423 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Mon, 30 Sep 2024 19:15:57 +0700 Subject: [PATCH 04/14] Revert "decoderPoolSize metric" This reverts commit 6e1e85138531bf11965f0c1883333be3b14b37b0. --- go.mod | 2 -- go.sum | 4 ++-- pipeline/pipeline.go | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 23cf6d97b..db3e904ba 100644 --- a/go.mod +++ b/go.mod @@ -51,8 +51,6 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e - require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect diff --git a/go.sum b/go.sum index a2ac63617..1a46bcbb8 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e h1:RSaL4V1x1McvmpbZDcGF1i03q9ZiwT0yJ6NYEl5ipxA= -github.com/DmitryRomanov/insane-json v0.1.6-0.20240926122634-ddd151e16a6e/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -393,6 +391,8 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= +github.com/vitkovskii/insane-json v0.1.7 h1:A84WpQ/xGw8SSzzbLTkTI6PD2IYAVWjTlgaxN/rCAnw= +github.com/vitkovskii/insane-json v0.1.7/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 56ee70b83..03a49440e 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -115,7 +115,6 @@ type Pipeline struct { // all pipeline`s metrics inUseEventsMetric prometheus.Gauge - decoderPoolSize prometheus.Gauge eventPoolCapacityMetric prometheus.Gauge inputEventsCountMetric prometheus.Counter inputEventSizeMetric prometheus.Counter @@ -231,7 +230,6 @@ func (p *Pipeline) IncMaxEventSizeExceeded() { func (p *Pipeline) registerMetrics() { m := p.actionParams.MetricCtl p.inUseEventsMetric = m.RegisterGauge("event_pool_in_use_events", "Count of pool events which is used for processing") - p.decoderPoolSize = m.RegisterGauge("decoder_pool_size", "Size of decoder pool") p.eventPoolCapacityMetric = m.RegisterGauge("event_pool_capacity", "Pool capacity value") p.inputEventsCountMetric = m.RegisterCounter("input_events_count", "Count of events on pipeline input") p.inputEventSizeMetric = m.RegisterCounter("input_events_size", "Size of events on pipeline input") @@ -809,8 +807,6 @@ func (p *Pipeline) maintenance() { myDeltas := p.incMetrics(inputEvents, inputSize, outputEvents, outputSize, readOps) p.setMetrics(p.eventPool.inUseEvents.Load()) p.logChanges(myDeltas) - - p.decoderPoolSize.Set(float64(insaneJSON.LenghtDecoderPool())) } } From 3648500961d06d0ef2d3e276d7491c1e6d63eaba Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Mon, 30 Sep 2024 19:22:31 +0700 Subject: [PATCH 05/14] use sync pool for insane decoder --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index db3e904ba..2c33d8783 100644 --- a/go.mod +++ b/go.mod @@ -51,6 +51,8 @@ require ( sigs.k8s.io/yaml v1.3.0 ) +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37 + require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect diff --git a/go.sum b/go.sum index 1a46bcbb8..f62af69ee 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= +github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37 h1:r4vfnTki2ovL1GpZj9l6tNkh22X9DPR67NzG+1ri6Hc= +github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -391,8 +393,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/vitkovskii/insane-json v0.1.7 h1:A84WpQ/xGw8SSzzbLTkTI6PD2IYAVWjTlgaxN/rCAnw= -github.com/vitkovskii/insane-json v0.1.7/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= From 03f2b6abcb353d6c6d07ca92e3716cb6f486851e Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Tue, 1 Oct 2024 14:46:42 +0700 Subject: [PATCH 06/14] release child root on spawn --- pipeline/processor.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pipeline/processor.go b/pipeline/processor.go index de4cd0eaa..d00b1bdf4 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -414,6 +414,7 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { child.stage = eventStageOutput p.output.Out(child) } + insaneJSON.Release(child.Root) } if p.busyActionsTotal == 0 { From 4f90069c80f1b1d692ddf27b21f78d6464c33f3c Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Mon, 7 Oct 2024 12:02:54 +0300 Subject: [PATCH 07/14] release pool in finalize --- pipeline/pipeline.go | 6 ++++++ pipeline/processor.go | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 03a49440e..5783de1dc 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -574,6 +574,12 @@ func (p *Pipeline) finalize(event *Event, notifyInput bool, backEvent bool) { for _, e := range event.children { insaneJSON.Release(e.Root) } + + if event.Root.PoolSize() > DefaultJSONNodePoolSize*4 && len(event.children) > 0 { + event.Root.ReleasePoolMem() + event.Root.ReleaseBufMem() + } + p.eventPool.back(event) } diff --git a/pipeline/processor.go b/pipeline/processor.go index d00b1bdf4..de4cd0eaa 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -414,7 +414,6 @@ func (p *processor) Spawn(parent *Event, nodes []*insaneJSON.Node) { child.stage = eventStageOutput p.output.Out(child) } - insaneJSON.Release(child.Root) } if p.busyActionsTotal == 0 { From ab591e23cecd6dc81b8cfed848503327a7776b41 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Mon, 7 Oct 2024 15:02:46 +0300 Subject: [PATCH 08/14] use sync pool for decoder node pool --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2c33d8783..17548312d 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37 +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/go.sum b/go.sum index f62af69ee..a6229206c 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37 h1:r4vfnTki2ovL1GpZj9l6tNkh22X9DPR67NzG+1ri6Hc= -github.com/DmitryRomanov/insane-json v0.1.6-0.20240930121319-27c156affa37/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948 h1:r4QOJe3pi/NDYrcIhUqSdzQ6iprVjbwZHh8+b5HWcIA= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= From c03e9da1a51dd0eb743e9f01dfcd9418dce5222c Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Tue, 8 Oct 2024 09:53:38 +0300 Subject: [PATCH 09/14] resets nodes on back pool --- go.mod | 2 +- go.sum | 2 ++ pipeline/pipeline.go | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 17548312d..03147beff 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948 +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/go.sum b/go.sum index a6229206c..8791a0a92 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UT github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948 h1:r4QOJe3pi/NDYrcIhUqSdzQ6iprVjbwZHh8+b5HWcIA= github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441 h1:KgGmx/V+EdmO5CchVk+6XxQh/Ghw+8wU7lpvxrhxdAo= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 5783de1dc..de0a8320e 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -575,11 +575,6 @@ func (p *Pipeline) finalize(event *Event, notifyInput bool, backEvent bool) { insaneJSON.Release(e.Root) } - if event.Root.PoolSize() > DefaultJSONNodePoolSize*4 && len(event.children) > 0 { - event.Root.ReleasePoolMem() - event.Root.ReleaseBufMem() - } - p.eventPool.back(event) } From f4b595e3ca40181203cc20b14fc175c42c7771d8 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Tue, 8 Oct 2024 11:08:37 +0300 Subject: [PATCH 10/14] reset only non-empty node pools --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 03147beff..22bb90bf3 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441 +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/go.sum b/go.sum index 8791a0a92..c367f129e 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948 h1:r4QOJe3pi/NDYrcIhUqSdzQ6iprVjbwZHh8+b5HWcIA= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241007115731-9f178d5b8948/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441 h1:KgGmx/V+EdmO5CchVk+6XxQh/Ghw+8wU7lpvxrhxdAo= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241008062604-33cf01b0c441/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a h1:aIy+Ad9xJKlZs0Q6l7DPQOi9bqoDzB+p+QlmsJdSnMY= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= From 763d81d6f2f6789085546602ce47c53769917bb9 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Mon, 28 Oct 2024 10:34:38 +0300 Subject: [PATCH 11/14] nill children on finalize --- go.mod | 2 +- go.sum | 4 ++-- pipeline/pipeline.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 22bb90bf3..005500e52 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a +replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/go.sum b/go.sum index c367f129e..8ce8abd4c 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a h1:aIy+Ad9xJKlZs0Q6l7DPQOi9bqoDzB+p+QlmsJdSnMY= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241008094754-751b7776020a/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612 h1:IUaXzcYMT1l+2KMZ/FFU53kVOs60s8kyrVNshlNAy2Q= +github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index de0a8320e..914b71870 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -571,8 +571,9 @@ func (p *Pipeline) finalize(event *Event, notifyInput bool, backEvent bool) { p.eventLogMu.Unlock() } - for _, e := range event.children { + for i, e := range event.children { insaneJSON.Release(e.Root) + event.children[i] = nil } p.eventPool.back(event) From a09d333885116a0c7193ee5345d2edd5563fde08 Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Fri, 1 Nov 2024 13:28:15 +0300 Subject: [PATCH 12/14] no need to make release in do_if_test --- pipeline/doif/do_if_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pipeline/doif/do_if_test.go b/pipeline/doif/do_if_test.go index d6858181b..2115143ca 100644 --- a/pipeline/doif/do_if_test.go +++ b/pipeline/doif/do_if_test.go @@ -1182,11 +1182,9 @@ func TestCheckTsCmpValChangeModeNow(t *testing.T) { eventRoot1, err := timeToJSON(ts1) require.NoError(t, err) - defer insaneJSON.Release(eventRoot1) eventRoot2, err := timeToJSON(ts2) require.NoError(t, err) - defer insaneJSON.Release(eventRoot1) require.True(t, checker.Check(eventRoot1)) require.False(t, checker.Check(eventRoot2)) From 7303ec54d37ded9beb20bff367c5252b951035bd Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Fri, 1 Nov 2024 14:49:50 +0300 Subject: [PATCH 13/14] revert to use sync pool for decoder node pool --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 005500e52..1bac5d8c4 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612 +replace github.com/vitkovskii/insane-json => github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66 require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect diff --git a/go.sum b/go.sum index 8ce8abd4c..7273f600b 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0= github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612 h1:IUaXzcYMT1l+2KMZ/FFU53kVOs60s8kyrVNshlNAy2Q= -github.com/DmitryRomanov/insane-json v0.1.6-0.20241011144952-c16630ca6612/go.mod h1:xQyYcnFJ8ElboaEZG805SrQ7I4QupForGkm0/TnRaZ8= github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0= github.com/KimMachineGun/automemlimit v0.2.6/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= @@ -29,10 +27,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.1 h1:xgwPbetQScXt1gh9BmoJ6j9JMr3TElvuIyjR8pgdoow= github.com/bitly/go-simplejson v0.5.1/go.mod h1:YOPVLzCfwK14b4Sff3oP1AmGhI9T9Vsg84etUnlyp+Q= -github.com/bufbuild/protocompile v0.13.0 h1:6cwUB0Y2tSvmNxsbunwzmIto3xOlJOV7ALALuVOs92M= -github.com/bufbuild/protocompile v0.13.0/go.mod h1:dr++fGGeMPWHv7jPeT06ZKukm45NJscd7rUxQVzEKRk= github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA= github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bufbuild/protocompile v0.13.0 h1:6cwUB0Y2tSvmNxsbunwzmIto3xOlJOV7ALALuVOs92M= +github.com/bufbuild/protocompile v0.13.0/go.mod h1:dr++fGGeMPWHv7jPeT06ZKukm45NJscd7rUxQVzEKRk= github.com/cenkalti/backoff/v3 v3.0.0 h1:ske+9nBpD9qZsTBoF41nW5L+AIuFBKMeze18XQ3eG1c= github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= @@ -313,6 +311,8 @@ github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66 h1:S+0GdJldCRVBWNKgNawxJuiK1x2T2FOPNk3KhrN1xhQ= +github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0= github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= From 25ae18c5e050c45182d323c59ce93870dae3cf4d Mon Sep 17 00:00:00 2001 From: Dmitry Romanov Date: Fri, 15 Nov 2024 15:46:53 +0700 Subject: [PATCH 14/14] github.com/vitkovskii/insane-json => github.com/ozontech/insane-json --- cmd/file.d/file.d.go | 2 +- decoder/decoder.go | 2 +- decoder/json.go | 2 +- decoder/nginx.go | 2 +- decoder/postgres.go | 2 +- decoder/postgres_test.go | 2 +- decoder/protobuf.go | 2 +- decoder/protobuf_test.go | 2 +- go.mod | 4 +--- go.sum | 4 ++-- pipeline/doif/check_type_op.go | 2 +- pipeline/doif/check_type_test.go | 2 +- pipeline/doif/do_if.go | 2 +- pipeline/doif/do_if_test.go | 2 +- pipeline/doif/field_op.go | 2 +- pipeline/doif/len_cmp_op.go | 2 +- pipeline/doif/logical_op.go | 2 +- pipeline/doif/ts_cmp_op.go | 2 +- pipeline/event.go | 2 +- pipeline/pipeline.go | 2 +- pipeline/processor.go | 2 +- pipeline/processor_test.go | 2 +- pipeline/util.go | 2 +- pipeline/util_test.go | 2 +- .../convert_utf8_bytes/convert_utf8_bytes.go | 2 +- plugin/action/debug/debug_test.go | 2 +- plugin/action/decode/decode.go | 2 +- .../action/join_template/join_template_test.go | 16 ++++++++-------- plugin/action/json_extract/json_extract.go | 2 +- plugin/action/json_extract/json_extract_test.go | 2 +- plugin/action/mask/mask.go | 2 +- plugin/action/mask/mask_test.go | 2 +- plugin/action/modify/modify_test.go | 2 +- plugin/action/move/move.go | 2 +- plugin/action/parse_es/parse_es_test.go | 2 +- plugin/action/parse_re2/parse_re2.go | 2 +- plugin/action/rename/config.go | 2 +- plugin/action/set_time/set_time_test.go | 2 +- plugin/action/split/split.go | 2 +- plugin/input/dmesg/dmesg.go | 2 +- plugin/input/k8s/multiline_action_test.go | 2 +- plugin/output/clickhouse/insanenode.go | 2 +- plugin/output/elasticsearch/elasticsearch.go | 2 +- .../output/elasticsearch/elasticsearch_test.go | 2 +- plugin/output/gelf/gelf.go | 2 +- plugin/output/gelf/gelf_test.go | 2 +- plugin/output/kafka/kafka_test.go | 2 +- plugin/output/postgres/postgres.go | 2 +- plugin/output/postgres/postgres_test.go | 2 +- plugin/output/splunk/splunk.go | 2 +- plugin/output/splunk/splunk_test.go | 2 +- 51 files changed, 59 insertions(+), 61 deletions(-) diff --git a/cmd/file.d/file.d.go b/cmd/file.d/file.d.go index 297c38799..d55a42fe6 100644 --- a/cmd/file.d/file.d.go +++ b/cmd/file.d/file.d.go @@ -57,7 +57,7 @@ import ( _ "github.com/ozontech/file.d/plugin/output/s3" _ "github.com/ozontech/file.d/plugin/output/splunk" _ "github.com/ozontech/file.d/plugin/output/stdout" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "go.uber.org/automaxprocs/maxprocs" ) diff --git a/decoder/decoder.go b/decoder/decoder.go index 86ae413c4..c7ad59724 100644 --- a/decoder/decoder.go +++ b/decoder/decoder.go @@ -1,6 +1,6 @@ package decoder -import insaneJSON "github.com/vitkovskii/insane-json" +import insaneJSON "github.com/ozontech/insane-json" type Type int diff --git a/decoder/json.go b/decoder/json.go index 6ee314365..9a893b69a 100644 --- a/decoder/json.go +++ b/decoder/json.go @@ -1,6 +1,6 @@ package decoder -import insaneJSON "github.com/vitkovskii/insane-json" +import insaneJSON "github.com/ozontech/insane-json" func DecodeJson(root *insaneJSON.Root, data []byte) error { return root.DecodeBytes(data) diff --git a/decoder/nginx.go b/decoder/nginx.go index 5e15641cd..42c43c9d8 100644 --- a/decoder/nginx.go +++ b/decoder/nginx.go @@ -6,7 +6,7 @@ import ( "fmt" "unicode" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) const ( diff --git a/decoder/postgres.go b/decoder/postgres.go index 1ae6f1308..ae25f8823 100644 --- a/decoder/postgres.go +++ b/decoder/postgres.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) const ( diff --git a/decoder/postgres_test.go b/decoder/postgres_test.go index 5e93ed09b..6b1ad02df 100644 --- a/decoder/postgres_test.go +++ b/decoder/postgres_test.go @@ -3,8 +3,8 @@ package decoder import ( "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestPostgres(t *testing.T) { diff --git a/decoder/protobuf.go b/decoder/protobuf.go index 4b5ec0374..7636c659d 100644 --- a/decoder/protobuf.go +++ b/decoder/protobuf.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/bufbuild/protocompile" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" diff --git a/decoder/protobuf_test.go b/decoder/protobuf_test.go index dd78083e6..2a3e024a3 100644 --- a/decoder/protobuf_test.go +++ b/decoder/protobuf_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) const protoContent = `syntax = "proto3"; diff --git a/go.mod b/go.mod index 1bac5d8c4..0da1d767e 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/jackc/pgx/v4 v4.18.1 github.com/klauspost/compress v1.17.8 github.com/minio/minio-go v6.0.14+incompatible + github.com/ozontech/insane-json v0.1.9 github.com/prometheus/client_golang v1.16.0 github.com/prometheus/procfs v0.10.1 github.com/rjeczalik/notify v0.9.3 @@ -37,7 +38,6 @@ require ( github.com/twmb/franz-go/plugin/kzap v1.1.2 github.com/twmb/tlscfg v1.2.1 github.com/valyala/fasthttp v1.48.0 - github.com/vitkovskii/insane-json v0.1.7 github.com/xdg-go/scram v1.1.2 go.uber.org/atomic v1.11.0 go.uber.org/automaxprocs v1.5.3 @@ -51,8 +51,6 @@ require ( sigs.k8s.io/yaml v1.3.0 ) -replace github.com/vitkovskii/insane-json => github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66 - require ( github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect diff --git a/go.sum b/go.sum index 7273f600b..6a5447755 100644 --- a/go.sum +++ b/go.sum @@ -311,8 +311,8 @@ github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66 h1:S+0GdJldCRVBWNKgNawxJuiK1x2T2FOPNk3KhrN1xhQ= -github.com/ozontech/insane-json v0.1.6-0.20241015080158-969fb1803c66/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= +github.com/ozontech/insane-json v0.1.9 h1:JG5cEsmuSDwmU7KTJTHfTJ40XMgvtPdsUQbXdbPv+bY= +github.com/ozontech/insane-json v0.1.9/go.mod h1:xZLf3tVLOqaT13rn1sv4fYaZfupAXNL9naLz4QRoMfY= github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0= github.com/pascaldekloe/name v1.0.1/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= diff --git a/pipeline/doif/check_type_op.go b/pipeline/doif/check_type_op.go index e1ea66fdb..fff31eec9 100644 --- a/pipeline/doif/check_type_op.go +++ b/pipeline/doif/check_type_op.go @@ -6,7 +6,7 @@ import ( "slices" "github.com/ozontech/file.d/cfg" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ do-if-check-type-op-node diff --git a/pipeline/doif/check_type_test.go b/pipeline/doif/check_type_test.go index 8ab0fb38a..f4dd33c34 100644 --- a/pipeline/doif/check_type_test.go +++ b/pipeline/doif/check_type_test.go @@ -3,9 +3,9 @@ package doif import ( "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) type testCheckTypeNode struct { diff --git a/pipeline/doif/do_if.go b/pipeline/doif/do_if.go index 847c6b9a4..f3eeba087 100644 --- a/pipeline/doif/do_if.go +++ b/pipeline/doif/do_if.go @@ -1,7 +1,7 @@ package doif import ( - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) // ! do-if-node diff --git a/pipeline/doif/do_if_test.go b/pipeline/doif/do_if_test.go index 2115143ca..120496202 100644 --- a/pipeline/doif/do_if_test.go +++ b/pipeline/doif/do_if_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) type treeNode struct { diff --git a/pipeline/doif/field_op.go b/pipeline/doif/field_op.go index 0b2904db9..4b79c3cf7 100644 --- a/pipeline/doif/field_op.go +++ b/pipeline/doif/field_op.go @@ -8,7 +8,7 @@ import ( "slices" "github.com/ozontech/file.d/cfg" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) // ! do-if-field-op diff --git a/pipeline/doif/len_cmp_op.go b/pipeline/doif/len_cmp_op.go index 589cba249..c8904dca9 100644 --- a/pipeline/doif/len_cmp_op.go +++ b/pipeline/doif/len_cmp_op.go @@ -6,7 +6,7 @@ import ( "slices" "github.com/ozontech/file.d/cfg" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ do-if-len-cmp-op-node diff --git a/pipeline/doif/logical_op.go b/pipeline/doif/logical_op.go index f28629e26..70930b077 100644 --- a/pipeline/doif/logical_op.go +++ b/pipeline/doif/logical_op.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) // ! do-if-logical-op diff --git a/pipeline/doif/ts_cmp_op.go b/pipeline/doif/ts_cmp_op.go index edfc72147..402bd9942 100644 --- a/pipeline/doif/ts_cmp_op.go +++ b/pipeline/doif/ts_cmp_op.go @@ -8,7 +8,7 @@ import ( "time" "github.com/ozontech/file.d/cfg" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ do-if-ts-cmp-op-node diff --git a/pipeline/event.go b/pipeline/event.go index d26e6caa0..34c6ac99a 100644 --- a/pipeline/event.go +++ b/pipeline/event.go @@ -7,7 +7,7 @@ import ( "time" "github.com/ozontech/file.d/logger" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "go.uber.org/atomic" ) diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 914b71870..0e0847017 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -16,8 +16,8 @@ import ( "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline/antispam" "github.com/ozontech/file.d/pipeline/metadata" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/atomic" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pipeline/processor.go b/pipeline/processor.go index de4cd0eaa..f9189b667 100644 --- a/pipeline/processor.go +++ b/pipeline/processor.go @@ -2,7 +2,7 @@ package pipeline import ( "github.com/ozontech/file.d/logger" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pipeline/processor_test.go b/pipeline/processor_test.go index 9e73692f6..8b389739d 100644 --- a/pipeline/processor_test.go +++ b/pipeline/processor_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/ozontech/file.d/decoder" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) func Test_processor_isMatch(t *testing.T) { diff --git a/pipeline/util.go b/pipeline/util.go index d5ec272c1..a370436e1 100644 --- a/pipeline/util.go +++ b/pipeline/util.go @@ -8,7 +8,7 @@ import ( "time" "unsafe" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) // Clone deeply copies string diff --git a/pipeline/util_test.go b/pipeline/util_test.go index da3ad1b76..394e0710e 100644 --- a/pipeline/util_test.go +++ b/pipeline/util_test.go @@ -3,8 +3,8 @@ package pipeline import ( "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestCreateNestedFieldPositive(t *testing.T) { diff --git a/plugin/action/convert_utf8_bytes/convert_utf8_bytes.go b/plugin/action/convert_utf8_bytes/convert_utf8_bytes.go index 8eb5d098c..437db0b6a 100644 --- a/plugin/action/convert_utf8_bytes/convert_utf8_bytes.go +++ b/plugin/action/convert_utf8_bytes/convert_utf8_bytes.go @@ -10,7 +10,7 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ introduction diff --git a/plugin/action/debug/debug_test.go b/plugin/action/debug/debug_test.go index f88f4861c..b59b52c4a 100644 --- a/plugin/action/debug/debug_test.go +++ b/plugin/action/debug/debug_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" diff --git a/plugin/action/decode/decode.go b/plugin/action/decode/decode.go index f1994f859..ed893e304 100644 --- a/plugin/action/decode/decode.go +++ b/plugin/action/decode/decode.go @@ -7,7 +7,7 @@ import ( "github.com/ozontech/file.d/decoder" "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "go.uber.org/zap" ) diff --git a/plugin/action/join_template/join_template_test.go b/plugin/action/join_template/join_template_test.go index 32d04661c..3ef4e070b 100644 --- a/plugin/action/join_template/join_template_test.go +++ b/plugin/action/join_template/join_template_test.go @@ -134,10 +134,10 @@ created by example.com/sre/filed/plugin/input/file.(*worker).start panic: runtime error: slice bounds out of range goroutine 227 [running]: -github.com/vitkovskii/insane-json.(*Node).unescapeField(0xc0005892c0) - /Users/root/go/pkg/mod/github.com/vitkovskii/insane-json@v0.0.15/insane.go:1313 +0xf5 -github.com/vitkovskii/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd) - /Users/root/go/pkg/mod/github.com/vitkovskii/insane-json@v0.0.15/insane.go:773 +0x1ba +github.com/ozontech/insane-json.(*Node).unescapeField(0xc0005892c0) + /Users/root/go/pkg/mod/github.com/ozontech/insane-json@v0.0.15/insane.go:1313 +0xf5 +github.com/ozontech/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd) + /Users/root/go/pkg/mod/github.com/ozontech/insane-json@v0.0.15/insane.go:773 +0x1ba example.com/sre/filed/pipeline.(*Pipeline).countEvent(0xc0002afa40, 0xc0002e99e0, 0x2, 0x150d768, 0x8, 0xc00987a580, 0x1, 0x4, 0xc00987a580, 0x4, ...) /Users/root/go/src/example.com/sre/filed/pipeline/pipeline.go:351 +0x154 example.com/sre/filed/pipeline.(*processor).countEvent(...) @@ -342,10 +342,10 @@ created by example.com/sre/filed/plugin/input/file.(*worker).start panic: runtime error: slice bounds out of range goroutine 227 [running]: -github.com/vitkovskii/insane-json.(*Node).unescapeField(0xc0005892c0) - /Users/root/go/pkg/mod/github.com/vitkovskii/insane-json@v0.0.15/insane.go:1313 +0xf5 -github.com/vitkovskii/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd) - /Users/root/go/pkg/mod/github.com/vitkovskii/insane-json@v0.0.15/insane.go:773 +0x1ba +github.com/ozontech/insane-json.(*Node).unescapeField(0xc0005892c0) + /Users/root/go/pkg/mod/github.com/ozontech/insane-json@v0.0.15/insane.go:1313 +0xf5 +github.com/ozontech/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd) + /Users/root/go/pkg/mod/github.com/ozontech/insane-json@v0.0.15/insane.go:773 +0x1ba example.com/sre/filed/pipeline.(*Pipeline).countEvent(0xc0002afa40, 0xc0002e99e0, 0x2, 0x150d768, 0x8, 0xc00987a580, 0x1, 0x4, 0xc00987a580, 0x4, ...) /Users/root/go/src/example.com/sre/filed/pipeline/pipeline.go:351 +0x154 example.com/sre/filed/pipeline.(*processor).countEvent(...) diff --git a/plugin/action/json_extract/json_extract.go b/plugin/action/json_extract/json_extract.go index 4f98b2a62..afebf5fc9 100644 --- a/plugin/action/json_extract/json_extract.go +++ b/plugin/action/json_extract/json_extract.go @@ -7,7 +7,7 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ introduction diff --git a/plugin/action/json_extract/json_extract_test.go b/plugin/action/json_extract/json_extract_test.go index c9f4aa017..747b8ba03 100644 --- a/plugin/action/json_extract/json_extract_test.go +++ b/plugin/action/json_extract/json_extract_test.go @@ -9,8 +9,8 @@ import ( "github.com/go-faster/jx" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestJsonExtract(t *testing.T) { diff --git a/plugin/action/mask/mask.go b/plugin/action/mask/mask.go index 98b4bb943..800824844 100644 --- a/plugin/action/mask/mask.go +++ b/plugin/action/mask/mask.go @@ -11,8 +11,8 @@ import ( "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - 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 6ed474eae..4766fb0f2 100644 --- a/plugin/action/mask/mask_test.go +++ b/plugin/action/mask/mask_test.go @@ -11,9 +11,9 @@ import ( "github.com/ozontech/file.d/cfg/matchrule" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/plugin/action/modify/modify_test.go b/plugin/action/modify/modify_test.go index 1e66992d1..474b44837 100644 --- a/plugin/action/modify/modify_test.go +++ b/plugin/action/modify/modify_test.go @@ -6,8 +6,8 @@ import ( "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestModify(t *testing.T) { diff --git a/plugin/action/move/move.go b/plugin/action/move/move.go index 637ac28a2..64b1e0cb3 100644 --- a/plugin/action/move/move.go +++ b/plugin/action/move/move.go @@ -7,7 +7,7 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) /*{ introduction diff --git a/plugin/action/parse_es/parse_es_test.go b/plugin/action/parse_es/parse_es_test.go index 426f7cb1c..64b3afc97 100644 --- a/plugin/action/parse_es/parse_es_test.go +++ b/plugin/action/parse_es/parse_es_test.go @@ -3,8 +3,8 @@ package parse_es import ( "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "github.com/ozontech/file.d/pipeline" diff --git a/plugin/action/parse_re2/parse_re2.go b/plugin/action/parse_re2/parse_re2.go index 0914207e2..6808b74ea 100644 --- a/plugin/action/parse_re2/parse_re2.go +++ b/plugin/action/parse_re2/parse_re2.go @@ -7,8 +7,8 @@ import ( "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" ) /*{ introduction diff --git a/plugin/action/rename/config.go b/plugin/action/rename/config.go index 85980841f..62eeea9f5 100644 --- a/plugin/action/rename/config.go +++ b/plugin/action/rename/config.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) type Config []string diff --git a/plugin/action/set_time/set_time_test.go b/plugin/action/set_time/set_time_test.go index 43eade9e7..b737bc609 100644 --- a/plugin/action/set_time/set_time_test.go +++ b/plugin/action/set_time/set_time_test.go @@ -8,8 +8,8 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/atomic" ) diff --git a/plugin/action/split/split.go b/plugin/action/split/split.go index c0a7401fa..8945bc99e 100644 --- a/plugin/action/split/split.go +++ b/plugin/action/split/split.go @@ -4,7 +4,7 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/pipeline" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" "go.uber.org/zap" ) diff --git a/plugin/input/dmesg/dmesg.go b/plugin/input/dmesg/dmesg.go index e1a45bedf..4aa939965 100644 --- a/plugin/input/dmesg/dmesg.go +++ b/plugin/input/dmesg/dmesg.go @@ -11,8 +11,8 @@ import ( "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/offset" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" ) diff --git a/plugin/input/k8s/multiline_action_test.go b/plugin/input/k8s/multiline_action_test.go index ad2fce6dd..06b6887ad 100644 --- a/plugin/input/k8s/multiline_action_test.go +++ b/plugin/input/k8s/multiline_action_test.go @@ -7,9 +7,9 @@ import ( "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestMultilineAction_Do(t *testing.T) { diff --git a/plugin/output/clickhouse/insanenode.go b/plugin/output/clickhouse/insanenode.go index d9298a0e1..6e8b079b4 100644 --- a/plugin/output/clickhouse/insanenode.go +++ b/plugin/output/clickhouse/insanenode.go @@ -8,7 +8,7 @@ import ( "github.com/ClickHouse/ch-go/proto" "github.com/google/uuid" - insaneJSON "github.com/vitkovskii/insane-json" + insaneJSON "github.com/ozontech/insane-json" ) var ( diff --git a/plugin/output/elasticsearch/elasticsearch.go b/plugin/output/elasticsearch/elasticsearch.go index 580664a33..edd308bad 100644 --- a/plugin/output/elasticsearch/elasticsearch.go +++ b/plugin/output/elasticsearch/elasticsearch.go @@ -14,8 +14,8 @@ import ( "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/xhttp" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/plugin/output/elasticsearch/elasticsearch_test.go b/plugin/output/elasticsearch/elasticsearch_test.go index 1d1f0f11a..e28ac4eb1 100644 --- a/plugin/output/elasticsearch/elasticsearch_test.go +++ b/plugin/output/elasticsearch/elasticsearch_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" diff --git a/plugin/output/gelf/gelf.go b/plugin/output/gelf/gelf.go index bd0315626..034ade23b 100644 --- a/plugin/output/gelf/gelf.go +++ b/plugin/output/gelf/gelf.go @@ -9,8 +9,8 @@ import ( "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/plugin/output/gelf/gelf_test.go b/plugin/output/gelf/gelf_test.go index 2984b1994..5a34a7d3a 100644 --- a/plugin/output/gelf/gelf_test.go +++ b/plugin/output/gelf/gelf_test.go @@ -8,8 +8,8 @@ import ( "github.com/ozontech/file.d/logger" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/test" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestFormatEvent(t *testing.T) { diff --git a/plugin/output/kafka/kafka_test.go b/plugin/output/kafka/kafka_test.go index 9c4a797c8..4385d599b 100644 --- a/plugin/output/kafka/kafka_test.go +++ b/plugin/output/kafka/kafka_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/twmb/franz-go/pkg/kgo" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap/zaptest" ) diff --git a/plugin/output/postgres/postgres.go b/plugin/output/postgres/postgres.go index 59530ec1d..9655323fe 100644 --- a/plugin/output/postgres/postgres.go +++ b/plugin/output/postgres/postgres.go @@ -14,8 +14,8 @@ import ( "github.com/ozontech/file.d/fd" "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/plugin/output/postgres/postgres_test.go b/plugin/output/postgres/postgres_test.go index 53d905ddd..b3be1093d 100644 --- a/plugin/output/postgres/postgres_test.go +++ b/plugin/output/postgres/postgres_test.go @@ -14,9 +14,9 @@ import ( "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" mock_pg "github.com/ozontech/file.d/plugin/output/postgres/mock" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - insaneJSON "github.com/vitkovskii/insane-json" ) func TestPrivateOut(t *testing.T) { diff --git a/plugin/output/splunk/splunk.go b/plugin/output/splunk/splunk.go index 325fa66b5..3be9b711c 100644 --- a/plugin/output/splunk/splunk.go +++ b/plugin/output/splunk/splunk.go @@ -14,8 +14,8 @@ import ( "github.com/ozontech/file.d/metric" "github.com/ozontech/file.d/pipeline" "github.com/ozontech/file.d/xhttp" + insaneJSON "github.com/ozontech/insane-json" "github.com/prometheus/client_golang/prometheus" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/plugin/output/splunk/splunk_test.go b/plugin/output/splunk/splunk_test.go index bbd91867a..40626e076 100644 --- a/plugin/output/splunk/splunk_test.go +++ b/plugin/output/splunk/splunk_test.go @@ -8,8 +8,8 @@ import ( "github.com/ozontech/file.d/cfg" "github.com/ozontech/file.d/pipeline" + insaneJSON "github.com/ozontech/insane-json" "github.com/stretchr/testify/assert" - insaneJSON "github.com/vitkovskii/insane-json" "go.uber.org/zap" )