From 6a29c5ffd40f1919cac40030c53160c19812bc8d Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:45:21 +0100 Subject: [performance] improved request batching (removes need for queueing) (#1687) * revamp http client to not limit requests, instead use sender worker Signed-off-by: kim * remove separate sender worker pool, spawn 2*GOMAXPROCS batch senders each time, no need for transport cache sweeping Signed-off-by: kim * improve batch senders to keep popping recipients until remote URL found Signed-off-by: kim * fix recipient looping issue Signed-off-by: kim * fix missing mutex unlock Signed-off-by: kim * move request id ctx key to gtscontext, finish filling out more code comments, add basic support for not logging client IP Signed-off-by: kim * slight code reformatting Signed-off-by: kim * a whitespace Signed-off-by: kim * remove unused code Signed-off-by: kim * add missing license headers Signed-off-by: kim * fix request backoff calculation Signed-off-by: kim --------- Signed-off-by: kim --- internal/middleware/logger.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'internal/middleware/logger.go') diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index e80488330..50e5542c3 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -34,7 +34,7 @@ import ( func Logger() gin.HandlerFunc { return func(c *gin.Context) { // Initialize the logging fields - fields := make(kv.Fields, 6, 7) + fields := make(kv.Fields, 5, 7) // Determine pre-handler time before := time.Now() @@ -68,11 +68,18 @@ func Logger() gin.HandlerFunc { // Set request logging fields fields[0] = kv.Field{"latency", time.Since(before)} - fields[1] = kv.Field{"clientIP", c.ClientIP()} - fields[2] = kv.Field{"userAgent", c.Request.UserAgent()} - fields[3] = kv.Field{"method", c.Request.Method} - fields[4] = kv.Field{"statusCode", code} - fields[5] = kv.Field{"path", path} + fields[1] = kv.Field{"userAgent", c.Request.UserAgent()} + fields[2] = kv.Field{"method", c.Request.Method} + fields[3] = kv.Field{"statusCode", code} + fields[4] = kv.Field{"path", path} + if includeClientIP := true; includeClientIP { + // TODO: make this configurable. + // + // Include clientIP if enabled. + fields = append(fields, kv.Field{ + "clientIP", c.ClientIP(), + }) + } // Create log entry with fields l := log.WithContext(c.Request.Context()). -- cgit v1.2.3