update for latest micro logger changes

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

go.mod

@@ -1,5 +1,15 @@
 module go.unistack.org/micro-client-http/v3
 
-go 1.18
+go 1.22
 
-require go.unistack.org/micro/v3 v3.10.16
+toolchain go1.23.1
+
+require go.unistack.org/micro/v3 v3.10.97
+
+require (
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
+	google.golang.org/grpc v1.67.1 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+)

go.sum

@@ -1,8 +1,39 @@
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
-go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro/v3 v3.10.69 h1:V4g9LqUhzGab73U2aevnjtffCdJqGTuMfWY7fy4qGwI=
+go.unistack.org/micro/v3 v3.10.69/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v3 v3.10.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U=
+go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
+go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 h1:QCqS/PdaHTSWGvupk2F/ehwHtGc0/GYkT+3GAcR1CCc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
+google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
+google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
+google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

http.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -21,7 +22,10 @@ import (
 	"go.unistack.org/micro/v3/errors"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/options"
 	"go.unistack.org/micro/v3/selector"
+	"go.unistack.org/micro/v3/semconv"
+	"go.unistack.org/micro/v3/tracer"
 	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
@@ -35,8 +39,12 @@ func filterLabel(r []router.Route) []router.Route {
 */
 
 type httpClient struct {
-	httpcli *http.Client
-	opts    client.Options
+	funcPublish      client.FuncPublish
+	funcBatchPublish client.FuncBatchPublish
+	funcCall         client.FuncCall
+	funcStream       client.FuncStream
+	httpcli          *http.Client
+	opts             client.Options
 	sync.RWMutex
 	init bool
 }
@@ -217,29 +225,29 @@ func newRequest(ctx context.Context, log logger.Logger, addr string, req client.
 	}
 
 	if log.V(logger.DebugLevel) {
-		log.Debugf(ctx, "request %s to %s with headers %v body %s", method, u.String(), hreq.Header, b)
+		log.Debug(ctx, fmt.Sprintf("request %s to %s with headers %v body %s", method, u.String(), hreq.Header, b))
 	}
 
 	return hreq, nil
 }
 
-func (h *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
+func (c *httpClient) call(ctx context.Context, addr string, req client.Request, rsp interface{}, opts client.CallOptions) error {
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
-	cf, err := h.newCodec(ct)
+	cf, err := c.newCodec(ct)
 	if err != nil {
 		return errors.BadRequest("go.micro.client", err.Error())
 	}
-	hreq, err := newRequest(ctx, h.opts.Logger, addr, req, ct, cf, req.Body(), opts)
+	hreq, err := newRequest(ctx, c.opts.Logger, addr, req, ct, cf, req.Body(), opts)
 	if err != nil {
 		return err
 	}
 
 	// make the request
-	hrsp, err := h.httpcli.Do(hreq)
+	hrsp, err := c.httpcli.Do(hreq)
 	if err != nil {
 		switch err := err.(type) {
 		case *url.Error:
@@ -256,29 +264,29 @@ func (h *httpClient) call(ctx context.Context, addr string, req client.Request,
 
 	defer hrsp.Body.Close()
 
-	return h.parseRsp(ctx, hrsp, rsp, opts)
+	return c.parseRsp(ctx, hrsp, rsp, opts)
 }
 
-func (h *httpClient) stream(ctx context.Context, addr string, req client.Request, opts client.CallOptions) (client.Stream, error) {
+func (c *httpClient) stream(ctx context.Context, addr string, req client.Request, opts client.CallOptions) (client.Stream, error) {
 	ct := req.ContentType()
 	if len(opts.ContentType) > 0 {
 		ct = opts.ContentType
 	}
 
 	// get codec
-	cf, err := h.newCodec(ct)
+	cf, err := c.newCodec(ct)
 	if err != nil {
 		return nil, errors.BadRequest("go.micro.client", err.Error())
 	}
 
-	cc, err := (h.httpcli.Transport).(*http.Transport).DialContext(ctx, "tcp", addr)
+	cc, err := (c.httpcli.Transport).(*http.Transport).DialContext(ctx, "tcp", addr)
 	if err != nil {
 		return nil, errors.InternalServerError("go.micro.client", fmt.Sprintf("Error dialing: %v", err))
 	}
 
 	return &httpStream{
 		address: addr,
-		logger:  h.opts.Logger,
+		logger:  c.opts.Logger,
 		context: ctx,
 		closed:  make(chan bool),
 		opts:    opts,
@@ -290,66 +298,88 @@ func (h *httpClient) stream(ctx context.Context, addr string, req client.Request
 	}, nil
 }
 
-func (h *httpClient) newCodec(ct string) (codec.Codec, error) {
-	h.RLock()
-	defer h.RUnlock()
+func (c *httpClient) newCodec(ct string) (codec.Codec, error) {
+	c.RLock()
 
 	if idx := strings.IndexRune(ct, ';'); idx >= 0 {
 		ct = ct[:idx]
 	}
 
-	if c, ok := h.opts.Codecs[ct]; ok {
-		return c, nil
+	if cf, ok := c.opts.Codecs[ct]; ok {
+		c.RUnlock()
+		return cf, nil
 	}
 
+	c.RUnlock()
 	return nil, codec.ErrUnknownContentType
 }
 
-func (h *httpClient) Init(opts ...client.Option) error {
-	if len(opts) == 0 && h.init {
-		return nil
-	}
+func (c *httpClient) Init(opts ...client.Option) error {
 	for _, o := range opts {
-		o(&h.opts)
+		o(&c.opts)
 	}
 
-	if err := h.opts.Broker.Init(); err != nil {
-		return err
-	}
-	if err := h.opts.Tracer.Init(); err != nil {
-		return err
-	}
-	if err := h.opts.Router.Init(); err != nil {
-		return err
-	}
-	if err := h.opts.Logger.Init(); err != nil {
-		return err
-	}
-	if err := h.opts.Meter.Init(); err != nil {
-		return err
-	}
-	if err := h.opts.Transport.Init(); err != nil {
-		return err
-	}
+	c.funcCall = c.fnCall
+	c.funcStream = c.fnStream
+	c.funcPublish = c.fnPublish
+	c.funcBatchPublish = c.fnBatchPublish
+
+	c.opts.Hooks.EachNext(func(hook options.Hook) {
+		switch h := hook.(type) {
+		case client.HookCall:
+			c.funcCall = h(c.funcCall)
+		case client.HookStream:
+			c.funcStream = h(c.funcStream)
+		case client.HookPublish:
+			c.funcPublish = h(c.funcPublish)
+		case client.HookBatchPublish:
+			c.funcBatchPublish = h(c.funcBatchPublish)
+		}
+	})
 
 	return nil
 }
 
-func (h *httpClient) Options() client.Options {
-	return h.opts
+func (c *httpClient) Options() client.Options {
+	return c.opts
 }
 
-func (h *httpClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
-	return newHTTPMessage(topic, msg, h.opts.ContentType, opts...)
+func (c *httpClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
+	return newHTTPMessage(topic, msg, c.opts.ContentType, opts...)
 }
 
-func (h *httpClient) NewRequest(service, method string, req interface{}, opts ...client.RequestOption) client.Request {
-	return newHTTPRequest(service, method, req, h.opts.ContentType, opts...)
+func (c *httpClient) NewRequest(service, method string, req interface{}, opts ...client.RequestOption) client.Request {
+	return newHTTPRequest(service, method, req, c.opts.ContentType, opts...)
 }
 
-func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+func (c *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+	ts := time.Now()
+	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
+	var sp tracer.Span
+	ctx, sp = c.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
+		tracer.WithSpanKind(tracer.SpanKindClient),
+		tracer.WithSpanLabels("endpoint", req.Endpoint()),
+	)
+	err := c.funcCall(ctx, req, rsp, opts...)
+	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
+	te := time.Since(ts)
+	c.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+	c.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+
+	if me := errors.FromError(err); me == nil {
+		sp.Finish()
+		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
+	} else {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
+	}
+
+	return err
+}
+
+func (c *httpClient) fnCall(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
 	// make a copy of call opts
-	callOpts := h.opts.CallOptions
+	callOpts := c.opts.CallOptions
 	for _, opt := range opts {
 		opt(&callOpts)
 	}
@@ -376,26 +406,21 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	}
 
 	// make copy of call method
-	hcall := h.call
-
-	// wrap the call in reverse
-	for i := len(callOpts.CallWrappers); i > 0; i-- {
-		hcall = callOpts.CallWrappers[i-1](hcall)
-	}
+	hcall := c.call
 
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
-		callOpts.Router = h.opts.Router
+		callOpts.Router = c.opts.Router
 	}
 
 	if callOpts.Selector == nil {
-		callOpts.Selector = h.opts.Selector
+		callOpts.Selector = c.opts.Selector
 	}
 
 	// inject proxy address
 	// TODO: don't even bother using Lookup/Select in this case
-	if len(h.opts.Proxy) > 0 {
-		callOpts.Address = []string{h.opts.Proxy}
+	if len(c.opts.Proxy) > 0 {
+		callOpts.Address = []string{c.opts.Proxy}
 	}
 
 	var next selector.Next
@@ -417,7 +442,7 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 			var routes []string
 			// lookup the route to send the reques to
 			// TODO apply any filtering here
-			routes, err = h.opts.Lookup(ctx, req, callOpts)
+			routes, err = c.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -434,7 +459,7 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 		// make the call
 		err = hcall(ctx, node, req, rsp, callOpts)
 		// record the result of the call to inform future routing decisions
-		if verr := h.opts.Selector.Record(node, err); verr != nil {
+		if verr := c.opts.Selector.Record(node, err); verr != nil {
 			return verr
 		}
 
@@ -479,11 +504,36 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	return gerr
 }
 
-func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+func (c *httpClient) Stream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
+	ts := time.Now()
+	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Inc()
+	var sp tracer.Span
+	ctx, sp = c.opts.Tracer.Start(ctx, req.Endpoint()+" rpc-client",
+		tracer.WithSpanKind(tracer.SpanKindClient),
+		tracer.WithSpanLabels("endpoint", req.Endpoint()),
+	)
+	stream, err := c.funcStream(ctx, req, opts...)
+	c.opts.Meter.Counter(semconv.ClientRequestInflight, "endpoint", req.Endpoint()).Dec()
+	te := time.Since(ts)
+	c.opts.Meter.Summary(semconv.ClientRequestLatencyMicroseconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+	c.opts.Meter.Histogram(semconv.ClientRequestDurationSeconds, "endpoint", req.Endpoint()).Update(te.Seconds())
+
+	if me := errors.FromError(err); me == nil {
+		sp.Finish()
+		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "success", "code", strconv.Itoa(int(200))).Inc()
+	} else {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		c.opts.Meter.Counter(semconv.ClientRequestTotal, "endpoint", req.Endpoint(), "status", "failure", "code", strconv.Itoa(int(me.Code))).Inc()
+	}
+
+	return stream, err
+}
+
+func (c *httpClient) fnStream(ctx context.Context, req client.Request, opts ...client.CallOption) (client.Stream, error) {
 	var err error
 
 	// make a copy of call opts
-	callOpts := h.opts.CallOptions
+	callOpts := c.opts.CallOptions
 	for _, o := range opts {
 		o(&callOpts)
 	}
@@ -520,17 +570,17 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
-		callOpts.Router = h.opts.Router
+		callOpts.Router = c.opts.Router
 	}
 
 	if callOpts.Selector == nil {
-		callOpts.Selector = h.opts.Selector
+		callOpts.Selector = c.opts.Selector
 	}
 
 	// inject proxy address
 	// TODO: don't even bother using Lookup/Select in this case
-	if len(h.opts.Proxy) > 0 {
-		callOpts.Address = []string{h.opts.Proxy}
+	if len(c.opts.Proxy) > 0 {
+		callOpts.Address = []string{c.opts.Proxy}
 	}
 
 	var next selector.Next
@@ -551,7 +601,7 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 			var routes []string
 			// lookup the route to send the reques to
 			// TODO apply any filtering here
-			routes, err = h.opts.Lookup(ctx, req, callOpts)
+			routes, err = c.opts.Lookup(ctx, req, callOpts)
 			if err != nil {
 				return nil, errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -565,10 +615,10 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 
 		node := next()
 
-		stream, cerr := h.stream(ctx, node, req, callOpts)
+		stream, cerr := c.stream(ctx, node, req, callOpts)
 
 		// record the result of the call to inform future routing decisions
-		if verr := h.opts.Selector.Record(node, cerr); verr != nil {
+		if verr := c.opts.Selector.Record(node, cerr); verr != nil {
 			return nil, verr
 		}
 
@@ -619,15 +669,23 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	return nil, grr
 }
 
-func (h *httpClient) BatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
-	return h.publish(ctx, p, opts...)
+func (c *httpClient) BatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
+	return c.funcBatchPublish(ctx, p, opts...)
 }
 
-func (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
-	return h.publish(ctx, []client.Message{p}, opts...)
+func (c *httpClient) fnBatchPublish(ctx context.Context, p []client.Message, opts ...client.PublishOption) error {
+	return c.publish(ctx, p, opts...)
 }
 
-func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
+func (c *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	return c.funcPublish(ctx, p, opts...)
+}
+
+func (c *httpClient) fnPublish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
+	return c.publish(ctx, []client.Message{p}, opts...)
+}
+
+func (c *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
 	var body []byte
 
 	options := client.NewPublishOptions(opts...)
@@ -637,6 +695,10 @@ func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	if v, ok := os.LookupEnv("MICRO_PROXY"); ok {
 		exchange = v
 	}
+	// get the exchange
+	if len(options.Exchange) > 0 {
+		exchange = options.Exchange
+	}
 
 	omd, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
@@ -648,13 +710,23 @@ func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 	for _, p := range ps {
 		md := metadata.Copy(omd)
 		md[metadata.HeaderContentType] = p.ContentType()
+		topic := p.Topic()
+		if len(exchange) > 0 {
+			topic = exchange
+		}
+		md.Set(metadata.HeaderTopic, topic)
+		iter := p.Metadata().Iterator()
+		var k, v string
+		for iter.Next(&k, &v) {
+			md.Set(k, v)
+		}
 
 		// passed in raw data
 		if d, ok := p.Payload().(*codec.Frame); ok {
 			body = d.Data
 		} else {
 			// use codec for payload
-			cf, err := h.newCodec(p.ContentType())
+			cf, err := c.newCodec(p.ContentType())
 			if err != nil {
 				return errors.InternalServerError("go.micro.client", err.Error())
 			}
@@ -666,40 +738,31 @@ func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...c
 			body = b
 		}
 
-		topic := p.Topic()
-		if len(exchange) > 0 {
-			topic = exchange
-		}
-
-		for k, v := range p.Metadata() {
-			md.Set(k, v)
-		}
-		md.Set(metadata.HeaderTopic, topic)
 		msgs = append(msgs, &broker.Message{Header: md, Body: body})
 	}
 
-	return h.opts.Broker.BatchPublish(ctx, msgs,
+	return c.opts.Broker.BatchPublish(ctx, msgs,
 		broker.PublishContext(ctx),
 		broker.PublishBodyOnly(options.BodyOnly),
 	)
 }
 
-func (h *httpClient) String() string {
+func (c *httpClient) String() string {
 	return "http"
 }
 
-func (h *httpClient) Name() string {
-	return h.opts.Name
+func (c *httpClient) Name() string {
+	return c.opts.Name
 }
 
-func NewClient(opts ...client.Option) client.Client {
+func NewClient(opts ...client.Option) *httpClient {
 	options := client.NewOptions(opts...)
 
 	if len(options.ContentType) == 0 {
 		options.ContentType = DefaultContentType
 	}
 
-	rc := &httpClient{
+	c := &httpClient{
 		opts: options,
 	}
 
@@ -722,7 +785,7 @@ func NewClient(opts ...client.Option) client.Client {
 	}
 
 	if httpcli, ok := options.Context.Value(httpClientKey{}).(*http.Client); ok {
-		rc.httpcli = httpcli
+		c.httpcli = httpcli
 	} else {
 		// TODO customTransport := http.DefaultTransport.(*http.Transport).Clone()
 		tr := &http.Transport{
@@ -738,14 +801,13 @@ func NewClient(opts ...client.Option) client.Client {
 			ExpectContinueTimeout: 1 * time.Second,
 			TLSClientConfig:       options.TLSConfig,
 		}
-		rc.httpcli = &http.Client{Transport: tr}
+		c.httpcli = &http.Client{Transport: tr}
 	}
-	c := client.Client(rc)
 
-	// wrap in reverse
-	for i := len(options.Wrappers); i > 0; i-- {
-		c = options.Wrappers[i-1](c)
-	}
+	c.funcCall = c.fnCall
+	c.funcStream = c.fnStream
+	c.funcPublish = c.fnPublish
+	c.funcBatchPublish = c.fnBatchPublish
 
 	return c
 }

http_test.go

@@ -1,21 +1,60 @@
 package http
 
 import (
+	"encoding/json"
+	"fmt"
 	"net/url"
 	"strings"
 	"testing"
 )
 
-type Request struct {
-	Name     string `json:"name"`
-	Field1   string `json:"field1"`
-	ClientID string
-	Field2   string
-	Field3   int64
+func TestNestedPathPost(t *testing.T) {
+	req := &request{Name: "first", Field1: "fieldval"}
+	p, m, err := newPathRequest("/api/v1/xxxx", "POST", "*", req, []string{"json", "protobuf"}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	u, err := url.Parse(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s := u.String(); s != "/api/v1/xxxx" {
+		t.Fatalf("nested path error %s", s)
+	}
+	_ = m
+}
+
+type request struct {
+	NestedTest *request `json:"nested_test,omitempty"`
+	Name       string   `json:"name,omitempty"`
+	Field1     string   `json:"field1,omitempty"`
+	ClientID   string   `json:",omitempty"`
+	Field2     string   `json:",omitempty"`
+	Field3     int64    `json:",omitempty"`
+}
+
+func TestNestedPath(t *testing.T) {
+	req := &request{Name: "first", NestedTest: &request{Name: "second"}, Field1: "fieldval"}
+	p, m, err := newPathRequest("/api/v1/{name}/{nested_test.name}", "PUT", "*", req, []string{"json", "protobuf"}, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	u, err := url.Parse(p)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s := u.String(); s != "/api/v1/first/second" {
+		t.Fatalf("nested path error %s", s)
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("m %#+v %s\n", m, b)
 }
 
 func TestPathWithHeader(t *testing.T) {
-	req := &Request{Name: "vtolstov", Field1: "field1", ClientID: "1234567890"}
+	req := &request{Name: "vtolstov", Field1: "field1", ClientID: "1234567890"}
 	p, m, err := newPathRequest(
 		"/api/v1/test?Name={name}&Field1={field1}",
 		"POST",
@@ -40,7 +79,7 @@ func TestPathWithHeader(t *testing.T) {
 }
 
 func TestPathValues(t *testing.T) {
-	req := &Request{Name: "vtolstov", Field1: "field1"}
+	req := &request{Name: "vtolstov", Field1: "field1"}
 	p, m, err := newPathRequest("/api/v1/test?Name={name}&Field1={field1}", "POST", "*", req, nil, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -56,7 +95,7 @@ func TestPathValues(t *testing.T) {
 }
 
 func TestValidPath(t *testing.T) {
-	req := &Request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
+	req := &request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
 	p, m, err := newPathRequest("/api/v1/{name}/list", "GET", "", req, nil, nil)
 	if err != nil {
 		t.Fatal(err)
@@ -73,9 +112,9 @@ func TestValidPath(t *testing.T) {
 }
 
 func TestInvalidPath(t *testing.T) {
-	req := &Request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
-	_, _, err := newPathRequest("/api/v1/{xname}/list", "GET", "", req, nil, nil)
+	req := &request{Name: "vtolstov", Field1: "field1", Field2: "field2", Field3: 10}
+	s, _, err := newPathRequest("/api/v1/{xname}/list", "GET", "", req, nil, nil)
 	if err == nil {
-		t.Fatal("path param must not be filled")
+		t.Fatalf("path param must not be filled: %s", s)
 	}
 }

stream.go

@@ -134,14 +134,14 @@ func (h *httpStream) parseRsp(ctx context.Context, log logger.Logger, hrsp *http
 			buf, err = io.ReadAll(hrsp.Body)
 			if err != nil {
 				if log.V(logger.ErrorLevel) {
-					log.Errorf(ctx, "failed to read body: %v", err)
+					log.Error(ctx, "failed to read body", err)
 				}
 				return errors.InternalServerError("go.micro.client", string(buf))
 			}
 		}
 
 		if log.V(logger.DebugLevel) {
-			log.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			log.Debug(ctx, fmt.Sprintf("response %s with %v", buf, hrsp.Header))
 		}
 
 		if hrsp.StatusCode < 400 {

util.go

@@ -87,6 +87,8 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 
 	values := url.Values{}
 	// copy cycle
+
+	cleanPath := make(map[string]bool)
 	for i := 0; i < tmsg.NumField(); i++ {
 		val := tmsg.Field(i)
 		if val.IsZero() {
@@ -121,6 +123,7 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			default:
 				t = &tag{key: tn, name: tp[0]}
 			}
+
 			if t.name != "" {
 				break
 			}
@@ -154,18 +157,63 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 			default:
 				fieldsmap[t.name] = getParam(val)
 			}
-		} else if (body == "*" || body == t.name) && method != http.MethodGet {
-			if tnmsg.Field(i).CanSet() {
-				tnmsg.Field(i).Set(val)
-			}
 		} else {
-			if val.Type().Kind() == reflect.Slice {
-				for idx := 0; idx < val.Len(); idx++ {
-					values.Add(t.name, getParam(val.Index(idx)))
+			for k, v := range fieldsmap {
+				isSet := false
+				if v != "" {
+					continue
+				}
+				var clean []string
+				fld := msg
+
+				parts := strings.Split(k, ".")
+
+				for idx := 0; idx < len(parts); idx++ {
+					var nfld interface{}
+					var name string
+					if tags == nil {
+						tags = []string{"json"}
+					}
+				tagsloop:
+					for ti := 0; ti < len(tags); ti++ {
+						name, nfld, err = rutil.StructFieldNameByTag(fld, tags[ti], parts[idx])
+						if err == nil {
+							clean = append(clean, name)
+							break tagsloop
+						}
+					}
+					if err == nil {
+						fld = nfld
+						if len(parts)-1 == idx {
+							isSet = true
+							fieldsmap[k] = fmt.Sprintf("%v", fld)
+
+						}
+					}
+				}
+				if isSet {
+					cleanPath[strings.Join(clean, ".")] = true
 				}
-			} else {
-				values.Add(t.name, getParam(val))
 			}
+			for k := range cleanPath {
+				if err = rutil.ZeroFieldByPath(nmsg, k); err != nil {
+					return "", nil, err
+				}
+			}
+			if (body == "*" || body == t.name) && method != http.MethodGet {
+				if tnmsg.Field(i).CanSet() {
+					tnmsg.Field(i).Set(val)
+				}
+			} else if method == http.MethodGet {
+				if val.Type().Kind() == reflect.Slice {
+					for idx := 0; idx < val.Len(); idx++ {
+						values.Add(t.name, getParam(val.Index(idx)))
+					}
+				} else if !rutil.IsEmpty(val) {
+					values.Add(t.name, getParam(val))
+				}
+			}
+
 		}
 	}
 
@@ -217,13 +265,23 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		_, _ = b.WriteString(values.Encode())
 	}
 
-	if rutil.IsZero(nmsg) {
+	// rutil.ZeroEmpty(tnmsg.Interface())
+
+	if rutil.IsZero(nmsg) && !isEmptyStruct(nmsg) {
 		return b.String(), nil, nil
 	}
 
 	return b.String(), nmsg, nil
 }
 
+func isEmptyStruct(v interface{}) bool {
+	val := reflect.ValueOf(v)
+	if val.Kind() == reflect.Ptr {
+		val = val.Elem()
+	}
+	return val.Kind() == reflect.Struct && val.NumField() == 0
+}
+
 func newTemplate(path string) ([]string, error) {
 	if len(path) == 0 || path[0] != '/' {
 		return nil, fmt.Errorf("path must starts with /")
@@ -274,7 +332,7 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 			buf, err = io.ReadAll(hrsp.Body)
 			if err != nil {
 				if h.opts.Logger.V(logger.ErrorLevel) {
-					h.opts.Logger.Errorf(ctx, "failed to read body: %v", err)
+					h.opts.Logger.Error(ctx, "failed to read body", err)
 				}
 				return errors.InternalServerError("go.micro.client", string(buf))
 			}
@@ -283,13 +341,13 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 		cf, cerr := h.newCodec(ct)
 		if cerr != nil {
 			if h.opts.Logger.V(logger.DebugLevel) {
-				h.opts.Logger.Debugf(ctx, "response with %v unknown content-type %s %s", hrsp.Header, ct, buf)
+				h.opts.Logger.Debug(ctx, fmt.Sprintf("response with %v unknown content-type %s %s", hrsp.Header, ct, buf))
 			}
 			return errors.InternalServerError("go.micro.client", cerr.Error())
 		}
 
 		if h.opts.Logger.V(logger.DebugLevel) {
-			h.opts.Logger.Debugf(ctx, "response %s with %v", buf, hrsp.Header)
+			h.opts.Logger.Debug(ctx, fmt.Sprintf("response %s with %v", buf, hrsp.Header))
 		}
 
 		// succeseful response

util_test.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"net/http"
 	"net/url"
 	"testing"
 )
@@ -52,9 +53,47 @@ func TestNewPathRequest(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		vals := u.Query()
-		if v, ok := vals["name"]; !ok || v[0] != "test_name" {
-			t.Fatalf("invalid path: %v nmsg: %v", path, nmsg)
+		switch m {
+		case http.MethodPost, http.MethodPut, http.MethodPatch, http.MethodDelete:
+			break
+		case http.MethodGet:
+			vals := u.Query()
+			if v, ok := vals["name"]; !ok || v[0] != "test_name" {
+				t.Fatalf("%s invalid path: %v nmsg: %v", m, path, nmsg)
+			}
+		}
+
+	}
+}
+
+func TestNewPathRequestWithEmptyBody(t *testing.T) {
+	val := struct{}{}
+	cases := []string{
+		"",
+		"*",
+		"{}",
+		"nil",
+		`{"type": "invalid"}`,
+	}
+
+	for _, body := range cases {
+		for _, m := range []string{"POST", "PUT", "PATCH", "GET", "DELETE"} {
+			path, nmsg, err := newPathRequest("/v1/test", m, body, val, []string{"protobuf", "json"}, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if nmsg == nil {
+				t.Fatalf("invalid path: nil nmsg")
+			}
+
+			u, err := url.Parse(path)
+			if err != nil {
+				t.Fatal(err)
+			}
+			vals := u.Query()
+			if len(vals) != 0 {
+				t.Fatalf("invalid path: %v nmsg: %v", path, nmsg)
+			}
 		}
 	}
 }
@@ -87,7 +126,7 @@ func TestNewPathVarRequest(t *testing.T) {
 				t.Fatalf("invalid nmsg: %#+v\n", nmsg)
 			}
 			if nmsg.(*Message).Name != "test_name" {
-				t.Fatalf("invalid nmsg: %v nmsg: %v", path, nmsg)
+				t.Fatalf("invalid path: %v nmsg: %#+v", path, nmsg)
 			}
 		} else {
 			vals := u.Query()