Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update module dependencies to squash Dependabot alerts #1223

Merged
merged 4 commits into from
Mar 17, 2022
Merged

Update module dependencies to squash Dependabot alerts #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f15577
module/apmgoredisv8: upgrade deps
axw Mar 15, 2022
3b1317d
module/apmgoredis: upgrade deps
axw Mar 15, 2022
8123edb
module/apmbeego: upgrade deps
axw Mar 15, 2022
3fed03e
module/apmgopg: upgrade deps
axw Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion module/apmbeego/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 => ../..
Expand Down
126 changes: 113 additions & 13 deletions module/apmbeego/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions module/apmgopg/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
78 changes: 65 additions & 13 deletions module/apmgopg/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions module/apmgoredis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => ../..
8 changes: 4 additions & 4 deletions module/apmgoredis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions module/apmgoredisv8/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
137 changes: 64 additions & 73 deletions module/apmgoredisv8/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions module/apmgoredisv8/hook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down