fixup panics and interface conversations

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

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# 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/stale.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -ex
-
-export PATH=$PATH:$(pwd)/bin
-export GO111MODULE=on
-export GOBIN=$(pwd)/bin
-
-#go get github.com/rvflash/goup@v0.4.1
-
-#goup -v ./...
-#go get github.com/psampaz/go-mod-outdated@v0.6.0
-go list -u -m -mod=mod -json all | go-mod-outdated -update -direct -ci || true
-
-#go list -u -m -json all | go-mod-outdated -update

.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@v1
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        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@v1
+        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

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

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

@@ -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@v1
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.15
+        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@v1
+        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.

README.md

@@ -1,23 +0,0 @@
-# Prometheus
-
-Wrappers are a form of middleware that can be used with go-micro services. They can wrap both the Client and Server handlers.
-This plugin implements the HandlerWrapper interface to provide automatic prometheus metric handling
-for each microservice method execution time and operation count for success and failed cases.
-
-This handler will export two metrics to prometheus:
-* **micro_request_total**. How many go-micro requests processed, partitioned by method and status.
-* **micro_request_duration_microseconds**. Service method request latencies in microseconds, partitioned by method.
-
-# Usage
-
-When creating your service, add the wrapper like so.
-
-```go
-    service := micro.NewService(
-        micro.Name("service name"),
-	micro.Version("latest"),
-	micro.WrapHandler(prometheus.NewHandlerWrapper()),
-    )
-
-    service.Init()
-```

go.mod

@@ -1,10 +1,324 @@
-module github.com/unistack-org/micro-meter-prometheus/v3
+module go.unistack.org/micro-meter-prometheus/v3
 
-go 1.15
+go 1.21
+
+toolchain go1.22.0
 
 require (
-	github.com/google/go-cmp v0.5.1 // indirect
-	github.com/prometheus/client_golang v1.9.0
-	github.com/unistack-org/micro/v3 v3.1.3
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/client_model v0.6.0
+	github.com/prometheus/common v0.51.1
+	go.unistack.org/micro/v3 v3.10.53
+)
+
+require (
+	cloud.google.com/go v0.110.2 // 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.20.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/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/alecthomas/kingpin/v2 v2.4.0 // indirect
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
+	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // 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/beorn7/perks v1.0.1 // indirect
+	github.com/boombuler/barcode v1.0.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/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/creack/pty v1.1.9 // indirect
+	github.com/davecgh/go-spew v1.1.1 // 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/fogleman/gg v1.3.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-kit/kit v0.9.0 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-pdf/fpdf v0.6.0 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
+	github.com/gogo/protobuf v1.1.1 // 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-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.4 // 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/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.0.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/s2a-go v0.1.4 // 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.11.0 // 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/jpillora/backoff v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
+	github.com/julienschmidt/httprouter v1.3.0 // 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.15.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
+	github.com/kr/fs v0.1.0 // indirect
+	github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
+	github.com/kr/pretty v0.3.1 // 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/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // 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/prometheus/procfs v0.13.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.10.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.6.0 // indirect
+	github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.3 // indirect
+	github.com/xhit/go-str2duration v1.2.0 // indirect
+	github.com/xhit/go-str2duration/v2 v2.1.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
+	golang.org/x/crypto v0.21.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.9.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // 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.126.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // 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.33.0 // indirect
+	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/errgo.v2 v2.1.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // 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
 )

metric_family.go

