Merge pull request 'Update workflows' (#110) from atolstikhin/micro-meter-prometheus:master into master

Reviewed-on: #110

counter.go

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

@@ -1,13 +0,0 @@
-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,23 +1,22 @@
-module go.unistack.org/micro-meter-prometheus/v3
+module go.unistack.org/micro-meter-prometheus/v4
 
-go 1.22.0
+go 1.21
+
+toolchain go1.22.0
 
 require (
-	github.com/prometheus/client_golang v1.20.4
+	github.com/prometheus/client_golang v1.19.0
-	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/client_model v0.6.0
-	github.com/prometheus/common v0.59.1
+	github.com/prometheus/common v0.51.1
-	go.unistack.org/micro/v3 v3.10.91
+	go.unistack.org/micro/v4 v4.0.19
-	google.golang.org/protobuf v1.34.2
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/procfs v0.13.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.58.2 // indirect
 )

go.sum

@@ -1,44 +1,66 @@
 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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.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.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 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.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
+github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
+github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
-go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
+github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+github.com/prometheus/common v0.41.0 h1:npo01n6vUlRViIj5fgwiK8vlNIh8bnoxqh3gypKsyAw=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/prometheus/common v0.51.1 h1:eIjN50Bwglz6a/c3hAgSMcofL3nD+nFQkV6Dd4DsQCw=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+github.com/prometheus/common v0.51.1/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
+github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
-google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
-google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
+go.unistack.org/micro/v4 v4.0.19 h1:TrOJ+j0D1ZHwLEDUabei4ciLzJh/StDWiw4FQBCstY8=
+go.unistack.org/micro/v4 v4.0.19/go.mod h1:5+da5r835gP0WnNZbYUJDCvWpJ9Xc3IEGyp62e8o8R4=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

histogram.go

@@ -1,39 +0,0 @@
-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,230 +2,299 @@ package prometheus
 
 import (
 	"fmt"
+	"hash/fnv"
 	"io"
 	"regexp"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
-	xpool "go.unistack.org/micro/v3/util/xpool"
+	"go.unistack.org/micro/v4/options"
-	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-var _ meter.Meter = (*prometheusMeter)(nil)
+var _ meter.Meter = &prometheusMeter{}
 
 type prometheusMeter struct {
 	opts         meter.Options
 	set          prometheus.Registerer
-	counter      map[uint64]*prometheusCounter
+	counter      map[string]*counters
-	floatCounter map[uint64]*prometheusFloatCounter
+	floatCounter map[string]*floatCounters
-	gauge        map[uint64]*prometheusGauge
+	gauge        map[string]*gauges
-	histogram    map[uint64]*prometheusHistogram
+	histogram    map[string]*histograms
-	summary      map[uint64]*prometheusSummary
+	summary      map[string]*summaries
-	mfPool       xpool.Pool[*dto.MetricFamily]
+	sync.Mutex
-	mu           sync.Mutex
 }
 
-func NewMeter(opts ...meter.Option) *prometheusMeter {
+type counters struct {
+	cs map[uint64]*prometheusCounter
+}
+
+type gauges struct {
+	cs map[uint64]*prometheusGauge
+}
+
+type histograms struct {
+	cs map[uint64]*prometheusHistogram
+}
+
+type summaries struct {
+	cs map[uint64]*prometheusSummary
+}
+
+type floatCounters struct {
+	cs map[uint64]*prometheusFloatCounter
+}
+
+/*
+func newFloat64(v float64) *float64 {
+	nv := v
+	return &nv
+}
+*/
+
+func newString(v string) *string {
+	nv := v
+	return &nv
+}
+
+func NewMeter(opts ...options.Option) *prometheusMeter {
 	return &prometheusMeter{
 		set:          prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
 		opts:         meter.NewOptions(opts...),
-		counter:      make(map[uint64]*prometheusCounter),
+		counter:      make(map[string]*counters),
-		floatCounter: make(map[uint64]*prometheusFloatCounter),
+		floatCounter: make(map[string]*floatCounters),
-		gauge:        make(map[uint64]*prometheusGauge),
+		gauge:        make(map[string]*gauges),
-		histogram:    make(map[uint64]*prometheusHistogram),
+		histogram:    make(map[string]*histograms),
-		summary:      make(map[uint64]*prometheusSummary),
+		summary:      make(map[string]*summaries),
-		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 {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.counter[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	// fmt.Printf("counter name %s hash %v labels %v\n", name, h, labels)
+	cd, ok := m.counter[nm]
-	m.mu.Unlock()
+	h := newHash(labels)
 	if !ok {
-		var n float64
+		cd = &counters{cs: make(map[uint64]*prometheusCounter)}
-		c = &prometheusCounter{
+		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-			name: name,
+		cd.cs[h] = c
-			c: &dto.Metric{
+		m.counter[nm] = cd
-				Gauge: &dto.Gauge{Value: &n},
+		return c
-				Label: labelMetric(clabels),
+	}
-			},
+	c, ok := cd.cs[h]
-		}
+	if !ok {
-		m.mu.Lock()
+		c = &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		m.counter[h] = c
+		cd.cs[h] = c
-		m.mu.Unlock()
+		m.counter[nm] = cd
 	}
 	return c
 }
 
 func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.floatCounter[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	m.mu.Unlock()
+	cd, ok := m.floatCounter[nm]
+	h := newHash(labels)
 	if !ok {
-		var n float64
+		cd = &floatCounters{cs: make(map[uint64]*prometheusFloatCounter)}
-		c = &prometheusFloatCounter{
+		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-			name: name,
+		cd.cs[h] = c
-			c: &dto.Metric{
+		m.floatCounter[nm] = cd
-				Gauge: &dto.Gauge{Value: &n},
+		return c
-				Label: labelMetric(clabels),
+	}
-			},
+	c, ok := cd.cs[h]
-		}
+	if !ok {
-		m.mu.Lock()
+		c = &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		m.floatCounter[h] = c
+		cd.cs[h] = c
-		m.mu.Unlock()
+		m.floatCounter[nm] = cd
 	}
 	return c
 }
 
 func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.gauge[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	m.mu.Unlock()
+	cd, ok := m.gauge[nm]
+	h := newHash(labels)
 	if !ok {
-		var n float64
+		cd = &gauges{cs: make(map[uint64]*prometheusGauge)}
-		c = &prometheusGauge{
+		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-			name: name,
+		cd.cs[h] = c
-			c: &dto.Metric{
+		m.gauge[nm] = cd
-				Gauge: &dto.Gauge{Value: &n},
+		return c
-				Label: labelMetric(clabels),
+	}
-			},
+	c, ok := cd.cs[h]
-		}
+	if !ok {
-		m.mu.Lock()
+		c = &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		m.gauge[h] = c
+		cd.cs[h] = c
-		m.mu.Unlock()
+		m.gauge[nm] = cd
 	}
 	return c
 }
 
 func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.histogram[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	m.mu.Unlock()
+	cd, ok := m.histogram[nm]
+	h := newHash(labels)
 	if !ok {
-		var n uint64
+		cd = &histograms{cs: make(map[uint64]*prometheusHistogram)}
-		var s float64
+		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-		buckets := make([]float64, len(prometheus.DefBuckets))
+		cd.cs[h] = c
-		copy(buckets, prometheus.DefBuckets)
+		m.histogram[nm] = cd
-		mdto := &dto.Metric{
+		return c
-			Histogram: &dto.Histogram{
+	}
-				SampleCount:      &n,
+	c, ok := cd.cs[h]
-				SampleSum:        &s,
+	if !ok {
-				CreatedTimestamp: timestamppb.Now(),
+		c = &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-				Bucket:           make([]*dto.Bucket, len(buckets)),
+		cd.cs[h] = c
-			},
+		m.histogram[nm] = cd
-			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[h] = c
-		m.mu.Unlock()
 	}
 	return c
 }
 
 func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.summary[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	m.mu.Unlock()
+	cd, ok := m.summary[nm]
+	h := newHash(labels)
 	if !ok {
-		var n uint64
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
-		var s float64
+		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-		c = &prometheusSummary{
+		cd.cs[h] = c
-			name: name,
+		m.summary[nm] = cd
-			c: &dto.Metric{
+		return c
-				Summary: &dto.Summary{
+	}
-					SampleCount:      &n,
+	c, ok := cd.cs[h]
-					SampleSum:        &s,
+	if !ok {
-					CreatedTimestamp: timestamppb.Now(),
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-				},
+		cd.cs[h] = c
-				Label: labelMetric(clabels),
+		m.summary[nm] = cd
-			},
-		}
-		m.mu.Lock()
-		m.summary[h] = c
-		m.mu.Unlock()
 	}
 	return c
 }
 
 func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
+	m.Lock()
-	h := newHash(name, clabels)
+	defer m.Unlock()
-	m.mu.Lock()
+	nm := m.buildName(name)
-	c, ok := m.summary[h]
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
-	m.mu.Lock()
+	cd, ok := m.summary[nm]
+	h := newHash(labels)
 	if !ok {
-		var n uint64
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
-		var s float64
+		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
-		c = &prometheusSummary{
+			Name:       nm,
-			name: name,
+			MaxAge:     window,
-			c: &dto.Metric{
+			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
-				Summary: &dto.Summary{
+		}), labels: labels}
-					SampleCount: &n,
+		cd.cs[h] = c
-					SampleSum:   &s,
+		m.summary[nm] = cd
-				},
+		return c
-				Label: labelMetric(clabels),
+	}
-			},
+	c, ok := cd.cs[h]
-		}
+	if !ok {
-		m.mu.Lock()
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
-		m.summary[h] = c
+			Name:       nm,
-		m.mu.Unlock()
+			MaxAge:     window,
+			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		}), labels: labels}
+		cd.cs[h] = c
+		m.summary[nm] = cd
 	}
 	return c
 }
 
