Merge pull request #382 from hellofresh/patch/stop-using-satori-uuid

PT-2875 Replaced satori uuid with gofrs
motiv-labs · Jan 28, 2019 · 68fc4ca · 68fc4ca
2 parents 305abe8 + 700d898
commit 68fc4ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -123,3 +123,7 @@
 [[constraint]]
   name = "github.com/globalsign/mgo"
   version = "r2018.04.23"
+
+[[constraint]]
+  name = "github.com/gofrs/uuid"
+  version = "3.2.0"
diff --git a/pkg/middleware/request_id.go b/pkg/middleware/request_id.go
@@ -3,8 +3,8 @@ package middleware
 import (
 	"net/http"
 
+	"github.com/gofrs/uuid"
 	"github.com/hellofresh/janus/pkg/observability"
-	"github.com/satori/go.uuid"
 )
 
 type reqIDKeyType int
@@ -19,7 +19,7 @@ func RequestID(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		requestID := r.Header.Get(requestIDHeader)
 		if requestID == "" {
-			requestID = uuid.NewV4().String()
+			requestID = uuid.Must(uuid.NewV4()).String()
 		}
 
 		r.Header.Set(requestIDHeader, requestID)