homelab/traefik
1
0
Fork 0
Code Activity

Provide Log Body in OTEL access Log

Browse source
This commit is contained in:
Tom Moulard 2025-07-24 11:52:04 +02:00 • committed by GitHub
parent c0edcc09bb
commit 5d85e6d088
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 151 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

77
pkg/middlewares/accesslog/logger.go
View file

@ -364,37 +364,54 @@ func (h *Handler) logTheRoundTrip(ctx context.Context, logDataTable *LogData) {
totalDuration := time.Now().UTC().Sub(core[StartUTC].(time.Time))
core[Duration] = totalDuration
if h.keepAccessLog(status, retryAttempts, totalDuration) {
size := logDataTable.DownstreamResponse.size
core[DownstreamContentSize] = size
if original, ok := core[OriginContentSize]; ok {
o64 := original.(int64)
if size != o64 && size != 0 {
core[GzipRatio] = float64(o64) / float64(size)
}
}
core[Overhead] = totalDuration
if origin, ok := core[OriginDuration]; ok {
core[Overhead] = totalDuration - origin.(time.Duration)
}
fields := logrus.Fields{}
for k, v := range logDataTable.Core {
if h.config.Fields.Keep(strings.ToLower(k)) {
fields[k] = v
}
}
h.redactHeaders(logDataTable.Request.headers, fields, "request_")
h.redactHeaders(logDataTable.OriginResponse, fields, "origin_")
h.redactHeaders(logDataTable.DownstreamResponse.headers, fields, "downstream_")
h.mu.Lock()
defer h.mu.Unlock()
h.logger.WithContext(ctx).WithFields(fields).Println()
if !h.keepAccessLog(status, retryAttempts, totalDuration) {
return
}
size := logDataTable.DownstreamResponse.size
core[DownstreamContentSize] = size
if original, ok := core[OriginContentSize]; ok {
o64 := original.(int64)
if size != o64 && size != 0 {
core[GzipRatio] = float64(o64) / float64(size)
}
}
core[Overhead] = totalDuration
if origin, ok := core[OriginDuration]; ok {
core[Overhead] = totalDuration - origin.(time.Duration)
}
fields := logrus.Fields{}
for k, v := range logDataTable.Core {
if h.config.Fields.Keep(strings.ToLower(k)) {
fields[k] = v
}
}
h.redactHeaders(logDataTable.Request.headers, fields, "request_")
h.redactHeaders(logDataTable.OriginResponse, fields, "origin_")
h.redactHeaders(logDataTable.DownstreamResponse.headers, fields, "downstream_")
h.mu.Lock()
defer h.mu.Unlock()
entry := h.logger.WithContext(ctx).WithFields(fields)
var message string
if h.config.OTLP != nil {
// If the logger is configured to use OpenTelemetry,
// we compute the log body with the formatter.
mBytes, err := h.logger.Formatter.Format(entry)
if err != nil {
message = fmt.Sprintf("Failed to format access log entry: %v", err)
} else {
message = string(mBytes)
}
}
entry.Println(message)
}
func (h *Handler) redactHeaders(headers http.Header, fields logrus.Fields, prefix string) {