Update util.go

Enrich remote calls with request id and route.
topfreegames · Sep 22, 2023 · 3689999 · 3689999
1 parent 0fdca8d
commit 3689999
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/util/util.go b/util/util.go
@@ -225,6 +225,15 @@ func GetContextFromRequest(req *protos.Request, serverID string) (context.Contex
 	if ctx == nil {
 		return nil, constants.ErrNoContextFound
 	}
-	ctx = CtxWithDefaultLogger(ctx, req.GetMsg().GetRoute(), "")
+
+	requestID := pcontext.GetFromPropagateCtx(ctx, constants.RequestIDKey)
+	if rID, ok := requestID.(string); !ok || (ok && rID == "") {
+		requestID = nuid.New().Next()
+		ctx = pcontext.AddToPropagateCtx(ctx, constants.RequestIDKey, requestID)
+	}
+
+	route := req.GetMsg().GetRoute()
+	ctx = pcontext.AddToPropagateCtx(ctx, constants.RouteKey, route)
+	ctx = CtxWithDefaultLogger(ctx, route, "")
 	return ctx, nil
 }