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](rs/zerolog@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] <[email protected]> * 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 <[email protected]> Co-authored-by: Paschalis Tsilias <[email protected]>
beatlabs · Jan 18, 2022 · db673e6 · db673e6
1 parent b785f11
commit db673e6
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/vendor/github.com/rs/zerolog/go.mod b/vendor/github.com/rs/zerolog/go.mod
diff --git a/vendor/github.com/rs/zerolog/go.sum b/vendor/github.com/rs/zerolog/go.sum
diff --git 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