@@ -1,111 +0,0 @@
-// +build ignore
-
-package prometheus
-
-import (
-	"sync"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-// metricFamily stores our cached metrics:
-type metricFamily struct {
-	counters           map[string]*prometheus.CounterVec
-	gauges             map[string]*prometheus.GaugeVec
-	timings            map[string]*prometheus.SummaryVec
-	defaultLabels      prometheus.Labels
-	mutex              sync.Mutex
-	prometheusRegistry *prometheus.Registry
-	timingObjectives   map[float64]float64
-}
-
-// newMetricFamily returns a new metricFamily (useful in case we want to change the structure later):
-func (r *Reporter) newMetricFamily() metricFamily {
-	return metricFamily{
-		counters:           make(map[string]*prometheus.CounterVec),
-		gauges:             make(map[string]*prometheus.GaugeVec),
-		timings:            make(map[string]*prometheus.SummaryVec),
-		defaultLabels:      r.convertTags(r.options.DefaultTags),
-		prometheusRegistry: r.prometheusRegistry,
-		timingObjectives:   r.options.TimingObjectives,
-	}
-}
-
-// getCounter either gets a counter, or makes a new one:
-func (mf *metricFamily) getCounter(name string, labelNames []string) *prometheus.CounterVec {
-	mf.mutex.Lock()
-	defer mf.mutex.Unlock()
-
-	// See if we already have this counter:
-	counter, ok := mf.counters[name]
-	if !ok {
-
-		// Make a new counter:
-		counter = prometheus.NewCounterVec(
-			prometheus.CounterOpts{
-				Name:        name,
-				ConstLabels: mf.defaultLabels,
-			},
-			labelNames,
-		)
-
-		// Register it and add it to our list:
-		mf.prometheusRegistry.MustRegister(counter)
-		mf.counters[name] = counter
-	}
-
-	return counter
-}
-
-// getGauge either gets a gauge, or makes a new one:
-func (mf *metricFamily) getGauge(name string, labelNames []string) *prometheus.GaugeVec {
-	mf.mutex.Lock()
-	defer mf.mutex.Unlock()
-
-	// See if we already have this gauge:
-	gauge, ok := mf.gauges[name]
-	if !ok {
-
-		// Make a new gauge:
-		gauge = prometheus.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name:        name,
-				ConstLabels: mf.defaultLabels,
-			},
-			labelNames,
-		)
-
-		// Register it and add it to our list:
-		mf.prometheusRegistry.MustRegister(gauge)
-		mf.gauges[name] = gauge
-	}
-
-	return gauge
-}
-
-// getTiming either gets a timing, or makes a new one:
-func (mf *metricFamily) getTiming(name string, labelNames []string) *prometheus.SummaryVec {
-	mf.mutex.Lock()
-	defer mf.mutex.Unlock()
-
-	// See if we already have this timing:
-	timing, ok := mf.timings[name]
-	if !ok {
-
-		// Make a new timing:
-		timing = prometheus.NewSummaryVec(
-			prometheus.SummaryOpts{
-				Name:        name,
-				ConstLabels: mf.defaultLabels,
-				Objectives:  mf.timingObjectives,
-			},
-			labelNames,
-		)
-
-		// Register it and add it to our list:
-		mf.prometheusRegistry.MustRegister(timing)
-		mf.timings[name] = timing
-	}
-
-	return timing
-}

metrics.go

@@ -1,70 +0,0 @@
-// +build ignore
-
-package prometheus
-
-import (
-	"errors"
-	"time"
-
-	"github.com/unistack-org/micro/v3/metadata"
-)
-
-// ErrPrometheusPanic is a catch-all for the panics which can be thrown by the Prometheus client:
-var ErrPrometheusPanic = errors.New("The Prometheus client panicked. Did you do something like change the tag cardinality or the type of a metric?")
-
-// Count is a counter with key/value tags:
-// New values are added to any previous one (eg "number of hits")
-func (r *Reporter) Count(name string, value int64, tags metadata.Metadata) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = ErrPrometheusPanic
-		}
-	}()
-
-	counter := r.metrics.getCounter(r.stripUnsupportedCharacters(name), r.listTagKeys(tags))
-	metric, err := counter.GetMetricWith(r.convertTags(tags))
-	if err != nil {
-		return err
-	}
-
-	metric.Add(float64(value))
-	return err
-}
-
-// Gauge is a register with key/value tags:
-// New values simply override any previous one (eg "current connections")
-func (r *Reporter) Gauge(name string, value float64, tags metadata.Metadata) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = ErrPrometheusPanic
-		}
-	}()
-
-	gauge := r.metrics.getGauge(r.stripUnsupportedCharacters(name), r.listTagKeys(tags))
-	metric, err := gauge.GetMetricWith(r.convertTags(tags))
-	if err != nil {
-		return err
-	}
-
-	metric.Set(value)
-	return err
-}
-
-// Timing is a histogram with key/valye tags:
-// New values are added into a series of aggregations
-func (r *Reporter) Timing(name string, value time.Duration, tags metadata.Metadata) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = ErrPrometheusPanic
-		}
-	}()
-
-	timing := r.metrics.getTiming(r.stripUnsupportedCharacters(name), r.listTagKeys(tags))
-	metric, err := timing.GetMetricWith(r.convertTags(tags))
-	if err != nil {
-		return err
-	}
-
-	metric.Observe(value.Seconds())
-	return err
-}

options_test.go

