update for latest micro logger changes

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

.github/dependabot.yml

@@ -11,16 +11,9 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    commit-message:
-      prefix: "chore"
-      include: "scope"
 
   # Maintain dependencies for Golang
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
       interval: "daily"
-    commit-message:
-      prefix: "chore"
-      include: "scope"
-

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -3,19 +3,20 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        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.

.github/workflows/codeql-analysis.yml

@@ -43,14 +43,14 @@ jobs:
 
     steps:
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
     - name: init
-      uses: github/codeql-action/init@v1
+      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.
@@ -61,7 +61,7 @@ jobs:
     # 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@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +75,4 @@ jobs:
     #   make release
 
     - name: analyze
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,4 +1,4 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
   pull_request_target:
@@ -9,21 +9,17 @@ permissions:
   contents: write
 
 jobs:
-  dependabot:
+  automerge:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: github.actor == 'dependabot[bot]'
     steps:
       - name: metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
           github-token: "${{ secrets.TOKEN }}"
-      - name: approve
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          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:

.github/workflows/pr.yml

@@ -3,19 +3,20 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v2
+        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.

go.mod

@@ -1,10 +1,323 @@
 module go.unistack.org/micro-broker-nats/v3
 
-go 1.16
+go 1.22
+
+toolchain go1.23.1
 
 require (
-	github.com/nats-io/nats-server/v2 v2.6.1 // indirect
-	github.com/nats-io/nats.go v1.12.3
-	go.unistack.org/micro/v3 v3.8.7
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	github.com/nats-io/nats.go v1.37.0
+	go.unistack.org/micro/v3 v3.10.97
+	golang.org/x/sync v0.8.0
+)
+
+require (
+	cloud.google.com/go v0.110.0 // indirect
+	cloud.google.com/go/accessapproval v1.6.0 // indirect
+	cloud.google.com/go/accesscontextmanager v1.7.0 // indirect
+	cloud.google.com/go/aiplatform v1.37.0 // indirect
+	cloud.google.com/go/analytics v0.19.0 // indirect
+	cloud.google.com/go/apigateway v1.5.0 // indirect
+	cloud.google.com/go/apigeeconnect v1.5.0 // indirect
+	cloud.google.com/go/apigeeregistry v0.6.0 // indirect
+	cloud.google.com/go/apikeys v0.6.0 // indirect
+	cloud.google.com/go/appengine v1.7.1 // indirect
+	cloud.google.com/go/area120 v0.7.1 // indirect
+	cloud.google.com/go/artifactregistry v1.13.0 // indirect
+	cloud.google.com/go/asset v1.13.0 // indirect
+	cloud.google.com/go/assuredworkloads v1.10.0 // indirect
+	cloud.google.com/go/automl v1.12.0 // indirect
+	cloud.google.com/go/baremetalsolution v0.5.0 // indirect
+	cloud.google.com/go/batch v0.7.0 // indirect
+	cloud.google.com/go/beyondcorp v0.5.0 // indirect
+	cloud.google.com/go/bigquery v1.50.0 // indirect
+	cloud.google.com/go/billing v1.13.0 // indirect
+	cloud.google.com/go/binaryauthorization v1.5.0 // indirect
+	cloud.google.com/go/certificatemanager v1.6.0 // indirect
+	cloud.google.com/go/channel v1.12.0 // indirect
+	cloud.google.com/go/cloudbuild v1.9.0 // indirect
+	cloud.google.com/go/clouddms v1.5.0 // indirect
+	cloud.google.com/go/cloudtasks v1.10.0 // indirect
+	cloud.google.com/go/compute v1.19.1 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/contactcenterinsights v1.6.0 // indirect
+	cloud.google.com/go/container v1.15.0 // indirect
+	cloud.google.com/go/containeranalysis v0.9.0 // indirect
+	cloud.google.com/go/datacatalog v1.13.0 // indirect
+	cloud.google.com/go/dataflow v0.8.0 // indirect
+	cloud.google.com/go/dataform v0.7.0 // indirect
+	cloud.google.com/go/datafusion v1.6.0 // indirect
+	cloud.google.com/go/datalabeling v0.7.0 // indirect
+	cloud.google.com/go/dataplex v1.6.0 // indirect
+	cloud.google.com/go/dataproc v1.12.0 // indirect
+	cloud.google.com/go/dataqna v0.7.0 // indirect
+	cloud.google.com/go/datastore v1.11.0 // indirect
+	cloud.google.com/go/datastream v1.7.0 // indirect
+	cloud.google.com/go/deploy v1.8.0 // indirect
+	cloud.google.com/go/dialogflow v1.32.0 // indirect
+	cloud.google.com/go/dlp v1.9.0 // indirect
+	cloud.google.com/go/documentai v1.18.0 // indirect
+	cloud.google.com/go/domains v0.8.0 // indirect
+	cloud.google.com/go/edgecontainer v1.0.0 // indirect
+	cloud.google.com/go/errorreporting v0.3.0 // indirect
+	cloud.google.com/go/essentialcontacts v1.5.0 // indirect
+	cloud.google.com/go/eventarc v1.11.0 // indirect
+	cloud.google.com/go/filestore v1.6.0 // indirect
+	cloud.google.com/go/firestore v1.9.0 // indirect
+	cloud.google.com/go/functions v1.13.0 // indirect
+	cloud.google.com/go/gaming v1.9.0 // indirect
+	cloud.google.com/go/gkebackup v0.4.0 // indirect
+	cloud.google.com/go/gkeconnect v0.7.0 // indirect
+	cloud.google.com/go/gkehub v0.12.0 // indirect
+	cloud.google.com/go/gkemulticloud v0.5.0 // indirect
+	cloud.google.com/go/grafeas v0.2.0 // indirect
+	cloud.google.com/go/gsuiteaddons v1.5.0 // indirect
+	cloud.google.com/go/iam v0.13.0 // indirect
+	cloud.google.com/go/iap v1.7.1 // indirect
+	cloud.google.com/go/ids v1.3.0 // indirect
+	cloud.google.com/go/iot v1.6.0 // indirect
+	cloud.google.com/go/kms v1.10.1 // indirect
+	cloud.google.com/go/language v1.9.0 // indirect
+	cloud.google.com/go/lifesciences v0.8.0 // indirect
+	cloud.google.com/go/logging v1.7.0 // indirect
+	cloud.google.com/go/longrunning v0.4.1 // indirect
+	cloud.google.com/go/managedidentities v1.5.0 // indirect
+	cloud.google.com/go/maps v0.7.0 // indirect
+	cloud.google.com/go/mediatranslation v0.7.0 // indirect
+	cloud.google.com/go/memcache v1.9.0 // indirect
+	cloud.google.com/go/metastore v1.10.0 // indirect
+	cloud.google.com/go/monitoring v1.13.0 // indirect
+	cloud.google.com/go/networkconnectivity v1.11.0 // indirect
+	cloud.google.com/go/networkmanagement v1.6.0 // indirect
+	cloud.google.com/go/networksecurity v0.8.0 // indirect
+	cloud.google.com/go/notebooks v1.8.0 // indirect
+	cloud.google.com/go/optimization v1.3.1 // indirect
+	cloud.google.com/go/orchestration v1.6.0 // indirect
+	cloud.google.com/go/orgpolicy v1.10.0 // indirect
+	cloud.google.com/go/osconfig v1.11.0 // indirect
+	cloud.google.com/go/oslogin v1.9.0 // indirect
+	cloud.google.com/go/phishingprotection v0.7.0 // indirect
+	cloud.google.com/go/policytroubleshooter v1.6.0 // indirect
+	cloud.google.com/go/privatecatalog v0.8.0 // indirect
+	cloud.google.com/go/pubsub v1.30.0 // indirect
+	cloud.google.com/go/pubsublite v1.7.0 // indirect
+	cloud.google.com/go/recaptchaenterprise v1.3.1 // indirect
+	cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 // indirect
+	cloud.google.com/go/recommendationengine v0.7.0 // indirect
+	cloud.google.com/go/recommender v1.9.0 // indirect
+	cloud.google.com/go/redis v1.11.0 // indirect
+	cloud.google.com/go/resourcemanager v1.7.0 // indirect
+	cloud.google.com/go/resourcesettings v1.5.0 // indirect
+	cloud.google.com/go/retail v1.12.0 // indirect
+	cloud.google.com/go/run v0.9.0 // indirect
+	cloud.google.com/go/scheduler v1.9.0 // indirect
+	cloud.google.com/go/secretmanager v1.10.0 // indirect
+	cloud.google.com/go/security v1.13.0 // indirect
+	cloud.google.com/go/securitycenter v1.19.0 // indirect
+	cloud.google.com/go/servicecontrol v1.11.1 // indirect
+	cloud.google.com/go/servicedirectory v1.9.0 // indirect
+	cloud.google.com/go/servicemanagement v1.8.0 // indirect
+	cloud.google.com/go/serviceusage v1.6.0 // indirect
+	cloud.google.com/go/shell v1.6.0 // indirect
+	cloud.google.com/go/spanner v1.45.0 // indirect
+	cloud.google.com/go/speech v1.15.0 // indirect
+	cloud.google.com/go/storage v1.29.0 // indirect
+	cloud.google.com/go/storagetransfer v1.8.0 // indirect
+	cloud.google.com/go/talent v1.5.0 // indirect
+	cloud.google.com/go/texttospeech v1.6.0 // indirect
+	cloud.google.com/go/tpu v1.5.0 // indirect
+	cloud.google.com/go/trace v1.9.0 // indirect
+	cloud.google.com/go/translate v1.7.0 // indirect
+	cloud.google.com/go/video v1.15.0 // indirect
+	cloud.google.com/go/videointelligence v1.10.0 // indirect
+	cloud.google.com/go/vision v1.2.0 // indirect
+	cloud.google.com/go/vision/v2 v2.7.0 // indirect
+	cloud.google.com/go/vmmigration v1.6.0 // indirect
+	cloud.google.com/go/vmwareengine v0.3.0 // indirect
+	cloud.google.com/go/vpcaccess v1.6.0 // indirect
+	cloud.google.com/go/webrisk v1.8.0 // indirect
+	cloud.google.com/go/websecurityscanner v1.5.0 // indirect
+	cloud.google.com/go/workflows v1.10.0 // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 // indirect
+	gioui.org v0.0.0-20210308172011-57750fc8a0a6 // indirect
+	git.sr.ht/~sbinet/gg v0.3.1 // indirect
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
+	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
+	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
+	github.com/KimMachineGun/automemlimit v0.6.1 // indirect
+	github.com/OneOfOne/xxhash v1.2.2 // indirect
+	github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 // indirect
+	github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 // indirect
+	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/antihax/optional v1.0.0 // indirect
+	github.com/apache/arrow/go/v10 v10.0.1 // indirect
+	github.com/apache/arrow/go/v11 v11.0.0 // indirect
+	github.com/apache/thrift v0.16.0 // indirect
+	github.com/boombuler/barcode v1.0.1 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chzyer/logex v1.1.10 // indirect
+	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
+	github.com/cilium/ebpf v0.9.1 // indirect
+	github.com/client9/misspell v0.3.4 // indirect
+	github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
+	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
+	github.com/containerd/cgroups/v3 v3.0.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/creack/pty v1.1.9 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
+	github.com/flowstack/go-jsonschema v0.1.1 // indirect
+	github.com/fogleman/gg v1.3.0 // indirect
+	github.com/frankban/quicktest v1.14.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-fonts/dejavu v0.1.0 // indirect
+	github.com/go-fonts/latin-modern v0.2.0 // indirect
+	github.com/go-fonts/liberation v0.2.0 // indirect
+	github.com/go-fonts/stix v0.1.0 // indirect
+	github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 // indirect
+	github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
+	github.com/go-pdf/fpdf v0.6.0 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/glog v1.1.0 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/btree v1.0.0 // indirect
+	github.com/google/flatbuffers v2.0.8+incompatible // indirect
+	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/martian v2.1.0+incompatible // indirect
+	github.com/google/martian/v3 v3.3.2 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/renameio v0.1.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
+	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/googleapis/go-type-adapters v1.0.0 // indirect
+	github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/iancoleman/strcase v0.2.0 // indirect
+	github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/kisielk/gotool v1.0.0 // indirect
+	github.com/klauspost/asmfmt v1.3.2 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/kr/fs v0.1.0 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/kr/pty v1.1.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/lyft/protoc-gen-star v0.6.1 // indirect
+	github.com/lyft/protoc-gen-star/v2 v2.0.1 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-sqlite3 v1.14.14 // indirect
+	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
+	github.com/minio/highwayhash v1.0.2 // indirect
+	github.com/nats-io/jwt/v2 v2.2.1-0.20220113022732-58e87895b296 // indirect
+	github.com/nats-io/nats-server/v2 v2.7.4 // indirect
+	github.com/nats-io/nkeys v0.4.7 // indirect
+	github.com/nats-io/nuid v1.0.1 // indirect
+	github.com/opencontainers/runtime-spec v1.0.2 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/phpdave11/gofpdf v1.4.2 // indirect
+	github.com/phpdave11/gofpdi v1.0.13 // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
+	github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pkg/sftp v1.13.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prashantv/gostub v1.1.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/rogpeppe/fastuuid v1.2.0 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 // indirect
+	github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/stoewer/go-strcase v1.2.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.3 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	github.com/yuin/goldmark v1.4.13 // indirect
+	github.com/zeebo/assert v1.3.0 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	go.uber.org/goleak v1.1.12 // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
+	golang.org/x/image v0.0.0-20220302094943-723b81ca9867 // indirect
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+	golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 // indirect
+	golang.org/x/term v0.25.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	gonum.org/v1/gonum v0.11.0 // indirect
+	gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 // indirect
+	gonum.org/v1/plot v0.10.1 // indirect
+	google.golang.org/api v0.114.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
+	google.golang.org/grpc v1.57.0 // indirect
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/errgo.v2 v2.1.0 // indirect
+	gopkg.in/yaml.v2 v2.2.3 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	honnef.co/go/tools v0.1.3 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.36.3 // indirect
+	modernc.org/ccgo/v3 v3.16.9 // indirect
+	modernc.org/ccorpus v1.11.6 // indirect
+	modernc.org/httpfs v1.0.6 // indirect
+	modernc.org/libc v1.17.1 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.2.1 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/sqlite v1.18.1 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/tcl v1.13.1 // indirect
+	modernc.org/token v1.0.0 // indirect
+	modernc.org/z v1.5.1 // indirect
+	rsc.io/binaryregexp v0.2.0 // indirect
+	rsc.io/pdf v0.1.1 // indirect
+	rsc.io/quote/v3 v3.1.0 // indirect
+	rsc.io/sampler v1.3.0 // indirect
 )

