Merge pull request 'micro v4 options fix' (#107) from options into master

Reviewed-on: #107

go.mod

@@ -1,25 +1,20 @@
-module go.unistack.org/micro-meter-prometheus/v3
+module go.unistack.org/micro-meter-prometheus/v4
 
-go 1.21
+go 1.20
-
-toolchain go1.22.0
 
 require (
-	github.com/prometheus/client_golang v1.20.4
+	github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/client_model v0.4.0
-	github.com/prometheus/common v0.59.1
+	github.com/prometheus/common v0.44.0
-	go.unistack.org/micro/v3 v3.10.91
+	go.unistack.org/micro/v4 v4.0.7
 )
 
 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/golang/protobuf v1.5.3 // 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.11.1 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
+	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/grpc v1.57.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
 )

go.sum

@@ -1,46 +1,50 @@
 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/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-go.unistack.org/micro/v3 v3.10.90 h1:EE7t4J14yjZC/lW6e0BfiBnU/xt/KqGkqSxumJhI/fI=
+github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
-go.unistack.org/micro/v3 v3.10.90/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+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/common v0.41.0 h1:npo01n6vUlRViIj5fgwiK8vlNIh8bnoxqh3gypKsyAw=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
+go.unistack.org/micro/v4 v4.0.7 h1:2lwtZlHcSwgkahhFbkI4x1lOS79lw8uLHtcEhlFF+AM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+go.unistack.org/micro/v4 v4.0.7/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
-google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+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=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

prometheus.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"hash/fnv"
 	"io"
-	"regexp"
 	"sync"
 	"time"
 
@@ -12,54 +11,111 @@ import (
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/options"
 )
 
-var _ meter.Meter = (*prometheusMeter)(nil)
+var _ meter.Meter = &prometheusMeter{}
 
 type prometheusMeter struct {
 	opts         meter.Options
 	set          prometheus.Registerer
-	counter      *sync.Map
+	counter      map[string]*counters
-	floatCounter *sync.Map
+	floatCounter map[string]*floatCounters
-	gauge        *sync.Map
+	gauge        map[string]*gauges
-	histogram    *sync.Map
+	histogram    map[string]*histograms
-	summary      *sync.Map
+	summary      map[string]*summaries
 	sync.Mutex
 }
 
 type counters struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusCounter
 }
 
 type gauges struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusGauge
 }
 
 type histograms struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusHistogram
 }
 
 type summaries struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusSummary
 }
 
 type floatCounters struct {
-	cs *sync.Map
+	cs map[uint64]*prometheusFloatCounter
 }
 
-func NewMeter(opts ...meter.Option) *prometheusMeter {
+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:      &sync.Map{},
+		counter:      make(map[string]*counters),
-		floatCounter: &sync.Map{},
+		floatCounter: make(map[string]*floatCounters),
-		gauge:        &sync.Map{},
+		gauge:        make(map[string]*gauges),
-		histogram:    &sync.Map{},
+		histogram:    make(map[string]*histograms),
-		summary:      &sync.Map{},
+		summary:      make(map[string]*summaries),
 	}
 }
 
+func (m *prometheusMeter) buildMetric(name string, labels ...string) string {
+	if len(m.opts.MetricPrefix) > 0 {
+		name = m.opts.MetricPrefix + name
+	}
+
+	nl := len(m.opts.Labels) + len(labels)
+	if nl == 0 {
+		return name
+	}
+
+	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
 }
@@ -67,182 +123,167 @@ func (m *prometheusMeter) Name() string {
 func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.counter.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.counter[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &counters{cs: &sync.Map{}}
+		cd = &counters{cs: make(map[uint64]*prometheusCounter)}
-		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.counter.Store(name, cd)
+		m.counter[nm] = cd
 		return c
 	}
-	cd := vcd.(*counters)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c = &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.counter.Store(name, cd)
+		m.counter[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusCounter)
 	return c
 }
 
 func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.floatCounter.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.floatCounter[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &floatCounters{cs: &sync.Map{}}
+		cd = &floatCounters{cs: make(map[uint64]*prometheusFloatCounter)}
-		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.floatCounter.Store(name, cd)
+		m.floatCounter[nm] = cd
 		return c
 	}
