fill metadata early

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Update golang.org/x/net commit hash to 89ef3d9
2021-04-30 00:40:15 +03:00 · 2021-04-28 16:43:11 +00:00 · 2021-04-28 01:42:52 +00:00
3 changed files with 13 additions and 14 deletions
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,5 @@ go 1.16

 require (
 	github.com/unistack-org/micro/v3 v3.3.17
-	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
+	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
 )
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,9 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
 github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/unistack-org/micro/v3 v3.3.17 h1:WcyS7InP0DlS/JpRQGLh5sG6VstkdHJbgpMp+gmHmwg=
 github.com/unistack-org/micro/v3 v3.3.17/go.mod h1:022EOEZZ789hZY3yB5ZSMXU6jLiadBgcNB/cpediV3c=
-golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
--- a/handler.go
+++ b/handler.go
@@ -81,7 +81,15 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	ctx := metadata.NewIncomingContext(r.Context(), nil)
+	ctx := context.WithValue(r.Context(), rspCodeKey{}, &rspCodeVal{})
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		md = metadata.New(len(r.Header))
+	}
+	for k, v := range r.Header {
+		md.Set(k, strings.Join(v, ", "))
+	}
+	ctx = metadata.NewIncomingContext(ctx, md)

 	defer r.Body.Close()

@@ -136,15 +144,6 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		md = metadata.New(0)
-	}
-
-	for k, v := range r.Header {
-		md.Set(k, strings.Join(v, ", "))
-	}
-
 	// get fields from url values
 	if len(r.URL.RawQuery) > 0 {
 		umd, cerr := rflutil.URLMap(r.URL.RawQuery)
@@ -203,13 +202,12 @@ func (h *httpServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		method:      fmt.Sprintf("%s.%s", hldr.name, hldr.mtype.method.Name),
 		body:        b,
 		payload:     argv.Interface(),
+		header:      md,
 	}

 	var scode int
 	// define the handler func
 	fn := func(fctx context.Context, req server.Request, rsp interface{}) (err error) {
-		fctx = context.WithValue(fctx, rspCodeKey{}, &rspCodeVal{})
-		fctx = metadata.NewIncomingContext(fctx, md)
 		returnValues = function.Call([]reflect.Value{hldr.rcvr, hldr.mtype.prepareContext(fctx), reflect.ValueOf(argv.Interface()), reflect.ValueOf(rsp)})

 		scode = GetRspCode(fctx)
Author	SHA1	Message	Date
Vasiliy Tolstov	b18465083b	fill metadata early Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-04-30 00:40:15 +03:00
Renovate Bot	11020aa6e5	Update golang.org/x/net commit hash to 89ef3d9	2021-04-28 16:43:11 +00:00
Renovate Bot	43c0eb4fda	Update golang.org/x/net commit hash to 85d9c07	2021-04-28 01:42:52 +00:00