nats.go

@@ -1,5 +1,5 @@
 // Package nats provides a NATS broker
-package nats // import "go.unistack.org/micro-broker-nats/v3"
+package nats
 
 import (
 	"context"
@@ -42,6 +42,7 @@ type publication struct {
 	topic string
 	err   error
 	msg   *broker.Message
+	ctx   context.Context
 }
 
 func (p *publication) Topic() string {
@@ -65,6 +66,10 @@ func (p *publication) Error() error {
 	return p.err
 }
 
+func (p *publication) Context() context.Context {
+	return p.ctx
+}
+
 type subscriber struct {
 	s    *nats.Subscription
 	opts broker.SubscribeOptions
@@ -109,13 +114,15 @@ func (n *natsBroker) setAddrs(addrs []string) []string {
 }
 
 func (n *natsBroker) Connect(ctx context.Context) error {
-	n.Lock()
-	defer n.Unlock()
-
+	n.RLock()
 	if n.connected {
+		n.RUnlock()
 		return nil
 	}
+	n.RUnlock()
 
+	n.Lock()
+	defer n.Unlock()
 	status := nats.CLOSED
 	if n.conn != nil {
 		status = n.conn.Status()
@@ -133,7 +140,7 @@ func (n *natsBroker) Connect(ctx context.Context) error {
 		c, err := opts.Connect()
 		if err != nil {
 			if n.opts.Logger.V(logger.WarnLevel) {
-				n.opts.Logger.Warnf(n.opts.Context, "Error connecting to broker: %v", err)
+				n.opts.Logger.Error(n.opts.Context, "error connecting to broker", err)
 			}
 
 			return err
@@ -145,12 +152,20 @@ func (n *natsBroker) Connect(ctx context.Context) error {
 }
 
 func (n *natsBroker) Disconnect(ctx context.Context) error {
+	n.RLock()
+	if !n.connected {
+		n.RUnlock()
+		return nil
+	}
+	n.RUnlock()
+
 	n.Lock()
 	defer n.Unlock()
-
 	// drain the connection if specified
 	if n.drain {
-		n.conn.Drain()
+		if err := n.conn.Drain(); err != nil {
+			return err
+		}
 		n.closeCh <- nil
 	}
 
@@ -194,7 +209,7 @@ func (n *natsBroker) Options() broker.Options {
 
 func (n *natsBroker) BatchPublish(ctx context.Context, p []*broker.Message, opts ...broker.PublishOption) error {
 	var err error
-	msgs := make([]*nats.Msg, len(p))
+	msgs := make([]*nats.Msg, 0, len(p))
 	var wg sync.WaitGroup
 
 	wg.Add(len(p))
@@ -296,6 +311,7 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
 		pub.msg.Body = nil
 		pub.topic = msg.Subject
 		pub.err = nil
+		pub.ctx = ctx
 
 		if options.BodyOnly {
 			pub.msg.Body = msg.Data
@@ -314,7 +330,7 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
 					eh(pub)
 				} else {
 					if n.opts.Logger.V(logger.ErrorLevel) {
-						n.opts.Logger.Error(n.opts.Context, err)
+						n.opts.Logger.Error(n.opts.Context, "handler error", err)
 					}
 				}
 				return
@@ -326,7 +342,7 @@ func (n *natsBroker) Subscribe(ctx context.Context, topic string, handler broker
 				eh(pub)
 			} else {
 				if n.opts.Logger.V(logger.ErrorLevel) {
-					n.opts.Logger.Error(n.opts.Context, err)
+					n.opts.Logger.Error(n.opts.Context, "handler error", err)
 				}
 			}
 		}
@@ -410,7 +426,7 @@ func NewBroker(opts ...broker.Option) *natsBroker {
 	options := broker.NewOptions(opts...)
 
 	if options.Codec.String() != "noop" {
-		options.Logger.Infof(options.Context, "broker codec not noop, disable plain nats headers usage")
+		options.Logger.Info(options.Context, "broker codec not noop, disable plain nats headers usage")
 	}
 
 	n := &natsBroker{