Revert "Bump insaneJSON (#576)" (#582)

This reverts commit 2f1335d.
ozontech · Jan 31, 2024 · 1be2b75 · 1be2b75
1 parent 10521d4
commit 1be2b75
Show file tree

Hide file tree

Showing 38 changed files with 46 additions and 46 deletions.
diff --git a/cmd/file.d/file.d.go b/cmd/file.d/file.d.go
@@ -54,7 +54,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/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 	"go.uber.org/automaxprocs/maxprocs"
 )
 

diff --git a/decoder/nginx.go b/decoder/nginx.go
@@ -3,7 +3,7 @@ package decoder
 import (
 	"errors"
 
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 func spaceSplit(b []byte, limit int) []int {

diff --git a/decoder/nginx_test.go b/decoder/nginx_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 const (

diff --git a/decoder/postgres.go b/decoder/postgres.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 const (

diff --git 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/go.mod b/go.mod
@@ -24,12 +24,12 @@ require (
 	github.com/jackc/pgx/v4 v4.18.1
 	github.com/klauspost/compress v1.16.7
 	github.com/minio/minio-go v6.0.14+incompatible
-	github.com/ozontech/insane-json v0.1.8
 	github.com/prometheus/client_golang v1.16.0
 	github.com/rjeczalik/notify v0.9.3
 	github.com/satori/go.uuid v1.2.0
 	github.com/stretchr/testify v1.8.4
 	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

diff --git a/go.sum b/go.sum
@@ -334,8 +334,6 @@ 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.8 h1:1GfOTbLjWRfjz+AFFnLKcDISCtO4Uz54GsaJN08k0E0=
-github.com/ozontech/insane-json v0.1.8/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.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
@@ -408,6 +406,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/do_if.go b/pipeline/do_if.go
@@ -8,7 +8,7 @@ import (
 	"slices"
 
 	"github.com/ozontech/file.d/cfg"
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 // ! do-if-node

diff --git a/pipeline/do_if_test.go b/pipeline/do_if_test.go
@@ -6,9 +6,9 @@ import (
 	"slices"
 	"testing"
 
-	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/event.go b/pipeline/event.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/ozontech/file.d/logger"
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 	"go.uber.org/atomic"
 )
 

diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go
@@ -16,8 +16,8 @@ import (
 	"github.com/ozontech/file.d/logger"
 	"github.com/ozontech/file.d/metric"
 	"github.com/ozontech/file.d/pipeline/antispam"
-	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
@@ -2,7 +2,7 @@ package pipeline
 
 import (
 	"github.com/ozontech/file.d/logger"
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 	"go.uber.org/atomic"
 	"go.uber.org/zap"
 )

diff --git a/pipeline/processor_test.go b/pipeline/processor_test.go
@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"testing"
 
-	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
@@ -8,7 +8,7 @@ import (
 	"time"
 	"unsafe"
 
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 // Clone deeply copies string

diff --git 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
@@ -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/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 /*{ introduction

diff --git 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/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/ozontech/insane-json.(*Node).unescapeField(0xc0005892c0)
-	/Users/root/go/pkg/mod/github.com/ozontech/[email protected]/insane.go:1313 +0xf5
-github.com/ozontech/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd)
-	/Users/root/go/pkg/mod/github.com/ozontech/[email protected]/insane.go:773 +0x1ba
+github.com/vitkovskii/insane-json.(*Node).unescapeField(0xc0005892c0)
+	/Users/root/go/pkg/mod/github.com/vitkovskii/[email protected]/insane.go:1313 +0xf5
+github.com/vitkovskii/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd)
+	/Users/root/go/pkg/mod/github.com/vitkovskii/[email protected]/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/ozontech/insane-json.(*Node).unescapeField(0xc0005892c0)
-	/Users/root/go/pkg/mod/github.com/ozontech/[email protected]/insane.go:1313 +0xf5
-github.com/ozontech/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd)
-	/Users/root/go/pkg/mod/github.com/ozontech/[email protected]/insane.go:773 +0x1ba
+github.com/vitkovskii/insane-json.(*Node).unescapeField(0xc0005892c0)
+	/Users/root/go/pkg/mod/github.com/vitkovskii/[email protected]/insane.go:1313 +0xf5
+github.com/vitkovskii/insane-json.(*Node).Dig(0xc000589130, 0xc009895e70, 0x1, 0x1, 0xc0000497dd)
+	/Users/root/go/pkg/mod/github.com/vitkovskii/[email protected]/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/mask/mask.go b/plugin/action/mask/mask.go
@@ -10,8 +10,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
@@ -10,9 +10,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/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/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 /*{ introduction

diff --git 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
@@ -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
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/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
@@ -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
@@ -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/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 	"go.uber.org/zap"
 )
 

diff --git 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
@@ -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
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ClickHouse/ch-go/proto"
 	"github.com/google/uuid"
-	insaneJSON "github.com/ozontech/insane-json"
+	insaneJSON "github.com/vitkovskii/insane-json"
 )
 
 var (

diff --git a/plugin/output/elasticsearch/elasticsearch.go b/plugin/output/elasticsearch/elasticsearch.go
@@ -15,9 +15,9 @@ import (
 	"github.com/ozontech/file.d/metric"
 	"github.com/ozontech/file.d/pipeline"
 	"github.com/ozontech/file.d/xtls"
-	insaneJSON "github.com/ozontech/insane-json"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/valyala/fasthttp"
+	insaneJSON "github.com/vitkovskii/insane-json"
 	"go.uber.org/zap"
 )
 

diff --git 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
@@ -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"
 )
 

diff --git 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
@@ -9,8 +9,8 @@ import (
 
 	"github.com/Shopify/sarama"
 	"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/zaptest"
 )
 

diff --git 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"
 )
 

diff --git 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
@@ -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"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"bytes"
     	"fmt"
-    	insaneJSON "github.com/ozontech/insane-json"
+    	insaneJSON "github.com/vitkovskii/insane-json"
     )
     const (
@@ Expand Down @@