chore: rename

seabyte7 · Aug 2, 2023 · 55da8e4 · 55da8e4
1 parent b3d7e7e
commit 55da8e4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/client/client.go b/client/client.go
@@ -319,8 +319,8 @@ func applyCallOptions(ctx context.Context, cfg rpcinfo.MutableRPCConfig, svr rem
 
 // Call implements the Client interface .
 func (kc *kClient) Call(ctx context.Context, method string, request, response interface{}) (err error) {
-	// use backup context if no metainfo found
-	ctx = backup.RecoverCtxOndemands(ctx, kc.opt.CtxBackupHandler)
+	// merge backup context if no metainfo found in ctx
+	ctx = backup.RecoverCtxOnDemands(ctx, kc.opt.CtxBackupHandler)
 
 	validateForCall(ctx, kc.inited, kc.closed)
 	var ri rpcinfo.RPCInfo

diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/cloudwego/dynamicgo v0.1.2
 	github.com/cloudwego/fastpb v0.0.4
 	github.com/cloudwego/frugal v0.1.7
-	github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338
+	github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9
 	github.com/cloudwego/netpoll v0.4.1
 	github.com/cloudwego/thriftgo v0.2.11
 	github.com/golang/mock v1.6.0

diff --git a/go.sum b/go.sum
@@ -57,8 +57,8 @@ github.com/cloudwego/frugal v0.1.7/go.mod h1:3VECBCSiTYwm3QApqHXjZB9NDH+8hUw7txx
 github.com/cloudwego/kitex v0.3.2/go.mod h1:/XD07VpUD9VQWmmoepASgZ6iw//vgWikVA9MpzLC5i0=
 github.com/cloudwego/kitex v0.4.4/go.mod h1:3FcH5h9Qw+dhRljSzuGSpWuThttA8DvK0BsL7HUYydo=
 github.com/cloudwego/kitex v0.6.1/go.mod h1:zI1GBrjT0qloTikcCfQTgxg3Ws+yQMyaChEEOcGNUvA=
-github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338 h1:tDF+SaPpV4JsXNhwbv+CxwnuMgwFtoW4cyHUM6B+YP0=
-github.com/cloudwego/localsession v0.0.2-beta.0.20230802050711-24c02255f338/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8=
+github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9 h1:5SZMdX9wVK4Gjhj1G4spHRnzTZKUOLFp5KWjkF4QE2c=
+github.com/cloudwego/localsession v0.0.2-beta.0.20230802053006-16e41b3db4c9/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8=
 github.com/cloudwego/netpoll v0.2.4/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzCx2KsnPI4E=
 github.com/cloudwego/netpoll v0.3.1/go.mod h1:1T2WVuQ+MQw6h6DpE45MohSvDTKdy2DlzCx2KsnPI4E=
 github.com/cloudwego/netpoll v0.4.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ=

diff --git a/server/server_test.go b/server/server_test.go
@@ -652,7 +652,7 @@ func testInvokeHandlerWithSession(t *testing.T, fail bool, ad string) {
 			defer wg.Done()
 
 			// miss context here
-			ctx := backup.RecoverCtxOndemands(context.Background(), backupHandler)
+			ctx := backup.RecoverCtxOnDemands(context.Background(), backupHandler)
 
 			if !fail {
 				b, _ := metainfo.GetPersistentValue(ctx, "a")