move to v4

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
Merge pull request 'Update workflows' (#110 ) from atolstikhin/micro-meter-prometheus:master into master
2025-03-04 11:40:51 +03:00 · 2024-12-15 17:49:54 +03:00 · 2024-12-15 17:35:40 +03:00 · 2024-12-15 17:33:16 +03:00 · 2024-12-14 01:36:02 +07:00 · 2024-04-04 16:52:52 +03:00
20 changed files with 319 additions and 1856 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: For reporting bugs in go-micro
+about: For reporting bugs in micro
 title: "[BUG]"
 labels: ''
 assignees: ''
@@ -16,9 +16,3 @@ assignees: ''
 **How to reproduce the bug:**

 If possible, please include a minimal code snippet here.
-
-**Environment:**
-Go Version: please paste `go version` output here
-```
-please paste `go env` output here
-```
--- a/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
+++ b/.github/ISSUE_TEMPLATE/feature-request---enhancement.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request / Enhancement
-about: If you have a need not served by go-micro
+about: If you have a need not served by micro
 title: "[FEATURE]"
 labels: ''
 assignees: ''
@@ -14,4 +14,4 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 A clear and concise description of what you want to happen.

 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here.
--- a/.gitea/ISSUE_TEMPLATE/question.md
+++ b/.gitea/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,8 @@
+---
+name: Question
+about: Ask a question about micro
+title: ''
+labels: ''
+assignees: ''
+
+---
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
--- a/.gitea/workflows/job_lint.yml
+++ b/.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'
--- a/.gitea/workflows/job_test.yml
+++ b/.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 ./...
--- a/.gitea/workflows/job_tests.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,14 +0,0 @@
---
-name: Question
-about: Ask a question about go-micro
-title: ''
-labels: ''
-assignees: ''
-
---
-
-Before asking, please check if your question has already been answered: 
-
-1. Check the documentation - https://micro.mu/docs/
-2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
-3. Search existing issues
--- a/.github/dependabot.yml
+++ b/.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"
--- a/.github/workflows/autoapprove.yml
+++ b/.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 }}
--- a/.github/workflows/automerge.yml
+++ b/.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}}
--- a/.github/workflows/build.yml
+++ b/.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
--- a/.github/workflows/codeql-analysis.yml
+++ b/.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
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.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}}
--- a/.github/workflows/pr.yml
+++ b/.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
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true
--- a/go.mod
+++ b/go.mod
@@ -1,324 +1,24 @@
-module go.unistack.org/micro-meter-prometheus/v3
+module go.unistack.org/micro-meter-prometheus/v4

-go 1.21
+go 1.22.0

-toolchain go1.22.0
+toolchain go1.24.0

 require (
-	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
+	github.com/prometheus/client_golang v1.21.0
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.62.0
+	go.unistack.org/micro/v4 v4.1.2
 )

 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/cespare/xxhash/v2 v2.3.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
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/prometheus.go
+++ b/prometheus.go
@@ -12,7 +12,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
 )

 var _ meter.Meter = &prometheusMeter{}
@@ -20,38 +20,40 @@ var _ meter.Meter = &prometheusMeter{}
 type prometheusMeter struct {
 	opts         meter.Options
 	set          prometheus.Registerer
-	counter      *sync.Map
-	floatCounter *sync.Map
-	gauge        *sync.Map
-	histogram    *sync.Map
-	summary      *sync.Map
+	counter      map[string]*counters
+	floatCounter map[string]*floatCounters
+	gauge        map[string]*gauges
+	histogram    map[string]*histograms
+	summary      map[string]*summaries
 	sync.Mutex
 }

 type counters struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusCounter
 }

 type gauges struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusGauge
 }

 type histograms struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusHistogram
 }

 type summaries struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusSummary
 }

 type floatCounters struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusFloatCounter
 }

