Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion internal/trace/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ func WithLoggerLevel(ctx context.Context, level logrus.Level) context.Context {
var formatter logrus.TextFormatter
if level == logrus.DebugLevel {
formatter.FullTimestamp = true
formatter.TimestampFormat = "2006-01-02 15:04:05.000000000Z"
} else {
formatter.DisableTimestamp = true
}
Expand All @@ -52,6 +53,23 @@ func WithLoggerLevel(ctx context.Context, level logrus.Level) context.Context {
logger.SetFormatter(&formatter)
logger.SetLevel(level)

// save logger to context
// Add UTC hook to convert timestamps to UTC
logger.AddHook(&UTCHook{})

return log.WithLogger(ctx, logger)
}

// UTCHook is a hook for logrus that converts timestamps to UTC
type UTCHook struct{}

// Levels returns the levels this hook is enabled for
func (h *UTCHook) Levels() []logrus.Level {
return logrus.AllLevels
}

// Fire is called by logrus when a log entry is created.
// This implementation converts the timestamp to UTC.
func (h *UTCHook) Fire(entry *logrus.Entry) error {
entry.Time = entry.Time.UTC()
return nil
}
Comment thread
JeyJeyGao marked this conversation as resolved.
4 changes: 2 additions & 2 deletions internal/trace/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error
e := log.GetLogger(ctx)

// log the request
e.Debugf("Request #%d\n> Request: %q %q\n> Request headers:\n%s",
e.Debugf("Request #%d\n> Request: %q %q\n> Request headers:\n%s\n\n\n",
id, req.Method, req.URL, logHeader(req.Header))

// log the response
Expand All @@ -79,7 +79,7 @@ func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error
} else if resp == nil {
e.Errorf("No response obtained for request %s %q", req.Method, req.URL)
} else {
e.Debugf("Response #%d\n< Response status: %q\n< Response headers:\n%s",
e.Debugf("Response #%d\n< Response status: %q\n< Response headers:\n%s\n\n\n",
id, resp.Status, logHeader(resp.Header))
}
return resp, err
Expand Down
Loading