Merge pull request #83 from dongxuny/master

Add GormCtx() function for rk-db traceId injection
rookie-ninja · Sep 6, 2022 · 293a008 · 293a008
2 parents 7fc2b90 + 743576d
commit 293a008
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/middleware/context/context.go b/middleware/context/context.go
@@ -117,6 +117,13 @@ func GetLogger(ctx context.Context) *zap.Logger {
 	return logger
 }
 
+func GormCtx(ctx context.Context) context.Context {
+	res := context.Background()
+	res = context.WithValue(res, rkmid.LoggerKey.String(), GetLogger(ctx))
+	res = context.WithValue(res, rkmid.EventKey.String(), GetEvent(ctx))
+	return res
+}
+
 // GetRequestId Get request id in outgoing metadata.
 func GetRequestId(ctx context.Context) string {
 	// case 1: called from server side context which wrapped with WrapContextForServer()'

diff --git a/middleware/context/context_test.go b/middleware/context/context_test.go
@@ -330,6 +330,10 @@ func TestGetJwtToken(t *testing.T) {
 	assert.Equal(t, token, GetJwtToken(ctx))
 }
 
+func TestGormCtx(t *testing.T) {
+	assert.NotNil(t, GormCtx(context.TODO()))
+}
+
 func assertNotPanic(t *testing.T) {
 	if r := recover(); r != nil {
 		// Expect panic to be called with non nil error