deps: upgrade kratos version to v2.1.5 (#1785)

pull/1788/head v2.1.5
包子 3 years ago committed by GitHub
parent 1c18228d61
commit 9ea78f302d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      cmd/kratos/internal/upgrade/upgrade.go
  2. 2
      cmd/kratos/version.go
  3. 2
      cmd/protoc-gen-go-errors/version.go
  4. 2
      cmd/protoc-gen-go-http/go.mod
  5. 4
      cmd/protoc-gen-go-http/go.sum
  6. 2
      cmd/protoc-gen-go-http/version.go
  7. 2
      contrib/config/apollo/go.mod
  8. 2
      contrib/config/consul/go.mod
  9. 2
      contrib/config/etcd/go.mod
  10. 2
      contrib/config/kubernetes/go.mod
  11. 2
      contrib/config/nacos/go.mod
  12. 2
      contrib/encoding/msgpack/go.mod
  13. 2
      contrib/log/aliyun/go.mod
  14. 6
      contrib/log/fluent/go.mod
  15. 18
      contrib/log/fluent/go.sum
  16. 2
      contrib/log/zap/go.mod
  17. 2
      contrib/metrics/datadog/go.mod
  18. 2
      contrib/metrics/prometheus/go.mod
  19. 2
      contrib/registry/consul/go.mod
  20. 2
      contrib/registry/discovery/go.mod
  21. 2
      contrib/registry/etcd/go.mod
  22. 2
      contrib/registry/kubernetes/go.mod
  23. 2
      contrib/registry/nacos/go.mod
  24. 2
      contrib/registry/zookeeper/go.mod
  25. 2
      examples/go.mod
  26. 2
      version.go

@ -25,7 +25,7 @@ func Run(cmd *cobra.Command, args []string) {
"google.golang.org/protobuf/cmd/protoc-gen-go@latest",
"google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest",
"github.com/envoyproxy/protoc-gen-validate@latest",
"github.com/google/gnostic/cmd/protoc-gen-openapi@v0.6.2",
"github.com/google/gnostic/cmd/protoc-gen-openapi@latest",
)
if err != nil {
fmt.Println(err)

@ -1,4 +1,4 @@
package main
// release is the current kratos tool version.
const release = "v2.1.4"
const release = "v2.1.5"

@ -1,4 +1,4 @@
package main
// release is the current protoc-gen-go-errors version.
const release = "v2.1.4"
const release = "v2.1.5"

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/cmd/protoc-gen-go-http/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.3
github.com/go-kratos/kratos/v2 v2.1.4
google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67
google.golang.org/protobuf v1.27.1
)

@ -25,8 +25,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-kratos/aegis v0.1.1/go.mod h1:jYeSQ3Gesba478zEnujOiG5QdsyF3Xk/8owFUeKcHxw=
github.com/go-kratos/kratos/v2 v2.1.3 h1:e2uq6NVJIo24s1flI7aiUp34MyiG40Uc6lI0xv1+iDc=
github.com/go-kratos/kratos/v2 v2.1.3/go.mod h1:/SOOBnLEDEgQRXV9bVVyZsITmxKsilSCc15U8uiNzcI=
github.com/go-kratos/kratos/v2 v2.1.4 h1:DQkov26ewRnWdjqxalMd/D10WUP5bMmW2V5oO90C8dg=
github.com/go-kratos/kratos/v2 v2.1.4/go.mod h1:/SOOBnLEDEgQRXV9bVVyZsITmxKsilSCc15U8uiNzcI=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=

@ -1,4 +1,4 @@
package main
// release is the current protoc-gen-go-http version.
const release = "v2.1.4"
const release = "v2.1.5"

@ -4,7 +4,7 @@ go 1.16
require (
github.com/apolloconfig/agollo/v4 v4.0.8
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
)
replace github.com/go-kratos/kratos/v2 => ../../../

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/consul/v2
go 1.15
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/hashicorp/consul/api v1.10.0
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/etcd/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
go.etcd.io/etcd/client/v3 v3.5.0
google.golang.org/grpc v1.43.0
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/kubernetes/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1
k8s.io/client-go v0.23.1

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/nacos/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/nacos-group/nacos-sdk-go v1.0.9
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/encoding/msgpack/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/vmihailenco/msgpack/v5 v5.3.4
)

@ -4,7 +4,7 @@ go 1.16
require (
github.com/aliyun/aliyun-log-go-sdk v0.1.27
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
google.golang.org/protobuf v1.27.1
)

@ -5,9 +5,9 @@ go 1.16
require (
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/fluent/fluent-logger-golang v1.5.0
github.com/go-kratos/kratos/v2 v2.1.4
github.com/kr/pretty v0.2.1 // indirect
github.com/tinylib/msgp v1.1.5 // indirect
github.com/go-kratos/kratos/v2 v2.1.5
github.com/kr/pretty v0.3.0 // indirect
github.com/tinylib/msgp v1.1.6 // indirect
)
replace github.com/go-kratos/kratos/v2 => ../../../

@ -17,6 +17,7 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@ -64,26 +65,29 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/shirou/gopsutil/v3 v3.21.8/go.mod h1:YWp/H8Qs5fVmf17v7JNZzA0mPJ+mS2e9JdiUF9LlKzQ=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw=
github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw=
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
@ -170,6 +174,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/log/zap/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
go.uber.org/zap v1.19.0
)

@ -5,7 +5,7 @@ go 1.16
require (
github.com/DataDog/datadog-go v4.8.1+incompatible
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/metrics/prometheus/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/prometheus/client_golang v1.9.0
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/consul/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/hashicorp/consul/api v1.9.1
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/discovery/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/go-resty/resty/v2 v2.6.0
github.com/pkg/errors v0.9.1
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/etcd/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
go.etcd.io/etcd/client/v3 v3.5.0
google.golang.org/grpc v1.43.0
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/kubernetes/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/json-iterator/go v1.1.12
k8s.io/api v0.23.1
k8s.io/apimachinery v0.23.1

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/nacos/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/nacos-group/nacos-sdk-go v1.0.9
)

@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/zookeeper/v2
go 1.16
require (
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/go-zookeeper/zk v1.0.2
)

@ -15,7 +15,7 @@ require (
github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-00010101000000-000000000000
github.com/go-kratos/kratos/contrib/registry/nacos/v2 v2.0.0-00010101000000-000000000000
github.com/go-kratos/kratos/contrib/registry/zookeeper/v2 v2.0.0-00010101000000-000000000000
github.com/go-kratos/kratos/v2 v2.1.4
github.com/go-kratos/kratos/v2 v2.1.5
github.com/go-kratos/swagger-api v1.0.0
github.com/go-redis/redis/extra/redisotel v0.3.0
github.com/go-redis/redis/v8 v8.11.2

@ -1,4 +1,4 @@
package kratos
// Release is the current kratos version.
const Release = "v2.1.4"
const Release = "v2.1.5"

Loading…
Cancel
Save