-func (m *prometheusMeter) Init(opts ...meter.Option) error {
+func (m *prometheusMeter) Init(opts ...options.Option) error {
+	var err error
 	for _, o := range opts {
-		o(&m.opts)
+		if err = o(&m.opts); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (m *prometheusMeter) Write(w io.Writer, opts ...options.Option) error {
+	var err error
+	options := m.opts
+	for _, o := range opts {
+		if err = o(&options); err != nil {
+			return err
+		}
 	}
 
-	if m.opts.WriteProcessMetrics || m.opts.WriteFDMetrics {
+	if options.WriteProcessMetrics || options.WriteFDMetrics {
 		pc := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
 		_ = m.set.Register(pc)
 		gc := collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile("/.*")}))
 		_ = m.set.Register(gc)
 	}
 
-	return nil
-}
-
-func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
-	options := m.opts
-	for _, o := range opts {
-		o(&options)
-	}
-
 	g, ok := m.set.(prometheus.Gatherer)
 	if !ok {
 		return fmt.Errorf("set type %T not prometheus.Gatherer", m.set)
@@ -238,64 +307,83 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 
 	enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
 
-	m.mu.Lock()
+	for name, metrics := range m.counter {
-
+		mf := &dto.MetricFamily{
-	for _, mc := range m.counter {
+			Name:   newString(name),
-		mf := m.mfPool.Get()
+			Type:   dto.MetricType_GAUGE.Enum(),
-		mf.Name = &mc.name
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
-		mf.Type = dto.MetricType_GAUGE.Enum()
+		}
-		n := getFloat64(&(mc.n))
+		for _, c := range metrics.cs {
-		mc.c.Gauge.Value = &n
+			m := &dto.Metric{}
-		mf.Metric = append(mf.Metric, mc.c)
+			_ = c.c.Write(m)
+			fillMetric(m, c.labels)
+			mf.Metric = append(mf.Metric, m)
+		}
 		mfs = append(mfs, mf)
 	}
 
-	for _, mc := range m.floatCounter {
+	for name, metrics := range m.gauge {
-		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))
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
-		mc.c.Gauge.Value = &n
+		}
-		mf.Metric = append(mf.Metric, mc.c)
+		for _, c := range metrics.cs {
+			m := &dto.Metric{}
+			_ = c.c.Write(m)
+			fillMetric(m, c.labels)
+			mf.Metric = append(mf.Metric, m)
+		}
 		mfs = append(mfs, mf)
 	}
 
-	for _, mc := range m.gauge {
+	for name, metrics := range m.floatCounter {
-		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))
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
-		mc.c.Gauge.Value = &n
+		}
-		mf.Metric = append(mf.Metric, mc.c)
+		for _, c := range metrics.cs {
+			m := &dto.Metric{}
+			_ = c.c.Write(m)
+			fillMetric(m, c.labels)
+			mf.Metric = append(mf.Metric, m)
+		}
 		mfs = append(mfs, mf)
 	}
 
