partially fix race cond

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

counter.go

@@ -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
+}

gauge.go

@@ -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))
+}

go.mod

@@ -1,324 +1,23 @@
 module go.unistack.org/micro-meter-prometheus/v3
 
-go 1.21
+go 1.22.0
-
-toolchain go1.22.0
 
 require (
-	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/client_golang v1.20.4
-	github.com/prometheus/client_model v0.6.0
+	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.51.1
+	github.com/prometheus/common v0.59.1
-	go.unistack.org/micro/v3 v3.10.53
+	go.unistack.org/micro/v3 v3.10.91
+	google.golang.org/protobuf v1.34.2
 )
 
 require (
-	cloud.google.com/go v0.110.2 // indirect
-	cloud.google.com/go/accessapproval v1.6.0 // indirect
-	cloud.google.com/go/accesscontextmanager v1.7.0 // indirect
-	cloud.google.com/go/aiplatform v1.37.0 // indirect
-	cloud.google.com/go/analytics v0.19.0 // indirect
-	cloud.google.com/go/apigateway v1.5.0 // indirect
-	cloud.google.com/go/apigeeconnect v1.5.0 // indirect
-	cloud.google.com/go/apigeeregistry v0.6.0 // indirect
-	cloud.google.com/go/apikeys v0.6.0 // indirect
-	cloud.google.com/go/appengine v1.7.1 // indirect
-	cloud.google.com/go/area120 v0.7.1 // indirect
-	cloud.google.com/go/artifactregistry v1.13.0 // indirect
-	cloud.google.com/go/asset v1.13.0 // indirect
-	cloud.google.com/go/assuredworkloads v1.10.0 // indirect
-	cloud.google.com/go/automl v1.12.0 // indirect
-	cloud.google.com/go/baremetalsolution v0.5.0 // indirect
-	cloud.google.com/go/batch v0.7.0 // indirect
-	cloud.google.com/go/beyondcorp v0.5.0 // indirect
-	cloud.google.com/go/bigquery v1.50.0 // indirect
-	cloud.google.com/go/billing v1.13.0 // indirect
-	cloud.google.com/go/binaryauthorization v1.5.0 // indirect
-	cloud.google.com/go/certificatemanager v1.6.0 // indirect
-	cloud.google.com/go/channel v1.12.0 // indirect
-	cloud.google.com/go/cloudbuild v1.9.0 // indirect
-	cloud.google.com/go/clouddms v1.5.0 // indirect
-	cloud.google.com/go/cloudtasks v1.10.0 // indirect
-	cloud.google.com/go/compute v1.20.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/contactcenterinsights v1.6.0 // indirect
-	cloud.google.com/go/container v1.15.0 // indirect
-	cloud.google.com/go/containeranalysis v0.9.0 // indirect
-	cloud.google.com/go/datacatalog v1.13.0 // indirect
-	cloud.google.com/go/dataflow v0.8.0 // indirect
-	cloud.google.com/go/dataform v0.7.0 // indirect
-	cloud.google.com/go/datafusion v1.6.0 // indirect
-	cloud.google.com/go/datalabeling v0.7.0 // indirect
-	cloud.google.com/go/dataplex v1.6.0 // indirect
-	cloud.google.com/go/dataproc v1.12.0 // indirect
-	cloud.google.com/go/dataqna v0.7.0 // indirect
-	cloud.google.com/go/datastore v1.11.0 // indirect
-	cloud.google.com/go/datastream v1.7.0 // indirect
-	cloud.google.com/go/deploy v1.8.0 // indirect
-	cloud.google.com/go/dialogflow v1.32.0 // indirect
-	cloud.google.com/go/dlp v1.9.0 // indirect
-	cloud.google.com/go/documentai v1.18.0 // indirect
-	cloud.google.com/go/domains v0.8.0 // indirect
-	cloud.google.com/go/edgecontainer v1.0.0 // indirect
-	cloud.google.com/go/errorreporting v0.3.0 // indirect
-	cloud.google.com/go/essentialcontacts v1.5.0 // indirect
-	cloud.google.com/go/eventarc v1.11.0 // indirect
-	cloud.google.com/go/filestore v1.6.0 // indirect
-	cloud.google.com/go/firestore v1.9.0 // indirect
-	cloud.google.com/go/functions v1.13.0 // indirect
-	cloud.google.com/go/gaming v1.9.0 // indirect
-	cloud.google.com/go/gkebackup v0.4.0 // indirect
-	cloud.google.com/go/gkeconnect v0.7.0 // indirect
-	cloud.google.com/go/gkehub v0.12.0 // indirect
-	cloud.google.com/go/gkemulticloud v0.5.0 // indirect
-	cloud.google.com/go/grafeas v0.2.0 // indirect
-	cloud.google.com/go/gsuiteaddons v1.5.0 // indirect
-	cloud.google.com/go/iam v0.13.0 // indirect
-	cloud.google.com/go/iap v1.7.1 // indirect
-	cloud.google.com/go/ids v1.3.0 // indirect
-	cloud.google.com/go/iot v1.6.0 // indirect
-	cloud.google.com/go/kms v1.10.1 // indirect
-	cloud.google.com/go/language v1.9.0 // indirect
-	cloud.google.com/go/lifesciences v0.8.0 // indirect
-	cloud.google.com/go/logging v1.7.0 // indirect
-	cloud.google.com/go/longrunning v0.4.1 // indirect
-	cloud.google.com/go/managedidentities v1.5.0 // indirect
-	cloud.google.com/go/maps v0.7.0 // indirect
-	cloud.google.com/go/mediatranslation v0.7.0 // indirect
-	cloud.google.com/go/memcache v1.9.0 // indirect
-	cloud.google.com/go/metastore v1.10.0 // indirect
-	cloud.google.com/go/monitoring v1.13.0 // indirect
-	cloud.google.com/go/networkconnectivity v1.11.0 // indirect
-	cloud.google.com/go/networkmanagement v1.6.0 // indirect
-	cloud.google.com/go/networksecurity v0.8.0 // indirect
-	cloud.google.com/go/notebooks v1.8.0 // indirect
-	cloud.google.com/go/optimization v1.3.1 // indirect
-	cloud.google.com/go/orchestration v1.6.0 // indirect
-	cloud.google.com/go/orgpolicy v1.10.0 // indirect
-	cloud.google.com/go/osconfig v1.11.0 // indirect
-	cloud.google.com/go/oslogin v1.9.0 // indirect
-	cloud.google.com/go/phishingprotection v0.7.0 // indirect
-	cloud.google.com/go/policytroubleshooter v1.6.0 // indirect
-	cloud.google.com/go/privatecatalog v0.8.0 // indirect
-	cloud.google.com/go/pubsub v1.30.0 // indirect
-	cloud.google.com/go/pubsublite v1.7.0 // indirect
-	cloud.google.com/go/recaptchaenterprise v1.3.1 // indirect
-	cloud.google.com/go/recaptchaenterprise/v2 v2.7.0 // indirect
-	cloud.google.com/go/recommendationengine v0.7.0 // indirect
-	cloud.google.com/go/recommender v1.9.0 // indirect
-	cloud.google.com/go/redis v1.11.0 // indirect
-	cloud.google.com/go/resourcemanager v1.7.0 // indirect
-	cloud.google.com/go/resourcesettings v1.5.0 // indirect
-	cloud.google.com/go/retail v1.12.0 // indirect
-	cloud.google.com/go/run v0.9.0 // indirect
-	cloud.google.com/go/scheduler v1.9.0 // indirect
-	cloud.google.com/go/secretmanager v1.10.0 // indirect
-	cloud.google.com/go/security v1.13.0 // indirect
-	cloud.google.com/go/securitycenter v1.19.0 // indirect
-	cloud.google.com/go/servicecontrol v1.11.1 // indirect
-	cloud.google.com/go/servicedirectory v1.9.0 // indirect
-	cloud.google.com/go/servicemanagement v1.8.0 // indirect
-	cloud.google.com/go/serviceusage v1.6.0 // indirect
-	cloud.google.com/go/shell v1.6.0 // indirect
-	cloud.google.com/go/spanner v1.45.0 // indirect
-	cloud.google.com/go/speech v1.15.0 // indirect
-	cloud.google.com/go/storage v1.29.0 // indirect
-	cloud.google.com/go/storagetransfer v1.8.0 // indirect
-	cloud.google.com/go/talent v1.5.0 // indirect
-	cloud.google.com/go/texttospeech v1.6.0 // indirect
-	cloud.google.com/go/tpu v1.5.0 // indirect
-	cloud.google.com/go/trace v1.9.0 // indirect
-	cloud.google.com/go/translate v1.7.0 // indirect
-	cloud.google.com/go/video v1.15.0 // indirect
-	cloud.google.com/go/videointelligence v1.10.0 // indirect
-	cloud.google.com/go/vision v1.2.0 // indirect
-	cloud.google.com/go/vision/v2 v2.7.0 // indirect
-	cloud.google.com/go/vmmigration v1.6.0 // indirect
-	cloud.google.com/go/vmwareengine v0.3.0 // indirect
-	cloud.google.com/go/vpcaccess v1.6.0 // indirect
-	cloud.google.com/go/webrisk v1.8.0 // indirect
-	cloud.google.com/go/websecurityscanner v1.5.0 // indirect
-	cloud.google.com/go/workflows v1.10.0 // indirect
-	dario.cat/mergo v1.0.0 // indirect
-	dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 // indirect
-	gioui.org v0.0.0-20210308172011-57750fc8a0a6 // indirect
-	git.sr.ht/~sbinet/gg v0.3.1 // indirect
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
-	github.com/DATA-DOG/go-sqlmock v1.5.0 // indirect
-	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
-	github.com/OneOfOne/xxhash v1.2.2 // indirect
-	github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 // indirect
-	github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 // indirect
-	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
-	github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
-	github.com/andybalholm/brotli v1.0.4 // indirect
-	github.com/antihax/optional v1.0.0 // indirect
-	github.com/apache/arrow/go/v10 v10.0.1 // indirect
-	github.com/apache/arrow/go/v11 v11.0.0 // indirect
-	github.com/apache/thrift v0.16.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/boombuler/barcode v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/google/btree v1.0.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/google/flatbuffers v2.0.8+incompatible // indirect
+	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
-	github.com/google/gofuzz v1.0.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	github.com/google/martian v2.1.0+incompatible // indirect
+	google.golang.org/grpc v1.58.2 // 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
 )