@@ -1,20 +0,0 @@
-// +build ignore
-
-package prometheus
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/unistack-org/micro/v3/meter"
-)
-
-func TestOptions(t *testing.T) {
-	// Make some new options:
-	options := meter.NewOptions(meter.Path("/prometheus"), meter.DefaultTags(map[string]string{"service": "prometheus-test"}))
-
-	// Check that the defaults and overrides were accepted:
-	assert.Equal(t, ":9000", options.Address)
-	assert.Equal(t, "/prometheus", options.Path)
-	assert.Equal(t, "prometheus-test", options.DefaultTags["service"])
-}

prometheus_test.go

@@ -0,0 +1,82 @@
+package prometheus
+
+import (
+	"bytes"
+	"context"
+	"testing"
+
+	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v3/meter/wrapper"
+)
+
+func TestStd(t *testing.T) {
+	m := NewMeter(meter.WriteProcessMetrics(true), meter.WriteFDMetrics(true))
+	if err := m.Init(); err != nil {
+		t.Fatal(err)
+	}
+	buf := bytes.NewBuffer(nil)
+	_ = m.Write(buf)
+	if !bytes.Contains(buf.Bytes(), []byte(`go_goroutine`)) {
+		t.Fatalf("invalid metrics output: %s", buf.Bytes())
+	}
+}
+
+func TestBuildName(t *testing.T) {
+	m := NewMeter()
+	check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
+	name := m.buildMetric("foo", "bar", "baz", "aaa", "b", "ccc", "d")
+	if name != check {
+		t.Fatalf("metric name error: %s != %s", name, check)
+	}
+
+	cnt := m.Counter("counter", "key", "val")
+	cnt.Inc()
+}
+
+func TestWrapper(t *testing.T) {
+	m := NewMeter() // meter.Labels("test_key", "test_val"))
+
+	w := wrapper.NewClientWrapper(
+		wrapper.ServiceName("svc1"),
+		wrapper.ServiceVersion("0.0.1"),
+		wrapper.ServiceID("12345"),
+		wrapper.Meter(m),
+	)
+
+	ctx := context.Background()
+
+	c := client.NewClient(client.Wrap(w))
+	if err := c.Init(); err != nil {
+		t.Fatal(err)
+	}
+	rsp := &codec.Frame{}
+	req := &codec.Frame{}
+	err := c.Call(ctx, c.NewRequest("svc2", "Service.Method", req), rsp)
+	_, _ = rsp, err
+	buf := bytes.NewBuffer(nil)
+	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_inflight{micro_endpoint="svc2.Service.Method"} 0`)) {
+		t.Fatalf("invalid metrics output: %s", buf.Bytes())
+	}
+}
+
+func TestMultiple(t *testing.T) {
+	m := NewMeter() // meter.Labels("test_key", "test_val"))
+
+	m.Counter("server", "endpoint", "ep1", "path", "/path1").Inc()
+	m.Counter("server", "endpoint", "ep1", "path", "/path1").Inc()
+
+	m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
+	m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
+
+	m.Counter("server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
+
+	buf := bytes.NewBuffer(nil)
+	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_server{micro_endpoint="ep1",micro_path="/path1"} 2`)) {
+		// t.Fatal("XXXX")
+		t.Fatalf("invalid metrics output: %s", buf.Bytes())
+	}
+}

reporter.go