-	cd := vcd.(*floatCounters)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c = &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.floatCounter.Store(name, cd)
+		m.floatCounter[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusFloatCounter)
 	return c
 }
 
 func (m *prometheusMeter) Gauge(name string, fn func() float64, labels ...string) meter.Gauge {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.gauge.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.gauge[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &gauges{cs: &sync.Map{}}
+		cd = &gauges{cs: make(map[uint64]*prometheusGauge)}
-		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.gauge.Store(name, cd)
+		m.gauge[nm] = cd
 		return c
 	}
-	cd := vcd.(*gauges)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: name}), labels: labels}
+		c = &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.gauge.Store(name, cd)
+		m.gauge[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusGauge)
 	return c
 }
 
 func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.histogram.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.histogram[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &histograms{cs: &sync.Map{}}
+		cd = &histograms{cs: make(map[uint64]*prometheusHistogram)}
-		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
+		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.histogram.Store(name, cd)
+		m.histogram[nm] = cd
 		return c
 	}
-	cd := vcd.(*histograms)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: name}), labels: labels}
+		c = &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.histogram.Store(name, cd)
+		m.histogram[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusHistogram)
 	return c
 }
 
 func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.summary.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.summary[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
+		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.summary.Store(name, cd)
+		m.summary[nm] = cd
 		return c
 	}
-	cd := vcd.(*summaries)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: name}), labels: labels}
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
-		cd.cs.Store(h, c)
+		cd.cs[h] = c
-		m.summary.Store(name, cd)
+		m.summary[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusSummary)
 	return c
 }
 
 func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantiles []float64, labels ...string) meter.Summary {
 	m.Lock()
 	defer m.Unlock()
-	labels = append(m.opts.Labels, labels...)
+	nm := m.buildName(name)
-	vcd, ok := m.summary.Load(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.summary[nm]
 	h := newHash(labels)
 	if !ok {
-		cd := &summaries{cs: &sync.Map{}}
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
 		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
-			Name:       name,
+			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)
+		cd.cs[h] = c
-		m.summary.Store(name, cd)
+		m.summary[nm] = cd
 		return c
 	}
-	cd := vcd.(*summaries)
+	c, ok := cd.cs[h]
-	vc, ok := cd.cs.Load(h)
 	if !ok {
-		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
-			Name:       name,
+			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)
+		cd.cs[h] = c
-		m.summary.Store(name, cd)
+		m.summary[nm] = cd
-		return c
 	}
-	c := vc.(*prometheusSummary)
 	return c
 }
 
-func (m *prometheusMeter) Init(opts ...meter.Option) error {
+func (m *prometheusMeter) Init(opts ...options.Option) error {
 	for _, o := range opts {
 		o(&m.opts)
 	}
-
-	if m.opts.WriteProcessMetrics || m.opts.WriteFDMetrics {
-		pc := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
-		_ = m.set.Register(pc)
-		gc := collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile("/.*")}))
-		_ = m.set.Register(gc)
-	}
-
 	return nil
 }
 