histogram.go

@@ -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)
+	}
+}

prometheus.go

@@ -2,10 +2,10 @@ package prometheus
 
 import (
 	"fmt"
-	"hash/fnv"
 	"io"
 	"regexp"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -13,274 +13,195 @@ import (
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
 	"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{}
+var _ meter.Meter = (*prometheusMeter)(nil)
 
 type prometheusMeter struct {
 	opts         meter.Options
 	set          prometheus.Registerer
-	counter      *sync.Map
+	counter      map[uint64]*prometheusCounter
-	floatCounter *sync.Map
+	floatCounter map[uint64]*prometheusFloatCounter
-	gauge        *sync.Map
+	gauge        map[uint64]*prometheusGauge
-	histogram    *sync.Map
+	histogram    map[uint64]*prometheusHistogram
-	summary      *sync.Map
+	summary      map[uint64]*prometheusSummary
-	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 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.NewRegistry(), // prometheus.DefaultRegisterer,
 		opts:         meter.NewOptions(opts...),
-		counter:      &sync.Map{},
+		counter:      make(map[uint64]*prometheusCounter),
-		floatCounter: &sync.Map{},
+		floatCounter: make(map[uint64]*prometheusFloatCounter),
-		gauge:        &sync.Map{},
+		gauge:        make(map[uint64]*prometheusGauge),
-		histogram:    &sync.Map{},
+		histogram:    make(map[uint64]*prometheusHistogram),
-		summary:      &sync.Map{},
+		summary:      make(map[uint64]*prometheusSummary),
+		mfPool: xpool.NewPool[*dto.MetricFamily](func() *dto.MetricFamily {
+			return &dto.MetricFamily{}
+		}),
 	}
 }
 
-func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
-	if len(m.opts.MetricPrefix) > 0 {
-		name = m.opts.MetricPrefix + name
-	}
-
-	nl := len(m.opts.Labels) + len(labels)
-	if nl == 0 {
-		return name
-	}
-
-	nlabels := make([]string, 0, nl)
-	nlabels = append(nlabels, m.opts.Labels...)
-	nlabels = append(nlabels, labels...)
-
-	if len(m.opts.LabelPrefix) == 0 {
-		return meter.BuildName(name, nlabels...)
-	}
-
-	for idx := 0; idx < nl; idx += 2 {
-		nlabels[idx] = m.opts.LabelPrefix + nlabels[idx]
-	}
-	return meter.BuildName(name, nlabels...)
-}
-
-func (m *prometheusMeter) buildName(name string) string {
-	if len(m.opts.MetricPrefix) > 0 {
-		name = m.opts.MetricPrefix + name
-	}
-	return name
-}
-
-func (m *prometheusMeter) buildLabels(labels ...string) []string {
-	nl := len(labels)
-	if nl == 0 {
-		return nil
-	}
-
-	nlabels := make([]string, 0, nl)
-
-	for idx := 0; idx < nl; idx += 2 {
-		nlabels = append(nlabels, m.opts.LabelPrefix+labels[idx])
-		nlabels = append(nlabels, labels[idx+1])
-	}
-	return nlabels
-}
-
 func (m *prometheusMeter) Name() string {
 	return m.opts.Name
 }
 
 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)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...) // TODO: Read prometheus.go:128
