From 79039f6a24b7660d3f3500bf75c9ad2ca207828e Mon Sep 17 00:00:00 2001 From: NorthLan <6995syu@163.com> Date: Tue, 26 Apr 2022 02:13:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8gorm?= =?UTF-8?q?=E5=90=84=E7=A7=8D=E5=B0=8F=E5=9D=91=E5=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/user_center/genModel.bat | 6 ++--- app/user_center/model/user_model_gen.go | 12 ++++----- app/user_center/model/user_platform_model.go | 3 ++- .../model/user_platform_model_gen.go | 26 +++++++++---------- .../platform_user/platform_user_retrieve.go | 12 ++++----- .../logic/retrieve_platform_user_logic.go | 14 +++++----- app/user_center/rpc/user_center.go | 4 +++ doc/template/1.3.4/model/insert.tpl | 4 +-- doc/template/1.3.4/model/table-name.tpl | 2 +- go.mod | 11 ++++---- go.sum | 15 ++--------- 11 files changed, 50 insertions(+), 59 deletions(-) diff --git a/app/user_center/genModel.bat b/app/user_center/genModel.bat index 594d6fa..147a430 100644 --- a/app/user_center/genModel.bat +++ b/app/user_center/genModel.bat @@ -5,10 +5,10 @@ set tables=user,user_platform set targetDir=.\model set templateDir=..\..\doc\template -::set host=127.0.0.1 -::set port=23306 -set host=192.168.1.100 +set host=127.0.0.1 set port=3306 +::set host=192.168.1.100 +::set port=3306 ::set dbname=dcg set dbname=dmgame set username=root diff --git a/app/user_center/model/user_model_gen.go b/app/user_center/model/user_model_gen.go index 92ec06f..8b3a1e1 100644 --- a/app/user_center/model/user_model_gen.go +++ b/app/user_center/model/user_model_gen.go @@ -34,10 +34,10 @@ type ( } User struct { - Id int64 `gorm:"column:id"` // 用户ID - Username string `gorm:"column:username"` // 用户名 - CreateTime time.Time `gorm:"column:create_time"` // 创建时间 - UpdateTime time.Time `gorm:"column:update_time"` // 更新时间 + Id int64 `gorm:"primaryKey"` // 用户ID + Username string `gorm:"column:username"` // 用户名 + CreateTime time.Time `gorm:"column:create_time;default:null"` // 创建时间 + UpdateTime time.Time `gorm:"column:update_time;default:null"` // 更新时间 } ) @@ -49,7 +49,7 @@ func newUserModel(conn *gorm.DB) *defaultUserModel { } func (m *defaultUserModel) Insert(ctx context.Context, data *User) error { - err := m.conn.WithContext(ctx).Save(&data).Error + err := m.conn.WithContext(ctx).Create(data).Error return err } @@ -82,6 +82,6 @@ func (m *defaultUserModel) tableName() string { } func (User) TableName() string { - model := defaultUserModel{} + model := newUserModel(nil) return model.tableName() } diff --git a/app/user_center/model/user_platform_model.go b/app/user_center/model/user_platform_model.go index b13e561..ec4a620 100644 --- a/app/user_center/model/user_platform_model.go +++ b/app/user_center/model/user_platform_model.go @@ -46,7 +46,8 @@ func (m *customUserPlatformModel) FindOneByPlatformAndPUid(ctx context.Context, func (m *customUserPlatformModel) FindUpdatableList(ctx context.Context, duration int64, num int64) ([]UserPlatform, error) { var resp []UserPlatform err := m.conn.WithContext(ctx). - Where("`p_info = ? AND `update_time` < (NOW() - INTERVAL ? HOUR LIMIT ?", "{}", duration, num). + Table(m.tableName()). + Where("JSON_LENGTH(`p_info`) = 0 OR `update_time` < (NOW() - INTERVAL ? HOUR) LIMIT ?", duration, num). Find(&resp).Error switch err { case nil: diff --git a/app/user_center/model/user_platform_model_gen.go b/app/user_center/model/user_platform_model_gen.go index 6ec9757..c427caf 100644 --- a/app/user_center/model/user_platform_model_gen.go +++ b/app/user_center/model/user_platform_model_gen.go @@ -16,7 +16,7 @@ import ( var ( userPlatformFieldNames = builder.RawFieldNames(&UserPlatform{}) userPlatformRows = strings.Join(userPlatformFieldNames, ",") - userPlatformRowsExpectAutoSet = strings.Join(stringx.Remove(userPlatformFieldNames, "`id`", "`create_time`", "`update_time`"), ",") + userPlatformRowsExpectAutoSet = strings.Join(stringx.Remove(userPlatformFieldNames, "`create_time`", "`update_time`"), ",") userPlatformRowsWithPlaceHolder = strings.Join(stringx.Remove(userPlatformFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" ) @@ -34,16 +34,16 @@ type ( } UserPlatform struct { - Id int64 `gorm:"column:id"` // 主键 - UserId int64 `gorm:"column:user_id"` // 用户ID - Platform string `gorm:"column:platform"` // 平台类型 - POpenid string `gorm:"column:p_openid"` // 平台用户openid - PUid string `gorm:"column:p_uid"` // 平台用户uid - PUname string `gorm:"column:p_uname"` // 平台用户名 - PInfo string `gorm:"column:p_info"` // 平台用户原始信息(json) - PAvatar string `gorm:"column:p_avatar"` // 平台用户头像地址 - CreateTime time.Time `gorm:"column:create_time"` // 创建时间 - UpdateTime time.Time `gorm:"column:update_time"` // 更新时间 + Id int64 `gorm:"primaryKey"` // 主键 + UserId int64 `gorm:"column:user_id"` // 用户ID + Platform string `gorm:"column:platform"` // 平台类型 + POpenid string `gorm:"column:p_openid"` // 平台用户openid + PUid string `gorm:"column:p_uid"` // 平台用户uid + PUname string `gorm:"column:p_uname"` // 平台用户名 + PInfo string `gorm:"column:p_info"` // 平台用户原始信息(json) + PAvatar string `gorm:"column:p_avatar"` // 平台用户头像地址 + CreateTime time.Time `gorm:"column:create_time;default:null"` // 创建时间 + UpdateTime time.Time `gorm:"column:update_time;default:null"` // 更新时间 } ) @@ -55,7 +55,7 @@ func newUserPlatformModel(conn *gorm.DB) *defaultUserPlatformModel { } func (m *defaultUserPlatformModel) Insert(ctx context.Context, data *UserPlatform) error { - err := m.conn.WithContext(ctx).Save(&data).Error + err := m.conn.WithContext(ctx).Create(data).Error return err } @@ -88,6 +88,6 @@ func (m *defaultUserPlatformModel) tableName() string { } func (UserPlatform) TableName() string { - model := defaultUserPlatformModel{} + model := newUserPlatformModel(nil) return model.tableName() } diff --git a/app/user_center/rpc/internal/logic/platform_user/platform_user_retrieve.go b/app/user_center/rpc/internal/logic/platform_user/platform_user_retrieve.go index ed6b79e..64d0406 100644 --- a/app/user_center/rpc/internal/logic/platform_user/platform_user_retrieve.go +++ b/app/user_center/rpc/internal/logic/platform_user/platform_user_retrieve.go @@ -28,7 +28,8 @@ type ( type RetrieveFunc func(pUid string) (*PlatformUser, error) -func NewUserRetriever(ctx context.Context, svcCtx *svc.ServiceContext) *UserRetriever { +func NewUserRetriever(svcCtx *svc.ServiceContext) *UserRetriever { + ctx := context.Background() result := &UserRetriever{ ctx: ctx, svcCtx: svcCtx, @@ -37,17 +38,15 @@ func NewUserRetriever(ctx context.Context, svcCtx *svc.ServiceContext) *UserRetr }, Logger: logx.WithContext(ctx), } - - go result.scheduler() return result } func (r *UserRetriever) retrieveUser(platform, pUid string) *PlatformUser { if handle, ok := r.retrieveMapper[platform]; ok { if p, err := handle(pUid); err != nil { - return p - } else { r.Logger.Errorf("获取平台用户信息错误: err: %s\n", err.Error()) + } else { + return p } } return &PlatformUser{ @@ -58,13 +57,14 @@ func (r *UserRetriever) retrieveUser(platform, pUid string) *PlatformUser { } } -func (r *UserRetriever) scheduler() { +func (r *UserRetriever) Scheduler() { c := cron.New() _, _ = c.AddFunc("@every 300ms", func() { list, err := r.svcCtx.UserPlatformModel.FindUpdatableList(r.ctx, r.svcCtx.Config.User.UpdateDuration, 10) if err != nil { return } + r.Logger.Info("list", list) for _, dbModel := range list { pUser := r.retrieveUser(dbModel.Platform, dbModel.PUid) if pUser.PInfo == "{}" { diff --git a/app/user_center/rpc/internal/logic/retrieve_platform_user_logic.go b/app/user_center/rpc/internal/logic/retrieve_platform_user_logic.go index f611e25..57ee4af 100644 --- a/app/user_center/rpc/internal/logic/retrieve_platform_user_logic.go +++ b/app/user_center/rpc/internal/logic/retrieve_platform_user_logic.go @@ -5,7 +5,6 @@ import ( "git.noahlan.cn/northlan/ntools-go/uuid" "github.com/pkg/errors" "live-service/app/user_center/model" - "live-service/app/user_center/rpc/internal/logic/platform_user" "live-service/app/user_center/rpc/internal/svc" "live-service/app/user_center/rpc/pb" @@ -13,19 +12,17 @@ import ( ) type RetrievePlatformUserLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - platformUserRetriever *platform_user.UserRetriever + ctx context.Context + svcCtx *svc.ServiceContext logx.Logger } func NewRetrievePlatformUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RetrievePlatformUserLogic { return &RetrievePlatformUserLogic{ - ctx: ctx, - svcCtx: svcCtx, - platformUserRetriever: platform_user.NewUserRetriever(ctx, svcCtx), - Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + Logger: logx.WithContext(ctx), } } @@ -60,6 +57,7 @@ func (l *RetrievePlatformUserLogic) RetrievePlatformUser(in *pb.PlatformUserReq) Id: uuid.NextId(), UserId: dbUser.Id, Platform: in.Platform, + PUid: in.PUid, PInfo: "{}", } if err = l.svcCtx.UserPlatformModel.Insert(l.ctx, dbPlatformUser); err != nil { diff --git a/app/user_center/rpc/user_center.go b/app/user_center/rpc/user_center.go index 2cf00a8..15a2586 100644 --- a/app/user_center/rpc/user_center.go +++ b/app/user_center/rpc/user_center.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "live-service/app/user_center/rpc/internal/config" + "live-service/app/user_center/rpc/internal/logic/platform_user" "live-service/app/user_center/rpc/internal/server" "live-service/app/user_center/rpc/internal/svc" "live-service/app/user_center/rpc/pb" @@ -25,6 +26,9 @@ func main() { ctx := svc.NewServiceContext(c) svr := server.NewUserCenterServer(ctx) + platformUserRetriever := platform_user.NewUserRetriever(ctx) + platformUserRetriever.Scheduler() + s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) { pb.RegisterUserCenterServer(grpcServer, svr) diff --git a/doc/template/1.3.4/model/insert.tpl b/doc/template/1.3.4/model/insert.tpl index 7b8f2fe..74d0286 100644 --- a/doc/template/1.3.4/model/insert.tpl +++ b/doc/template/1.3.4/model/insert.tpl @@ -2,7 +2,7 @@ func (m *default{{.upperStartCamelObject}}Model) Insert(ctx context.Context, data *{{.upperStartCamelObject}}) error { {{if .withCache}}{{.keys}} err := m.ExecCtx(ctx, func(conn *gorm.DB) *gorm.DB { - return conn.Save(&data) - }, {{.keyValues}}){{else}}err:=m.conn.WithContext(ctx).Save(&data).Error{{end}} + return conn.Create(&data) + }, {{.keyValues}}){{else}}err:=m.conn.WithContext(ctx).Create(&data).Error{{end}} return err } diff --git a/doc/template/1.3.4/model/table-name.tpl b/doc/template/1.3.4/model/table-name.tpl index 61f4ea1..079c0a8 100644 --- a/doc/template/1.3.4/model/table-name.tpl +++ b/doc/template/1.3.4/model/table-name.tpl @@ -4,6 +4,6 @@ func (m *default{{.upperStartCamelObject}}Model) tableName() string { } func ({{.upperStartCamelObject}}) TableName() string { - model := default{{.upperStartCamelObject}}Model{} + model := new{{.upperStartCamelObject}}Model(nil) return model.tableName() } \ No newline at end of file diff --git a/go.mod b/go.mod index bd30eb7..888e68a 100644 --- a/go.mod +++ b/go.mod @@ -3,18 +3,20 @@ module live-service go 1.18 require ( + git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.1 git.noahlan.cn/northlan/ntools-go/kafka v1.0.1 - git.noahlan.cn/northlan/ntools-go/stringn v1.0.0 git.noahlan.cn/northlan/ntools-go/uuid v1.0.0 - github.com/Shopify/sarama v1.32.0 github.com/pkg/errors v0.9.1 + github.com/robfig/cron/v3 v3.0.0 github.com/zeromicro/go-zero v1.3.2 google.golang.org/grpc v1.45.0 google.golang.org/protobuf v1.27.1 + gorm.io/driver/mysql v1.3.3 + gorm.io/gorm v1.23.4 ) require ( - git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.1 // indirect + github.com/Shopify/sarama v1.32.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coreos/go-semver v0.3.0 // indirect @@ -56,7 +58,6 @@ require ( github.com/prometheus/common v0.30.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/robfig/cron/v3 v3.0.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect go.etcd.io/etcd/api/v3 v3.5.2 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect @@ -81,8 +82,6 @@ require ( google.golang.org/genproto v0.0.0-20220228195345-15d65a4533f7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gorm.io/driver/mysql v1.3.3 // indirect - gorm.io/gorm v1.23.4 // indirect k8s.io/api v0.20.12 // indirect k8s.io/apimachinery v0.20.12 // indirect k8s.io/client-go v0.20.12 // indirect diff --git a/go.sum b/go.sum index a6ff68a..1124443 100644 --- a/go.sum +++ b/go.sum @@ -31,14 +31,10 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.0 h1:Em5V7PQoO3Okf5lugGHsdGzVTnInIFdPj4D8ykfpYYo= -git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.0/go.mod h1:fDeW2GCJEU5OEPMisWH9wyA/BiPZg6tK5FegDIaMURg= git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.1 h1:c/vZx96FPV4xyZEsSvWAXzQH+S3QZ9ixMBv3faQzXSY= git.noahlan.cn/northlan/ntools-go/gorm-zero v1.0.1/go.mod h1:fDeW2GCJEU5OEPMisWH9wyA/BiPZg6tK5FegDIaMURg= git.noahlan.cn/northlan/ntools-go/kafka v1.0.1 h1:SDUwYRzksZ3Vcu7PTZxk+TEMF2f3gBiQEboKOhi1yfI= git.noahlan.cn/northlan/ntools-go/kafka v1.0.1/go.mod h1:RxX9JSUIr3Gbk+cvUwE5k+i08AgIK3TA9ayDJCMn2n8= -git.noahlan.cn/northlan/ntools-go/stringn v1.0.0 h1:kQlk6JkJSX2JRsxtji6Ht1f3FfwdJiFEJ52k0ehjR8s= -git.noahlan.cn/northlan/ntools-go/stringn v1.0.0/go.mod h1:71TA+fLLhTNGsZvX4Fd/YbV6UeYiliW5hxK+3a9wKko= git.noahlan.cn/northlan/ntools-go/uuid v1.0.0 h1:C0PazSzG3+e/Hfh2C6Qf8R46sNZmZKTOcWS990yUmrE= git.noahlan.cn/northlan/ntools-go/uuid v1.0.0/go.mod h1:qTbvG+IYjUYTjIOvo//P3KRBTJOSCt9Z3Sv2xnjlG0w= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= @@ -53,7 +49,6 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.5.1/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= -github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -154,7 +149,6 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -168,7 +162,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-redis/redis/v8 v8.11.4 h1:kHoYkfZP6+pe04aFTnhDH6GDROa5yJdHJVNxV3F46Tg= github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= @@ -357,7 +350,6 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= @@ -373,6 +365,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -425,8 +418,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -453,7 +446,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.3 h1:FLOfo8f9JzFVFVyU+MSRJc2HdEAXQgm7pIv2uFKRSZE= go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= @@ -463,7 +455,6 @@ go.opentelemetry.io/otel/exporters/zipkin v1.3.0 h1:uOD28dZ7yIKITTcUS6MeAGNHYy3u go.opentelemetry.io/otel/exporters/zipkin v1.3.0/go.mod h1:LxGGfHIYbvsFnrJtBcazb0yG24xHdDGrT/H6RB9r3+8= go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.3 h1:IqN4L+5b0mPNjdXIiZ90Ni4Bl5BRkDQywePLWemd9bc= go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= @@ -471,7 +462,6 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/automaxprocs v1.5.1 h1:e1YG66Lrk73dn4qhg8WFSvhF0JuFQF0ERIp4rpuV8Qk= go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= @@ -643,7 +633,6 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc= golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=