|
|
@@ -67,6 +67,7 @@ func (l Logger) Error(ctx context.Context, str string, args ...interface{}) {
|
|
|
}
|
|
|
|
|
|
func (l Logger) Trace(ctx context.Context, begin time.Time, fc func() (string, int64), err error) {
|
|
|
+ spanId := ctx.Value("X-Span-ID")
|
|
|
if l.LogLevel <= 0 {
|
|
|
return
|
|
|
}
|
|
|
@@ -74,13 +75,13 @@ func (l Logger) Trace(ctx context.Context, begin time.Time, fc func() (string, i
|
|
|
switch {
|
|
|
case err != nil && l.LogLevel >= gormlogger.Error && (!l.IgnoreRecordNotFoundError || !errors.Is(err, gorm.ErrRecordNotFound)):
|
|
|
sql, rows := fc()
|
|
|
- l.logger().Error("trace", zap.Error(err), zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
+ l.logger().Error("trace", zap.Any("spanId", spanId), zap.Error(err), zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
case l.SlowThreshold != 0 && elapsed > l.SlowThreshold && l.LogLevel >= gormlogger.Warn:
|
|
|
sql, rows := fc()
|
|
|
- l.logger().Warn("trace", zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
+ l.logger().Warn("trace", zap.Any("spanId", spanId), zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
case l.LogLevel >= gormlogger.Info:
|
|
|
sql, rows := fc()
|
|
|
- l.logger().Info("trace", zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
+ l.logger().Info("trace", zap.Any("spanId", spanId), zap.Duration("elapsed", elapsed), zap.Int64("rows", rows), zap.String("sql", sql))
|
|
|
}
|
|
|
}
|
|
|
|
