Compare commits
119 Commits
Author | SHA1 | Date | |
---|---|---|---|
0975e8fb4d | |||
8dfa97b54f | |||
439d5cf125 | |||
e02f291db2 | |||
4e64f3f994 | |||
c0b834b0b4 | |||
f937328147 | |||
|
883569bf14 | ||
e32c70a27d | |||
|
8c9abca56e | ||
09c9cbb39f | |||
|
1075d8cf42 | ||
92db4e4209 | |||
|
06ebcd2764 | ||
66878c406f | |||
|
0561824ca3 | ||
|
6210e2ad0c | ||
89c00bb59f | |||
|
8d20f74ec9 | ||
|
e0634128f1 | ||
|
873801833b | ||
160217d9a5 | |||
|
6053ceecc3 | ||
34e909dc98 | |||
|
ae51f8ff7c | ||
f561c77a0d | |||
|
aba9197d2b | ||
f2c3f3d5d1 | |||
|
a702bb558d | ||
aa685064bc | |||
|
7f5ce2e66c | ||
11f849b92d | |||
|
e0c8b29893 | ||
c57e4eedbd | |||
|
b8b9b8ae6b | ||
|
d9f6ca8fae | ||
5ca911c33a | |||
|
09205abdcf | ||
63ab0dbc88 | |||
|
8e21533a35 | ||
|
5c3028d217 | ||
997de86f0f | |||
43d28eca6f | |||
|
49fab99ef6 | ||
|
8f64a205a7 | ||
|
b629031cdc | ||
|
b1082245a6 | ||
|
6b11525d4a | ||
|
f0847578a4 | ||
a0ea7509f7 | |||
|
e30bd45b92 | ||
b6da2df6dc | |||
|
1c8a9d87e8 | ||
|
dbc53d520a | ||
|
ee1616c05b | ||
|
e6cd8bb731 | ||
|
4be3245371 | ||
da1ebc38ca | |||
|
14acb77ab8 | ||
|
9ef586a818 | ||
|
44a26918f9 | ||
95ae9cd371 | |||
|
7cc49c92cd | ||
5517b36e40 | |||
|
7ce39c2bcc | ||
cecd5801cc | |||
|
99063751e1 | ||
6dfd19692d | |||
|
7cc55694f9 | ||
e9bdb73e79 | |||
|
558e2b2360 | ||
d13f36d444 | |||
|
2f6780544e | ||
ce1eeb4af1 | |||
|
79626cb7fb | ||
9afed0bfb0 | |||
eac6b15775 | |||
85319f9bd0 | |||
e4f2c77510 | |||
b77f70aeb0 | |||
bae8886836 | |||
8ad0258828 | |||
d7a9e96561 | |||
4a8caabc52 | |||
5d50b02888 | |||
|
c793eeafda | ||
|
4bad2f0a5f | ||
|
1dac3b9598 | ||
|
c77ac5eed2 | ||
dc498edc1b | |||
326eceddc5 | |||
|
071a135a70 | ||
336b128033 | |||
4579965c49 | |||
944294f19f | |||
|
2a6371c797 | ||
|
629a3fee48 | ||
6dc3d858d6 | |||
|
e7797e2e46 | ||
1a03f7e25f | |||
50d21479fd | |||
2f8021fe00 | |||
0571f46d75 | |||
13843fbcf4 | |||
|
d4d0604412 | ||
fe897ee428 | |||
|
d142fc6e91 | ||
2d918e9f5a | |||
|
6d80445682 | ||
bb514b5dc2 | |||
|
b79261650a | ||
62c424c47f | |||
|
078a9c9391 | ||
45a8351d5e | |||
|
4eb66bfe99 | ||
54aee07622 | |||
|
357455f07d | ||
9b86861918 | |||
|
5fa2e1bef0 |
20
.github/workflows/autoapprove.yml
vendored
Normal file
20
.github/workflows/autoapprove.yml
vendored
Normal file
@@ -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 }}
|
21
.github/workflows/automerge.yml
vendored
Normal file
21
.github/workflows/automerge.yml
vendored
Normal file
@@ -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}}
|
13
.github/workflows/build.yml
vendored
13
.github/workflows/build.yml
vendored
@@ -3,19 +3,20 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- v3
|
||||
jobs:
|
||||
test:
|
||||
name: test
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: setup
|
||||
uses: actions/setup-go@v2
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: 1.16
|
||||
go-version: 1.17
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: cache
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/go/pkg/mod
|
||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||
@@ -31,9 +32,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: lint
|
||||
uses: golangci/golangci-lint-action@v2
|
||||
uses: golangci/golangci-lint-action@v3.4.0
|
||||
continue-on-error: true
|
||||
with:
|
||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||
|
12
.github/workflows/codeql-analysis.yml
vendored
12
.github/workflows/codeql-analysis.yml
vendored
@@ -43,14 +43,14 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: setup
|
||||
uses: actions/setup-go@v2
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: 1.16
|
||||
go-version: 1.17
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: init
|
||||
uses: github/codeql-action/init@v1
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
@@ -61,7 +61,7 @@ jobs:
|
||||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||
# If this step fails, then you should remove it and run the build manually (see below)
|
||||
- name: autobuild
|
||||
uses: github/codeql-action/autobuild@v1
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 https://git.io/JvXDl
|
||||
@@ -75,4 +75,4 @@ jobs:
|
||||
# make release
|
||||
|
||||
- name: analyze
|
||||
uses: github/codeql-action/analyze@v1
|
||||
uses: github/codeql-action/analyze@v2
|
||||
|
14
.github/workflows/dependabot-automerge.yml
vendored
14
.github/workflows/dependabot-automerge.yml
vendored
@@ -1,4 +1,4 @@
|
||||
name: "prautomerge"
|
||||
name: "dependabot-automerge"
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
@@ -9,21 +9,17 @@ permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
dependabot:
|
||||
automerge:
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ github.actor == 'dependabot[bot]' }}
|
||||
if: github.actor == 'dependabot[bot]'
|
||||
steps:
|
||||
- name: metadata
|
||||
id: metadata
|
||||
uses: dependabot/fetch-metadata@v1.1.1
|
||||
uses: dependabot/fetch-metadata@v1.3.6
|
||||
with:
|
||||
github-token: "${{ secrets.TOKEN }}"
|
||||
- name: approve
|
||||
run: gh pr review --approve "$PR_URL"
|
||||
env:
|
||||
PR_URL: ${{github.event.pull_request.html_url}}
|
||||
GITHUB_TOKEN: ${{secrets.TOKEN}}
|
||||
- name: merge
|
||||
id: merge
|
||||
if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
|
||||
run: gh pr merge --auto --merge "$PR_URL"
|
||||
env:
|
||||
|
13
.github/workflows/pr.yml
vendored
13
.github/workflows/pr.yml
vendored
@@ -3,19 +3,20 @@ on:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- v3
|
||||
jobs:
|
||||
test:
|
||||
name: test
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: setup
|
||||
uses: actions/setup-go@v2
|
||||
uses: actions/setup-go@v3
|
||||
with:
|
||||
go-version: 1.16
|
||||
go-version: 1.17
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: cache
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/go/pkg/mod
|
||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||
@@ -31,9 +32,9 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: actions/checkout@v3
|
||||
- name: lint
|
||||
uses: golangci/golangci-lint-action@v2
|
||||
uses: golangci/golangci-lint-action@v3.4.0
|
||||
continue-on-error: true
|
||||
with:
|
||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||
|
324
go.mod
324
go.mod
@@ -1,10 +1,324 @@
|
||||
module go.unistack.org/micro-meter-prometheus/v3
|
||||
|
||||
go 1.16
|
||||
go 1.21
|
||||
|
||||
toolchain go1.22.0
|
||||
|
||||
require (
|
||||
github.com/prometheus/client_golang v1.11.0
|
||||
github.com/prometheus/client_model v0.2.0
|
||||
github.com/prometheus/common v0.26.0
|
||||
go.unistack.org/micro/v3 v3.8.7
|
||||
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
|
||||
)
|
||||
|
414
prometheus.go
414
prometheus.go
@@ -2,7 +2,9 @@ package prometheus
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"hash/fnv"
|
||||
"io"
|
||||
"regexp"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -13,26 +15,58 @@ import (
|
||||
"go.unistack.org/micro/v3/meter"
|
||||
)
|
||||
|
||||
var _ meter.Meter = &prometheusMeter{}
|
||||
|
||||
type prometheusMeter struct {
|
||||
opts meter.Options
|
||||
set prometheus.Registerer
|
||||
counter map[string]prometheusCounter
|
||||
floatCounter map[string]prometheusFloatCounter
|
||||
gauge map[string]prometheusGauge
|
||||
histogram map[string]prometheusHistogram
|
||||
summary map[string]prometheusSummary
|
||||
counter *sync.Map
|
||||
floatCounter *sync.Map
|
||||
gauge *sync.Map
|
||||
histogram *sync.Map
|
||||
summary *sync.Map
|
||||
sync.Mutex
|
||||
}
|
||||
|
||||
func NewMeter(opts ...meter.Option) meter.Meter {
|
||||
type counters struct {
|
||||
cs *sync.Map
|
||||
}
|
||||
|
||||
type gauges struct {
|
||||
cs *sync.Map
|
||||
}
|
||||
|
||||
type histograms struct {
|
||||
cs *sync.Map
|
||||
}
|
||||
|
||||
type summaries struct {
|
||||
cs *sync.Map
|
||||
}
|
||||
|
||||
type floatCounters struct {
|
||||
cs *sync.Map
|
||||
}
|
||||
|
||||
func newFloat64(v float64) *float64 {
|
||||
nv := v
|
||||
return &nv
|
||||
}
|
||||
|
||||
func newString(v string) *string {
|
||||
nv := v
|
||||
return &nv
|
||||
}
|
||||
|
||||
func NewMeter(opts ...meter.Option) *prometheusMeter {
|
||||
return &prometheusMeter{
|
||||
set: prometheus.DefaultRegisterer,
|
||||
set: prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
|
||||
opts: meter.NewOptions(opts...),
|
||||
counter: make(map[string]prometheusCounter),
|
||||
floatCounter: make(map[string]prometheusFloatCounter),
|
||||
gauge: make(map[string]prometheusGauge),
|
||||
histogram: make(map[string]prometheusHistogram),
|
||||
summary: make(map[string]prometheusSummary),
|
||||
counter: &sync.Map{},
|
||||
floatCounter: &sync.Map{},
|
||||
gauge: &sync.Map{},
|
||||
histogram: &sync.Map{},
|
||||
summary: &sync.Map{},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,9 +88,8 @@ func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
|
||||
return meter.BuildName(name, nlabels...)
|
||||
}
|
||||
|
||||
for idx := 0; idx < nl; idx++ {
|
||||
for idx := 0; idx < nl; idx += 2 {
|
||||
nlabels[idx] = m.opts.LabelPrefix + nlabels[idx]
|
||||
idx++
|
||||
}
|
||||
return meter.BuildName(name, nlabels...)
|
||||
}
|
||||
@@ -69,18 +102,16 @@ func (m *prometheusMeter) buildName(name string) string {
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) buildLabels(labels ...string) []string {
|
||||
nl := len(m.opts.Labels) + len(labels)
|
||||
nl := len(labels)
|
||||
if nl == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
nlabels := make([]string, 0, nl)
|
||||
nlabels = append(nlabels, m.opts.Labels...)
|
||||
nlabels = append(nlabels, labels...)
|
||||
|
||||
for idx := 0; idx < nl; idx++ {
|
||||
nlabels[idx] = m.opts.LabelPrefix + nlabels[idx]
|
||||
idx++
|
||||
for idx := 0; idx < nl; idx += 2 {
|
||||
nlabels = append(nlabels, m.opts.LabelPrefix+labels[idx])
|
||||
nlabels = append(nlabels, labels[idx+1])
|
||||
}
|
||||
return nlabels
|
||||
}
|
||||
@@ -89,114 +120,167 @@ func (m *prometheusMeter) Name() string {
|
||||
return m.opts.Name
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) mapLabels(labels ...string) map[string]string {
|
||||
labels = m.buildLabels(labels...)
|
||||
elementMap := make(map[string]string, len(labels)/2)
|
||||
for idx := 0; idx < len(labels); idx++ {
|
||||
elementMap[labels[idx]] = labels[idx+1]
|
||||
idx++
|
||||
}
|
||||
return elementMap
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
|
||||
m.Lock()
|
||||
defer m.Unlock()
|
||||
|
||||
nm := m.buildMetric(name, labels...)
|
||||
c, ok := m.counter[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...) // TODO: Read prometheus.go:128
|
||||
vcd, ok := m.counter.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewGauge(prometheus.GaugeOpts{Name: m.buildName(name), ConstLabels: m.mapLabels(labels...)})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusCounter{c: nc}
|
||||
m.counter[nm] = c
|
||||
cd := &counters{cs: &sync.Map{}}
|
||||
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
|
||||
cd.cs.Store(h, c)
|
||||
m.counter.Store(nm, cd)
|
||||
return c
|
||||
}
|
||||
|
||||
cd := vcd.(*counters)
|
||||
vc, ok := cd.cs.Load(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 := vc.(*prometheusCounter)
|
||||
return c
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
|
||||
m.Lock()
|
||||
defer m.Unlock()
|
||||
|
||||
nm := m.buildMetric(name, labels...)
|
||||
c, ok := m.floatCounter[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
|
||||
vcd, ok := m.floatCounter.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewGauge(prometheus.GaugeOpts{Name: m.buildName(name), ConstLabels: m.mapLabels(labels...)})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusFloatCounter{c: nc}
|
||||
m.floatCounter[nm] = c
|
||||
cd := &floatCounters{cs: &sync.Map{}}
|
||||
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
|
||||
cd.cs.Store(h, c)
|
||||
m.floatCounter.Store(nm, cd)
|
||||
return c
|
||||
}
|
||||
|
||||
cd := vcd.(*floatCounters)
|
||||
vc, ok := cd.cs.Load(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 := vc.(*prometheusFloatCounter)
|
||||
return c
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
|
||||
m.Lock()
|
||||
defer m.Unlock()
|
||||
|
||||
nm := m.buildMetric(name, labels...)
|
||||
c, ok := m.gauge[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
|
||||
vcd, ok := m.gauge.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewGauge(prometheus.GaugeOpts{Name: m.buildName(name), ConstLabels: m.mapLabels(labels...)})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusGauge{c: nc}
|
||||
m.gauge[nm] = c
|
||||
cd := &gauges{cs: &sync.Map{}}
|
||||
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
|
||||
cd.cs.Store(h, c)
|
||||
m.gauge.Store(nm, cd)
|
||||
return c
|
||||
}
|
||||
|
||||
cd := vcd.(*gauges)
|
||||
vc, ok := cd.cs.Load(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 := vc.(*prometheusGauge)
|
||||
return c
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
|
||||
m.Lock()
|
||||
defer m.Unlock()
|
||||
|
||||
nm := m.buildMetric(name, labels...)
|
||||
c, ok := m.histogram[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
|
||||
vcd, ok := m.histogram.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewHistogram(prometheus.HistogramOpts{Name: m.buildName(name), ConstLabels: m.mapLabels(labels...)})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusHistogram{c: nc}
|
||||
m.histogram[nm] = c
|
||||
cd := &histograms{cs: &sync.Map{}}
|
||||
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
|
||||
cd.cs.Store(h, c)
|
||||
m.histogram.Store(nm, cd)
|
||||
return c
|
||||
}
|
||||
|
||||
cd := vcd.(*histograms)
|
||||
vc, ok := cd.cs.Load(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 := vc.(*prometheusHistogram)
|
||||
return c
|
||||
}
|
||||
|
||||
func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
|
||||
m.Lock()
|
||||
defer m.Unlock()
|
||||
|
||||
nm := m.buildMetric(name, labels...)
|
||||
c, ok := m.summary[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
|
||||
vcd, ok := m.summary.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewSummary(prometheus.SummaryOpts{Name: m.buildName(name), ConstLabels: m.mapLabels(labels...)})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusSummary{c: nc}
|
||||
m.summary[nm] = c
|
||||
cd := &summaries{cs: &sync.Map{}}
|
||||
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
|
||||
cd.cs.Store(h, c)
|
||||
m.summary.Store(nm, cd)
|
||||
return c
|
||||
}
|
||||
|
||||
cd := vcd.(*summaries)
|
||||
vc, ok := cd.cs.Load(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 := 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.buildMetric(name, labels...)
|
||||
c, ok := m.summary[nm]
|
||||
nm := m.buildName(name)
|
||||
labels = m.buildLabels(append(m.opts.Labels, labels...)...)
|
||||
vcd, ok := m.summary.Load(nm)
|
||||
h := newHash(labels)
|
||||
if !ok {
|
||||
nc := prometheus.NewSummary(prometheus.SummaryOpts{
|
||||
Name: m.buildName(name),
|
||||
ConstLabels: m.mapLabels(labels...),
|
||||
MaxAge: window,
|
||||
Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
|
||||
})
|
||||
m.set.MustRegister(nc)
|
||||
c = prometheusSummary{c: nc}
|
||||
m.summary[nm] = c
|
||||
cd := &summaries{cs: &sync.Map{}}
|
||||
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 := vcd.(*summaries)
|
||||
vc, ok := cd.cs.Load(h)
|
||||
if !ok {
|
||||
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
|
||||
}
|
||||
c := vc.(*prometheusSummary)
|
||||
return c
|
||||
}
|
||||
|
||||
@@ -204,7 +288,6 @@ func (m *prometheusMeter) Init(opts ...meter.Option) error {
|
||||
for _, o := range opts {
|
||||
o(&m.opts)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -215,8 +298,10 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
|
||||
}
|
||||
|
||||
if options.WriteProcessMetrics || options.WriteFDMetrics {
|
||||
c := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
|
||||
_ = m.set.Register(c)
|
||||
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)
|
||||
@@ -229,7 +314,98 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
|
||||
return err
|
||||
}
|
||||
|
||||
enc := expfmt.NewEncoder(w, expfmt.FmtText)
|
||||
enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
|
||||
|
||||
m.counter.Range(func(k, v any) bool {
|
||||
name := k.(string)
|
||||
mf := &dto.MetricFamily{
|
||||
Name: newString(name),
|
||||
Type: dto.MetricType_GAUGE.Enum(),
|
||||
}
|
||||
v.(*counters).cs.Range(func(_, nv any) bool {
|
||||
c := nv.(*prometheusCounter)
|
||||
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)
|
||||
mf := &dto.MetricFamily{
|
||||
Name: newString(name),
|
||||
Type: dto.MetricType_GAUGE.Enum(),
|
||||
}
|
||||
v.(*gauges).cs.Range(func(_, nv any) bool {
|
||||
c := nv.(*prometheusGauge)
|
||||
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)
|
||||
mf := &dto.MetricFamily{
|
||||
Name: newString(name),
|
||||
Type: dto.MetricType_GAUGE.Enum(),
|
||||
}
|
||||
v.(*floatCounters).cs.Range(func(_, nv any) bool {
|
||||
c := nv.(*prometheusGauge)
|
||||
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)
|
||||
mf := &dto.MetricFamily{
|
||||
Name: newString(name),
|
||||
Type: dto.MetricType_HISTOGRAM.Enum(),
|
||||
}
|
||||
v.(*histograms).cs.Range(func(_, nv any) bool {
|
||||
c := nv.(*prometheusHistogram)
|
||||
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)
|
||||
mf := &dto.MetricFamily{
|
||||
Name: newString(name),
|
||||
Type: dto.MetricType_SUMMARY.Enum(),
|
||||
}
|
||||
v.(*summaries).cs.Range(func(_, nv any) bool {
|
||||
c := nv.(*prometheusSummary)
|
||||
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)
|
||||
}
|
||||
@@ -248,12 +424,13 @@ func (m *prometheusMeter) Clone(opts ...meter.Option) meter.Meter {
|
||||
}
|
||||
|
||||
return &prometheusMeter{
|
||||
set: m.set,
|
||||
opts: options,
|
||||
counter: m.counter,
|
||||
gauge: m.gauge,
|
||||
histogram: m.histogram,
|
||||
summary: m.summary,
|
||||
set: m.set,
|
||||
opts: options,
|
||||
floatCounter: m.floatCounter,
|
||||
counter: m.counter,
|
||||
gauge: m.gauge,
|
||||
histogram: m.histogram,
|
||||
summary: m.summary,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -275,22 +452,23 @@ func (m *prometheusMeter) Set(opts ...meter.Option) meter.Meter {
|
||||
}
|
||||
|
||||
type prometheusCounter struct {
|
||||
c prometheus.Gauge
|
||||
c prometheus.Gauge
|
||||
labels []string
|
||||
}
|
||||
|
||||
func (c prometheusCounter) Add(n int) {
|
||||
func (c *prometheusCounter) Add(n int) {
|
||||
c.c.Add(float64(n))
|
||||
}
|
||||
|
||||
func (c prometheusCounter) Dec() {
|
||||
func (c *prometheusCounter) Dec() {
|
||||
c.c.Dec()
|
||||
}
|
||||
|
||||
func (c prometheusCounter) Inc() {
|
||||
func (c *prometheusCounter) Inc() {
|
||||
c.c.Inc()
|
||||
}
|
||||
|
||||
func (c prometheusCounter) Get() uint64 {
|
||||
func (c *prometheusCounter) Get() uint64 {
|
||||
m := &dto.Metric{}
|
||||
if err := c.c.Write(m); err != nil {
|
||||
return 0
|
||||
@@ -298,12 +476,13 @@ func (c prometheusCounter) Get() uint64 {
|
||||
return uint64(m.GetGauge().GetValue())
|
||||
}
|
||||
|
||||
func (c prometheusCounter) Set(n uint64) {
|
||||
func (c *prometheusCounter) Set(n uint64) {
|
||||
c.c.Set(float64(n))
|
||||
}
|
||||
|
||||
type prometheusFloatCounter struct {
|
||||
c prometheus.Gauge
|
||||
c prometheus.Gauge
|
||||
labels []string
|
||||
}
|
||||
|
||||
func (c prometheusFloatCounter) Add(n float64) {
|
||||
@@ -327,7 +506,8 @@ func (c prometheusFloatCounter) Sub(n float64) {
|
||||
}
|
||||
|
||||
type prometheusGauge struct {
|
||||
c prometheus.Gauge
|
||||
c prometheus.Gauge
|
||||
labels []string
|
||||
}
|
||||
|
||||
func (c prometheusGauge) Get() float64 {
|
||||
@@ -339,7 +519,8 @@ func (c prometheusGauge) Get() float64 {
|
||||
}
|
||||
|
||||
type prometheusHistogram struct {
|
||||
c prometheus.Histogram
|
||||
c prometheus.Histogram
|
||||
labels []string
|
||||
}
|
||||
|
||||
func (c prometheusHistogram) Reset() {
|
||||
@@ -354,7 +535,8 @@ func (c prometheusHistogram) UpdateDuration(n time.Time) {
|
||||
}
|
||||
|
||||
type prometheusSummary struct {
|
||||
c prometheus.Summary
|
||||
c prometheus.Summary
|
||||
labels []string
|
||||
}
|
||||
|
||||
func (c prometheusSummary) Update(n float64) {
|
||||
@@ -364,3 +546,29 @@ func (c prometheusSummary) Update(n float64) {
|
||||
func (c prometheusSummary) UpdateDuration(n time.Time) {
|
||||
c.c.Observe(time.Since(n).Seconds())
|
||||
}
|
||||
|
||||
func newHash(labels []string) uint64 {
|
||||
labels = meter.BuildLabels(labels...)
|
||||
h := fnv.New64a()
|
||||
for _, l := range labels {
|
||||
h.Write([]byte(l))
|
||||
}
|
||||
return h.Sum64()
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
@@ -11,11 +11,22 @@ import (
|
||||
"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()
|
||||
im := m.(*prometheusMeter)
|
||||
check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
|
||||
name := im.buildMetric("foo", "bar", "baz", "aaa", "b", "ccc", "d")
|
||||
name := m.buildMetric("foo", "bar", "baz", "aaa", "b", "ccc", "d")
|
||||
if name != check {
|
||||
t.Fatalf("metric name error: %s != %s", name, check)
|
||||
}
|
||||
@@ -50,3 +61,22 @@ func TestWrapper(t *testing.T) {
|
||||
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())
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user