+/*
 func newFloat64(v float64) *float64 {
 	nv := v
 	return &nv
 }
+*/

 func newString(v string) *string {
 	nv := v
@@ -62,19 +64,15 @@ func NewMeter(opts ...meter.Option) *prometheusMeter {
 	return &prometheusMeter{
 		set:          prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
 		opts:         meter.NewOptions(opts...),
-		counter:      &sync.Map{},
-		floatCounter: &sync.Map{},
-		gauge:        &sync.Map{},
-		histogram:    &sync.Map{},
-		summary:      &sync.Map{},
+		counter:      make(map[string]*counters),
+		floatCounter: make(map[string]*floatCounters),
+		gauge:        make(map[string]*gauges),
+		histogram:    make(map[string]*histograms),
+		summary:      make(map[string]*summaries),
 	}
 }

 func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
-	if len(m.opts.MetricPrefix) > 0 {
-		name = m.opts.MetricPrefix + name
-	}
-
 	nl := len(m.opts.Labels) + len(labels)
 	if nl == 0 {
 		return name
@@ -84,38 +82,9 @@ func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
 	nlabels = append(nlabels, m.opts.Labels...)
 	nlabels = append(nlabels, labels...)

-	if len(m.opts.LabelPrefix) == 0 {
-		return meter.BuildName(name, nlabels...)
-	}
-
-	for idx := 0; idx < nl; idx += 2 {
-		nlabels[idx] = m.opts.LabelPrefix + nlabels[idx]
-	}
 	return meter.BuildName(name, nlabels...)
 }

-func (m *prometheusMeter) buildName(name string) string {
-	if len(m.opts.MetricPrefix) > 0 {
-		name = m.opts.MetricPrefix + name
-	}
-	return name
-}
-
-func (m *prometheusMeter) buildLabels(labels ...string) []string {
-	nl := len(labels)
-	if nl == 0 {
-		return nil
-	}
-
-	nlabels := make([]string, 0, nl)
-
-	for idx := 0; idx < nl; idx += 2 {
-		nlabels = append(nlabels, m.opts.LabelPrefix+labels[idx])
-		nlabels = append(nlabels, labels[idx+1])
-	}
-	return nlabels
-}
-
 func (m *prometheusMeter) Name() string {
 	return m.opts.Name
 }
@@ -123,164 +92,146 @@ func (m *prometheusMeter) Name() string {
 func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...) // TODO: Read prometheus.go:128
-	vcd, ok := m.counter.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.counter[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &counters{cs: &sync.Map{}}
+		cd = &counters{cs: make(map[uint64]*prometheusCounter)}
 		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.counter.Store(nm, cd)
+		cd.cs[h] = c
+		m.counter[nm] = cd
 		return c
 	}
-	cd := vcd.(*counters)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.counter.Store(nm, cd)
-		return c
+		c = &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.counter[nm] = cd
 	}
-	c := vc.(*prometheusCounter)
 	return c
 }

 func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	vcd, ok := m.floatCounter.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.floatCounter[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &floatCounters{cs: &sync.Map{}}
+		cd = &floatCounters{cs: make(map[uint64]*prometheusFloatCounter)}
 		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.floatCounter.Store(nm, cd)
+		cd.cs[h] = c
+		m.floatCounter[nm] = cd
 		return c
 	}
-	cd := vcd.(*floatCounters)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.floatCounter.Store(nm, cd)
-		return c
+		c = &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.floatCounter[nm] = cd
 	}
-	c := vc.(*prometheusFloatCounter)
 	return c
 }

 func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	vcd, ok := m.gauge.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.gauge[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &gauges{cs: &sync.Map{}}
+		cd = &gauges{cs: make(map[uint64]*prometheusGauge)}
 		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.gauge.Store(nm, cd)
+		cd.cs[h] = c
+		m.gauge[nm] = cd
 		return c
 	}
-	cd := vcd.(*gauges)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.gauge.Store(nm, cd)
-		return c
+		c = &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.gauge[nm] = cd
 	}
