Skip to content

Commit 91b805a

Browse files
Bump google.golang.org/grpc from 1.40.0 to 1.56.3 (#195)
* Bump google.golang.org/grpc from 1.40.0 to 1.56.3 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.40.0 to 1.56.3. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.40.0...v1.56.3) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * license * lint --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
1 parent dd7a87c commit 91b805a

File tree

5 files changed

+28
-21
lines changed

5 files changed

+28
-21
lines changed

dist/LICENSE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ The text of each license is also included at licenses/license-[project].txt.
199199
github.com/spf13/afero v1.2.2 Apache-2.0
200200
gomodules.xyz/jsonpatch/v2 v2.2.0 Apache-2.0
201201
google.golang.org/appengine v1.6.7 Apache-2.0
202-
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 Apache-2.0
203-
google.golang.org/grpc v1.40.0 Apache-2.0
202+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 Apache-2.0
203+
google.golang.org/grpc v1.56.3 Apache-2.0
204204
gopkg.in/ini.v1 v1.51.0 Apache-2.0
205205
gopkg.in/yaml.v2 v2.4.0 Apache-2.0
206206
k8s.io/api v0.22.1 Apache-2.0
@@ -238,14 +238,14 @@ The text of each license is also included at licenses/license-[project].txt.
238238
github.com/evanphx/json-patch v4.11.0+incompatible BSD-3-Clause
239239
github.com/fsnotify/fsnotify v1.4.9 BSD-3-Clause
240240
github.com/gogo/protobuf v1.3.2 BSD-3-Clause
241-
github.com/golang/protobuf v1.5.2 BSD-3-Clause
242-
github.com/google/go-cmp v0.5.6 BSD-3-Clause
241+
github.com/golang/protobuf v1.5.3 BSD-3-Clause
242+
github.com/google/go-cmp v0.5.9 BSD-3-Clause
243243
github.com/google/uuid v1.3.0 BSD-3-Clause
244244
github.com/imdario/mergo v0.3.12 BSD-3-Clause
245245
github.com/spf13/pflag v1.0.5 BSD-3-Clause
246246
golang.org/x/crypto v0.35.0 BSD-3-Clause
247247
golang.org/x/net v0.21.0 BSD-3-Clause
248-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d BSD-3-Clause
248+
golang.org/x/oauth2 v0.7.0 BSD-3-Clause
249249
golang.org/x/sys v0.30.0 BSD-3-Clause
250250
golang.org/x/term v0.29.0 BSD-3-Clause
251251
golang.org/x/text v0.22.0 BSD-3-Clause
@@ -275,7 +275,7 @@ The text of each license is also included at licenses/license-[project].txt.
275275
github.com/Masterminds/semver/v3 v3.1.0 MIT
276276
github.com/Masterminds/sprig/v3 v3.1.0 MIT
277277
github.com/beorn7/perks v1.0.1 MIT
278-
github.com/cespare/xxhash/v2 v2.1.1 MIT
278+
github.com/cespare/xxhash/v2 v2.2.0 MIT
279279
github.com/cpuguy83/go-md2man/v2 v2.0.0 MIT
280280
github.com/gizak/termui/v3 v3.1.0 MIT
281281
github.com/huandu/xstrings v1.3.1 MIT

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/spf13/viper v1.7.0
1515
github.com/urfave/cli/v2 v2.3.0
1616
golang.org/x/text v0.22.0
17-
google.golang.org/grpc v1.40.0
17+
google.golang.org/grpc v1.56.3
1818
gopkg.in/yaml.v2 v2.4.0
1919
k8s.io/apimachinery v0.22.1
2020
sigs.k8s.io/controller-runtime v0.10.0
@@ -27,7 +27,7 @@ require (
2727
github.com/Masterminds/semver/v3 v3.1.0 // indirect
2828
github.com/Masterminds/sprig/v3 v3.1.0 // indirect
2929
github.com/beorn7/perks v1.0.1 // indirect
30-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
30+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3131
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
3232
github.com/davecgh/go-spew v1.1.1 // indirect
3333
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
@@ -36,8 +36,8 @@ require (
3636
github.com/go-logr/logr v0.4.0 // indirect
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
39-
github.com/golang/protobuf v1.5.2 // indirect
40-
github.com/google/go-cmp v0.5.6 // indirect
39+
github.com/golang/protobuf v1.5.3 // indirect
40+
github.com/google/go-cmp v0.5.9 // indirect
4141
github.com/google/gofuzz v1.1.0 // indirect
4242
github.com/googleapis/gnostic v0.5.5 // indirect
4343
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -68,13 +68,13 @@ require (
6868
github.com/subosito/gotenv v1.2.0 // indirect
6969
golang.org/x/crypto v0.35.0 // indirect
7070
golang.org/x/net v0.21.0 // indirect
71-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
71+
golang.org/x/oauth2 v0.7.0 // indirect
7272
golang.org/x/sys v0.30.0 // indirect
7373
golang.org/x/term v0.29.0 // indirect
7474
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
7575
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
7676
google.golang.org/appengine v1.6.7 // indirect
77-
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect
77+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
7878
google.golang.org/protobuf v1.32.0 // indirect
7979
gopkg.in/inf.v0 v0.9.1 // indirect
8080
gopkg.in/ini.v1 v1.51.0 // indirect

go.sum

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
7272
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
7373
github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
7474
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
75-
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
7675
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
76+
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
77+
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
7778
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
7879
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
7980
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -186,8 +187,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
186187
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
187188
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
188189
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
189-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
190190
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
191+
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
192+
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
191193
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
192194
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
193195
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
@@ -198,8 +200,9 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
198200
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
199201
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
200202
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
201-
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
202203
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
204+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
205+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
203206
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
204207
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
205208
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -588,8 +591,9 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
588591
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
589592
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
590593
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
591-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
592594
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
595+
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
596+
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
593597
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
594598
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
595599
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -734,7 +738,6 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb
734738
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
735739
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
736740
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
737-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
738741
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
739742
gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY=
740743
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
@@ -778,8 +781,9 @@ google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfG
778781
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
779782
google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
780783
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
781-
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 h1:R1r5J0u6Cx+RNl/6mezTw6oA14cmKC96FeUwL6A9bd4=
782784
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
785+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
786+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
783787
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
784788
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
785789
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -793,8 +797,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp
793797
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
794798
google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
795799
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
796-
google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
797800
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
801+
google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
802+
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
798803
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
799804
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
800805
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

pkg/grpc/grpc.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ import (
2525
event "skywalking.apache.org/repo/goapi/collect/event/v3"
2626

2727
"google.golang.org/grpc"
28+
"google.golang.org/grpc/credentials/insecure"
2829
)
2930

3031
// ReportEvent creates a grpc client and reports an event to OAP.
3132
func ReportEvent(addr string, e *event.Event) (*common.Commands, error) {
32-
conn, err := grpc.Dial(addr, grpc.WithInsecure())
33+
conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
3334
if err != nil {
3435
return nil, err
3536
}

pkg/healthcheck/grpc.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"google.golang.org/grpc"
2828
"google.golang.org/grpc/codes"
2929
"google.golang.org/grpc/credentials"
30+
"google.golang.org/grpc/credentials/insecure"
3031
healthpb "google.golang.org/grpc/health/grpc_health_v1"
3132
"google.golang.org/grpc/status"
3233
)
@@ -52,7 +53,7 @@ func HealthCheck(addr string, enableTLS bool) int {
5253
})
5354
opts = append(opts, grpc.WithTransportCredentials(creds))
5455
} else {
55-
opts = append(opts, grpc.WithInsecure())
56+
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
5657
}
5758
dialCtx, cancel := context.WithTimeout(ctx, time.Second)
5859
defer cancel()

0 commit comments

Comments
 (0)