-func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
+func (m *prometheusMeter) Write(w io.Writer, opts ...options.Option) error {
 	options := m.opts
 	for _, o := range opts {
 		o(&options)
 	}
 
+	if options.WriteProcessMetrics || options.WriteFDMetrics {
+		c := collectors.NewProcessCollector(collectors.ProcessCollectorOpts{})
+		_ = m.set.Register(c)
+	}
+
 	g, ok := m.set.(prometheus.Gatherer)
 	if !ok {
 		return fmt.Errorf("set type %T not prometheus.Gatherer", m.set)
@@ -253,97 +294,82 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 		return err
 	}
 
-	enc := expfmt.NewEncoder(w, expfmt.NewFormat(expfmt.TypeTextPlain))
+	enc := expfmt.NewEncoder(w, expfmt.FmtText)
 
-	m.counter.Range(func(k, v any) bool {
+	for name, metrics := range m.counter {
-		name := k.(string)
 		mf := &dto.MetricFamily{
-			Name: &name,
+			Name:   newString(name),
 			Type:   dto.MetricType_GAUGE.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*counters).cs.Range(func(_, nv any) bool {
+		for _, c := range metrics.cs {
-			c := nv.(*prometheusCounter)
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
-		})
-		mfs = append(mfs, mf)
-		return true
-	})
-
-	m.gauge.Range(func(k, v any) bool {
-		name := k.(string)
-		mf := &dto.MetricFamily{
-			Name: &name,
-			Type: dto.MetricType_GAUGE.Enum(),
 		}
-		v.(*gauges).cs.Range(func(_, nv any) bool {
+		mfs = append(mfs, mf)
-			c := nv.(*prometheusGauge)
+	}
+
+	for name, metrics := range m.gauge {
+		mf := &dto.MetricFamily{
+			Name:   newString(name),
+			Type:   dto.MetricType_GAUGE.Enum(),
+			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)
-			return true
-		})
-		mfs = append(mfs, mf)
-		return true
-	})
-
-	m.floatCounter.Range(func(k, v any) bool {
-		name := k.(string)
-		mf := &dto.MetricFamily{
-			Name: &name,
-			Type: dto.MetricType_GAUGE.Enum(),
 		}
-		v.(*floatCounters).cs.Range(func(_, nv any) bool {
+		mfs = append(mfs, mf)
-			c := nv.(*prometheusFloatCounter)
+	}
+
+	for name, metrics := range m.floatCounter {
+		mf := &dto.MetricFamily{
+			Name:   newString(name),
+			Type:   dto.MetricType_GAUGE.Enum(),
+			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)
-			return true
+		}
-		})
 		mfs = append(mfs, mf)
-		return true
+	}
-	})
 
-	m.histogram.Range(func(k, v any) bool {
+	for name, metrics := range m.histogram {
-		name := k.(string)
 		mf := &dto.MetricFamily{
-			Name: &name,
+			Name:   newString(name),
 			Type:   dto.MetricType_HISTOGRAM.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*histograms).cs.Range(func(_, nv any) bool {
+		for _, c := range metrics.cs {
-			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 name, metrics := range m.summary {
-		name := k.(string)
 		mf := &dto.MetricFamily{
-			Name: &name,
+			Name:   newString(name),
 			Type:   dto.MetricType_SUMMARY.Enum(),
+			Metric: make([]*dto.Metric, 0, len(metrics.cs)),
 		}
-		v.(*summaries).cs.Range(func(_, nv any) bool {
+		for _, c := range metrics.cs {
-			c := nv.(*prometheusSummary)
 			m := &dto.Metric{}
 			_ = c.c.Write(m)
 			fillMetric(m, c.labels)
 			mf.Metric = append(mf.Metric, m)
-			return true
+		}
-		})
 		mfs = append(mfs, mf)
-		return true
+	}
-	})
 
 	for _, mf := range mfs {
 		_ = enc.Encode(mf)
@@ -356,7 +382,7 @@ 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)
@@ -381,7 +407,7 @@ 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)
@@ -496,18 +522,12 @@ func newHash(labels []string) uint64 {
 }
 
 func fillMetric(m *dto.Metric, labels []string) *dto.Metric {
-	var ok bool
-	seen := make(map[string]bool, len(labels)/2)
 	m.Label = make([]*dto.LabelPair, 0, len(labels)/2)
 	for idx := 0; idx < len(labels); idx += 2 {
-		if _, ok = seen[labels[idx]]; ok {
-			continue
-		}
 		m.Label = append(m.Label, &dto.LabelPair{
-			Name:  &(labels[idx]),
+			Name:  newString(labels[idx]),
-			Value: &(labels[idx+1]),
+			Value: newString(labels[idx+1]),
 		})
-		seen[labels[idx]] = true
 	}
 	return m
 }

prometheus_test.go

@@ -5,29 +5,37 @@ import (
 	"context"
 	"testing"
 
-	"go.unistack.org/micro/v3/client"
+	"go.unistack.org/micro/v4/client"
-	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v3/meter"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/meter/wrapper"
 )
 
-func TestStd(t *testing.T) {
+func TestBuildName(t *testing.T) {
-	m := NewMeter(meter.WriteProcessMetrics(true), meter.WriteFDMetrics(true))
+	m := NewMeter()
-	if err := m.Init(); err != nil {
+	check := `micro_foo{micro_aaa="b",micro_bar="baz",micro_ccc="d"}`
-		t.Fatal(err)
+	name := m.buildMetric("foo", "bar", "baz", "aaa", "b", "ccc", "d")
-	}
+	if name != check {
-	buf := bytes.NewBuffer(nil)
+		t.Fatalf("metric name error: %s != %s", name, check)
-	_ = m.Write(buf)
-	if !bytes.Contains(buf.Bytes(), []byte(`go_goroutine`)) {
-		t.Fatalf("invalid metrics output: %s", buf.Bytes())
 	}
+
+	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.Meter(m))
+	c := client.NewClient(client.Wrap(w))
 	if err := c.Init(); err != nil {
 		t.Fatal(err)
 	}
@@ -37,7 +45,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())
 	}
 }
@@ -45,17 +53,17 @@ 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.Fatal("XXXX")
 		t.Fatalf("invalid metrics output: %s", buf.Bytes())
 	}