From acf427c4bb637d67dbc55cb685294601464e8e93 Mon Sep 17 00:00:00 2001
From: Jason McNeil <sixcolors@mac.com>
Date: Thu, 10 Aug 2023 15:27:25 -0300
Subject: [PATCH 1/3] chore: TagLatency match gin-gonic/gin format

---
 middleware/logger/logger_test.go | 54 ++++++++++++++++++++++++++++++++
 middleware/logger/tags.go        |  2 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/middleware/logger/logger_test.go b/middleware/logger/logger_test.go
index d3006c88de..84906c55cd 100644
--- a/middleware/logger/logger_test.go
+++ b/middleware/logger/logger_test.go
@@ -205,6 +205,60 @@ func Test_Logger_All(t *testing.T) {
 	utils.AssertEqual(t, expected, buf.String())
 }
 
+// go test -run Test_Logger_WithLatency
+func Test_Logger_WithLatency(t *testing.T) {
+	t.Parallel()
+	buff := bytebufferpool.Get()
+	defer bytebufferpool.Put(buff)
+	app := fiber.New()
+	logger := New(Config{
+		Output: buff,
+		Format: "${latency}",
+	})
+	app.Use(logger)
+
+	// Define a list of time units to test
+	timeUnits := []struct {
+		unit string
+		div  time.Duration
+	}{
+		// {"ns", time.Nanosecond}, // TODO: Nano seconds are too fast to test
+		{"µs", time.Microsecond},
+		{"ms", time.Millisecond},
+		{"s", time.Second},
+	}
+
+	// Initialize a new time unit
+	sleepDuration := 1 * time.Nanosecond
+
+	// Define a test route that sleeps
+	app.Get("/test", func(c *fiber.Ctx) error {
+		time.Sleep(sleepDuration)
+		return c.SendStatus(fiber.StatusOK)
+	})
+
+	// Loop through each time unit and assert that the log output contains the expected latency value
+	for _, tu := range timeUnits {
+		// Update the sleep duration for the next iteration
+		sleepDuration = 1 * tu.div
+
+		// Create a new HTTP request to the test route
+		resp, err := app.Test(httptest.NewRequest(fiber.MethodGet, "/test", nil), int(2*time.Second))
+		utils.AssertEqual(t, nil, err)
+		utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode)
+
+		fmt.Println("|", buff.String(), "|")
+
+		// Assert that the log output contains the expected latency value in the current time unit
+		bb := buff.Bytes()
+		unit := bb[len(bb)-len(tu.unit):]
+		utils.AssertEqual(t, string(unit), tu.unit)
+
+		// Reset the buffer
+		buff.Reset()
+	}
+}
+
 // go test -run Test_Query_Params
 func Test_Query_Params(t *testing.T) {
 	t.Parallel()
diff --git a/middleware/logger/tags.go b/middleware/logger/tags.go
index 2f746ddd4e..ac2b909002 100644
--- a/middleware/logger/tags.go
+++ b/middleware/logger/tags.go
@@ -192,7 +192,7 @@ func createTagMap(cfg *Config) map[string]LogFunc {
 		},
 		TagLatency: func(output Buffer, c *fiber.Ctx, data *Data, extraParam string) (int, error) {
 			latency := data.Stop.Sub(data.Start)
-			return output.WriteString(fmt.Sprintf("%7v", latency))
+			return output.WriteString(fmt.Sprintf("%13v", latency))
 		},
 		TagTime: func(output Buffer, c *fiber.Ctx, data *Data, extraParam string) (int, error) {
 			return output.WriteString(data.Timestamp.Load().(string)) //nolint:forcetypeassert // We always store a string in here

From 7b1aa8a612a1dc314e7594c200a04e5198c43a99 Mon Sep 17 00:00:00 2001
From: Jason McNeil <sixcolors@mac.com>
Date: Thu, 10 Aug 2023 15:35:16 -0300
Subject: [PATCH 2/3] chore: rm debug

---
 middleware/logger/logger_test.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/middleware/logger/logger_test.go b/middleware/logger/logger_test.go
index 84906c55cd..8638aa75f0 100644
--- a/middleware/logger/logger_test.go
+++ b/middleware/logger/logger_test.go
@@ -247,8 +247,6 @@ func Test_Logger_WithLatency(t *testing.T) {
 		utils.AssertEqual(t, nil, err)
 		utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode)
 
-		fmt.Println("|", buff.String(), "|")
-
 		// Assert that the log output contains the expected latency value in the current time unit
 		bb := buff.Bytes()
 		unit := bb[len(bb)-len(tu.unit):]

From 35da4c6a7510e9a4a73409e85f2b70c632347d89 Mon Sep 17 00:00:00 2001
From: Jason McNeil <sixcolors@mac.com>
Date: Thu, 10 Aug 2023 16:04:29 -0300
Subject: [PATCH 3/3] test: fix text

---
 middleware/logger/logger_test.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/middleware/logger/logger_test.go b/middleware/logger/logger_test.go
index 8638aa75f0..a5764580f9 100644
--- a/middleware/logger/logger_test.go
+++ b/middleware/logger/logger_test.go
@@ -248,9 +248,7 @@ func Test_Logger_WithLatency(t *testing.T) {
 		utils.AssertEqual(t, fiber.StatusOK, resp.StatusCode)
 
 		// Assert that the log output contains the expected latency value in the current time unit
-		bb := buff.Bytes()
-		unit := bb[len(bb)-len(tu.unit):]
-		utils.AssertEqual(t, string(unit), tu.unit)
+		utils.AssertEqual(t, bytes.HasSuffix(buff.Bytes(), []byte(tu.unit)), true, "Expected latency to be in %s, got %s", tu.unit, buff.String())
 
 		// Reset the buffer
 		buff.Reset()