From db673e62300b87090c7b09311ac633235cc0c0d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 20:05:00 +0200 Subject: [PATCH] Bump github.com/rs/zerolog from 1.26.0 to 1.26.1 (#449) * Bump github.com/rs/zerolog from 1.26.0 to 1.26.1 Bumps [github.com/rs/zerolog](https://github.com/rs/zerolog) from 1.26.0 to 1.26.1. - [Release notes](https://github.com/rs/zerolog/releases) - [Commits](https://github.com/rs/zerolog/compare/v1.26.0...v1.26.1) --- updated-dependencies: - dependency-name: github.com/rs/zerolog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Fixed broken test race conditions * Fixed broken test race conditions Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sotirios Mantziaris Co-authored-by: Paschalis Tsilias --- component/amqp/message_test.go | 12 ++++-------- go.mod | 2 +- go.sum | 7 ++++--- service_test.go | 2 -- test/docker/aws/component_integration_test.go | 3 ++- test/docker/aws/sns_integration_test.go | 6 ++++-- test/docker/aws/sqs_integration_test.go | 5 +++-- vendor/github.com/rs/zerolog/console.go | 2 +- vendor/github.com/rs/zerolog/go.mod | 1 + vendor/github.com/rs/zerolog/go.sum | 3 +++ vendor/modules.txt | 4 ++-- 11 files changed, 25 insertions(+), 22 deletions(-) diff --git a/component/amqp/message_test.go b/component/amqp/message_test.go index bdd19a258..7566dd886 100644 --- a/component/amqp/message_test.go +++ b/component/amqp/message_test.go @@ -52,7 +52,7 @@ func Test_message(t *testing.T) { } func Test_message_ACK(t *testing.T) { - t.Parallel() + t.Cleanup(func() { mockTracer.Reset() }) type fields struct { acknowledger amqp.Acknowledger } @@ -71,7 +71,7 @@ func Test_message_ACK(t *testing.T) { for name, tt := range tests { tt := tt t.Run(name, func(t *testing.T) { - t.Parallel() + t.Cleanup(func() { mockTracer.Reset() }) m := createMessage("1", tt.fields.acknowledger) err := m.ACK() @@ -85,7 +85,6 @@ func Test_message_ACK(t *testing.T) { "correlationID": "123", } assert.Equal(t, expected, mockTracer.FinishedSpans()[0].Tags()) - mockTracer.Reset() } else { assert.NoError(t, err) expected := map[string]interface{}{ @@ -96,14 +95,13 @@ func Test_message_ACK(t *testing.T) { "correlationID": "123", } assert.Equal(t, expected, mockTracer.FinishedSpans()[0].Tags()) - mockTracer.Reset() } }) } } func Test_message_NACK(t *testing.T) { - t.Parallel() + t.Cleanup(func() { mockTracer.Reset() }) type fields struct { acknowledger amqp.Acknowledger } @@ -122,7 +120,7 @@ func Test_message_NACK(t *testing.T) { for name, tt := range tests { tt := tt t.Run(name, func(t *testing.T) { - t.Parallel() + t.Cleanup(func() { mockTracer.Reset() }) m := createMessage("1", tt.fields.acknowledger) err := m.NACK() @@ -136,7 +134,6 @@ func Test_message_NACK(t *testing.T) { "correlationID": "123", } assert.Equal(t, expected, mockTracer.FinishedSpans()[0].Tags()) - mockTracer.Reset() } else { assert.NoError(t, err) expected := map[string]interface{}{ @@ -147,7 +144,6 @@ func Test_message_NACK(t *testing.T) { "correlationID": "123", } assert.Equal(t, expected, mockTracer.FinishedSpans()[0].Tags()) - mockTracer.Reset() } }) } diff --git a/go.mod b/go.mod index 3dd718f4b..24adf332c 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/opentracing/opentracing-go v1.2.0 github.com/ory/dockertest/v3 v3.8.1 github.com/prometheus/client_golang v1.11.0 - github.com/rs/zerolog v1.26.0 + github.com/rs/zerolog v1.26.1 github.com/streadway/amqp v1.0.0 github.com/stretchr/testify v1.7.0 github.com/uber/jaeger-client-go v2.30.0+incompatible diff --git a/go.sum b/go.sum index 8cf873a9d..a8d23833f 100644 --- a/go.sum +++ b/go.sum @@ -270,8 +270,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.26.0 h1:ORM4ibhEZeTeQlCojCK2kPz1ogAY4bGs4tD+SaAdGaE= -github.com/rs/zerolog v1.26.0/go.mod h1:yBiM87lvSqX8h0Ww4sdzNSkVYZ8dL2xjZJG1lAuGZEo= +github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= +github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -325,8 +325,9 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 h1:kETrAMYZq6WVGPa8IIixL0CaEcIUNi+1WX7grUoi3y8= golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e h1:1SzTfNOXwIS2oWiMF+6qu0OUDKb0dauo6MoDUQyu+yU= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= diff --git a/service_test.go b/service_test.go index 9cc309272..71d726649 100644 --- a/service_test.go +++ b/service_test.go @@ -351,7 +351,6 @@ func (ts testComponent) Run(_ context.Context) error { } func TestLogFields(t *testing.T) { - t.Parallel() defaultFields := defaultLogFields("test", "1.0") fields := map[string]interface{}{"key": "value"} fields1 := defaultLogFields("name1", "version1") @@ -368,7 +367,6 @@ func TestLogFields(t *testing.T) { for name, tt := range tests { tt := tt t.Run(name, func(t *testing.T) { - t.Parallel() cfg := Config{fields: defaultFields} LogFields(tt.args.fields)(&cfg) assert.Equal(t, tt.want, cfg) diff --git a/test/docker/aws/component_integration_test.go b/test/docker/aws/component_integration_test.go index cfa9b454a..4bae39595 100644 --- a/test/docker/aws/component_integration_test.go +++ b/test/docker/aws/component_integration_test.go @@ -23,7 +23,8 @@ type message struct { } func Test_SQS_Consume(t *testing.T) { - defer mtr.Reset() + mtr.Reset() + t.Cleanup(func() { mtr.Reset() }) const queueName = "test-sqs-consume" const correlationID = "123" diff --git a/test/docker/aws/sns_integration_test.go b/test/docker/aws/sns_integration_test.go index 9608dc9ae..45402cfbb 100644 --- a/test/docker/aws/sns_integration_test.go +++ b/test/docker/aws/sns_integration_test.go @@ -17,7 +17,8 @@ import ( ) func Test_SNS_Publish_Message(t *testing.T) { - defer mtr.Reset() + mtr.Reset() + t.Cleanup(func() { mtr.Reset() }) const topic = "test_publish_message" @@ -42,7 +43,8 @@ func Test_SNS_Publish_Message(t *testing.T) { } func Test_SNS_Publish_Message_v2(t *testing.T) { - defer mtr.Reset() + mtr.Reset() + t.Cleanup(func() { mtr.Reset() }) const topic = "test_publish_message_v2" diff --git a/test/docker/aws/sqs_integration_test.go b/test/docker/aws/sqs_integration_test.go index ce6fc063c..3167b25be 100644 --- a/test/docker/aws/sqs_integration_test.go +++ b/test/docker/aws/sqs_integration_test.go @@ -24,7 +24,7 @@ type sampleMsg struct { func Test_SQS_Publish_Message(t *testing.T) { mtr.Reset() - defer mtr.Reset() + t.Cleanup(func() { mtr.Reset() }) const queueName = "test-sqs-publish" @@ -71,7 +71,8 @@ func Test_SQS_Publish_Message(t *testing.T) { } func Test_SQS_Publish_Message_v2(t *testing.T) { - defer mtr.Reset() + mtr.Reset() + t.Cleanup(func() { mtr.Reset() }) const queueName = "test-sqs-publish-v2" diff --git a/vendor/github.com/rs/zerolog/console.go b/vendor/github.com/rs/zerolog/console.go index c07838242..a8e12b23e 100644 --- a/vendor/github.com/rs/zerolog/console.go +++ b/vendor/github.com/rs/zerolog/console.go @@ -398,7 +398,7 @@ func consoleDefaultFormatFieldValue(i interface{}) string { func consoleDefaultFormatErrFieldName(noColor bool) Formatter { return func(i interface{}) string { - return colorize(fmt.Sprintf("%s=", i), colorRed, noColor) + return colorize(fmt.Sprintf("%s=", i), colorCyan, noColor) } } diff --git a/vendor/github.com/rs/zerolog/go.mod b/vendor/github.com/rs/zerolog/go.mod index 738c6f824..b86215de9 100644 --- a/vendor/github.com/rs/zerolog/go.mod +++ b/vendor/github.com/rs/zerolog/go.mod @@ -6,5 +6,6 @@ require ( github.com/coreos/go-systemd/v22 v22.3.2 github.com/pkg/errors v0.9.1 github.com/rs/xid v1.3.0 + golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect golang.org/x/tools v0.1.7 ) diff --git a/vendor/github.com/rs/zerolog/go.sum b/vendor/github.com/rs/zerolog/go.sum index 6edd2143d..a61396353 100644 --- a/vendor/github.com/rs/zerolog/go.sum +++ b/vendor/github.com/rs/zerolog/go.sum @@ -8,10 +8,12 @@ github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -23,6 +25,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/vendor/modules.txt b/vendor/modules.txt index 71cfd909b..cd7da92a0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -271,7 +271,7 @@ github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util # github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/rcrowley/go-metrics -# github.com/rs/zerolog v1.26.0 +# github.com/rs/zerolog v1.26.1 ## explicit github.com/rs/zerolog github.com/rs/zerolog/internal/cbor @@ -318,7 +318,7 @@ github.com/xeipuuv/gojsonschema # go.uber.org/atomic v1.9.0 ## explicit go.uber.org/atomic -# golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 +# golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e golang.org/x/crypto/md4 golang.org/x/crypto/pbkdf2 # golang.org/x/net v0.0.0-20210917221730-978cfadd31cf