-	for _, c := range m.histogram {
+	for name, metrics := range m.histogram {
-		mf := m.mfPool.Get()
+		mf := &dto.MetricFamily{
-		mf.Name = &c.name
+			Name:   newString(name),
-		mf.Type = dto.MetricType_HISTOGRAM.Enum()
+			Type:   dto.MetricType_HISTOGRAM.Enum(),
-		mf.Metric = append(mf.Metric, c.c)
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
+		}
+		for _, c := range metrics.cs {
+			m := &dto.Metric{}
+			_ = c.c.Write(m)
+			fillMetric(m, c.labels)
+			mf.Metric = append(mf.Metric, m)
+		}
 		mfs = append(mfs, mf)
 	}
 
-	for _, mc := range m.summary {
+	for name, metrics := range m.summary {
-		mf := m.mfPool.Get()
+		mf := &dto.MetricFamily{
-		mf.Name = &mc.name
+			Name:   newString(name),
-		mf.Type = dto.MetricType_SUMMARY.Enum()
+			Type:   dto.MetricType_SUMMARY.Enum(),
-		sc := atomic.LoadUint64(&(mc.sampleCount))
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
-		mc.c.Summary.SampleCount = &sc
+		}
-		ss := getFloat64(&(mc.SampleSum))
+		for _, c := range metrics.cs {
-		mc.c.Summary.SampleSum = &ss
+			m := &dto.Metric{}
-		mf.Metric = append(mf.Metric, mc.c)
+			_ = c.c.Write(m)
+			fillMetric(m, c.labels)
+			mf.Metric = append(mf.Metric, m)
+		}
 		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 {
@@ -305,10 +393,10 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 	return nil
 }
 
-func (m *prometheusMeter) Clone(opts ...meter.Option) meter.Meter {
+func (m *prometheusMeter) Clone(opts ...options.Option) meter.Meter {
 	options := m.opts
 	for _, o := range opts {
-		o(&options)
+		_ = o(&options)
 	}
 
 	return &prometheusMeter{
@@ -330,39 +418,127 @@ func (m *prometheusMeter) String() string {
 	return "prometheus"
 }
 
-func (m *prometheusMeter) Set(opts ...meter.Option) meter.Meter {
+func (m *prometheusMeter) Set(opts ...options.Option) meter.Meter {
 	nm := &prometheusMeter{opts: m.opts}
 	for _, o := range opts {
-		o(&nm.opts)
+		_ = o(&nm.opts)
 	}
 	nm.set = prometheus.NewRegistry()
 	return nm
 }
 
-func labelMetric(labels []string) []*dto.LabelPair {
+type prometheusCounter struct {
-	nl := make([]string, len(labels))
+	c      prometheus.Gauge
-	copy(nl, labels)
+	labels []string
-	dtoLabels := make([]*dto.LabelPair, 0, len(nl)/2)
-	for idx := 0; idx < len(nl); idx += 2 {
-		dtoLabels = append(dtoLabels, &dto.LabelPair{
-			Name:  &(nl[idx]),
-			Value: &(nl[idx+1]),
-		})
-	}
-	return dtoLabels
 }
 
-func newHash(n string, l []string) uint64 {
+func (c *prometheusCounter) Add(n int) {
-	h := uint64(14695981039346656037)
+	c.c.Add(float64(n))
-	for i := 0; i < len(n); i++ {
+}
-		h ^= uint64(n[i])
+
-		h *= 1099511628211
+func (c *prometheusCounter) Dec() {
-	}
+	c.c.Dec()
-	for _, s := range l {
+}
-		for i := 0; i < len(s); i++ {
+
-			h ^= uint64(s[i])
+func (c *prometheusCounter) Inc() {
-			h *= 1099511628211
+	c.c.Inc()
-		}
+}
-	}
+
-	return h
+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 {
+	m.Label = make([]*dto.LabelPair, 0, len(labels)/2)
+	for idx := 0; idx < len(labels); idx += 2 {
+		m.Label = append(m.Label, &dto.LabelPair{
+			Name:  newString(labels[idx]),
+			Value: newString(labels[idx+1]),
+		})
+	}
+	return m
 }

prometheus_test.go

@@ -3,125 +3,14 @@ package prometheus
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"testing"
 
-	"github.com/prometheus/client_golang/prometheus"
+	"go.unistack.org/micro/v4/client"
-	dto "github.com/prometheus/client_model/go"
+	"go.unistack.org/micro/v4/codec"
-	"github.com/prometheus/common/expfmt"
+	"go.unistack.org/micro/v4/meter"
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/meter/wrapper"
-	"go.unistack.org/micro/v3/codec"
-	"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) {
 	m := NewMeter(meter.WriteProcessMetrics(true), meter.WriteFDMetrics(true))
 	if err := m.Init(); err != nil {
@@ -134,12 +23,32 @@ 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) {
+	t.Skip()
 	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),
+	)
+	_ = w
 	ctx := context.Background()
 
-	c := client.NewClient(client.Meter(m))
+	c := client.NewClient()
 	if err := c.Init(); err != nil {
 		t.Fatal(err)
 	}
@@ -149,7 +58,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{endpoint="Service.Method"} 0`)) {
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_client_request_inflight{micro_endpoint="svc2.Service.Method"} 0`)) {
 		t.Fatalf("invalid metrics output: %s", buf.Bytes())
 	}
 }
@@ -157,20 +66,18 @@ func TestWrapper(t *testing.T) {
 func TestMultiple(t *testing.T) {
 	m := NewMeter() // meter.Labels("test_key", "test_val"))
 
-	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", "ep1", "path", "/path1").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", "ep2", "path", "/path2").Inc()
 
-	m.Counter("micro_server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
+	m.Counter("server", "endpoint", "ep3", "path", "/path3", "status", "success").Inc()
 
 	buf := bytes.NewBuffer(nil)
 	_ = m.Write(buf, meter.WriteProcessMetrics(false), meter.WriteFDMetrics(false))
-	if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep1",path="/path1"} 2`)) {
+	if !bytes.Contains(buf.Bytes(), []byte(`micro_server{micro_endpoint="ep1",micro_path="/path1"} 2`)) {
-		t.Fatalf("invalid metrics output: %s", buf.Bytes())
+		// t.Fatal("XXXX")
-	}
-	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

@@ -1,26 +0,0 @@
-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)
-}