refactor(http): improve http logging and request tracing

Remove standalone access log middleware and consolidate into context logger. Move logger initialization inside request handler to avoid state reuse. Simplify trace config parsing with early returns. Detect request scheme dynamically instead of defaulting to https.

Author: moshloop

http/middlewares/accesslog.go

@@ -66,24 +66,21 @@ func getLogger(req *http.Request) logger.Logger {
 
 func newContextLogger(config TraceConfig) Middleware {
 	return func(rt http.RoundTripper) http.RoundTripper {
-		l := &httpretty.Logger{
-			TLS:            config.TLS,
-			RequestHeader:  config.Headers,
-			RequestBody:    config.Body,
-			ResponseHeader: config.ResponseHeaders,
-			ResponseBody:   config.Response,
-			Auth:           config.Auth,
-			Colors:         true,
-			Formatters:     []httpretty.Formatter{&jsonFormatter{}, &formURLEncodedFormatter{}},
-		}
-		l.SkipHeader(logger.SensitiveHeaders)
-
-		var buf bytes.Buffer
-		l.SetOutput(&buf)
-		inner := l.RoundTripper(rt)
-
 		return RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-			buf.Reset()
+			var buf bytes.Buffer
+			l := &httpretty.Logger{
+				TLS:            config.TLS,
+				RequestHeader:  config.Headers,
+				RequestBody:    config.Body,
+				ResponseHeader: config.ResponseHeaders,
+				ResponseBody:   config.Response,
+				Auth:           config.Auth,
+				Colors:         true,
+				Formatters:     []httpretty.Formatter{&jsonFormatter{}, &formURLEncodedFormatter{}},
+			}
+			l.SkipHeader(logger.SensitiveHeaders)
+			l.SetOutput(&buf)
+			inner := l.RoundTripper(rt)
 			start := time.Now()
 			resp, err := inner.RoundTrip(req)
 			elapsed := time.Since(start)
@@ -131,10 +128,10 @@ func newContextAccessLog() Middleware {
 			elapsed := time.Since(start)
 			log := getLogger(req)
 			if err != nil {
-				log.Infof("%s %s %s %s", console.Bluef(req.Method), console.Yellowf("%s", req.URL), console.Redf("error"), elapsed.Truncate(time.Millisecond))
+				log.Infof("%s %s %s %s", console.Bluef("%s", req.Method), console.Yellowf("%s", req.URL), console.Redf("error"), elapsed.Truncate(time.Millisecond))
 				return nil, err
 			}
-			log.Infof("%s %s %s %s", console.Bluef(req.Method), console.Yellowf("%s", req.URL), statusColor(resp.StatusCode)("%d", resp.StatusCode), elapsed.Truncate(time.Millisecond))
+			log.Infof("%s %s %s %s", console.Bluef("%s", req.Method), console.Yellowf("%s", req.URL), statusColor(resp.StatusCode)("%d", resp.StatusCode), elapsed.Truncate(time.Millisecond))
 			return resp, nil
 		})
 	}

http/middlewares/logger.go

@@ -86,49 +86,48 @@ var traceHeaders = TraceConfig{
 }
 
 func TraceConfigFromString(s string) TraceConfig {
+	var config TraceConfig
 	switch s {
 	case "access":
-		return TraceConfig{AccessLog: true}
+		config = TraceConfig{AccessLog: true}
 	case "debug", "headers":
-		return traceHeaders
+		config = traceHeaders
 	case "body":
-		config := traceHeaders
+		config = traceHeaders
 		config.Body = true
-		return config
 	case "trace", "all", "response":
-		return traceAll
-	}
-
-	config := TraceConfig{}
-	if strings.Contains(s, "all") {
 		config = traceAll
-	}
-	if strings.Contains(s, "headers") {
-		config.Headers = true
-	}
-	if strings.Contains(s, "body") {
-		config.Body = true
-	}
-	if strings.Contains(s, "response") {
-		config.Response = true
-	}
-	if strings.Contains(s, "responseHeaders") {
-		config.ResponseHeaders = true
-	}
-	if strings.Contains(s, "queryParam") {
-		config.QueryParam = true
-	}
-	if strings.Contains(s, "tls") {
-		config.TLS = true
-	}
-	if strings.Contains(s, "timing") {
-		config.Timing = true
-	}
-	if strings.Contains(s, "auth") {
-		config.Auth = true
-	}
-	if strings.Contains(s, "access") {
-		config.AccessLog = true
+	default:
+		if strings.Contains(s, "all") {
+			config = traceAll
+		}
+		if strings.Contains(s, "headers") {
+			config.Headers = true
+		}
+		if strings.Contains(s, "body") {
+			config.Body = true
+		}
+		if strings.Contains(s, "response") {
+			config.Response = true
+		}
+		if strings.Contains(s, "responseHeaders") {
+			config.ResponseHeaders = true
+		}
+		if strings.Contains(s, "queryParam") {
+			config.QueryParam = true
+		}
+		if strings.Contains(s, "tls") {
+			config.TLS = true
+		}
+		if strings.Contains(s, "timing") {
+			config.Timing = true
+		}
+		if strings.Contains(s, "auth") {
+			config.Auth = true
+		}
+		if strings.Contains(s, "access") {
+			config.AccessLog = true
+		}
 	}
 	if properties.On(false, "http.body.disabled") {
 		config.Body = false

http/middlewares/trace.go

@@ -624,7 +624,11 @@ func (p *printer) printRequestHeader(req *http.Request) {
 		}
 		scheme := req.URL.Scheme
 		if scheme == "" {
-			scheme = "https"
+			if req.TLS != nil {
+				scheme = "https"
+			} else {
+				scheme = "http"
+			}
 		}
 		uri = fmt.Sprintf("%s://%s%s", scheme, host, req.URL.RequestURI())
 	}