@@ -1,76 +0,0 @@
-// +build ignore
-
-package prometheus
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/meter"
-)
-
-// Reporter is an implementation of meter.Reporter:
-type Reporter struct {
-	options            meter.Options
-	prometheusRegistry *prometheus.Registry
-	metrics            metricFamily
-}
-
-// New returns a configured prometheus reporter:
-func New(opts ...meter.Option) (meter.Reporter, error) {
-	options := meter.NewOptions(opts...)
-
-	// Make a prometheus registry (this keeps track of any metrics we generate):
-	prometheusRegistry := prometheus.NewRegistry()
-	prometheusRegistry.Register(prometheus.NewGoCollector())
-	prometheusRegistry.Register(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{Namespace: "goruntime"}))
-
-	// Make a new Reporter:
-	newReporter := &Reporter{
-		options:            options,
-		prometheusRegistry: prometheusRegistry,
-	}
-
-	// Add metrics families for each type:
-	newReporter.metrics = newReporter.newMetricFamily()
-
-	// Handle the metrics endpoint with prometheus:
-	logger.Infof(options.Context, "Metrics/Prometheus [http] Listening on %s%s", options.Address, options.Path)
-	http.Handle(options.Path, promhttp.HandlerFor(prometheusRegistry, promhttp.HandlerOpts{ErrorHandling: promhttp.ContinueOnError}))
-	go http.ListenAndServe(options.Address, nil)
-
-	return newReporter, nil
-}
-
-func (r *Reporter) Init(...meter.Option) error {
-	return nil
-}
-
-// convertTags turns Tags into prometheus labels:
-func (r *Reporter) convertTags(tags metadata.Metadata) prometheus.Labels {
-	labels := prometheus.Labels{}
-	for key, value := range tags {
-		labels[key] = r.stripUnsupportedCharacters(value)
-	}
-	return labels
-}
-
-// listTagKeys returns a list of tag keys (we need to provide this to the Prometheus client):
-func (r *Reporter) listTagKeys(tags metadata.Metadata) (labelKeys []string) {
-	for key := range tags {
-		labelKeys = append(labelKeys, key)
-	}
-	return
-}
-
-// stripUnsupportedCharacters cleans up a metrics key or value:
-func (r *Reporter) stripUnsupportedCharacters(metricName string) string {
-	valueWithoutDots := strings.Replace(metricName, ".", "_", -1)
-	valueWithoutCommas := strings.Replace(valueWithoutDots, ",", "_", -1)
-	valueWIthoutSpaces := strings.Replace(valueWithoutCommas, " ", "", -1)
-	return valueWIthoutSpaces
-}

reporter_test.go

@@ -1,72 +0,0 @@
-// +build ignore
-
-package prometheus
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/meter"
-)
-
-func TestPrometheusReporter(t *testing.T) {
-
-	// Make a Reporter:
-	reporter, err := New(meter.Path("/prometheus"), meter.DefaultTags(map[string]string{"service": "prometheus-test"}))
-	assert.NoError(t, err)
-	assert.NotNil(t, reporter)
-	assert.Equal(t, "prometheus-test", reporter.options.DefaultTags["service"])
-	assert.Equal(t, ":9000", reporter.options.Address)
-	assert.Equal(t, "/prometheus", reporter.options.Path)
-
-	// Test tag conversion:
-	tags := metadata.Metadata{
-		"tag1": "false",
-		"tag2": "true",
-	}
-	convertedTags := reporter.convertTags(tags)
-	assert.Equal(t, "false", convertedTags["tag1"])
-	assert.Equal(t, "true", convertedTags["tag2"])
-
-	// Test tag enumeration:
-	listedTags := reporter.listTagKeys(tags)
-	assert.Contains(t, listedTags, "tag1")
-	assert.Contains(t, listedTags, "tag2")
-
-	// Test string cleaning:
-	preparedMetricName := reporter.stripUnsupportedCharacters("some.kind,of tag")
-	assert.Equal(t, "some_kind_oftag", preparedMetricName)
-
-	// Test MetricFamilies:
-	metricFamily := reporter.newMetricFamily()
-
-	// Counters:
-	assert.NotNil(t, metricFamily.getCounter("testCounter", []string{"test", "counter"}))
-	assert.Len(t, metricFamily.counters, 1)
-
-	// Gauges:
-	assert.NotNil(t, metricFamily.getGauge("testGauge", []string{"test", "gauge"}))
-	assert.Len(t, metricFamily.gauges, 1)
-
-	// Timings:
-	assert.NotNil(t, metricFamily.getTiming("testTiming", []string{"test", "timing"}))
-	assert.Len(t, metricFamily.timings, 1)
-
-	// Test submitting metrics through the interface methods:
-	assert.NoError(t, reporter.Count("test.counter.1", 6, tags))
-	assert.NoError(t, reporter.Count("test.counter.2", 19, tags))
-	assert.NoError(t, reporter.Count("test.counter.1", 5, tags))
-	assert.NoError(t, reporter.Gauge("test.gauge.1", 99, tags))
-	assert.NoError(t, reporter.Gauge("test.gauge.2", 55, tags))
-	assert.NoError(t, reporter.Gauge("test.gauge.1", 98, tags))
-	assert.NoError(t, reporter.Timing("test.timing.1", time.Second, tags))
-	assert.NoError(t, reporter.Timing("test.timing.2", time.Minute, tags))
-	assert.Len(t, reporter.metrics.counters, 2)
-	assert.Len(t, reporter.metrics.gauges, 2)
-	assert.Len(t, reporter.metrics.timings, 2)
-
-	// Test reading back the metrics:
-	// This could be done by hitting the /metrics endpoint
-}