Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
1dbf610d02 | |||
0f9ff3fe38 | |||
3dcb589de9 | |||
3c23fa1343 | |||
|
8aecd80e99 | ||
d4472e1ab2 | |||
6f6d362c20 | |||
dd71d9ec59 | |||
da9201efff |
29
.gitea/workflows/job_lint.yml
Normal file
29
.gitea/workflows/job_lint.yml
Normal file
@@ -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'
|
34
.gitea/workflows/job_test.yml
Normal file
34
.gitea/workflows/job_test.yml
Normal file
@@ -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 ./...
|
53
.gitea/workflows/job_tests.yml
Normal file
53
.gitea/workflows/job_tests.yml
Normal file
@@ -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
|
19
.github/dependabot.yml
vendored
19
.github/dependabot.yml
vendored
@@ -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"
|
|
20
.github/workflows/autoapprove.yml
vendored
20
.github/workflows/autoapprove.yml
vendored
@@ -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 }}
|
|
21
.github/workflows/automerge.yml
vendored
21
.github/workflows/automerge.yml
vendored
@@ -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}}
|
|
47
.github/workflows/build.yml
vendored
47
.github/workflows/build.yml
vendored
@@ -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
|
|
78
.github/workflows/codeql-analysis.yml
vendored
78
.github/workflows/codeql-analysis.yml
vendored
@@ -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
|
|
27
.github/workflows/dependabot-automerge.yml
vendored
27
.github/workflows/dependabot-automerge.yml
vendored
@@ -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}}
|
|
47
.github/workflows/pr.yml
vendored
47
.github/workflows/pr.yml
vendored
@@ -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
|
|
5
.golangci.yml
Normal file
5
.golangci.yml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
run:
|
||||||
|
concurrency: 8
|
||||||
|
deadline: 5m
|
||||||
|
issues-exit-code: 1
|
||||||
|
tests: true
|
93
counter.go
Normal file
93
counter.go
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
package prometheus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"sync/atomic"
|
||||||
|
"unsafe"
|
||||||
|
|
||||||
|
dto "github.com/prometheus/client_model/go"
|
||||||
|
)
|
||||||
|
|
||||||
|
type prometheusCounter struct {
|
||||||
|
name string
|
||||||
|
c *dto.Metric
|
||||||
|
n float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusCounter) Add(n int) {
|
||||||
|
addFloat64(&(c.n), float64(n))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusCounter) Dec() {
|
||||||
|
addFloat64(&(c.n), float64(-1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusCounter) Inc() {
|
||||||
|
addFloat64(&(c.n), float64(1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusCounter) Get() uint64 {
|
||||||
|
return uint64(getFloat64(&(c.n)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusCounter) Set(n uint64) {
|
||||||
|
setFloat64(&(c.n), math.Float64frombits(n))
|
||||||
|
}
|
||||||
|
|
||||||
|
type prometheusFloatCounter struct {
|
||||||
|
name string
|
||||||
|
c *dto.Metric
|
||||||
|
n float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Add(n float64) {
|
||||||
|
addFloat64(&(c.n), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Dec() {
|
||||||
|
addFloat64(&(c.n), float64(-1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Inc() {
|
||||||
|
addFloat64(&(c.n), float64(1))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Get() float64 {
|
||||||
|
return getFloat64(&(c.n))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Set(n float64) {
|
||||||
|
setFloat64(&(c.n), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusFloatCounter) Sub(n float64) {
|
||||||
|
addFloat64(&(c.n), -n)
|
||||||
|
}
|
||||||
|
|
||||||
|
func setFloat64(_addr *float64, value float64) float64 {
|
||||||
|
addr := (*uint64)(unsafe.Pointer(_addr))
|
||||||
|
for {
|
||||||
|
x := atomic.LoadUint64(addr)
|
||||||
|
if atomic.CompareAndSwapUint64(addr, x, math.Float64bits(value)) {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func addFloat64(_addr *float64, delta float64) float64 {
|
||||||
|
addr := (*uint64)(unsafe.Pointer(_addr))
|
||||||
|
for {
|
||||||
|
x := atomic.LoadUint64(addr)
|
||||||
|
y := math.Float64frombits(x) + delta
|
||||||
|
if atomic.CompareAndSwapUint64(addr, x, math.Float64bits(y)) {
|
||||||
|
return y
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func getFloat64(_addr *float64) float64 {
|
||||||
|
addr := (*uint64)(unsafe.Pointer(_addr))
|
||||||
|
x := atomic.LoadUint64(addr)
|
||||||
|
y := math.Float64frombits(x)
|
||||||
|
return y
|
||||||
|
}
|
13
gauge.go
Normal file
13
gauge.go
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
package prometheus
|
||||||
|
|
||||||
|
import dto "github.com/prometheus/client_model/go"
|
||||||
|
|
||||||
|
type prometheusGauge struct {
|
||||||
|
name string
|
||||||
|
c *dto.Metric
|
||||||
|
n float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusGauge) Get() float64 {
|
||||||
|
return getFloat64(&(c.n))
|
||||||
|
}
|
18
go.mod
18
go.mod
@@ -1,25 +1,27 @@
|
|||||||
module go.unistack.org/micro-meter-prometheus/v3
|
module go.unistack.org/micro-meter-prometheus/v3
|
||||||
|
|
||||||
go 1.21
|
go 1.22.0
|
||||||
|
|
||||||
toolchain go1.22.0
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/prometheus/client_golang v1.20.4
|
github.com/prometheus/client_golang v1.20.4
|
||||||
github.com/prometheus/client_model v0.6.1
|
github.com/prometheus/client_model v0.6.1
|
||||||
github.com/prometheus/common v0.59.1
|
github.com/prometheus/common v0.59.1
|
||||||
go.unistack.org/micro/v3 v3.10.91
|
go.unistack.org/micro/v3 v3.10.91
|
||||||
|
google.golang.org/protobuf v1.35.2
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
github.com/beorn7/perks v1.0.1 // indirect
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||||
github.com/golang/protobuf v1.5.4 // indirect
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
|
||||||
|
github.com/klauspost/compress v1.17.11 // indirect
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
|
||||||
github.com/prometheus/procfs v0.15.1 // indirect
|
github.com/prometheus/procfs v0.15.1 // indirect
|
||||||
|
github.com/stretchr/testify v1.10.0 // indirect
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
|
go.unistack.org/micro-proto/v3 v3.4.1 // indirect
|
||||||
golang.org/x/sys v0.25.0 // indirect
|
golang.org/x/net v0.32.0 // indirect
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
|
golang.org/x/sys v0.28.0 // indirect
|
||||||
google.golang.org/grpc v1.57.0 // indirect
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
|
||||||
google.golang.org/protobuf v1.34.2 // indirect
|
google.golang.org/grpc v1.68.1 // indirect
|
||||||
)
|
)
|
||||||
|
32
go.sum
32
go.sum
@@ -2,18 +2,15 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
|||||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||||
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
|
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
|
||||||
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
|
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
|
||||||
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
|
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
|
||||||
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
|
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
|
||||||
@@ -22,25 +19,16 @@ github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJ
|
|||||||
github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
|
github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
|
||||||
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
||||||
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
|
go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
|
||||||
go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
|
go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
|
||||||
go.unistack.org/micro/v3 v3.10.90 h1:EE7t4J14yjZC/lW6e0BfiBnU/xt/KqGkqSxumJhI/fI=
|
|
||||||
go.unistack.org/micro/v3 v3.10.90/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
|
||||||
go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
|
go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
|
||||||
go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
||||||
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
|
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
|
||||||
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
|
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
|
||||||
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
|
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||||
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY=
|
||||||
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
|
google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
|
||||||
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
|
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
|
|
||||||
google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
|
|
||||||
google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
|
|
||||||
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
|
||||||
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
39
histogram.go
Normal file
39
histogram.go
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
package prometheus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
dto "github.com/prometheus/client_model/go"
|
||||||
|
)
|
||||||
|
|
||||||
|
type prometheusHistogram struct {
|
||||||
|
name string
|
||||||
|
c *dto.Metric
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c prometheusHistogram) Reset() {
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c prometheusHistogram) Update(n float64) {
|
||||||
|
atomic.AddUint64(c.c.Histogram.SampleCount, 1)
|
||||||
|
addFloat64(c.c.Histogram.SampleSum, n)
|
||||||
|
for _, b := range c.c.Histogram.Bucket {
|
||||||
|
if n > *b.UpperBound {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
atomic.AddUint64(b.CumulativeCount, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c prometheusHistogram) UpdateDuration(n time.Time) {
|
||||||
|
x := time.Since(n).Seconds()
|
||||||
|
atomic.AddUint64(c.c.Histogram.SampleCount, 1)
|
||||||
|
addFloat64(c.c.Histogram.SampleSum, x)
|
||||||
|
for _, b := range c.c.Histogram.Bucket {
|
||||||
|
if x > *b.UpperBound {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
atomic.AddUint64(b.CumulativeCount, 1)
|
||||||
|
}
|
||||||
|
}
|
560
prometheus.go
560
prometheus.go
@@ -2,10 +2,10 @@ package prometheus
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"hash/fnv"
|
|
||||||
"io"
|
"io"
|
||||||
"regexp"
|
"regexp"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
@@ -13,6 +13,8 @@ import (
|
|||||||
dto "github.com/prometheus/client_model/go"
|
dto "github.com/prometheus/client_model/go"
|
||||||
"github.com/prometheus/common/expfmt"
|
"github.com/prometheus/common/expfmt"
|
||||||
"go.unistack.org/micro/v3/meter"
|
"go.unistack.org/micro/v3/meter"
|
||||||
|
xpool "go.unistack.org/micro/v3/util/xpool"
|
||||||
|
"google.golang.org/protobuf/types/known/timestamppb"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ meter.Meter = (*prometheusMeter)(nil)
|
var _ meter.Meter = (*prometheusMeter)(nil)
|
||||||
@@ -20,43 +22,22 @@ var _ meter.Meter = (*prometheusMeter)(nil)
|
|||||||
type prometheusMeter struct {
|
type prometheusMeter struct {
|
||||||
opts meter.Options
|
opts meter.Options
|
||||||
set prometheus.Registerer
|
set prometheus.Registerer
|
||||||
counter *sync.Map
|
counter sync.Map
|
||||||
floatCounter *sync.Map
|
floatCounter sync.Map
|
||||||
gauge *sync.Map
|
gauge sync.Map
|
||||||
histogram *sync.Map
|
histogram sync.Map
|
||||||
summary *sync.Map
|
summary sync.Map
|
||||||
sync.Mutex
|
mfPool xpool.Pool[*dto.MetricFamily]
|
||||||
}
|
mu sync.Mutex
|
||||||
|
|
||||||
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 NewMeter(opts ...meter.Option) *prometheusMeter {
|
func NewMeter(opts ...meter.Option) *prometheusMeter {
|
||||||
return &prometheusMeter{
|
return &prometheusMeter{
|
||||||
set: prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
|
set: prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
|
||||||
opts: meter.NewOptions(opts...),
|
opts: meter.NewOptions(opts...),
|
||||||
counter: &sync.Map{},
|
mfPool: xpool.NewPool[*dto.MetricFamily](func() *dto.MetricFamily {
|
||||||
floatCounter: &sync.Map{},
|
return &dto.MetricFamily{}
|
||||||
gauge: &sync.Map{},
|
}),
|
||||||
histogram: &sync.Map{},
|
|
||||||
summary: &sync.Map{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,161 +46,158 @@ func (m *prometheusMeter) Name() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
|
func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.counter.Load(name)
|
c, ok := m.counter.Load(h)
|
||||||
h := newHash(labels)
|
// fmt.Printf("counter name %s hash %v labels %v\n", name, h, labels)
|
||||||
|
m.mu.Unlock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &counters{cs: &sync.Map{}}
|
var n float64
|
||||||
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
c = &prometheusCounter{
|
||||||
cd.cs.Store(h, c)
|
name: name,
|
||||||
m.counter.Store(name, cd)
|
c: &dto.Metric{
|
||||||
return c
|
Gauge: &dto.Gauge{Value: &n},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.counter.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*counters)
|
return c.(*prometheusCounter)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
|
||||||
cd.cs.Store(h, c)
|
|
||||||
m.counter.Store(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusCounter)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
|
func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.floatCounter.Load(name)
|
c, ok := m.counter.Load(h)
|
||||||
h := newHash(labels)
|
m.mu.Unlock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &floatCounters{cs: &sync.Map{}}
|
var n float64
|
||||||
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
c = &prometheusFloatCounter{
|
||||||
cd.cs.Store(h, c)
|
name: name,
|
||||||
m.floatCounter.Store(name, cd)
|
c: &dto.Metric{
|
||||||
return c
|
Gauge: &dto.Gauge{Value: &n},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.counter.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*floatCounters)
|
return c.(*prometheusFloatCounter)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
|
||||||
cd.cs.Store(h, c)
|
|
||||||
m.floatCounter.Store(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusFloatCounter)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
|
func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.gauge.Load(name)
|
c, ok := m.gauge.Load(h)
|
||||||
h := newHash(labels)
|
m.mu.Unlock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &gauges{cs: &sync.Map{}}
|
var n float64
|
||||||
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
c = &prometheusGauge{
|
||||||
cd.cs.Store(h, c)
|
name: name,
|
||||||
m.gauge.Store(name, cd)
|
c: &dto.Metric{
|
||||||
return c
|
Gauge: &dto.Gauge{Value: &n},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.gauge.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*gauges)
|
return c.(*prometheusGauge)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
|
|
||||||
cd.cs.Store(h, c)
|
|
||||||
m.gauge.Store(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusGauge)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
|
func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.histogram.Load(name)
|
c, ok := m.histogram.Load(h)
|
||||||
h := newHash(labels)
|
m.mu.Unlock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &histograms{cs: &sync.Map{}}
|
var n uint64
|
||||||
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
|
var s float64
|
||||||
cd.cs.Store(h, c)
|
buckets := make([]float64, len(prometheus.DefBuckets))
|
||||||
m.histogram.Store(name, cd)
|
copy(buckets, prometheus.DefBuckets)
|
||||||
return c
|
mdto := &dto.Metric{
|
||||||
|
Histogram: &dto.Histogram{
|
||||||
|
SampleCount: &n,
|
||||||
|
SampleSum: &s,
|
||||||
|
CreatedTimestamp: timestamppb.Now(),
|
||||||
|
Bucket: make([]*dto.Bucket, len(buckets)),
|
||||||
|
},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
}
|
||||||
|
for idx, b := range buckets {
|
||||||
|
var cc uint64
|
||||||
|
mdto.Histogram.Bucket[idx] = &dto.Bucket{CumulativeCount: &cc, UpperBound: &b}
|
||||||
|
}
|
||||||
|
c = &prometheusHistogram{
|
||||||
|
name: name,
|
||||||
|
c: mdto,
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.histogram.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*histograms)
|
return c.(*prometheusHistogram)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
|
|
||||||
cd.cs.Store(h, c)
|
|
||||||
m.histogram.Store(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusHistogram)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
|
func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.summary.Load(name)
|
c, ok := m.summary.Load(h)
|
||||||
h := newHash(labels)
|
m.mu.Unlock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &summaries{cs: &sync.Map{}}
|
var n uint64
|
||||||
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
|
var s float64
|
||||||
cd.cs.Store(h, c)
|
c = &prometheusSummary{
|
||||||
m.summary.Store(name, cd)
|
name: name,
|
||||||
return c
|
c: &dto.Metric{
|
||||||
|
Summary: &dto.Summary{
|
||||||
|
SampleCount: &n,
|
||||||
|
SampleSum: &s,
|
||||||
|
CreatedTimestamp: timestamppb.Now(),
|
||||||
|
},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.summary.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*summaries)
|
return c.(*prometheusSummary)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
|
|
||||||
cd.cs.Store(h, c)
|
|
||||||
m.summary.Store(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusSummary)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
|
func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
|
||||||
m.Lock()
|
clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
|
||||||
defer m.Unlock()
|
h := newHash(name, clabels)
|
||||||
labels = append(m.opts.Labels, labels...)
|
m.mu.Lock()
|
||||||
vcd, ok := m.summary.Load(name)
|
c, ok := m.summary.Load(h)
|
||||||
h := newHash(labels)
|
m.mu.Lock()
|
||||||
if !ok {
|
if !ok {
|
||||||
cd := &summaries{cs: &sync.Map{}}
|
var n uint64
|
||||||
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
|
var s float64
|
||||||
Name: name,
|
c = &prometheusSummary{
|
||||||
MaxAge: window,
|
name: name,
|
||||||
Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
|
c: &dto.Metric{
|
||||||
}), labels: labels}
|
Summary: &dto.Summary{
|
||||||
cd.cs.Store(h, c)
|
SampleCount: &n,
|
||||||
m.summary.Store(name, cd)
|
SampleSum: &s,
|
||||||
return c
|
},
|
||||||
|
Label: labelMetric(clabels),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
m.summary.Store(h, c)
|
||||||
|
m.mu.Unlock()
|
||||||
}
|
}
|
||||||
cd := vcd.(*summaries)
|
return c.(*prometheusSummary)
|
||||||
vc, ok := cd.cs.Load(h)
|
|
||||||
if !ok {
|
|
||||||
c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
|
|
||||||
Name: name,
|
|
||||||
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(name, cd)
|
|
||||||
return c
|
|
||||||
}
|
|
||||||
c := vc.(*prometheusSummary)
|
|
||||||
return c
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *prometheusMeter) Init(opts ...meter.Option) error {
|
func (m *prometheusMeter) Init(opts ...meter.Option) error {
|
||||||
@@ -255,98 +233,74 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
|
|||||||
|
|
||||||
enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
|
enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
|
||||||
|
|
||||||
m.counter.Range(func(k, v any) bool {
|
m.mu.Lock()
|
||||||
name := k.(string)
|
|
||||||
mf := &dto.MetricFamily{
|
m.counter.Range(func(_ any, v any) bool {
|
||||||
Name: &name,
|
mc := v.(*prometheusCounter)
|
||||||
Type: dto.MetricType_GAUGE.Enum(),
|
mf := m.mfPool.Get()
|
||||||
}
|
mf.Name = &mc.name
|
||||||
v.(*counters).cs.Range(func(_, nv any) bool {
|
mf.Type = dto.MetricType_GAUGE.Enum()
|
||||||
c := nv.(*prometheusCounter)
|
n := getFloat64(&(mc.n))
|
||||||
m := &dto.Metric{}
|
mc.c.Gauge.Value = &n
|
||||||
_ = c.c.Write(m)
|
mf.Metric = append(mf.Metric, mc.c)
|
||||||
fillMetric(m, c.labels)
|
|
||||||
mf.Metric = append(mf.Metric, m)
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
mfs = append(mfs, mf)
|
mfs = append(mfs, mf)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
m.gauge.Range(func(k, v any) bool {
|
m.floatCounter.Range(func(_ any, v any) bool {
|
||||||
name := k.(string)
|
mc := v.(*prometheusFloatCounter)
|
||||||
mf := &dto.MetricFamily{
|
mf := m.mfPool.Get()
|
||||||
Name: &name,
|
mf.Name = &mc.name
|
||||||
Type: dto.MetricType_GAUGE.Enum(),
|
mf.Type = dto.MetricType_GAUGE.Enum()
|
||||||
}
|
n := getFloat64(&(mc.n))
|
||||||
v.(*gauges).cs.Range(func(_, nv any) bool {
|
mc.c.Gauge.Value = &n
|
||||||
c := nv.(*prometheusGauge)
|
mf.Metric = append(mf.Metric, mc.c)
|
||||||
m := &dto.Metric{}
|
|
||||||
_ = c.c.Write(m)
|
|
||||||
fillMetric(m, c.labels)
|
|
||||||
mf.Metric = append(mf.Metric, m)
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
mfs = append(mfs, mf)
|
mfs = append(mfs, mf)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
m.floatCounter.Range(func(k, v any) bool {
|
m.gauge.Range(func(_ any, v any) bool {
|
||||||
name := k.(string)
|
mc := v.(*prometheusGauge)
|
||||||
mf := &dto.MetricFamily{
|
mf := m.mfPool.Get()
|
||||||
Name: &name,
|
mf.Name = &mc.name
|
||||||
Type: dto.MetricType_GAUGE.Enum(),
|
mf.Type = dto.MetricType_GAUGE.Enum()
|
||||||
}
|
n := getFloat64(&(mc.n))
|
||||||
v.(*floatCounters).cs.Range(func(_, nv any) bool {
|
mc.c.Gauge.Value = &n
|
||||||
c := nv.(*prometheusFloatCounter)
|
mf.Metric = append(mf.Metric, mc.c)
|
||||||
m := &dto.Metric{}
|
|
||||||
_ = c.c.Write(m)
|
|
||||||
fillMetric(m, c.labels)
|
|
||||||
mf.Metric = append(mf.Metric, m)
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
mfs = append(mfs, mf)
|
mfs = append(mfs, mf)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
m.histogram.Range(func(k, v any) bool {
|
m.histogram.Range(func(_ any, v any) bool {
|
||||||
name := k.(string)
|
c := v.(*prometheusHistogram)
|
||||||
mf := &dto.MetricFamily{
|
mf := m.mfPool.Get()
|
||||||
Name: &name,
|
mf.Name = &c.name
|
||||||
Type: dto.MetricType_HISTOGRAM.Enum(),
|
mf.Type = dto.MetricType_HISTOGRAM.Enum()
|
||||||
}
|
mf.Metric = append(mf.Metric, c.c)
|
||||||
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)
|
mfs = append(mfs, mf)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
m.summary.Range(func(k, v any) bool {
|
m.summary.Range(func(_ any, v any) bool {
|
||||||
name := k.(string)
|
mc := v.(*prometheusSummary)
|
||||||
mf := &dto.MetricFamily{
|
mf := m.mfPool.Get()
|
||||||
Name: &name,
|
mf.Name = &mc.name
|
||||||
Type: dto.MetricType_SUMMARY.Enum(),
|
mf.Type = dto.MetricType_SUMMARY.Enum()
|
||||||
}
|
sc := atomic.LoadUint64(&(mc.sampleCount))
|
||||||
v.(*summaries).cs.Range(func(_, nv any) bool {
|
mc.c.Summary.SampleCount = &sc
|
||||||
c := nv.(*prometheusSummary)
|
ss := getFloat64(&(mc.SampleSum))
|
||||||
m := &dto.Metric{}
|
mc.c.Summary.SampleSum = &ss
|
||||||
_ = c.c.Write(m)
|
mf.Metric = append(mf.Metric, mc.c)
|
||||||
fillMetric(m, c.labels)
|
|
||||||
mf.Metric = append(mf.Metric, m)
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
mfs = append(mfs, mf)
|
mfs = append(mfs, mf)
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
for _, mf := range mfs {
|
for _, mf := range mfs {
|
||||||
_ = enc.Encode(mf)
|
_ = enc.Encode(mf)
|
||||||
|
mf.Reset()
|
||||||
|
m.mfPool.Put(mf)
|
||||||
}
|
}
|
||||||
|
|
||||||
if closer, ok := enc.(io.Closer); ok {
|
if closer, ok := enc.(io.Closer); ok {
|
||||||
@@ -390,124 +344,30 @@ func (m *prometheusMeter) Set(opts ...meter.Option) meter.Meter {
|
|||||||
return nm
|
return nm
|
||||||
}
|
}
|
||||||
|
|
||||||
type prometheusCounter struct {
|
func labelMetric(labels []string) []*dto.LabelPair {
|
||||||
c prometheus.Gauge
|
nl := make([]string, len(labels))
|
||||||
labels []string
|
copy(nl, labels)
|
||||||
}
|
dtoLabels := make([]*dto.LabelPair, 0, len(nl)/2)
|
||||||
|
for idx := 0; idx < len(nl); idx += 2 {
|
||||||
func (c *prometheusCounter) Add(n int) {
|
dtoLabels = append(dtoLabels, &dto.LabelPair{
|
||||||
c.c.Add(float64(n))
|
Name: &(nl[idx]),
|
||||||
}
|
Value: &(nl[idx+1]),
|
||||||
|
|
||||||
func (c *prometheusCounter) Dec() {
|
|
||||||
c.c.Dec()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *prometheusCounter) Inc() {
|
|
||||||
c.c.Inc()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *prometheusCounter) Get() uint64 {
|
|
||||||
m := &dto.Metric{}
|
|
||||||
if err := c.c.Write(m); err != nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return uint64(m.GetGauge().GetValue())
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *prometheusCounter) Set(n uint64) {
|
|
||||||
c.c.Set(float64(n))
|
|
||||||
}
|
|
||||||
|
|
||||||
type prometheusFloatCounter struct {
|
|
||||||
c prometheus.Gauge
|
|
||||||
labels []string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusFloatCounter) Add(n float64) {
|
|
||||||
c.c.Add(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusFloatCounter) Get() float64 {
|
|
||||||
m := &dto.Metric{}
|
|
||||||
if err := c.c.Write(m); err != nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return m.GetGauge().GetValue()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusFloatCounter) Set(n float64) {
|
|
||||||
c.c.Set(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusFloatCounter) Sub(n float64) {
|
|
||||||
c.c.Add(-n)
|
|
||||||
}
|
|
||||||
|
|
||||||
type prometheusGauge struct {
|
|
||||||
c prometheus.Gauge
|
|
||||||
labels []string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusGauge) Get() float64 {
|
|
||||||
m := &dto.Metric{}
|
|
||||||
if err := c.c.Write(m); err != nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
return float64(m.GetGauge().GetValue())
|
|
||||||
}
|
|
||||||
|
|
||||||
type prometheusHistogram struct {
|
|
||||||
c prometheus.Histogram
|
|
||||||
labels []string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusHistogram) Reset() {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusHistogram) Update(n float64) {
|
|
||||||
c.c.Observe(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusHistogram) UpdateDuration(n time.Time) {
|
|
||||||
c.c.Observe(time.Since(n).Seconds())
|
|
||||||
}
|
|
||||||
|
|
||||||
type prometheusSummary struct {
|
|
||||||
c prometheus.Summary
|
|
||||||
labels []string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c prometheusSummary) Update(n float64) {
|
|
||||||
c.c.Observe(n)
|
|
||||||
}
|
|
||||||
|
|
||||||
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: &(labels[idx]),
|
|
||||||
Value: &(labels[idx+1]),
|
|
||||||
})
|
})
|
||||||
seen[labels[idx]] = true
|
|
||||||
}
|
}
|
||||||
return m
|
return dtoLabels
|
||||||
|
}
|
||||||
|
|
||||||
|
func newHash(n string, l []string) uint64 {
|
||||||
|
h := uint64(14695981039346656037)
|
||||||
|
for i := 0; i < len(n); i++ {
|
||||||
|
h ^= uint64(n[i])
|
||||||
|
h *= 1099511628211
|
||||||
|
}
|
||||||
|
for _, s := range l {
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
h ^= uint64(s[i])
|
||||||
|
h *= 1099511628211
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return h
|
||||||
}
|
}
|
||||||
|
@@ -3,13 +3,125 @@ package prometheus
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
dto "github.com/prometheus/client_model/go"
|
||||||
|
"github.com/prometheus/common/expfmt"
|
||||||
"go.unistack.org/micro/v3/client"
|
"go.unistack.org/micro/v3/client"
|
||||||
"go.unistack.org/micro/v3/codec"
|
"go.unistack.org/micro/v3/codec"
|
||||||
"go.unistack.org/micro/v3/meter"
|
"go.unistack.org/micro/v3/meter"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func TestHash(t *testing.T) {
|
||||||
|
m := NewMeter() // meter.Labels("test_key", "test_val"))
|
||||||
|
|
||||||
|
buf := bytes.NewBuffer(nil)
|
||||||
|
|
||||||
|
for i := 0; i < 100000; i++ {
|
||||||
|
go func() {
|
||||||
|
m.Counter("micro_server_request_total", "code", "16",
|
||||||
|
"endpoint", "/clientprofile.ClientProfileService/GetClientProfile",
|
||||||
|
"status", "failure").Inc()
|
||||||
|
m.Counter("micro_server_request_total", "code", "16",
|
||||||
|
"endpoint", "/clientproduct.ClientProductService/GetDepositProducts",
|
||||||
|
"status", "failure").Inc()
|
||||||
|
m.Counter("micro_server_request_total", "code", "16",
|
||||||
|
"endpoint", "/operationsinfo.OperationsInfoService/GetOperations",
|
||||||
|
"status", "failure").Inc()
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
_ = m.Write(buf)
|
||||||
|
t.Logf("h1: %s\n", buf.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHistogram(t *testing.T) {
|
||||||
|
m := NewMeter()
|
||||||
|
name := "test"
|
||||||
|
m.Histogram(name, "endpoint").Update(1)
|
||||||
|
m.Histogram(name, "endpoint").Update(1)
|
||||||
|
m.Histogram(name, "endpoint").Update(5)
|
||||||
|
m.Histogram(name, "endpoint").Update(10)
|
||||||
|
m.Histogram(name, "endpoint").Update(10)
|
||||||
|
m.Histogram(name, "endpoint").Update(30)
|
||||||
|
mbuf := bytes.NewBuffer(nil)
|
||||||
|
_ = m.Write(mbuf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
|
||||||
|
|
||||||
|
/*
|
||||||
|
if !bytes.Contains(buf.Bytes(), []byte(`micro_server_sum{endpoint="ep1",path="/path1"} 20`)) {
|
||||||
|
t.Fatalf("invalid metrics output: %s", buf.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
if !bytes.Contains(buf.Bytes(), []byte(`micro_server_count{endpoint="ep1",path="/path1"} 2`)) {
|
||||||
|
t.Fatalf("invalid metrics output: %s", buf.Bytes())
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
p := prometheus.NewHistogram(prometheus.HistogramOpts{Name: name})
|
||||||
|
p.Observe(1)
|
||||||
|
p.Observe(1)
|
||||||
|
p.Observe(5)
|
||||||
|
p.Observe(10)
|
||||||
|
p.Observe(10)
|
||||||
|
p.Observe(30)
|
||||||
|
mdto := &dto.Metric{}
|
||||||
|
_ = p.Write(mdto)
|
||||||
|
pbuf := bytes.NewBuffer(nil)
|
||||||
|
enc := expfmt.NewEncoder(pbuf, expfmt.NewFormat(expfmt.TypeTextPlain))
|
||||||
|
mf := &dto.MetricFamily{Name: &name, Type: dto.MetricType_HISTOGRAM.Enum(), Metric: []*dto.Metric{mdto}}
|
||||||
|
_ = enc.Encode(mf)
|
||||||
|
|
||||||
|
if !bytes.Equal(mbuf.Bytes(), pbuf.Bytes()) {
|
||||||
|
fmt.Printf("m\n%s\n", mbuf.Bytes())
|
||||||
|
fmt.Printf("m\n%s\n", pbuf.Bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSummary(t *testing.T) {
|
||||||
|
t.Skip()
|
||||||
|
name := "micro_server"
|
||||||
|
m := NewMeter()
|
||||||
|
m.Summary("micro_server").Update(1)
|
||||||
|
m.Summary("micro_server").Update(1)
|
||||||
|
m.Summary("micro_server").Update(5)
|
||||||
|
m.Summary("micro_server").Update(10)
|
||||||
|
m.Summary("micro_server").Update(10)
|
||||||
|
m.Summary("micro_server").Update(30)
|
||||||
|
mbuf := bytes.NewBuffer(nil)
|
||||||
|
_ = m.Write(mbuf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
|
||||||
|
|
||||||
|
if !bytes.Contains(mbuf.Bytes(), []byte(`micro_server_sum 57`)) {
|
||||||
|
t.Fatalf("invalid metrics output: %s", mbuf.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
if !bytes.Contains(mbuf.Bytes(), []byte(`micro_server_count 6`)) {
|
||||||
|
t.Fatalf("invalid metrics output: %s", mbuf.Bytes())
|
||||||
|
}
|
||||||
|
|
||||||
|
objectives := make(map[float64]float64)
|
||||||
|
for _, c := range meter.DefaultSummaryQuantiles {
|
||||||
|
objectives[c] = c
|
||||||
|
}
|
||||||
|
p := prometheus.NewSummary(prometheus.SummaryOpts{Name: name, Objectives: objectives, MaxAge: meter.DefaultSummaryWindow})
|
||||||
|
p.Observe(1)
|
||||||
|
p.Observe(1)
|
||||||
|
p.Observe(5)
|
||||||
|
p.Observe(10)
|
||||||
|
p.Observe(10)
|
||||||
|
p.Observe(30)
|
||||||
|
mdto := &dto.Metric{}
|
||||||
|
_ = p.Write(mdto)
|
||||||
|
pbuf := bytes.NewBuffer(nil)
|
||||||
|
enc := expfmt.NewEncoder(pbuf, expfmt.NewFormat(expfmt.TypeTextPlain))
|
||||||
|
mf := &dto.MetricFamily{Name: &name, Type: dto.MetricType_SUMMARY.Enum(), Metric: []*dto.Metric{mdto}}
|
||||||
|
_ = enc.Encode(mf)
|
||||||
|
|
||||||
|
if !bytes.Equal(mbuf.Bytes(), pbuf.Bytes()) {
|
||||||
|
fmt.Printf("m\n%s\n", mbuf.Bytes())
|
||||||
|
fmt.Printf("m\n%s\n", pbuf.Bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestStd(t *testing.T) {
|
func TestStd(t *testing.T) {
|
||||||
m := NewMeter(meter.WriteProcessMetrics(true), meter.WriteFDMetrics(true))
|
m := NewMeter(meter.WriteProcessMetrics(true), meter.WriteFDMetrics(true))
|
||||||
if err := m.Init(); err != nil {
|
if err := m.Init(); err != nil {
|
||||||
@@ -56,7 +168,9 @@ func TestMultiple(t *testing.T) {
|
|||||||
buf := bytes.NewBuffer(nil)
|
buf := bytes.NewBuffer(nil)
|
||||||
_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
|
_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
|
||||||
if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep1",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())
|
||||||
|
}
|
||||||
|
if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep3",path="/path3",status="success"} 1`)) {
|
||||||
t.Fatalf("invalid metrics output: %s", buf.Bytes())
|
t.Fatalf("invalid metrics output: %s", buf.Bytes())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
26
summary.go
Normal file
26
summary.go
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
package prometheus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
dto "github.com/prometheus/client_model/go"
|
||||||
|
)
|
||||||
|
|
||||||
|
type prometheusSummary struct {
|
||||||
|
name string
|
||||||
|
c *dto.Metric
|
||||||
|
sampleCount uint64
|
||||||
|
SampleSum float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusSummary) Update(n float64) {
|
||||||
|
atomic.AddUint64(&(c.sampleCount), 1)
|
||||||
|
addFloat64(&(c.SampleSum), n)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *prometheusSummary) UpdateDuration(t time.Time) {
|
||||||
|
n := time.Since(t).Seconds()
|
||||||
|
atomic.AddUint64(&(c.sampleCount), 1)
|
||||||
|
addFloat64(&(c.SampleSum), n)
|
||||||
|
}
|
Reference in New Issue
Block a user