Update workflows (#120)

Co-authored-by: Aleksandr Tolstikhin <atolstikhin@mtsbank.ru>
Reviewed-on: #120
Co-authored-by: Александр Толстихин <tolstihin1996@mail.ru>
Co-committed-by: Александр Толстихин <tolstihin1996@mail.ru>

.gitea/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.gitea/workflows/job_test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests        
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true        

.github/dependabot.yml

@@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-
-  # Maintain dependencies for GitHub Actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-
-  # Maintain dependencies for Golang
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-name: "autoapprove"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  autoapprove:
-    runs-on: ubuntu-latest
-    steps:
-      - name: approve
-        uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
-        id: approve
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -1,21 +0,0 @@
-name: "automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'vtolstov'
-    steps:
-      - name: merge
-        id: merge
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -1,47 +0,0 @@
-name: build
-on:
- push:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -1,78 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "codeql"
-
-on:
-  workflow_run:
-    workflows: ["prbuild"]
-    types:
-      - completed
-  push:
-    branches: [ master, v3 ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master, v3 ]
-  schedule:
-    - cron: '34 1 * * 0'
-
-jobs:
-  analyze:
-    name: analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    # Initializes the CodeQL tools for scanning.
-    - name: init
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: analyze
-      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,27 +0,0 @@
-name: "dependabot-automerge"
-
-on:
-  pull_request_target:
-    types: [assigned, opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - name: metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.3.6
-        with:
-          github-token: "${{ secrets.TOKEN }}"
-      - name: merge
-        id: merge
-        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -1,47 +0,0 @@
-name: prbuild
-on:
-  pull_request:
-    branches:
-    - master
-    - v3
-jobs:
-  test:
-    name: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: setup
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: cache
-      uses: actions/cache@v3
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: ${{ runner.os }}-go-
-    - name: deps
-      run: go get -v -t -d ./...
-    - name: test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...
-  lint:
-    name: lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v3
-      - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
-        continue-on-error: true
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
-          # Optional: working directory, useful for monorepos
-          # working-directory: somedir
-          # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
-          # Optional: show only new issues if it's a pull request. The default value is `false`.
-          # only-new-issues: true

.golangci.yml

@@ -1,44 +1,5 @@
 run:
-  concurrency: 4
+  concurrency: 8
   deadline: 5m
   issues-exit-code: 1
   tests: true
-
-linters-settings:
-  govet:
-    check-shadowing: true
-    enable:
-      - fieldalignment
-
-linters:
-  enable:
-    - govet
-    - deadcode
-    - errcheck
-    - govet
-    - ineffassign
-    - staticcheck
-    - structcheck
-    - typecheck
-    - unused
-    - varcheck
-    - bodyclose
-    - gci
-    - goconst
-    - gocritic
-    - gosimple
-    - gofmt
-    - gofumpt
-    - goimports
-    - golint
-    - gosec
-    - makezero
-    - misspell
-    - nakedret
-    - nestif
-    - nilerr
-    - noctx
-    - prealloc
-    - unconvert
-    - unparam
-  disable-all: false

README.md

@@ -5,14 +5,14 @@ This plugin is a http client for micro.
 ## Overview
 
 The http client wraps `net/http` to provide a robust micro client with service discovery, load balancing and streaming. 
-It complies with the [micro.Client](https://godoc.org/go.unistack.org/micro-client-http/v3#Client) interface.
+It complies with the [micro.Client](https://godoc.org/go.unistack.org/micro-client-http/v4#Client) interface.
 
 ## Usage
 
 ### Use directly
 
 ```go
-import "go.unistack.org/micro-client-http/v3"
+import "go.unistack.org/micro-client-http/v4"
 
 service := micro.NewService(
 	micro.Name("my.service"),

go.mod

@@ -1,5 +1,5 @@
-module go.unistack.org/micro-client-http/v3
+module go.unistack.org/micro-client-http/v4
 
-go 1.18
+go 1.19
 
-require go.unistack.org/micro/v3 v3.10.16
+require go.unistack.org/micro/v4 v4.0.18

go.sum

@@ -1,8 +1,6 @@
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro/v4 v4.0.6 h1:YFWvTh3VwyOd6NHYTQcf47n2TF5+p/EhpnbuBQX3qhk=
-go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
+go.unistack.org/micro/v4 v4.0.6/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
-go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+go.unistack.org/micro/v4 v4.0.18 h1:b7WFwem8Nz1xBrRg5FeLnm9CE5gJseHyf9j0BhkiXW0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+go.unistack.org/micro/v4 v4.0.18/go.mod h1:5+da5r835gP0WnNZbYUJDCvWpJ9Xc3IEGyp62e8o8R4=
-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=

http.go

@@ -1,5 +1,5 @@
 // Package http provides a http client
-package http // import "go.unistack.org/micro-client-http/v3"
+package http // import "go.unistack.org/micro-client-http/v4"
 
 import (
 	"bufio"
@@ -10,19 +10,18 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"os"
 	"strings"
 	"sync"
 	"time"
 
-	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/logger"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/options"
-	"go.unistack.org/micro/v3/selector"
+	"go.unistack.org/micro/v4/selector"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var DefaultContentType = "application/json"
@@ -140,17 +139,22 @@ func newRequest(ctx context.Context, log logger.Logger, addr string, req client.
 	if opts.Context != nil {
 		if md, ok := opts.Context.Value(metadataKey{}).(metadata.Metadata); ok {
 			for k, v := range md {
-				header.Set(k, v)
+				header[k] = v
 			}
 		}
 	}
 	if opts.AuthToken != "" {
 		header.Set(metadata.HeaderAuthorization, opts.AuthToken)
 	}
+	if opts.RequestMetadata != nil {
+		for k, v := range opts.RequestMetadata {
+			header[k] = v
+		}
+	}
 
 	if md, ok := metadata.FromOutgoingContext(ctx); ok {
 		for k, v := range md {
-			header.Set(k, v)
+			header[k] = v
 		}
 	}
 
@@ -212,7 +216,7 @@ 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
@@ -300,7 +304,7 @@ func (h *httpClient) newCodec(ct string) (codec.Codec, error) {
 	return nil, codec.ErrUnknownContentType
 }
 
-func (h *httpClient) Init(opts ...client.Option) error {
+func (h *httpClient) Init(opts ...options.Option) error {
 	if len(opts) == 0 && h.init {
 		return nil
 	}
@@ -308,9 +312,6 @@ func (h *httpClient) Init(opts ...client.Option) error {
 		o(&h.opts)
 	}
 
-	if err := h.opts.Broker.Init(); err != nil {
-		return err
-	}
 	if err := h.opts.Tracer.Init(); err != nil {
 		return err
 	}
@@ -323,9 +324,6 @@ func (h *httpClient) Init(opts ...client.Option) error {
 	if err := h.opts.Meter.Init(); err != nil {
 		return err
 	}
-	if err := h.opts.Transport.Init(); err != nil {
-		return err
-	}
 
 	return nil
 }
@@ -334,15 +332,11 @@ func (h *httpClient) Options() client.Options {
 	return h.opts
 }
 
-func (h *httpClient) NewMessage(topic string, msg interface{}, opts ...client.MessageOption) client.Message {
+func (h *httpClient) NewRequest(service, method string, req interface{}, opts ...options.Option) client.Request {
-	return newHTTPMessage(topic, msg, h.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 (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...client.CallOption) error {
+func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface{}, opts ...options.Option) error {
 	// make a copy of call opts
 	callOpts := h.opts.CallOptions
 	for _, opt := range opts {
@@ -359,8 +353,9 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		opt := client.WithRequestTimeout(time.Until(d))
+		if err := options.Set(&callOpts, time.Until(d), ".RequestTimeout"); err != nil {
-		opt(&callOpts)
+			return errors.New("go.micro.client", fmt.Sprintf("%v", err.Error()), 400)
+		}
 	}
 
 	// should we noop right here?
@@ -374,9 +369,9 @@ func (h *httpClient) Call(ctx context.Context, req client.Request, rsp interface
 	hcall := h.call
 
 	// wrap the call in reverse
-	for i := len(callOpts.CallWrappers); i > 0; i-- {
+	//for i := len(callOpts.CallWrappers); i > 0; i-- {
-		hcall = callOpts.CallWrappers[i-1](hcall)
+	//	hcall = callOpts.CallWrappers[i-1](hcall)
-	}
+	//}
 
 	// use the router passed as a call option, or fallback to the rpc clients router
 	if callOpts.Router == nil {
@@ -474,7 +469,7 @@ 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 (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...options.Option) (client.Stream, error) {
 	var err error
 
 	// make a copy of call opts
@@ -493,8 +488,9 @@ func (h *httpClient) Stream(ctx context.Context, req client.Request, opts ...cli
 	} else {
 		// got a deadline so no need to setup context
 		// but we need to set the timeout we pass along
-		o := client.WithStreamTimeout(time.Until(d))
+		if err = options.Set(&callOpts, time.Until(d), ".StreamTimeout"); err != nil {
-		o(&callOpts)
+			return nil, errors.New("go.micro.client", fmt.Sprintf("%v", err.Error()), 400)
+		}
 	}
 
 	// should we noop right here?
@@ -614,71 +610,6 @@ 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 (h *httpClient) Publish(ctx context.Context, p client.Message, opts ...client.PublishOption) error {
-	return h.publish(ctx, []client.Message{p}, opts...)
-}
-
-func (h *httpClient) publish(ctx context.Context, ps []client.Message, opts ...client.PublishOption) error {
-	var body []byte
-
-	options := client.NewPublishOptions(opts...)
-
-	// get proxy
-	exchange := ""
-	if v, ok := os.LookupEnv("MICRO_PROXY"); ok {
-		exchange = v
-	}
-
-	omd, ok := metadata.FromOutgoingContext(ctx)
-	if !ok {
-		omd = metadata.New(2)
-	}
-
-	msgs := make([]*broker.Message, 0, len(ps))
-
-	for _, p := range ps {
-		md := metadata.Copy(omd)
-		md[metadata.HeaderContentType] = p.ContentType()
-
-		// 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())
-			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
-			// set the body
-			b, err := cf.Marshal(p.Payload())
-			if err != nil {
-				return errors.InternalServerError("go.micro.client", err.Error())
-			}
-			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,
-		broker.PublishContext(ctx),
-		broker.PublishBodyOnly(options.BodyOnly),
-	)
-}
-
 func (h *httpClient) String() string {
 	return "http"
 }
@@ -687,7 +618,7 @@ func (h *httpClient) Name() string {
 	return h.opts.Name
 }
 
-func NewClient(opts ...client.Option) client.Client {
+func NewClient(opts ...options.Option) client.Client {
 	options := client.NewOptions(opts...)
 
 	if len(options.ContentType) == 0 {
@@ -737,10 +668,5 @@ func NewClient(opts ...client.Option) client.Client {
 	}
 	c := client.Client(rc)
 
-	// wrap in reverse
-	for i := len(options.Wrappers); i > 0; i-- {
-		c = options.Wrappers[i-1](c)
-	}
-
 	return c
 }

message.go

@@ -1,44 +0,0 @@
-package http
-
-import (
-	"go.unistack.org/micro/v3/client"
-	"go.unistack.org/micro/v3/metadata"
-)
-
-type httpMessage struct {
-	payload     interface{}
-	topic       string
-	contentType string
-	opts        client.MessageOptions
-}
-
-func newHTTPMessage(topic string, payload interface{}, contentType string, opts ...client.MessageOption) client.Message {
-	options := client.NewMessageOptions(opts...)
-
-	if len(options.ContentType) > 0 {
-		contentType = options.ContentType
-	}
-
-	return &httpMessage{
-		payload:     payload,
-		topic:       topic,
-		contentType: contentType,
-		opts:        options,
-	}
-}
-
-func (h *httpMessage) ContentType() string {
-	return h.contentType
-}
-
-func (h *httpMessage) Topic() string {
-	return h.topic
-}
-
-func (h *httpMessage) Payload() interface{} {
-	return h.payload
-}
-
-func (h *httpMessage) Metadata() metadata.Metadata {
-	return h.opts.Metadata
-}

options.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"net/http"
 
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/metadata"
-	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v4/options"
 )
 
 var (
@@ -29,98 +29,98 @@ var (
 type poolMaxStreams struct{}
 
 // PoolMaxStreams maximum streams on a connectioin
-func PoolMaxStreams(n int) client.Option {
+func PoolMaxStreams(n int) options.Option {
-	return client.SetOption(poolMaxStreams{}, n)
+	return options.ContextOption(poolMaxStreams{}, n)
 }
 
 type poolMaxIdle struct{}
 
 // PoolMaxIdle maximum idle conns of a pool
-func PoolMaxIdle(d int) client.Option {
+func PoolMaxIdle(d int) options.Option {
-	return client.SetOption(poolMaxIdle{}, d)
+	return options.ContextOption(poolMaxIdle{}, d)
 }
 
 type maxRecvMsgSizeKey struct{}
 
 // MaxRecvMsgSize set the maximum size of message that client can receive.
-func MaxRecvMsgSize(s int) client.Option {
+func MaxRecvMsgSize(s int) options.Option {
-	return client.SetOption(maxRecvMsgSizeKey{}, s)
+	return options.ContextOption(maxRecvMsgSizeKey{}, s)
 }
 
 type maxSendMsgSizeKey struct{}
 
 // MaxSendMsgSize set the maximum size of message that client can send.
-func MaxSendMsgSize(s int) client.Option {
+func MaxSendMsgSize(s int) options.Option {
-	return client.SetOption(maxSendMsgSizeKey{}, s)
+	return options.ContextOption(maxSendMsgSizeKey{}, s)
 }
 
 type httpClientKey struct{}
 
 // nolint: golint
 // HTTPClient pass http.Client option to client Call
-func HTTPClient(c *http.Client) client.Option {
+func HTTPClient(c *http.Client) options.Option {
-	return client.SetOption(httpClientKey{}, c)
+	return options.ContextOption(httpClientKey{}, c)
 }
 
 type httpDialerKey struct{}
 
 // nolint: golint
 // HTTPDialer pass net.Dialer option to client
-func HTTPDialer(d *net.Dialer) client.Option {
+func HTTPDialer(d *net.Dialer) options.Option {
-	return client.SetOption(httpDialerKey{}, d)
+	return options.ContextOption(httpDialerKey{}, d)
 }
 
 type methodKey struct{}
 
 // Method pass method option to client Call
-func Method(m string) client.CallOption {
+func Method(m string) options.Option {
-	return client.SetCallOption(methodKey{}, m)
+	return options.ContextOption(methodKey{}, m)
 }
 
 type pathKey struct{}
 
 // Path spcecifies path option to client Call
-func Path(p string) client.CallOption {
+func Path(p string) options.Option {
-	return client.SetCallOption(pathKey{}, p)
+	return options.ContextOption(pathKey{}, p)
 }
 
 type bodyKey struct{}
 
 // Body specifies body option to client Call
-func Body(b string) client.CallOption {
+func Body(b string) options.Option {
-	return client.SetCallOption(bodyKey{}, b)
+	return options.ContextOption(bodyKey{}, b)
 }
 
 type errorMapKey struct{}
 
-func ErrorMap(m map[string]interface{}) client.CallOption {
+func ErrorMap(m map[string]interface{}) options.Option {
-	return client.SetCallOption(errorMapKey{}, m)
+	return options.ContextOption(errorMapKey{}, m)
 }
 
 type structTagsKey struct{}
 
 // StructTags pass tags slice option to client Call
-func StructTags(tags []string) client.CallOption {
+func StructTags(tags []string) options.Option {
-	return client.SetCallOption(structTagsKey{}, tags)
+	return options.ContextOption(structTagsKey{}, tags)
 }
 
 type metadataKey struct{}
 
 // Metadata pass metadata to client Call
-func Metadata(md metadata.Metadata) client.CallOption {
+func Metadata(md metadata.Metadata) options.Option {
-	return client.SetCallOption(metadataKey{}, md)
+	return options.ContextOption(metadataKey{}, md)
 }
 
 type cookieKey struct{}
 
 // Cookie pass cookie to client Call
-func Cookie(cookies ...string) client.CallOption {
+func Cookie(cookies ...string) options.Option {
-	return client.SetCallOption(cookieKey{}, cookies)
+	return options.ContextOption(cookieKey{}, cookies)
 }
 
 type headerKey struct{}
 
 // Header pass cookie to client Call
-func Header(headers ...string) client.CallOption {
+func Header(headers ...string) options.Option {
-	return client.SetCallOption(headerKey{}, headers)
+	return options.ContextOption(headerKey{}, headers)
 }

request.go

@@ -1,8 +1,9 @@
 package http
 
 import (
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/options"
 )
 
 type httpRequest struct {
@@ -13,7 +14,7 @@ type httpRequest struct {
 	opts        client.RequestOptions
 }
 
-func newHTTPRequest(service, method string, request interface{}, contentType string, opts ...client.RequestOption) client.Request {
+func newHTTPRequest(service, method string, request interface{}, contentType string, opts ...options.Option) client.Request {
 	options := client.NewRequestOptions(opts...)
 	if len(options.ContentType) == 0 {
 		options.ContentType = contentType

stream.go

@@ -9,10 +9,10 @@ import (
 	"net/http"
 	"sync"
 
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
 )
 
 // Implements the streamer interface
@@ -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

@@ -10,10 +10,11 @@ import (
 	"strings"
 	"sync"
 
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v4/errors"
-	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v4/logger"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/metadata"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var (
@@ -216,13 +217,21 @@ func newPathRequest(path string, method string, body string, msg interface{}, ta
 		_, _ = b.WriteString(values.Encode())
 	}
 
-	if rutil.IsZero(nmsg) {
+	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 /")
@@ -252,6 +261,13 @@ func (h *httpClient) parseRsp(ctx context.Context, hrsp *http.Response, rsp inte
 		return nil
 	}
 
+	if opts.ResponseMetadata != nil {
+		*opts.ResponseMetadata = metadata.New(len(hrsp.Header))
+		for k, v := range hrsp.Header {
+			opts.ResponseMetadata.Set(k, strings.Join(v, ","))
+		}
+	}
+
 	select {
 	case <-ctx.Done():
 		err = ctx.Err()
@@ -266,7 +282,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))
 			}
@@ -275,13 +291,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", 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

@@ -59,6 +59,38 @@ func TestNewPathRequest(t *testing.T) {
 	}
 }
 
+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)
+			}
+		}
+	}
+}
+
 func TestNewPathVarRequest(t *testing.T) {
 	type Message struct {
 		Name string `json:"name"`