From c609b4fa397af6378f92b7d9f1cd1f4576178cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sv=C3=A4topluk=20Hanzel?= <svatoplukhanzel@pm.me>
Date: Sat, 21 Aug 2021 00:38:13 +0200
Subject: [PATCH] fix(http/log_middleware): fix latency keys

---
 builder_http.go           | 2 +-
 cadre.go                  | 7 +++----
 http/middleware/logger.go | 4 ++--
 lb/shard/main.go          | 5 ++++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/builder_http.go b/builder_http.go
index a2b0e23..84c5375 100644
--- a/builder_http.go
+++ b/builder_http.go
@@ -141,7 +141,7 @@ func WithHTTPListeningAddress(addr string) HTTPOption {
 }
 
 // WithGlobalMiddleware adds new global middleware to the HTTP server
-// default - metrics, recovery and logging
+// default - metrics, logging and recovery (in this order)
 func WithGlobalMiddleware(middlware ...gin.HandlerFunc) HTTPOption {
 	return func(h *httpOptions) error {
 		h.globalMiddleware = append(h.globalMiddleware, middlware...)
diff --git a/cadre.go b/cadre.go
index bd8a3f6..6a0c351 100644
--- a/cadre.go
+++ b/cadre.go
@@ -3,7 +3,6 @@ package cadre
 import (
 	"context"
 	"net"
-	"net/http"
 	stdhttp "net/http"
 	"os"
 	"os/signal"
@@ -73,7 +72,7 @@ func (c *cadre) Start() error {
 	// start http servers
 	for port, httpServer := range c.httpServers {
 		c.swg.Add(1)
-		go c.startHttpServer(port, httpServer)
+		go c.startHTTPServer(port, httpServer)
 	}
 
 	// start grpc server
@@ -105,7 +104,7 @@ func (c *cadre) Shutdown() error {
 	return nil
 }
 
-func (c *cadre) startHttpServer(addr string, httpServer *stdhttp.Server) {
+func (c *cadre) startHTTPServer(addr string, httpServer *stdhttp.Server) {
 	defer c.swg.Done()
 
 	c.logger.Debug().
@@ -119,7 +118,7 @@ func (c *cadre) startHttpServer(addr string, httpServer *stdhttp.Server) {
 	}()
 
 	err := httpServer.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
+	if err != nil && err != stdhttp.ErrServerClosed {
 		c.logger.Error().
 			Err(err).
 			Msg("http server failed")
diff --git a/http/middleware/logger.go b/http/middleware/logger.go
index 2cc6b9f..f0ce4cb 100644
--- a/http/middleware/logger.go
+++ b/http/middleware/logger.go
@@ -22,8 +22,8 @@ func NewLogger(baseLogger zerolog.Logger) func(*gin.Context) {
 		dumplogger := logger.With().
 			Str("method", c.Request.Method).
 			Str("path", path).
-			Dur("latency_ms", latency).       // keep this for log aggregation, where number is better than user-readable string
-			Str("latency", latency.String()). // user-readable latency
+			Dur("latency", latency).              // keep this for log aggregation, where number is better than user-readable string
+			Str("latency_str", latency.String()). // user-readable latency
 			Int("status_code", c.Writer.Status()).
 			Str("ip", c.ClientIP()).Logger()
 
diff --git a/lb/shard/main.go b/lb/shard/main.go
index 4662604..b00d585 100644
--- a/lb/shard/main.go
+++ b/lb/shard/main.go
@@ -1,4 +1,7 @@
 package shard
 
 const Name = "shard"
-const DefaultShardKeyName = "shard_key"
+
+type ShardLBCtxKeyType string
+
+const DefaultShardKeyName ShardLBCtxKeyType = "shard_key"