feat(request-id): generate request id as uuid

cookielab · Apr 8, 2024 · 1d7e586 · 1d7e586
1 parent d3b2222
commit 1d7e586
Show file tree

Hide file tree

Showing 25 changed files with 1,457 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -1,3 +1,5 @@
 module github.com/cookielab/traefik-middleware-request-logger
 
 go 1.19
+
+require github.com/google/uuid v1.6.0 // indirect
diff --git a/go.sum b/go.sum
@@ -0,0 +1,2 @@
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
diff --git a/logger.go b/logger.go
@@ -5,15 +5,15 @@ import (
 	"bufio"
 	"bytes"
 	"context"
-	"crypto/rand"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
 	"os"
 	"time"
+
+	"github.com/google/uuid" //nolint:depguard
 )
 
 // Config holds the plugin configuration.
@@ -91,7 +91,7 @@ func New(_ context.Context, next http.Handler, config *Config, name string) (htt
 }
 
 func (p *logRequest) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	requestID, _ := generateRandomID(16)
+	requestID := uuid.NewString()
 
 	if r.Header.Get(p.requestIDHeaderName) != "" {
 		requestID = r.Header.Get(p.requestIDHeaderName)
@@ -215,14 +215,6 @@ func (w *wrappedResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	return hijacker.Hijack()
 }
 
-func generateRandomID(length int) (string, error) {
-	bytes := make([]byte, length)
-	if _, err := rand.Read(bytes); err != nil {
-		return "", err
-	}
-	return hex.EncodeToString(bytes), nil
-}
-
 func allowContentType(contentType string, contentTypes []string) bool {
 	if len(contentTypes) == 0 {
 		return true

diff --git a/vendor/github.com/google/uuid/CHANGELOG.md b/vendor/github.com/google/uuid/CHANGELOG.md
diff --git a/vendor/github.com/google/uuid/CONTRIBUTING.md b/vendor/github.com/google/uuid/CONTRIBUTING.md
diff --git a/vendor/github.com/google/uuid/CONTRIBUTORS b/vendor/github.com/google/uuid/CONTRIBUTORS
diff --git a/vendor/github.com/google/uuid/LICENSE b/vendor/github.com/google/uuid/LICENSE
diff --git a/vendor/github.com/google/uuid/README.md b/vendor/github.com/google/uuid/README.md
diff --git a/vendor/github.com/google/uuid/dce.go b/vendor/github.com/google/uuid/dce.go
diff --git a/vendor/github.com/google/uuid/doc.go b/vendor/github.com/google/uuid/doc.go
diff --git a/vendor/github.com/google/uuid/hash.go b/vendor/github.com/google/uuid/hash.go
diff --git a/vendor/github.com/google/uuid/marshal.go b/vendor/github.com/google/uuid/marshal.go