Update module dependencies to squash Dependabot alerts (#1223)

* module/apmgoredisv8: upgrade deps * module/apmgoredis: upgrade deps * module/apmbeego: upgrade deps * module/apmgopg: upgrade deps
elastic · Mar 17, 2022 · 8d46413 · 8d46413
1 parent 3cb2475
commit 8d46413
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 118 deletions.
diff --git a/module/apmbeego/go.mod b/module/apmbeego/go.mod
@@ -1,11 +1,12 @@
 module go.elastic.co/apm/module/apmbeego/v2
 
 require (
-	github.com/astaxie/beego v1.11.1
+	github.com/astaxie/beego v1.12.3
 	github.com/stretchr/testify v1.6.1
 	go.elastic.co/apm/module/apmhttp/v2 v2.0.0
 	go.elastic.co/apm/module/apmsql/v2 v2.0.0
 	go.elastic.co/apm/v2 v2.0.0
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 replace go.elastic.co/apm/v2 => ../..

diff --git a/module/apmbeego/go.sum b/module/apmbeego/go.sum
diff --git a/module/apmgopg/go.mod b/module/apmgopg/go.mod
@@ -1,10 +1,10 @@
 module go.elastic.co/apm/module/apmgopg/v2
 
 require (
-	github.com/go-pg/pg v8.0.4+incompatible
+	github.com/go-pg/pg v8.0.7+incompatible
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.18.1 // indirect
 	github.com/stretchr/testify v1.6.1
 	go.elastic.co/apm/module/apmsql/v2 v2.0.0
 	go.elastic.co/apm/v2 v2.0.0

diff --git a/module/apmgopg/go.sum b/module/apmgopg/go.sum
diff --git a/module/apmgoredis/go.mod b/module/apmgoredis/go.mod
@@ -3,12 +3,12 @@ module go.elastic.co/apm/module/apmgoredis/v2
 go 1.15
 
 require (
-	github.com/go-redis/redis v6.15.3-0.20190424063336-97e6ed817821+incompatible
+	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/stretchr/testify v1.6.1
 	go.elastic.co/apm/v2 v2.0.0
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 replace go.elastic.co/apm/v2 => ../..
diff --git a/module/apmgoredis/go.sum b/module/apmgoredis/go.sum
@@ -11,8 +11,8 @@ github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUt
 github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-redis/redis v6.15.3-0.20190424063336-97e6ed817821+incompatible h1:bm97yNL46k7mxjP07AFvFkIBvQzHDbLzJmVSxRubdLY=
-github.com/go-redis/redis v6.15.3-0.20190424063336-97e6ed817821+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
+github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
@@ -116,8 +116,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=

diff --git a/module/apmgoredisv8/go.mod b/module/apmgoredisv8/go.mod
@@ -3,8 +3,8 @@ module go.elastic.co/apm/module/apmgoredisv8/v2
 go 1.15
 
 require (
-	github.com/go-redis/redis/v8 v8.0.0-beta.2
-	github.com/stretchr/testify v1.6.1
+	github.com/go-redis/redis/v8 v8.11.4
+	github.com/stretchr/testify v1.7.0
 	go.elastic.co/apm/v2 v2.0.0
 )
 

diff --git a/module/apmgoredisv8/go.sum b/module/apmgoredisv8/go.sum
diff --git a/module/apmgoredisv8/hook_test.go b/module/apmgoredisv8/hook_test.go
@@ -122,14 +122,13 @@ func TestHookTxPipeline(t *testing.T) {
 			})
 
 			require.Len(t, spans, 1)
-			if _, ok := client.(*redis.Client); ok {
-				// *redis.Client wraps queued commands with MULTI/EXEC
-				// in (*redis.Client) processTxPipeline
-				assert.Equal(t, "MULTI, GET, SET, GET, (empty command), EXEC", spans[0].Name)
-			} else {
-				// *redis.ClusterClient and *redis.Ring don't wrap queued commands
-				// with MULTI/EXEC in (*redis.Client) processTxPipeline
+			if _, ok := client.(*redis.Ring); ok {
+				// *redis.Ring doesn't wrap queued commands with MULTI/EXEC
+				// in (*redis.Client) processTxPipeline, whereas *redis.Client
+				// and *redis.ClusterClient do.
 				assert.Equal(t, "GET, SET, GET, (empty command)", spans[0].Name)
+			} else {
+				assert.Equal(t, "MULTI, GET, SET, GET, (empty command), EXEC", spans[0].Name)
 			}
 			assert.Equal(t, "db", spans[0].Type)
 			assert.Equal(t, "redis", spans[0].Subtype)