-	c := vc.(*prometheusGauge)
 	return c
 }

 func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	vcd, ok := m.histogram.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.histogram[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &histograms{cs: &sync.Map{}}
+		cd = &histograms{cs: make(map[uint64]*prometheusHistogram)}
 		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.histogram.Store(nm, cd)
+		cd.cs[h] = c
+		m.histogram[nm] = cd
 		return c
 	}
-	cd := vcd.(*histograms)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.histogram.Store(nm, cd)
-		return c
+		c = &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.histogram[nm] = cd
 	}
-	c := vc.(*prometheusHistogram)
 	return c
 }

 func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	vcd, ok := m.summary.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.summary[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
 		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.summary.Store(nm, cd)
+		cd.cs[h] = c
+		m.summary[nm] = cd
 		return c
 	}
-	cd := vcd.(*summaries)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
-		m.summary.Store(nm, cd)
-		return c
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.summary[nm] = cd
 	}
-	c := vc.(*prometheusSummary)
 	return c
 }

 func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
 	m.Lock()
 	defer m.Unlock()
-	nm := m.buildName(name)
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	vcd, ok := m.summary.Load(nm)
+	nm := m.buildMetric(name)
+	labels = append(m.opts.Labels, labels...)
+	cd, ok := m.summary[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
 		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
 			Name:       nm,
 			MaxAge:     window,
 			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
 		}), labels: labels}
-		cd.cs.Store(h, c)
-		m.summary.Store(nm, cd)
+		cd.cs[h] = c
+		m.summary[nm] = cd
 		return c
 	}
-	cd := vcd.(*summaries)
-	vc, ok := cd.cs.Load(h)
+	c, ok := cd.cs[h]
 	if !ok {
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
 			Name:       nm,
 			MaxAge:     window,
 			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
 		}), labels: labels}
-		cd.cs.Store(h, c)
-		m.summary.Store(nm, cd)
-		return c
+		cd.cs[h] = c
+		m.summary[nm] = cd
 	}
-	c := vc.(*prometheusSummary)
 	return c
 }

@@ -288,14 +239,6 @@ func (m *prometheusMeter) Init(opts ...meter.Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
-
-	if m.opts.WriteProcessMetrics || m.opts.WriteFDMetrics {
-		pc := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
-		_ = m.set.Register(pc)
-		gc := collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile("/.*")}))
-		_ = m.set.Register(gc)
-	}
-
 	return nil
 }

@@ -305,6 +248,13 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 		o(&options)
 	}

+	if options.WriteProcessMetrics || options.WriteFDMetrics {
+		pc := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
+		_ = m.set.Register(pc)
+		gc := collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile("/.*")}))
+		_ = m.set.Register(gc)
+	}
+
 	g, ok := m.set.(prometheus.Gatherer)
 	if !ok {
 		return fmt.Errorf("set type %T not prometheus.Gatherer", m.set)
@@ -317,95 +267,80 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {

 	enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))