+	c, ok := m.counter[h]
-	vcd, ok := m.counter.Load(nm)
+	// fmt.Printf("counter name %s hash %v labels %v\n", name, h, labels)
-	h := newHash(labels)
+	m.mu.Unlock()
 	if !ok {
-		cd := &counters{cs: &sync.Map{}}
+		var n float64
-		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		c = &prometheusCounter{
-		cd.cs.Store(h, c)
+			name: name,
-		m.counter.Store(nm, cd)
+			c: &dto.Metric{
-		return c
+				Gauge: &dto.Gauge{Value: &n},
+				Label: labelMetric(clabels),
+			},
 		}
-	cd := vcd.(*counters)
+		m.mu.Lock()
-	vc, ok := cd.cs.Load(h)
+		m.counter[h] = c
-	if !ok {
+		m.mu.Unlock()
-		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()
+	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	defer m.Unlock()
+	h := newHash(name, clabels)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	c, ok := m.floatCounter[h]
-	vcd, ok := m.floatCounter.Load(nm)
+	m.mu.Unlock()
-	h := newHash(labels)
 	if !ok {
-		cd := &floatCounters{cs: &sync.Map{}}
+		var n float64
-		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		c = &prometheusFloatCounter{
-		cd.cs.Store(h, c)
+			name: name,
-		m.floatCounter.Store(nm, cd)
+			c: &dto.Metric{
-		return c
+				Gauge: &dto.Gauge{Value: &n},
+				Label: labelMetric(clabels),
+			},
 		}
-	cd := vcd.(*floatCounters)
+		m.mu.Lock()
-	vc, ok := cd.cs.Load(h)
+		m.floatCounter[h] = c
-	if !ok {
+		m.mu.Unlock()
-		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()
+	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	defer m.Unlock()
+	h := newHash(name, clabels)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	c, ok := m.gauge[h]
-	vcd, ok := m.gauge.Load(nm)
+	m.mu.Unlock()
-	h := newHash(labels)
 	if !ok {
-		cd := &gauges{cs: &sync.Map{}}
+		var n float64
-		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		c = &prometheusGauge{
-		cd.cs.Store(h, c)
+			name: name,
-		m.gauge.Store(nm, cd)
+			c: &dto.Metric{
-		return c
+				Gauge: &dto.Gauge{Value: &n},
+				Label: labelMetric(clabels),
+			},
 		}
-	cd := vcd.(*gauges)
+		m.mu.Lock()
-	vc, ok := cd.cs.Load(h)
+		m.gauge[h] = c
-	if !ok {
+		m.mu.Unlock()
-		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()
+	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	defer m.Unlock()
+	h := newHash(name, clabels)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	c, ok := m.histogram[h]
-	vcd, ok := m.histogram.Load(nm)
+	m.mu.Unlock()
-	h := newHash(labels)
 	if !ok {
-		cd := &histograms{cs: &sync.Map{}}
+		var n uint64
-		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
+		var s float64
-		cd.cs.Store(h, c)
+		buckets := make([]float64, len(prometheus.DefBuckets))
-		m.histogram.Store(nm, 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),
 		}
-	cd := vcd.(*histograms)
+		for idx, b := range buckets {
-	vc, ok := cd.cs.Load(h)
+			var cc uint64
-	if !ok {
+			mdto.Histogram.Bucket[idx] = &dto.Bucket{CumulativeCount: &cc, UpperBound: &b}
-		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
+		}
-		cd.cs.Store(h, c)
+		c = &prometheusHistogram{
-		m.histogram.Store(nm, cd)
+			name: name,
-		return c
+			c:    mdto,
+		}
+		m.mu.Lock()
+		m.histogram[h] = c
+		m.mu.Unlock()
 	}
-	c := vc.(*prometheusHistogram)
 	return c
 }
 
 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)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	c, ok := m.summary[h]
-	vcd, ok := m.summary.Load(nm)
+	m.mu.Unlock()
-	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		var n uint64
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
+		var s float64
-		cd.cs.Store(h, c)
+		c = &prometheusSummary{
-		m.summary.Store(nm, cd)
+			name: name,
-		return c
+			c: &dto.Metric{
+				Summary: &dto.Summary{
+					SampleCount:      &n,
+					SampleSum:        &s,
+					CreatedTimestamp: timestamppb.Now(),
+				},
+				Label: labelMetric(clabels),
+			},
 		}
-	cd := vcd.(*summaries)
+		m.mu.Lock()
-	vc, ok := cd.cs.Load(h)
+		m.summary[h] = c
-	if !ok {
+		m.mu.Unlock()
-		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()
+	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	defer m.Unlock()
+	h := newHash(name, clabels)
-	nm := m.buildName(name)
+	m.mu.Lock()
-	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	c, ok := m.summary[h]
-	vcd, ok := m.summary.Load(nm)
+	m.mu.Lock()
-	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		var n uint64
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
+		var s float64
-			Name:       nm,
+		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(nm, cd)
+					SampleSum:   &s,
-		return c
+				},
+				Label: labelMetric(clabels),
+			},
 		}
-	cd := vcd.(*summaries)
+		m.mu.Lock()
-	vc, ok := cd.cs.Load(h)
+		m.summary[h] = c
-	if !ok {
+		m.mu.Unlock()
-		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
 }
 
@@ -317,98 +238,64 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 
 	enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
 
-	m.counter.Range(func(k, v any) bool {
+	m.mu.Lock()
-		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 {
+	for _, mc := range m.counter {
-		name := k.(string)
+		mf := m.mfPool.Get()
-		mf := &dto.MetricFamily{
+		mf.Name = &mc.name
-			Name: newString(name),
+		mf.Type = dto.MetricType_GAUGE.Enum()
-			Type: dto.MetricType_GAUGE.Enum(),
+		n := getFloat64(&(mc.n))
-		}
+		mc.c.Gauge.Value = &n
-		v.(*gauges).cs.Range(func(_, nv any) bool {
+		mf.Metric = append(mf.Metric, mc.c)
-			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 {
+	for _, mc := range m.floatCounter {
-		name := k.(string)
+		mf := m.mfPool.Get()
-		mf := &dto.MetricFamily{
+		mf.Name = &mc.name
-			Name: newString(name),
+		mf.Type = dto.MetricType_GAUGE.Enum()
-			Type: dto.MetricType_GAUGE.Enum(),
+		n := getFloat64(&(mc.n))
-		}
+		mc.c.Gauge.Value = &n
-		v.(*floatCounters).cs.Range(func(_, nv any) bool {
+		mf.Metric = append(mf.Metric, mc.c)
-			c := nv.(*prometheusFloatCounter)
-			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 {
+	for _, mc := range m.gauge {
-		name := k.(string)
+		mf := m.mfPool.Get()
-		mf := &dto.MetricFamily{
+		mf.Name = &mc.name
-			Name: newString(name),
+		mf.Type = dto.MetricType_GAUGE.Enum()
-			Type: dto.MetricType_HISTOGRAM.Enum(),
+		n := getFloat64(&(mc.n))
-		}
+		mc.c.Gauge.Value = &n
-		v.(*histograms).cs.Range(func(_, nv any) bool {
+		mf.Metric = append(mf.Metric, mc.c)
-			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 {
+	for _, c := range m.histogram {
-		name := k.(string)
+		mf := m.mfPool.Get()
-		mf := &dto.MetricFamily{
+		mf.Name = &c.name
-			Name: newString(name),
+		mf.Type = dto.MetricType_HISTOGRAM.Enum()
-			Type: dto.MetricType_SUMMARY.Enum(),
+		mf.Metric = append(mf.Metric, c.c)
-		}
-		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 _, mc := range m.summary {
+		mf := m.mfPool.Get()
+		mf.Name = &mc.name
+		mf.Type = dto.MetricType_SUMMARY.Enum()
+		sc := atomic.LoadUint64(&(mc.sampleCount))
+		mc.c.Summary.SampleCount = &sc
+		ss := getFloat64(&(mc.SampleSum))
+		mc.c.Summary.SampleSum = &ss
+		mf.Metric = append(mf.Metric, mc.c)
+		mfs = append(mfs, mf)
+	}
+
+	m.mu.Unlock()
 
 	for _, mf := range mfs {
 		_ = enc.Encode(mf)
+		mf.Reset()
+		m.mfPool.Put(mf)
 	}
 
 	if closer, ok := enc.(io.Closer); ok {
@@ -452,124 +339,30 @@ func (m *prometheusMeter) Set(opts ...meter.Option) meter.Meter {
 	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:  newString(labels[idx]),
-			Value: newString(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
 }

prometheus_test.go

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

summary.go

@@ -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)
+}