From b8f89ab6557c34f24aad36a219f419ec6dbab071 Mon Sep 17 00:00:00 2001 From: Asai Neko Date: Wed, 21 Jan 2026 16:43:46 +0800 Subject: [PATCH] Add context for everything Signed-off-by: Asai Neko --- data/attendance.go | 51 +++++++++---------- data/client.go | 9 ++-- data/drivers/meilisearch.go | 14 +++++- data/drivers/postgres.go | 10 +++- data/drivers/redis.go | 12 +++++ data/event.go | 33 +++++++------ data/user.go | 37 +++++++------- go.mod | 27 +++++++++- go.sum | 98 +++++++++++++++++++++++++++++++++++-- logger/gorm.go | 28 +++++++++++ logger/slog.go | 30 +++++++++--- middleware/jwt.go | 2 +- middleware/permission.go | 2 +- pkgs/authcode/authcode.go | 7 +-- pkgs/authtoken/authtoken.go | 27 +++++----- server/server.go | 3 +- service/auth/exchange.go | 4 +- service/auth/magic.go | 2 +- service/auth/redirect.go | 10 ++-- service/auth/refresh.go | 4 +- service/auth/token.go | 6 +-- service/event/checkin.go | 6 +-- service/event/info.go | 2 +- service/user/full.go | 4 +- service/user/info.go | 2 +- service/user/list.go | 2 +- service/user/update.go | 4 +- 27 files changed, 309 insertions(+), 127 deletions(-) create mode 100644 logger/gorm.go diff --git a/data/attendance.go b/data/attendance.go index 67ed0dc..09d7e1c 100644 --- a/data/attendance.go +++ b/data/attendance.go @@ -34,10 +34,10 @@ type AttendanceSearchDoc struct { CheckinAt time.Time `json:"checkin_at"` } -func (self *Attendance) GetAttendance(userId, eventId uuid.UUID) (*Attendance, error) { +func (self *Attendance) GetAttendance(ctx context.Context, userId, eventId uuid.UUID) (*Attendance, error) { var checkin Attendance - err := Database. + err := Database.WithContext(ctx). Where("user_id = ? AND event_id = ?", userId, eventId). First(&checkin).Error @@ -57,10 +57,10 @@ type AttendanceUsers struct { CheckinAt time.Time `json:"checkin_at"` } -func (self *Attendance) GetUsersByEventID(eventID uuid.UUID) (*[]AttendanceUsers, error) { +func (self *Attendance) GetUsersByEventID(ctx context.Context, eventID uuid.UUID) (*[]AttendanceUsers, error) { var result []AttendanceUsers - err := Database. + err := Database.WithContext(ctx). Model(&Attendance{}). Select("user_id, checkin_at"). Where("event_id = ?", eventID). @@ -75,10 +75,10 @@ type AttendanceEvent struct { CheckinAt time.Time `json:"checkin_at"` } -func (self *Attendance) GetEventsByUserID(userID uuid.UUID) (*[]AttendanceEvent, error) { +func (self *Attendance) GetEventsByUserID(ctx context.Context, userID uuid.UUID) (*[]AttendanceEvent, error) { var result []AttendanceEvent - err := Database. + err := Database.WithContext(ctx). Model(&Attendance{}). Select("event_id, checkin_at"). Where("user_id = ?", userID). @@ -88,12 +88,12 @@ func (self *Attendance) GetEventsByUserID(userID uuid.UUID) (*[]AttendanceEvent, return &result, err } -func (self *Attendance) Create() error { +func (self *Attendance) Create(ctx context.Context) error { self.UUID = uuid.New() self.AttendanceId = uuid.New() // DB transaction for strong consistency - err := Database.Transaction(func(tx *gorm.DB) error { + err := Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { if err := tx.Create(&self).Error; err != nil { return err } @@ -103,17 +103,17 @@ func (self *Attendance) Create() error { return err } - if err := self.UpdateSearchIndex(); err != nil { + if err := self.UpdateSearchIndex(ctx); err != nil { return err } return nil } -func (self *Attendance) Update(attendanceId uuid.UUID, checkinTime *time.Time) (*Attendance, error) { +func (self *Attendance) Update(ctx context.Context, attendanceId uuid.UUID, checkinTime *time.Time) (*Attendance, error) { var attendance Attendance - err := Database.Transaction(func(tx *gorm.DB) error { + err := Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { // Lock the row for update if err := tx. Where("attendance_id = ?", attendanceId). @@ -148,32 +148,32 @@ func (self *Attendance) Update(attendanceId uuid.UUID, checkinTime *time.Time) ( } // Sync to MeiliSearch (eventual consistency) - if err := attendance.UpdateSearchIndex(); err != nil { + if err := attendance.UpdateSearchIndex(ctx); err != nil { return nil, err } return &attendance, nil } -func (self *Attendance) SearchUsersByEvent(eventID string) (*meilisearch.SearchResponse, error) { +func (self *Attendance) SearchUsersByEvent(ctx context.Context, eventID string) (*meilisearch.SearchResponse, error) { index := MeiliSearch.Index("attendance") - return index.Search("", &meilisearch.SearchRequest{ + return index.SearchWithContext(ctx, "", &meilisearch.SearchRequest{ Filter: "event_id = \"" + eventID + "\"", Sort: []string{"checkin_at:asc"}, }) } -func (self *Attendance) SearchEventsByUser(userID string) (*meilisearch.SearchResponse, error) { +func (self *Attendance) SearchEventsByUser(ctx context.Context, userID string) (*meilisearch.SearchResponse, error) { index := MeiliSearch.Index("attendance") - return index.Search("", &meilisearch.SearchRequest{ + return index.SearchWithContext(ctx, "", &meilisearch.SearchRequest{ Filter: "user_id = \"" + userID + "\"", Sort: []string{"checkin_at:asc"}, }) } -func (self *Attendance) UpdateSearchIndex() error { +func (self *Attendance) UpdateSearchIndex(ctx context.Context) error { doc := AttendanceSearchDoc{ AttendanceId: self.AttendanceId.String(), EventId: self.EventId.String(), @@ -188,21 +188,20 @@ func (self *Attendance) UpdateSearchIndex() error { PrimaryKey: &primaryKey, } - if _, err := index.UpdateDocuments([]AttendanceSearchDoc{doc}, opts); err != nil { + if _, err := index.UpdateDocumentsWithContext(ctx, []AttendanceSearchDoc{doc}, opts); err != nil { return err } return nil } -func (self *Attendance) DeleteSearchIndex() error { +func (self *Attendance) DeleteSearchIndex(ctx context.Context) error { index := MeiliSearch.Index("attendance") - _, err := index.DeleteDocument(self.AttendanceId.String(), nil) + _, err := index.DeleteDocumentWithContext(ctx, self.AttendanceId.String(), nil) return err } -func (self *Attendance) GenCheckinCode(eventId uuid.UUID) (*string, error) { - ctx := context.Background() +func (self *Attendance) GenCheckinCode(ctx context.Context, eventId uuid.UUID) (*string, error) { ttl := viper.GetDuration("ttl.checkin_code_ttl") rng := rand.New(rand.NewSource(time.Now().UnixNano())) @@ -223,9 +222,7 @@ func (self *Attendance) GenCheckinCode(eventId uuid.UUID) (*string, error) { } } -func (self *Attendance) VerifyCheckinCode(checkinCode string) error { - ctx := context.Background() - +func (self *Attendance) VerifyCheckinCode(ctx context.Context, checkinCode string) error { val, err := Redis.Get(ctx, "checkin_code:"+checkinCode).Result() if err != nil { return errors.New("[Attendance Data] invalid or expired checkin code") @@ -250,13 +247,13 @@ func (self *Attendance) VerifyCheckinCode(checkinCode string) error { return err } - attendanceData, err := self.GetAttendance(userId, eventId) + attendanceData, err := self.GetAttendance(ctx, userId, eventId) if err != nil { return err } time := time.Now() - _, err = self.Update(attendanceData.AttendanceId, &time) + _, err = self.Update(ctx, attendanceData.AttendanceId, &time) if err != nil { return err } diff --git a/data/client.go b/data/client.go index 539e30a..c9115ae 100644 --- a/data/client.go +++ b/data/client.go @@ -1,6 +1,7 @@ package data import ( + "context" "crypto/rand" "encoding/base64" "encoding/json" @@ -22,9 +23,9 @@ type Client struct { RedirectUri datatypes.JSON `json:"redirect_uri" gorm:"type:json;not null"` } -func (self *Client) GetClientByClientId(clientId string) (*Client, error) { +func (self *Client) GetClientByClientId(ctx context.Context, clientId string) (*Client, error) { var client Client - if err := Database. + if err := Database.WithContext(ctx). Where("client_id = ?", clientId). First(&client).Error; err != nil { return nil, err @@ -44,7 +45,7 @@ type ClientParams struct { RedirectUri []string } -func (self *Client) Create(params *ClientParams) (*Client, error) { +func (self *Client) Create(ctx context.Context, params *ClientParams) (*Client, error) { jsonRedirectUri, err := json.Marshal(params.RedirectUri) if err != nil { return nil, err @@ -69,7 +70,7 @@ func (self *Client) Create(params *ClientParams) (*Client, error) { RedirectUri: jsonRedirectUri, } - if err := Database.Create(&client).Error; err != nil { + if err := Database.WithContext(ctx).Create(&client).Error; err != nil { return nil, err } diff --git a/data/drivers/meilisearch.go b/data/drivers/meilisearch.go index 0bd8bb6..3ee3877 100644 --- a/data/drivers/meilisearch.go +++ b/data/drivers/meilisearch.go @@ -1,10 +1,22 @@ package drivers -import "github.com/meilisearch/meilisearch-go" +import ( + "net/http" + + "github.com/meilisearch/meilisearch-go" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" +) func MeiliSearch(dsn MeiliDSN) meilisearch.ServiceManager { + otelTransport := otelhttp.NewTransport(http.DefaultTransport) + + httpClient := &http.Client{ + Transport: otelTransport, + } + return meilisearch.New(dsn.Host, meilisearch.WithAPIKey(dsn.ApiKey), + meilisearch.WithCustomClient(httpClient), meilisearch.WithContentEncoding( meilisearch.GzipEncoding, meilisearch.BestCompression, diff --git a/data/drivers/postgres.go b/data/drivers/postgres.go index 01c349a..b193bd1 100644 --- a/data/drivers/postgres.go +++ b/data/drivers/postgres.go @@ -1,11 +1,14 @@ package drivers import ( + "log/slog" "nixcn-cms/config" + "nixcn-cms/logger" "strings" "gorm.io/driver/postgres" "gorm.io/gorm" + "gorm.io/plugin/opentelemetry/tracing" ) func SplitHostPort(url string) (host, port string) { @@ -19,6 +22,11 @@ func SplitHostPort(url string) (host, port string) { func Postgres(dsn ExternalDSN) (*gorm.DB, error) { host, port := SplitHostPort(dsn.Host) conn := "host=" + host + " user=" + dsn.Username + " password=" + dsn.Password + " dbname=" + dsn.Name + " port=" + port + " sslmode=disable TimeZone=" + config.TZ() - db, err := gorm.Open(postgres.Open(conn), &gorm.Config{}) + db, err := gorm.Open(postgres.Open(conn), &gorm.Config{Logger: logger.GormLogger()}) + + // Use otel gorm plugin + if err := db.Use(tracing.NewPlugin()); err != nil { + slog.Error("[Database] Error starting otel plugin!", "err", err) + } return db, err } diff --git a/data/drivers/redis.go b/data/drivers/redis.go index 1997dcf..da82cfa 100644 --- a/data/drivers/redis.go +++ b/data/drivers/redis.go @@ -2,7 +2,9 @@ package drivers import ( "context" + "log/slog" + "github.com/redis/go-redis/extra/redisotel/v9" "github.com/redis/go-redis/v9" ) @@ -15,7 +17,17 @@ func Redis(dsn RedisDSN) (redis.UniversalClient, error) { Password: dsn.Password, DB: dsn.DB, }) + + if err := redisotel.InstrumentMetrics(rdb); err != nil { + slog.Error("[Redis] Error starting otel metrics plugin!", "err", err) + } + + if err := redisotel.InstrumentTracing(rdb); err != nil { + slog.Error("[Redis] Error starting otel tracing plugin!", "err", err) + } + ctx := context.Background() + // Ping Redis _, err := rdb.Ping(ctx).Result() return rdb, err diff --git a/data/event.go b/data/event.go index 16e4298..37b8e6b 100644 --- a/data/event.go +++ b/data/event.go @@ -1,6 +1,7 @@ package data import ( + "context" "time" "github.com/go-viper/mapstructure/v2" @@ -31,10 +32,10 @@ type EventSearchDoc struct { EndTime time.Time `json:"end_time"` } -func (self *Event) GetEventById(eventId uuid.UUID) (*Event, error) { +func (self *Event) GetEventById(ctx context.Context, eventId uuid.UUID) (*Event, error) { var event Event - err := Database. + err := Database.WithContext(ctx). Where("event_id = ?", eventId). First(&event).Error @@ -48,9 +49,9 @@ func (self *Event) GetEventById(eventId uuid.UUID) (*Event, error) { return &event, nil } -func (self *Event) UpdateEventById(eventId uuid.UUID) error { +func (self *Event) UpdateEventById(ctx context.Context, eventId uuid.UUID) error { // DB transaction - if err := Database.Transaction(func(tx *gorm.DB) error { + if err := Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { // Update by business key if err := tx. Model(&Event{}). @@ -68,19 +69,19 @@ func (self *Event) UpdateEventById(eventId uuid.UUID) error { } // Sync search index - if err := self.UpdateSearchIndex(); err != nil { + if err := self.UpdateSearchIndex(ctx); err != nil { return err } return nil } -func (self *Event) Create() error { +func (self *Event) Create(ctx context.Context) error { self.UUID = uuid.New() self.EventId = uuid.New() // DB transaction only - if err := Database.Transaction(func(tx *gorm.DB) error { + if err := Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { if err := tx.Create(self).Error; err != nil { return err } @@ -90,7 +91,7 @@ func (self *Event) Create() error { } // Search index (eventual consistency) - if err := self.UpdateSearchIndex(); err != nil { + if err := self.UpdateSearchIndex(ctx); err != nil { // TODO: async retry / log return err } @@ -98,20 +99,20 @@ func (self *Event) Create() error { return nil } -func (self *Event) GetFullTable() (*[]Event, error) { +func (self *Event) GetFullTable(ctx context.Context) (*[]Event, error) { var events []Event - err := Database.Find(&events).Error + err := Database.WithContext(ctx).Find(&events).Error if err != nil { return nil, err } return &events, err } -func (self *Event) FastListEvents(limit, offset int64) (*[]EventSearchDoc, error) { +func (self *Event) FastListEvents(ctx context.Context, limit, offset int64) (*[]EventSearchDoc, error) { index := MeiliSearch.Index("event") // Fast read from MeiliSearch (no DB involved) - result, err := index.Search("", &meilisearch.SearchRequest{ + result, err := index.SearchWithContext(ctx, "", &meilisearch.SearchRequest{ Limit: limit, Offset: offset, }) @@ -127,7 +128,7 @@ func (self *Event) FastListEvents(limit, offset int64) (*[]EventSearchDoc, error return &list, nil } -func (self *Event) UpdateSearchIndex() error { +func (self *Event) UpdateSearchIndex(ctx context.Context) error { doc := EventSearchDoc{ EventId: self.EventId.String(), Name: self.Name, @@ -143,15 +144,15 @@ func (self *Event) UpdateSearchIndex() error { PrimaryKey: &primaryKey, } - if _, err := index.UpdateDocuments([]EventSearchDoc{doc}, opts); err != nil { + if _, err := index.UpdateDocumentsWithContext(ctx, []EventSearchDoc{doc}, opts); err != nil { return err } return nil } -func (self *Event) DeleteSearchIndex() error { +func (self *Event) DeleteSearchIndex(ctx context.Context) error { index := MeiliSearch.Index("event") - _, err := index.DeleteDocument(self.EventId.String(), nil) + _, err := index.DeleteDocumentWithContext(ctx, self.EventId.String(), nil) return err } diff --git a/data/user.go b/data/user.go index 46ab651..7124b18 100644 --- a/data/user.go +++ b/data/user.go @@ -1,6 +1,8 @@ package data import ( + "context" + "github.com/go-viper/mapstructure/v2" "github.com/google/uuid" "github.com/meilisearch/meilisearch-go" @@ -31,10 +33,10 @@ type UserSearchDoc struct { Avatar string `json:"avatar"` } -func (self *User) GetByEmail(email string) (*User, error) { +func (self *User) GetByEmail(ctx context.Context, email string) (*User, error) { var user User - err := Database. + err := Database.WithContext(ctx). Where("email = ?", email). First(&user).Error @@ -48,10 +50,10 @@ func (self *User) GetByEmail(email string) (*User, error) { return &user, nil } -func (self *User) GetByUserId(userId uuid.UUID) (*User, error) { +func (self *User) GetByUserId(ctx context.Context, userId uuid.UUID) (*User, error) { var user User - err := Database. + err := Database.WithContext(ctx). Where("user_id = ?", userId). First(&user).Error @@ -65,12 +67,12 @@ func (self *User) GetByUserId(userId uuid.UUID) (*User, error) { return &user, err } -func (self *User) Create() error { +func (self *User) Create(ctx context.Context) error { self.UUID = uuid.New() self.UserId = uuid.New() // DB transaction only - if err := Database.Transaction(func(tx *gorm.DB) error { + if err := Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { if err := tx.Create(self).Error; err != nil { return err } @@ -80,7 +82,7 @@ func (self *User) Create() error { } // Search index (eventual consistency) - if err := self.UpdateSearchIndex(); err != nil { + if err := self.UpdateSearchIndex(ctx); err != nil { // TODO: async retry / log return err } @@ -88,8 +90,8 @@ func (self *User) Create() error { return nil } -func (self *User) UpdateByUserID(userId uuid.UUID) error { - return Database.Transaction(func(tx *gorm.DB) error { +func (self *User) UpdateByUserID(ctx context.Context, userId uuid.UUID) error { + return Database.WithContext(ctx).Transaction(func(tx *gorm.DB) error { if err := tx.Model(&User{}).Where("user_id = ?", userId).Updates(&self).Error; err != nil { return err } @@ -97,20 +99,20 @@ func (self *User) UpdateByUserID(userId uuid.UUID) error { }) } -func (self *User) GetFullTable() (*[]User, error) { +func (self *User) GetFullTable(ctx context.Context) (*[]User, error) { var users []User - err := Database.Find(&users).Error + err := Database.WithContext(ctx).Find(&users).Error if err != nil { return nil, err } return &users, nil } -func (self *User) FastListUsers(limit, offset int64) (*[]UserSearchDoc, error) { +func (self *User) FastListUsers(ctx context.Context, limit, offset int64) (*[]UserSearchDoc, error) { index := MeiliSearch.Index("user") // Fast read from MeiliSearch, no DB involved - result, err := index.Search("", &meilisearch.SearchRequest{ + result, err := index.SearchWithContext(ctx, "", &meilisearch.SearchRequest{ Limit: limit, Offset: offset, }) @@ -126,7 +128,7 @@ func (self *User) FastListUsers(limit, offset int64) (*[]UserSearchDoc, error) { return &list, nil } -func (self *User) UpdateSearchIndex() error { +func (self *User) UpdateSearchIndex(ctx context.Context) error { doc := UserSearchDoc{ UserId: self.UserId.String(), Email: self.Email, @@ -142,7 +144,8 @@ func (self *User) UpdateSearchIndex() error { PrimaryKey: &primaryKey, } - if _, err := index.UpdateDocuments( + if _, err := index.UpdateDocumentsWithContext( + ctx, []UserSearchDoc{doc}, opts, ); err != nil { @@ -152,8 +155,8 @@ func (self *User) UpdateSearchIndex() error { return nil } -func (self *User) DeleteSearchIndex() error { +func (self *User) DeleteSearchIndex(ctx context.Context) error { index := MeiliSearch.Index("user") - _, err := index.DeleteDocument(self.UserId.String(), nil) + _, err := index.DeleteDocumentWithContext(ctx, self.UserId.String(), nil) return err } diff --git a/go.mod b/go.mod index 49c19f0..611c5db 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,12 @@ require ( github.com/golang-jwt/jwt/v5 v5.3.0 github.com/google/uuid v1.6.0 github.com/meilisearch/meilisearch-go v0.35.0 + github.com/redis/go-redis/extra/redisotel/v9 v9.17.2 github.com/redis/go-redis/v9 v9.17.2 github.com/spf13/viper v1.21.0 + go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.64.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 + go.opentelemetry.io/otel/trace v1.39.0 golang.org/x/crypto v0.46.0 golang.org/x/text v0.33.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df @@ -23,10 +27,13 @@ require ( gorm.io/datatypes v1.2.7 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.1 + gorm.io/plugin/opentelemetry v0.1.16 ) require ( filippo.io/edwards25519 v1.1.0 // indirect + github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/ClickHouse/clickhouse-go/v2 v2.30.0 // indirect github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect github.com/alibabacloud-go/debug v1.0.1 // indirect github.com/alibabacloud-go/openapi-util v0.1.1 // indirect @@ -38,15 +45,21 @@ require ( github.com/clbanning/mxj/v2 v2.7.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/gabriel-vasile/mimetype v1.4.12 // indirect github.com/gin-contrib/sse v1.1.0 // indirect + github.com/go-faster/city v1.0.1 // indirect + github.com/go-faster/errors v0.7.1 // indirect + github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.29.0 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/goccy/go-yaml v1.19.1 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.6.0 // indirect @@ -54,15 +67,22 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/paulmach/orb v0.11.1 // indirect github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/quic-go/qpack v0.6.0 // indirect github.com/quic-go/quic-go v0.57.1 // indirect + github.com/redis/go-redis/extra/rediscmd/v9 v9.17.2 // indirect github.com/sagikazarmark/locafero v0.11.0 // indirect + github.com/segmentio/asm v1.2.0 // indirect + github.com/shopspring/decimal v1.4.0 // indirect github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.10.0 // indirect @@ -71,7 +91,9 @@ require ( github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.1 // indirect - go.uber.org/mock v0.6.0 // indirect + go.opentelemetry.io/auto/sdk v1.2.1 // indirect + go.opentelemetry.io/otel v1.39.0 // indirect + go.opentelemetry.io/otel/metric v1.39.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/arch v0.23.0 // indirect golang.org/x/net v0.48.0 // indirect @@ -80,5 +102,6 @@ require ( google.golang.org/protobuf v1.36.11 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gorm.io/driver/mysql v1.5.6 // indirect + gorm.io/driver/clickhouse v0.7.0 // indirect + gorm.io/driver/mysql v1.5.7 // indirect ) diff --git a/go.sum b/go.sum index e82ee89..847f885 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= +github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/clickhouse-go/v2 v2.30.0 h1:AG4D/hW39qa58+JHQIFOSnxyL46H6h2lrmGGk17dhFo= +github.com/ClickHouse/clickhouse-go/v2 v2.30.0/go.mod h1:i9ZQAojcayW3RsdCb3YR+n+wC2h65eJsZCscZ1Z1wyo= github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 h1:eIf+iGJxdU4U9ypaUfbtOWCsZSbTb8AUHvyPrxu6mAA= github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo= github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc= @@ -78,6 +82,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= @@ -88,6 +94,15 @@ github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls= +github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= +github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= +github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= +github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -105,6 +120,7 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.1 h1:3rG3+v8pkhRqoQ/88NYNMHYVGYztCOCIZ7UQhu7H+NE= github.com/goccy/go-yaml v1.19.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= @@ -124,10 +140,14 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -136,6 +156,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -152,8 +174,14 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -177,9 +205,17 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU= +github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU= +github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -187,12 +223,20 @@ github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= github.com/quic-go/quic-go v0.57.1 h1:25KAAR9QR8KZrCZRThWMKVAwGoiHIrNbT72ULHTuI10= github.com/quic-go/quic-go v0.57.1/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s= +github.com/redis/go-redis/extra/rediscmd/v9 v9.17.2 h1:KYWnHK9pwzOUo3sNJlNmzRwZ5mw7opugn8njtGThKNg= +github.com/redis/go-redis/extra/rediscmd/v9 v9.17.2/go.mod h1:wsfMQVl/GFYD9Gx/tlxurlTtvHkZRAt8j1qi27eIlTk= +github.com/redis/go-redis/extra/redisotel/v9 v9.17.2 h1:wthFPRW3Y50CknMrjjJoYwXUFR4U7hMVJCMeLzDI8s4= +github.com/redis/go-redis/extra/redisotel/v9 v9.17.2/go.mod h1:iqfQX7U2o8MWSl8W+Ah8KqbQyi/UoR/MQNgvaUyA1wc= github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI= github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -213,6 +257,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= @@ -222,6 +267,7 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= @@ -229,11 +275,37 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= +github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= +go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= +go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= +go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.64.0 h1:7IKZbAYwlwLXAdu7SVPhzTjDjogWZxP4MIa7rovY+PU= +go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.64.0/go.mod h1:+TF5nf3NIv2X8PGxqfYOaRnAoMM43rUA2C3XsN2DoWA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 h1:ssfIgGNANqpVFCndZvcuyKbl0g+UAVcbBcqGkG28H0Y= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0/go.mod h1:GQ/474YrbE4Jx8gZ4q5I4hrhUzM6UPzyrqJYV2AqPoQ= +go.opentelemetry.io/contrib/propagators/b3 v1.39.0 h1:PI7pt9pkSnimWcp5sQhUA9OzLbc3Ba4sL+VEUTNsxrk= +go.opentelemetry.io/contrib/propagators/b3 v1.39.0/go.mod h1:5gV/EzPnfYIwjzj+6y8tbGW2PKWhcsz5e/7twptRVQY= +go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48= +go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0 h1:8UPA4IbVZxpsD76ihGOQiFml99GPAEZLohDXvqHdi6U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0/go.mod h1:MZ1T/+51uIVKlRzGw1Fo46KEWThjlCBZKl2LzY5nv4g= +go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0= +go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs= +go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18= +go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE= +go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8= +go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew= +go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI= +go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= @@ -247,6 +319,7 @@ golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= @@ -261,6 +334,7 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -275,7 +349,9 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -295,6 +371,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= @@ -309,6 +387,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -339,6 +418,7 @@ golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= @@ -358,6 +438,8 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= @@ -365,6 +447,7 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -379,11 +462,14 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= 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/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -399,8 +485,10 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/datatypes v1.2.7 h1:ww9GAhF1aGXZY3EB3cJPJ7//JiuQo7DlQA7NNlVaTdk= gorm.io/datatypes v1.2.7/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY= -gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8= -gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= +gorm.io/driver/clickhouse v0.7.0 h1:BCrqvgONayvZRgtuA6hdya+eAW5P2QVagV3OlEp1vtA= +gorm.io/driver/clickhouse v0.7.0/go.mod h1:TmNo0wcVTsD4BBObiRnCahUgHJHjBIwuRejHwYt3JRs= +gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= +gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= @@ -410,5 +498,7 @@ gorm.io/driver/sqlserver v1.6.0/go.mod h1:WQzt4IJo/WHKnckU9jXBLMJIVNMVeTu25dnOze gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/plugin/opentelemetry v0.1.16 h1:Kypj2YYAliJqkIczDZDde6P6sFMhKSlG5IpngMFQGpc= +gorm.io/plugin/opentelemetry v0.1.16/go.mod h1:P3RmTeZXT+9n0F1ccUqR5uuTvEXDxF8k2UpO7mTIB2Y= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/logger/gorm.go b/logger/gorm.go new file mode 100644 index 0000000..e9046ba --- /dev/null +++ b/logger/gorm.go @@ -0,0 +1,28 @@ +package logger + +import ( + "fmt" + "log/slog" + "time" + + "gorm.io/gorm/logger" +) + +type SlogWriter struct{} + +func (w *SlogWriter) Printf(format string, args ...any) { + msg := fmt.Sprintf(format, args...) + slog.Info(msg) +} + +func GormLogger() logger.Interface { + return logger.New( + &SlogWriter{}, + logger.Config{ + SlowThreshold: 200 * time.Millisecond, + LogLevel: logger.Warn, + IgnoreRecordNotFoundError: true, + Colorful: false, + }, + ) +} diff --git a/logger/slog.go b/logger/slog.go index aef74e1..856b4f1 100644 --- a/logger/slog.go +++ b/logger/slog.go @@ -1,12 +1,19 @@ package logger import ( + "context" "io" "log/slog" "os" "strings" + + "go.opentelemetry.io/otel/trace" ) +type otlpHandler struct { + slog.Handler +} + func Init() { levelStr := strings.ToLower(os.Getenv("LOG_LEVEL")) var level slog.Level @@ -22,14 +29,9 @@ func Init() { } var writer io.Writer = os.Stdout - if level == slog.LevelDebug { - file, err := os.OpenFile("app.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666) - if err != nil { - slog.Error("Failed to open log file for debug mode", "err", err) - } else { - writer = io.MultiWriter(os.Stdout, file) - } + file, _ := os.OpenFile("app.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666) + writer = io.MultiWriter(os.Stdout, file) } opts := &slog.HandlerOptions{ @@ -43,7 +45,19 @@ func Init() { }, } - handler := slog.NewJSONHandler(writer, opts) + baseHandler := slog.NewJSONHandler(writer, opts) + handler := &otlpHandler{baseHandler} logger := slog.New(handler) slog.SetDefault(logger) } + +func (h *otlpHandler) Handle(ctx context.Context, r slog.Record) error { + span := trace.SpanFromContext(ctx) + if span.SpanContext().HasTraceID() { + r.AddAttrs( + slog.String("trace_id", span.SpanContext().TraceID().String()), + slog.String("span_id", span.SpanContext().SpanID().String()), + ) + } + return h.Handler.Handle(ctx, r) +} diff --git a/middleware/jwt.go b/middleware/jwt.go index 6ec6b74..8e84fc2 100644 --- a/middleware/jwt.go +++ b/middleware/jwt.go @@ -14,7 +14,7 @@ func JWTAuth() gin.HandlerFunc { auth := c.GetHeader("Authorization") authtoken := new(authtoken.Token) - uid, err := authtoken.HeaderVerify(auth) + uid, err := authtoken.HeaderVerify(c, auth) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). diff --git a/middleware/permission.go b/middleware/permission.go index 89324db..00425b9 100644 --- a/middleware/permission.go +++ b/middleware/permission.go @@ -41,7 +41,7 @@ func Permission(requiredLevel uint) gin.HandlerFunc { return } - userData, err := new(data.User).GetByUserId(userId) + userData, err := new(data.User).GetByUserId(c, userId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). diff --git a/pkgs/authcode/authcode.go b/pkgs/authcode/authcode.go index b815c44..d5a35e3 100644 --- a/pkgs/authcode/authcode.go +++ b/pkgs/authcode/authcode.go @@ -14,9 +14,7 @@ type Token struct { Email string } -func NewAuthCode(clientId string, email string) (string, error) { - ctx := context.Background() - +func NewAuthCode(ctx context.Context, clientId string, email string) (string, error) { // generate random code b := make([]byte, 32) if _, err := rand.Read(b); err != nil { @@ -48,8 +46,7 @@ func NewAuthCode(clientId string, email string) (string, error) { return code, nil } -func VerifyAuthCode(code string) (*Token, bool) { - ctx := context.Background() +func VerifyAuthCode(ctx context.Context, code string) (*Token, bool) { key := "auth_code:" + code // Read auth code payload diff --git a/pkgs/authtoken/authtoken.go b/pkgs/authtoken/authtoken.go index df1be0c..be97e98 100644 --- a/pkgs/authtoken/authtoken.go +++ b/pkgs/authtoken/authtoken.go @@ -39,11 +39,11 @@ func (self *Token) NewClaims(clientId string, userId uuid.UUID) JwtClaims { } // Generate access token -func (self *Token) GenerateAccessToken(clientId string, userId uuid.UUID) (string, error) { +func (self *Token) GenerateAccessToken(ctx context.Context, clientId string, userId uuid.UUID) (string, error) { claims := self.NewClaims(clientId, userId) token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims) - clientData, err := new(data.Client).GetClientByClientId(clientId) + clientData, err := new(data.Client).GetClientByClientId(ctx, clientId) if err != nil { return "", fmt.Errorf("error getting client data: %v", err) } @@ -70,9 +70,9 @@ func (self *Token) GenerateRefreshToken() (string, error) { } // Issue both access and refresh token -func (self *Token) IssueTokens(clientId string, userId uuid.UUID) (string, string, error) { +func (self *Token) IssueTokens(ctx context.Context, clientId string, userId uuid.UUID) (string, string, error) { // access token - access, err := self.GenerateAccessToken(clientId, userId) + access, err := self.GenerateAccessToken(ctx, clientId, userId) if err != nil { return "", "", err } @@ -83,7 +83,6 @@ func (self *Token) IssueTokens(clientId string, userId uuid.UUID) (string, strin return "", "", err } - ctx := context.Background() ttl := viper.GetDuration("ttl.refresh_ttl") refreshKey := "refresh:" + refresh @@ -122,8 +121,7 @@ func (self *Token) IssueTokens(clientId string, userId uuid.UUID) (string, strin } // Refresh access token -func (self *Token) RefreshAccessToken(refreshToken string) (string, error) { - ctx := context.Background() +func (self *Token) RefreshAccessToken(ctx context.Context, refreshToken string) (string, error) { key := "refresh:" + refreshToken // read refresh token bind data @@ -145,11 +143,10 @@ func (self *Token) RefreshAccessToken(refreshToken string) (string, error) { } // Generate new access token - return self.GenerateAccessToken(clientId, userId) + return self.GenerateAccessToken(ctx, clientId, userId) } -func (self *Token) RenewRefreshToken(refreshToken string) (string, error) { - ctx := context.Background() +func (self *Token) RenewRefreshToken(ctx context.Context, refreshToken string) (string, error) { ttl := viper.GetDuration("ttl.refresh_ttl") oldKey := "refresh:" + refreshToken @@ -174,7 +171,7 @@ func (self *Token) RenewRefreshToken(refreshToken string) (string, error) { } // revoke old refresh token - if err := self.RevokeRefreshToken(refreshToken); err != nil { + if err := self.RevokeRefreshToken(ctx, refreshToken); err != nil { return "", err } @@ -211,9 +208,7 @@ func (self *Token) RenewRefreshToken(refreshToken string) (string, error) { return newRefresh, nil } -func (self *Token) RevokeRefreshToken(refreshToken string) error { - ctx := context.Background() - +func (self *Token) RevokeRefreshToken(ctx context.Context, refreshToken string) error { refreshKey := "refresh:" + refreshToken // read refresh token metadata (user_id, client_id) @@ -246,7 +241,7 @@ func (self *Token) RevokeRefreshToken(refreshToken string) error { return err } -func (self *Token) HeaderVerify(header string) (string, error) { +func (self *Token) HeaderVerify(ctx context.Context, header string) (string, error) { if header == "" { return "", nil } @@ -273,7 +268,7 @@ func (self *Token) HeaderVerify(header string) (string, error) { return nil, errors.New("[Auth Token] client_id missing in token") } - clientData, err := new(data.Client).GetClientByClientId(claims.ClientId) + clientData, err := new(data.Client).GetClientByClientId(ctx, claims.ClientId) if err != nil { return nil, fmt.Errorf("error getting client data: %v", err) } diff --git a/server/server.go b/server/server.go index ad9f9db..711acfd 100644 --- a/server/server.go +++ b/server/server.go @@ -8,6 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/spf13/viper" + "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" ) func Start() { @@ -17,7 +18,7 @@ func Start() { } r := gin.New() - r.Use(gin.Recovery(), middleware.GinLogger()) + r.Use(gin.Recovery(), middleware.GinLogger(), otelgin.Middleware("nixcn-cms-backend")) Router(r) diff --git a/service/auth/exchange.go b/service/auth/exchange.go index c697d5b..334c0c2 100644 --- a/service/auth/exchange.go +++ b/service/auth/exchange.go @@ -64,7 +64,7 @@ func Exchange(c *gin.Context) { } userData := new(data.User) - user, err := userData.GetByUserId(userId) + user, err := userData.GetByUserId(c, userId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). @@ -78,7 +78,7 @@ func Exchange(c *gin.Context) { return } - code, err := authcode.NewAuthCode(exchangeReq.ClientId, user.Email) + code, err := authcode.NewAuthCode(c, exchangeReq.ClientId, user.Email) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/auth/magic.go b/service/auth/magic.go index 69d6731..68cd1d6 100644 --- a/service/auth/magic.go +++ b/service/auth/magic.go @@ -51,7 +51,7 @@ func Magic(c *gin.Context) { return } - code, err := authcode.NewAuthCode(req.ClientId, req.Email) + code, err := authcode.NewAuthCode(c, req.ClientId, req.Email) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/auth/redirect.go b/service/auth/redirect.go index d99fc3d..4b9a386 100644 --- a/service/auth/redirect.go +++ b/service/auth/redirect.go @@ -55,7 +55,7 @@ func Redirect(c *gin.Context) { code := c.Query("code") // Verify email token - authCode, ok := authcode.VerifyAuthCode(code) + authCode, ok := authcode.VerifyAuthCode(c, code) if !ok { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -70,7 +70,7 @@ func Redirect(c *gin.Context) { // Verify if user exists userData := new(data.User) - user, err := userData.GetByEmail(authCode.Email) + user, err := userData.GetByEmail(c, authCode.Email) if err != nil { if err == gorm.ErrRecordNotFound { @@ -80,7 +80,7 @@ func Redirect(c *gin.Context) { user.Email = authCode.Email user.Username = user.UserId.String() user.PermissionLevel = 10 - if err := user.Create(); err != nil { + if err := user.Create(c); err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). SetService(exception.ServiceAuth). @@ -107,7 +107,7 @@ func Redirect(c *gin.Context) { } clientData := new(data.Client) - client, err := clientData.GetClientByClientId(clientId) + client, err := clientData.GetClientByClientId(c, clientId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -135,7 +135,7 @@ func Redirect(c *gin.Context) { return } - newCode, err := authcode.NewAuthCode(clientId, authCode.Email) + newCode, err := authcode.NewAuthCode(c, clientId, authCode.Email) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/auth/refresh.go b/service/auth/refresh.go index 0e36076..bfa839c 100644 --- a/service/auth/refresh.go +++ b/service/auth/refresh.go @@ -31,7 +31,7 @@ func Refresh(c *gin.Context) { Application: viper.GetString("server.application"), } - accessToken, err := JwtTool.RefreshAccessToken(req.RefreshToken) + accessToken, err := JwtTool.RefreshAccessToken(c, req.RefreshToken) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -45,7 +45,7 @@ func Refresh(c *gin.Context) { return } - refreshToken, err := JwtTool.RenewRefreshToken(req.RefreshToken) + refreshToken, err := JwtTool.RenewRefreshToken(c, req.RefreshToken) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/auth/token.go b/service/auth/token.go index c1e0ac7..7020327 100644 --- a/service/auth/token.go +++ b/service/auth/token.go @@ -32,7 +32,7 @@ func Token(c *gin.Context) { return } - authCode, ok := authcode.VerifyAuthCode(req.Code) + authCode, ok := authcode.VerifyAuthCode(c, req.Code) if !ok { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -46,7 +46,7 @@ func Token(c *gin.Context) { } userData := new(data.User) - user, err := userData.GetByEmail(authCode.Email) + user, err := userData.GetByEmail(c, authCode.Email) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). @@ -64,7 +64,7 @@ func Token(c *gin.Context) { JwtTool := authtoken.Token{ Application: viper.GetString("server.application"), } - accessToken, refreshToken, err := JwtTool.IssueTokens(authCode.ClientId, user.UserId) + accessToken, refreshToken, err := JwtTool.IssueTokens(c, authCode.ClientId, user.UserId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/event/checkin.go b/service/event/checkin.go index 6ae01c1..23e478c 100644 --- a/service/event/checkin.go +++ b/service/event/checkin.go @@ -66,7 +66,7 @@ func Checkin(c *gin.Context) { return } data.UserId = userId - code, err := data.GenCheckinCode(eventId) + code, err := data.GenCheckinCode(c, eventId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). @@ -93,7 +93,7 @@ func CheckinSubmit(c *gin.Context) { c.ShouldBindJSON(&req) attendanceData := new(data.Attendance) - err := attendanceData.VerifyCheckinCode(req.ChekinCode) + err := attendanceData.VerifyCheckinCode(c, req.ChekinCode) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -164,7 +164,7 @@ func CheckinQuery(c *gin.Context) { } attendanceData := new(data.Attendance) - attendance, err := attendanceData.GetAttendance(userId, eventId) + attendance, err := attendanceData.GetAttendance(c, userId, eventId) if err != nil { errorCode := new(exception.Builder). diff --git a/service/event/info.go b/service/event/info.go index 14b50e0..18161bf 100644 --- a/service/event/info.go +++ b/service/event/info.go @@ -40,7 +40,7 @@ func Info(c *gin.Context) { return } - event, err := eventData.GetEventById(eventId) + event, err := eventData.GetEventById(c, eventId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). diff --git a/service/user/full.go b/service/user/full.go index b11a79e..9fcd99f 100644 --- a/service/user/full.go +++ b/service/user/full.go @@ -36,7 +36,7 @@ func Full(c *gin.Context) { return } - userData, err := new(data.User).GetByUserId(userId) + userData, err := new(data.User).GetByUserId(c, userId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -50,7 +50,7 @@ func Full(c *gin.Context) { return } - users, err := userData.GetFullTable() + users, err := userData.GetFullTable(c) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/user/info.go b/service/user/info.go index 6eacc5b..778fd3f 100644 --- a/service/user/info.go +++ b/service/user/info.go @@ -38,7 +38,7 @@ func Info(c *gin.Context) { } // Get user from database - user, err := userData.GetByUserId(userId) + user, err := userData.GetByUserId(c, userId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). diff --git a/service/user/list.go b/service/user/list.go index 61e6f0d..831253d 100644 --- a/service/user/list.go +++ b/service/user/list.go @@ -57,7 +57,7 @@ func List(c *gin.Context) { } // Get user list from search engine - list, err := new(data.User).FastListUsers(limitNum, offsetNum) + list, err := new(data.User).FastListUsers(c, limitNum, offsetNum) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusServer). diff --git a/service/user/update.go b/service/user/update.go index 26b9713..f003321 100644 --- a/service/user/update.go +++ b/service/user/update.go @@ -56,7 +56,7 @@ func Update(c *gin.Context) { } // Get user info - userData, err := new(data.User).GetByUserId(userId) + userData, err := new(data.User).GetByUserId(c, userId) if err != nil { errorCode := new(exception.Builder). SetStatus(exception.StatusUser). @@ -157,7 +157,7 @@ func Update(c *gin.Context) { } // Update user info - userData.UpdateByUserID(userId) + userData.UpdateByUserID(c, userId) errorCode := new(exception.Builder). SetStatus(exception.StatusUser).