-	m.counter.Range(func(k, v any) bool {
-		name := k.(string)
+	for name, metrics := range m.counter {
 		mf := &dto.MetricFamily{
-			Name: newString(name),
-			Type: dto.MetricType_GAUGE.Enum(),
+			Name:   newString(name),
+			Type:   dto.MetricType_GAUGE.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*counters).cs.Range(func(_, nv any) bool {
-			c := nv.(*prometheusCounter)
+		for _, c := range metrics.cs {
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}

-	m.gauge.Range(func(k, v any) bool {
-		name := k.(string)
+	for name, metrics := range m.gauge {
 		mf := &dto.MetricFamily{
-			Name: newString(name),
-			Type: dto.MetricType_GAUGE.Enum(),
+			Name:   newString(name),
+			Type:   dto.MetricType_GAUGE.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*gauges).cs.Range(func(_, nv any) bool {
-			c := nv.(*prometheusGauge)
+		for _, c := range metrics.cs {
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}

-	m.floatCounter.Range(func(k, v any) bool {
-		name := k.(string)
+	for name, metrics := range m.floatCounter {
 		mf := &dto.MetricFamily{
-			Name: newString(name),
-			Type: dto.MetricType_GAUGE.Enum(),
+			Name:   newString(name),
+			Type:   dto.MetricType_GAUGE.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*floatCounters).cs.Range(func(_, nv any) bool {
-			c := nv.(*prometheusFloatCounter)
+		for _, c := range metrics.cs {
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}

-	m.histogram.Range(func(k, v any) bool {
-		name := k.(string)
+	for name, metrics := range m.histogram {
 		mf := &dto.MetricFamily{
-			Name: newString(name),
-			Type: dto.MetricType_HISTOGRAM.Enum(),
+			Name:   newString(name),
+			Type:   dto.MetricType_HISTOGRAM.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*histograms).cs.Range(func(_, nv any) bool {
-			c := nv.(*prometheusHistogram)
+		for _, c := range metrics.cs {
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}

-	m.summary.Range(func(k, v any) bool {
-		name := k.(string)
+	for name, metrics := range m.summary {
 		mf := &dto.MetricFamily{
-			Name: newString(name),
-			Type: dto.MetricType_SUMMARY.Enum(),
+			Name:   newString(name),
+			Type:   dto.MetricType_SUMMARY.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*summaries).cs.Range(func(_, nv any) bool {
-			c := nv.(*prometheusSummary)
+		for _, c := range metrics.cs {
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}

 	for _, mf := range mfs {
 		_ = enc.Encode(mf)
@@ -549,7 +484,6 @@ func (c prometheusSummary) UpdateDuration(n time.Time) {
 }

 func newHash(labels []string) uint64 {
-	labels = meter.BuildLabels(labels...)
 	h := fnv.New64a()
 	for _, l := range labels {
 		h.Write([]byte(l))
@@ -558,18 +492,12 @@ func newHash(labels []string) uint64 {
 }

 func fillMetric(m *dto.Metric, labels []string) *dto.Metric {
-	var ok bool
-	seen := make(map[string]bool, len(labels)/2)
 	m.Label = make([]*dto.LabelPair, 0, len(labels)/2)
 	for idx := 0; idx < len(labels); idx += 2 {
-		if _, ok = seen[labels[idx]]; ok {
-			continue
-		}
 		m.Label = append(m.Label, &dto.LabelPair{
 			Name:  newString(labels[idx]),
 			Value: newString(labels[idx+1]),
 		})
-		seen[labels[idx]] = true
 	}
 	return m
 }
--- a/prometheus_test.go
+++ b/prometheus_test.go
@@ -2,13 +2,9 @@ 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"
+	"go.unistack.org/micro/v4/meter"
 )

 func TestStd(t *testing.T) {
@@ -25,8 +21,8 @@ func TestStd(t *testing.T) {

 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")
+	check := `micro_foo{aaa="b",bar="baz",ccc="d"}`
+	name := m.buildMetric("micro_foo", "bar", "baz", "aaa", "b", "ccc", "d")
 	if name != check {
 		t.Fatalf("metric name error: %s != %s", name, check)
 	}
@@ -35,47 +31,20 @@ func TestBuildName(t *testing.T) {
 	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("micro_server", "endpoint", "ep1", "path", "/path1").Inc()
+	m.Counter("micro_server", "endpoint", "ep1", "path", "/path1").Inc()

-	m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
-	m.Counter("server", "endpoint", "ep2", "path", "/path2").Inc()
+	m.Counter("micro_server", "endpoint", "ep2", "path", "/path2").Inc()
+	m.Counter("micro_server", "endpoint", "ep2", "path", "/path2").Inc()

-	m.Counter("server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
+	m.Counter("micro_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`)) {
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep1",path="/path1"} 2`)) {
 		// t.Fatal("XXXX")
 		t.Fatalf("invalid metrics output: %s", buf.Bytes())
 	}
Author	SHA1	Message	Date
Vasiliy Tolstov	ffa3e0753f	move to v4 All checks were successful test / test (push) Successful in 1m49s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2025-03-04 11:40:51 +03:00
Василий Толстов	434c2e31a3	Merge pull request 'Update workflows' (#110 ) from atolstikhin/micro-meter-prometheus:master into master Some checks failed test / test (push) Failing after 10m47s Details Reviewed-on: #110	2024-12-15 17:49:54 +03:00
Василий Толстов	09528896b1	Merge branch 'master' into master Some checks failed dependabot-automerge / automerge (pull_request) Has been skipped Details automerge / automerge (pull_request) Failing after 14s Details autoapprove / autoapprove (pull_request) Failing after 30s Details lint / lint (pull_request) Successful in 47s Details test / test (pull_request) Successful in 13m17s Details	2024-12-15 17:35:40 +03:00
Vasiliy Tolstov	c798df52a1	fixup lint Some checks failed build / lint (push) Successful in 25s Details build / test (push) Failing after 29s Details codeql / analyze (go) (push) Failing after 2m27s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-12-15 17:33:16 +03:00
Aleksandr Tolstikhin	118517eb72	Update workflows Some checks failed automerge / automerge (pull_request) Has been skipped Details dependabot-automerge / automerge (pull_request) Has been skipped Details autoapprove / autoapprove (pull_request) Successful in 6s Details lint / lint (pull_request) Failing after 51s Details test / test (pull_request) Successful in 45s Details	2024-12-14 01:36:02 +07:00
Vasiliy Tolstov	3d0ec5c6ea	recover go std metrics Some checks failed build / test (push) Failing after 1m37s Details build / lint (push) Successful in 9m16s Details codeql / analyze (go) (push) Failing after 14m44s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-04-04 16:52:52 +03:00
Vasiliy Tolstov	1862ee5380	fixup golang std metrics Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-04-04 16:51:48 +03:00
Vasiliy Tolstov	4cd610a474	update deps Some checks failed build / test (push) Has been cancelled Details build / lint (push) Has been cancelled Details codeql / analyze (go) (push) Has been cancelled Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-03-27 11:42:49 +03:00
Vasiliy Tolstov	b64ea019ed	Merge pull request 'micro v4 options fix' (#107 ) from options into master Some checks failed build / test (push) Failing after 48s Details build / lint (push) Successful in 12s Details codeql / analyze (go) (push) Failing after 1m30s Details Reviewed-on: #107	2023-08-16 15:42:16 +03:00
Vasiliy Tolstov	4cdca6cd83	micro v4 options fix Some checks failed autoapprove / autoapprove (pull_request) Failing after 8s Details automerge / automerge (pull_request) Failing after 4s Details codeql / analyze (go) (pull_request) Failing after 1m46s Details dependabot-automerge / automerge (pull_request) Has been skipped Details prbuild / test (pull_request) Failing after 52s Details prbuild / lint (pull_request) Successful in 14s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-08-16 15:41:33 +03:00
Vasiliy Tolstov	bd8eca5f5e	Merge pull request 'move to micro v4' (#106 ) from v4 into master Some checks failed build / test (push) Failing after 4s Details build / lint (push) Failing after 5s Details codeql / analyze (go) (push) Failing after 7s Details Reviewed-on: #106	2023-05-07 19:36:08 +03:00
Vasiliy Tolstov	04d67b540c	move to micro v4 Some checks failed autoapprove / autoapprove (pull_request) Failing after 3s Details automerge / automerge (pull_request) Failing after 7s Details dependabot-automerge / automerge (pull_request) Has been skipped Details codeql / analyze (go) (pull_request) Failing after 9s Details prbuild / test (pull_request) Failing after 1m0s Details prbuild / lint (pull_request) Failing after 5s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2023-05-07 19:35:39 +03:00
Vasiliy Tolstov	44b2cb9572	Merge branch 'v3' Some checks failed build / test (push) Failing after 6s Details build / lint (push) Failing after 4s Details codeql / analyze (go) (push) Failing after 5s Details	2023-05-07 19:34:13 +03:00