Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

caddyhttp: Optimize logs using zap's WithLazy() #6590

Merged
merged 5 commits into from
Sep 26, 2024
Merged

caddyhttp: Optimize logs using zap's WithLazy() #6590

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d380731
uses zap's .WithLazy with a cloned request
Alliballibaba2 Sep 24, 2024
e62916f
fixes the cloning
Alliballibaba2 Sep 24, 2024
75f8ba4
Merge branch 'master' into improved-http-performance
AlliBalliBaba Sep 25, 2024
fac862a
adds comment explaining why cloning is faster
Alliballibaba2 Sep 25, 2024
25098cf
Merge branch 'improved-http-performance' of https://github.com/AlliBa…
Alliballibaba2 Sep 25, 2024
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
8 changes: 5 additions & 3 deletions modules/caddyhttp/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,16 +312,18 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
}

// encode the request for logging purposes before
// clone the request for logging purposes before
// it enters any handler chain; this is necessary
// to capture the original request in case it gets
// modified during handling
// cloning the request and using .WithLazy is considerably faster
// than using .With, which will JSON encode the request immediately
shouldLogCredentials := s.Logs != nil && s.Logs.ShouldLogCredentials
loggableReq := zap.Object("request", LoggableHTTPRequest{
Request: r,
Request: r.Clone(r.Context()),
ShouldLogCredentials: shouldLogCredentials,
})
errLog := s.errorLogger.With(loggableReq)
errLog := s.errorLogger.WithLazy(loggableReq)

var duration time.Duration

Expand Down
Loading