From 81eaf8c8b2a9f78666324e9611e541e0fd7cd3ca Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 6 Sep 2022 22:25:04 +0300 Subject: [PATCH] update opentelemetry version (#6) Co-authored-by: andrey1s Reviewed-on: https://gitoa.ru/go-4devs/log/pulls/6 Co-authored-by: andrey Co-committed-by: andrey --- .drone.yml | 4 ++-- .golangci.yml | 13 +++++++++++- bench_test.go | 6 +++--- entry/pool.go | 4 ++-- field/encoder.go | 1 + field/field.go | 4 ++-- field/fields_test.go | 5 +++-- field/key.go | 2 +- field/value.go | 4 ++-- go.mod | 13 +++++------- go.sum | 38 ++++++++++++++++-------------------- logger.go | 2 +- logger_example_test.go | 10 +++++----- logger_example_trace_test.go | 4 ++-- writter.go | 2 +- 15 files changed, 59 insertions(+), 53 deletions(-) diff --git a/.drone.yml b/.drone.yml index d6ac213..8eaa186 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ name: default steps: - name: test - image: golang:1.17.8 + image: golang:1.18.1 volumes: - name: deps path: /go/src/mod @@ -11,7 +11,7 @@ steps: - go test - name: golangci-lint - image: golangci/golangci-lint:v1.44 + image: golangci/golangci-lint:v1.49 commands: - golangci-lint run diff --git a/.golangci.yml b/.golangci.yml index dc58bb9..47cef9c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -37,6 +37,17 @@ linters-settings: linters: enable-all: true + disable: + - exhaustivestruct + - maligned + - deadcode + - interfacer + - golint + - varcheck + - nosnakecase + - scopelint + - ifshort + - structcheck issues: # Excluding configuration per-path, per-linter, per-text and per-source @@ -44,5 +55,5 @@ issues: - path: _test\.go linters: - gomnd - - exhaustivestruct - ireturn + - exhaustruct diff --git a/bench_test.go b/bench_test.go index 0a7bdac..9d003f0 100644 --- a/bench_test.go +++ b/bench_test.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "io" "testing" "time" @@ -12,7 +12,7 @@ import ( "gitoa.ru/go-4devs/log/field" ) -// nolint: gochecknoglobals +//nolint:gochecknoglobals var ( errExample = errors.New("fail") _messages = fakeMessages(1000) @@ -118,7 +118,7 @@ func fakeSugarFields() []interface{} { } func NewLogger() log.Logger { - return log.New(log.WithWriter(ioutil.Discard)) + return log.New(log.WithWriter(io.Discard)) } func BenchmarkDisabledWithoutFields(b *testing.B) { diff --git a/entry/pool.go b/entry/pool.go index 5229eac..e98abc4 100644 --- a/entry/pool.go +++ b/entry/pool.go @@ -2,14 +2,14 @@ package entry import "sync" -// nolint: gochecknoglobals +//nolint:gochecknoglobals var pool = sync.Pool{ New: func() interface{} { return New() }, } -//nolint: forcetypeassert +//nolint:forcetypeassert func Get() *Entry { e := pool.Get().(*Entry) e.Reset() diff --git a/field/encoder.go b/field/encoder.go index bf16399..905eb2e 100644 --- a/field/encoder.go +++ b/field/encoder.go @@ -2,6 +2,7 @@ package field import "time" +//nolint:interfacebloat type Encoder interface { // Built-in types. AddArray(key string, value Value) diff --git a/field/field.go b/field/field.go index ab9bdfb..a3029d3 100644 --- a/field/field.go +++ b/field/field.go @@ -255,13 +255,13 @@ type Field struct { value Value } -//nolint: gocyclo,cyclop +//nolint:gocyclo,cyclop func (f Field) AddTo(enc Encoder) { key := string(f.key) switch { case f.value.IsArray(): - enc.AddAny(key, f.value) + enc.AddArray(key, f.value) case f.value.IsNil(): enc.AddNil(key) case f.value.IsBool(): diff --git a/field/fields_test.go b/field/fields_test.go index 181fd69..04c0a0c 100644 --- a/field/fields_test.go +++ b/field/fields_test.go @@ -3,7 +3,6 @@ package field_test import ( "testing" - "github.com/stretchr/testify/require" "gitoa.ru/go-4devs/log/field" ) @@ -13,5 +12,7 @@ func TestFields_Append(t *testing.T) { fields := field.Fields{field.Any("any", "value")} fields = fields.Append(field.String("string", "value")) - require.Len(t, fields, 2) + if len(fields) != 2 { + t.Fatalf("require 2 field got %v", len(fields)) + } } diff --git a/field/key.go b/field/key.go index 6ddb843..febd38d 100644 --- a/field/key.go +++ b/field/key.go @@ -6,7 +6,7 @@ import ( type Key string -//nolint: gocyclo,funlen,cyclop +//nolint:funlen,cyclop,gocyclo func (k Key) Any(value interface{}) Field { switch val := value.(type) { case string: diff --git a/field/value.go b/field/value.go index d5846bb..c8b4283 100644 --- a/field/value.go +++ b/field/value.go @@ -24,7 +24,7 @@ func (v Value) MarshalJSON() ([]byte, error) { return b, nil } -//nolint: gocyclo,gomnd,cyclop +//nolint:gocyclo,gomnd,cyclop func (v Value) String() string { switch { case v.vtype.IsArray(), v.vtype.IsAny(): @@ -62,7 +62,7 @@ func (v Value) String() string { return fmt.Sprintf("%+v", v.AsInterface()) } -//nolint: gocyclo,cyclop +//nolint:gocyclo,cyclop func (v Value) AsInterface() interface{} { switch { case v.vtype.IsArray(): diff --git a/go.mod b/go.mod index 14730db..2a0255b 100644 --- a/go.mod +++ b/go.mod @@ -4,19 +4,16 @@ go 1.17 require ( github.com/sirupsen/logrus v1.8.1 - github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/otel v0.20.0 - go.opentelemetry.io/otel/sdk v0.20.0 - go.opentelemetry.io/otel/trace v0.20.0 + go.opentelemetry.io/otel v1.9.0 + go.opentelemetry.io/otel/sdk v1.9.0 + go.opentelemetry.io/otel/trace v1.9.0 go.uber.org/zap v1.21.0 ) require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/otel/metric v0.20.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index c99ccf0..8e210af 100644 --- a/go.sum +++ b/go.sum @@ -3,12 +3,15 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -19,28 +22,22 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/metric v0.20.0 h1:4kzhXFP+btKm4jwxpjIqjs41A7MakRFUS86bqLHTIw8= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/oteltest v0.20.0 h1:HiITxCawalo5vQzdHfKeZurV8x7ljcqAgiWzF6Vaeaw= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0 h1:JsxtGXd06J8jrnya7fdI/U/MR6yXA5DtbZy+qoHQlr8= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/trace v0.20.0 h1:1DL6EXUdcg95gukhuRRvLDO/4X5THh/5dIV52lqtnbw= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= +go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= +go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= +go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= +go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= +go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -58,6 +55,7 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -69,10 +67,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/logger.go b/logger.go index 64ea93c..a1e1d8f 100644 --- a/logger.go +++ b/logger.go @@ -306,7 +306,7 @@ func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.F } } -//nolint: containedctx +//nolint:containedctx type writer struct { ctx context.Context level level.Level diff --git a/logger_example_test.go b/logger_example_test.go index fefce82..c572e89 100644 --- a/logger_example_test.go +++ b/logger_example_test.go @@ -69,7 +69,7 @@ func ExampleNew_jsonFormat() { log.GoVersion("go-version"), ) logger.Err(ctx, "same error message") - // Output: {"go-version":"go1.17.8","level":"error","msg":"same error message"} + // Output: {"go-version":"go1.18.1","level":"error","msg":"same error message"} } func ExampleNew_textEncoding() { @@ -82,8 +82,8 @@ func ExampleNew_textEncoding() { logger.InfoKVs(ctx, "same info message", "api-version", 0.1) // Output: - // msg="same error message" level=error go-version=go1.17.8 - // msg="same info message" api-version=0.1 level=info go-version=go1.17.8 + // msg="same error message" level=error go-version=go1.18.1 + // msg="same info message" api-version=0.1 level=info go-version=go1.18.1 } type ctxKey string @@ -105,7 +105,7 @@ func ExampleWith() { levelInfo, log.WithContextValue(requestID), log.KeyValue("api", "0.1.0"), log.GoVersion("go"), ) logger.Info(vctx, "same message") - // Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.17.8 + // Output: msg="same message" level=info requestID=6a5fa048-7181-11ea-bc55-0242ac130003 api=0.1.0 go=go1.18.1 } func ExampleLogger_Print() { @@ -114,7 +114,7 @@ func ExampleLogger_Print() { levelInfo, log.KeyValue("client", "http"), log.KeyValue("api", "0.1.0"), log.GoVersion("go"), ) logger.Print("same message") - // Output: msg="same message" level=info client=http api=0.1.0 go=go1.17.8 + // Output: msg="same message" level=info client=http api=0.1.0 go=go1.18.1 } func ExamplePrint() { diff --git a/logger_example_trace_test.go b/logger_example_trace_test.go index 836ff0b..7611a92 100644 --- a/logger_example_trace_test.go +++ b/logger_example_trace_test.go @@ -44,9 +44,9 @@ func (e exporter) Shutdown(_ context.Context) error { return nil } -func (e exporter) ExportSpans(ctx context.Context, spanData []*sdktrace.SpanSnapshot) error { +func (e exporter) ExportSpans(ctx context.Context, spanData []sdktrace.ReadOnlySpan) error { for _, data := range spanData { - for _, events := range data.MessageEvents { + for _, events := range data.Events() { fmt.Print("event: ", events.Name) for _, attr := range events.Attributes { diff --git a/writter.go b/writter.go index 2387c7c..ce4eeca 100644 --- a/writter.go +++ b/writter.go @@ -76,7 +76,7 @@ func WithJSONFormat() Option { return WithEncode(jsonFormat) } -//nolint: forcetypeassert +//nolint:forcetypeassert func stringFormat() func(entry *entry.Entry) ([]byte, error) { pool := sync.Pool{ New: func() interface{} {