Merge pull request 'move to micro v4' (#106) from v4 into master

Reviewed-on: #106

counter.go

@@ -1,91 +0,0 @@
-package prometheus
-
-import (
-	"math"
-	"sync/atomic"
-	"unsafe"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-type prometheusCounter struct {
-	name string
-	c    *dto.Metric
-}
-
-func (c *prometheusCounter) Add(n int) {
-	addFloat64(c.c.Gauge.Value, float64(n))
-}
-
-func (c *prometheusCounter) Dec() {
-	addFloat64(c.c.Gauge.Value, float64(-1))
-}
-
-func (c *prometheusCounter) Inc() {
-	addFloat64(c.c.Gauge.Value, float64(1))
-}
-
-func (c *prometheusCounter) Get() uint64 {
-	return uint64(getFloat64(c.c.Gauge.Value))
-}
-
-func (c *prometheusCounter) Set(n uint64) {
-	setFloat64(c.c.Gauge.Value, math.Float64frombits(n))
-}
-
-type prometheusFloatCounter struct {
-	name string
-	c    *dto.Metric
-}
-
-func (c *prometheusFloatCounter) Add(n float64) {
-	addFloat64(c.c.Gauge.Value, n)
-}
-
-func (c *prometheusFloatCounter) Dec() {
-	addFloat64(c.c.Gauge.Value, float64(-1))
-}
-
-func (c *prometheusFloatCounter) Inc() {
-	addFloat64(c.c.Gauge.Value, float64(1))
-}
-
-func (c *prometheusFloatCounter) Get() float64 {
-	return getFloat64(c.c.Gauge.Value)
-}
-
-func (c *prometheusFloatCounter) Set(n float64) {
-	setFloat64(c.c.Gauge.Value, n)
-}
-
-func (c *prometheusFloatCounter) Sub(n float64) {
-	addFloat64(c.c.Gauge.Value, -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,12 +0,0 @@
-package prometheus
-
-import dto "github.com/prometheus/client_model/go"
-
-type prometheusGauge struct {
-	name string
-	c    *dto.Metric
-}
-
-func (c prometheusGauge) Get() float64 {
-	return getFloat64(c.c.Gauge.Value)
-}

go.mod

@@ -1,23 +1,20 @@
-module go.unistack.org/micro-meter-prometheus/v3
+module go.unistack.org/micro-meter-prometheus/v4
 
-go 1.22.0
+go 1.20
 
 require (
-	github.com/prometheus/client_golang v1.20.4
-	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.59.1
-	go.unistack.org/micro/v3 v3.10.91
-	google.golang.org/protobuf v1.34.2
+	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_model v0.3.0
+	github.com/prometheus/common v0.39.0
+	go.unistack.org/micro/v4 v4.0.1
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.58.2 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -1,44 +1,31 @@
 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.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
-github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
-github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.10.91 h1:vuJY4tXwpqimwIkEJ3TozMYNVQQs+C5QMlQWPgSY/YM=
-go.unistack.org/micro/v3 v3.10.91/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
-google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
-google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+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.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
+github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

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,8 +2,8 @@ package prometheus
 
 import (
 	"fmt"
+	"hash/fnv"
 	"io"
-	"regexp"
 	"sync"
 	"time"
 
@@ -11,186 +11,264 @@ 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"
-	xpool "go.unistack.org/micro/v3/util/xpool"
-	"google.golang.org/protobuf/types/known/timestamppb"
+	"go.unistack.org/micro/v4/meter"
 )
 
-var _ meter.Meter = (*prometheusMeter)(nil)
+var _ meter.Meter = &prometheusMeter{}
 
 type prometheusMeter struct {
 	opts         meter.Options
 	set          prometheus.Registerer
-	counter      *sync.Map
-	floatCounter *sync.Map
-	gauge        *sync.Map
-	histogram    *sync.Map
-	summary      *sync.Map
-	mfPool       xpool.Pool[*dto.MetricFamily]
+	counter      map[string]*counters
+	floatCounter map[string]*floatCounters
+	gauge        map[string]*gauges
+	histogram    map[string]*histograms
+	summary      map[string]*summaries
+	sync.Mutex
+}
+
+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 ...meter.Option) *prometheusMeter {
 	return &prometheusMeter{
 		set:          prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
 		opts:         meter.NewOptions(opts...),
-		counter:      &sync.Map{},
-		floatCounter: &sync.Map{},
-		gauge:        &sync.Map{},
-		histogram:    &sync.Map{},
-		summary:      &sync.Map{},
-		mfPool: xpool.NewPool[*dto.MetricFamily](func() *dto.MetricFamily {
-			return &dto.MetricFamily{}
-		}),
+		counter:      make(map[string]*counters),
+		floatCounter: make(map[string]*floatCounters),
+		gauge:        make(map[string]*gauges),
+		histogram:    make(map[string]*histograms),
+		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
 }
 
 func (m *prometheusMeter) Counter(name string, labels ...string) meter.Counter {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.counter.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.counter[nm]
+	h := newHash(labels)
 	if !ok {
-		var v float64
-		mc = &prometheusCounter{
-			name: name,
-			c: &dto.Metric{
-				Gauge: &dto.Gauge{Value: &v},
-				Label: labelMetric(clabels),
-			},
-		}
-		m.counter.Store(h, mc)
+		cd = &counters{cs: make(map[uint64]*prometheusCounter)}
+		c := &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.counter[nm] = cd
+		return c
 	}
-	return mc.(*prometheusCounter)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.counter[nm] = cd
+	}
+	return c
 }
 
 func (m *prometheusMeter) FloatCounter(name string, labels ...string) meter.FloatCounter {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.floatCounter.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.floatCounter[nm]
+	h := newHash(labels)
 	if !ok {
-		var v float64
-		mc = &prometheusFloatCounter{
-			name: name,
-			c: &dto.Metric{
-				Gauge: &dto.Gauge{Value: &v},
-				Label: labelMetric(clabels),
-			},
-		}
-		m.floatCounter.Store(h, mc)
+		cd = &floatCounters{cs: make(map[uint64]*prometheusFloatCounter)}
+		c := &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.floatCounter[nm] = cd
+		return c
 	}
-	return mc.(*prometheusFloatCounter)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusFloatCounter{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		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...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.gauge.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.gauge[nm]
+	h := newHash(labels)
 	if !ok {
-		var v float64
-		mc = &prometheusGauge{
-			name: name,
-			c: &dto.Metric{
-				Gauge: &dto.Gauge{Value: &v},
-				Label: labelMetric(clabels),
-			},
-		}
-		m.gauge.Store(h, mc)
+		cd = &gauges{cs: make(map[uint64]*prometheusGauge)}
+		c := &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.gauge[nm] = cd
+		return c
 	}
-	return mc.(*prometheusGauge)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusGauge{c: prometheus.NewGauge(prometheus.GaugeOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.gauge[nm] = cd
+	}
+	return c
 }
 
 func (m *prometheusMeter) Histogram(name string, labels ...string) meter.Histogram {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.histogram.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.histogram[nm]
+	h := newHash(labels)
 	if !ok {
-		var c uint64
-		var s float64
-		buckets := make([]float64, len(prometheus.DefBuckets))
-		copy(buckets, prometheus.DefBuckets)
-		mdto := &dto.Metric{
-			Histogram: &dto.Histogram{
-				SampleCount:      &c,
-				SampleSum:        &s,
-				CreatedTimestamp: timestamppb.Now(),
-				Bucket:           make([]*dto.Bucket, len(buckets)),
-			},
-			Label: labelMetric(clabels),
-		}
-		for idx, b := range buckets {
-			var cc uint64
-			mdto.Histogram.Bucket[idx] = &dto.Bucket{CumulativeCount: &cc, UpperBound: &b}
-		}
-		mc = &prometheusHistogram{
-			name: name,
-			c:    mdto,
-		}
-
-		m.histogram.Store(h, mc)
+		cd = &histograms{cs: make(map[uint64]*prometheusHistogram)}
+		c := &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.histogram[nm] = cd
+		return c
 	}
-	return mc.(*prometheusHistogram)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusHistogram{c: prometheus.NewHistogram(prometheus.HistogramOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.histogram[nm] = cd
+	}
+	return c
 }
 
 func (m *prometheusMeter) Summary(name string, labels ...string) meter.Summary {
-	clabels := meter.BuildLabels(append(m.opts.Labels, labels...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.summary.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.summary[nm]
+	h := newHash(labels)
 	if !ok {
-		var c uint64
-		var s float64
-		mc = &prometheusSummary{
-			name: name,
-			c: &dto.Metric{
-				Summary: &dto.Summary{
-					SampleCount:      &c,
-					SampleSum:        &s,
-					CreatedTimestamp: timestamppb.Now(),
-				},
-				Label: labelMetric(clabels),
-			},
-		}
-		m.summary.Store(h, mc)
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
+		c := &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.summary[nm] = cd
+		return c
 	}
-	return mc.(*prometheusSummary)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{Name: nm}), labels: labels}
+		cd.cs[h] = c
+		m.summary[nm] = cd
+	}
+	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...)...)
-	h := newHash(name, clabels)
-	mc, ok := m.summary.Load(h)
+	m.Lock()
+	defer m.Unlock()
+	nm := m.buildName(name)
+	labels = m.buildLabels(append(m.opts.Labels, labels...)...)
+	cd, ok := m.summary[nm]
+	h := newHash(labels)
 	if !ok {
-		var c uint64
-		var s float64
-		mc = &prometheusSummary{
-			name: name,
-			c: &dto.Metric{
-				Summary: &dto.Summary{
-					SampleCount: &c,
-					SampleSum:   &s,
-				},
-				Label: labelMetric(clabels),
-			},
-		}
-		m.summary.Store(h, mc)
+		cd = &summaries{cs: make(map[uint64]*prometheusSummary)}
+		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[h] = c
+		m.summary[nm] = cd
+		return c
 	}
-	return mc.(*prometheusSummary)
+	c, ok := cd.cs[h]
+	if !ok {
+		c = &prometheusSummary{c: prometheus.NewSummary(prometheus.SummaryOpts{
+			Name:       nm,
+			MaxAge:     window,
+			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		}), labels: labels}
+		cd.cs[h] = c
+		m.summary[nm] = cd
+	}
+	return c
 }
 
 func (m *prometheusMeter) Init(opts ...meter.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
 }
 
@@ -200,6 +278,11 @@ func (m *prometheusMeter) Write(w io.Writer, opts ...meter.Option) error {
 		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)
@@ -210,62 +293,85 @@ 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 {
-		c := v.(*prometheusCounter)
-		mf := m.mfPool.Get()
-		mf.Name = &c.name
-		mf.Type = dto.MetricType_GAUGE.Enum()
-		mf.Metric = append(mf.Metric, c.c)
+	for name, metrics := range m.counter {
+		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)
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}
 
-	m.floatCounter.Range(func(k, v any) bool {
-		c := v.(*prometheusFloatCounter)
-		mf := m.mfPool.Get()
-		mf.Name = &c.name
-		mf.Type = dto.MetricType_GAUGE.Enum()
-		mf.Metric = append(mf.Metric, c.c)
+	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)
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}
 
-	m.gauge.Range(func(k, v any) bool {
-		c := v.(*prometheusGauge)
-		mf := m.mfPool.Get()
-		mf.Name = &c.name
-		mf.Type = dto.MetricType_GAUGE.Enum()
-		mf.Metric = append(mf.Metric, c.c)
+	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)
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}
 
-	m.histogram.Range(func(k, v any) bool {
-		c := v.(*prometheusHistogram)
-		mf := m.mfPool.Get()
-		mf.Name = &c.name
-		mf.Type = dto.MetricType_HISTOGRAM.Enum()
-		mf.Metric = append(mf.Metric, c.c)
+	for name, metrics := range m.histogram {
+		mf := &dto.MetricFamily{
+			Name:   newString(name),
+			Type:   dto.MetricType_HISTOGRAM.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)
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}
 
-	m.summary.Range(func(k, v any) bool {
-		c := v.(*prometheusSummary)
-		mf := m.mfPool.Get()
-		mf.Name = &c.name
-		mf.Type = dto.MetricType_SUMMARY.Enum()
-		mf.Metric = append(mf.Metric, c.c)
+	for name, metrics := range m.summary {
+		mf := &dto.MetricFamily{
+			Name:   newString(name),
+			Type:   dto.MetricType_SUMMARY.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)
+		}
 		mfs = append(mfs, mf)
-		return true
-	})
+	}
 
 	for _, mf := range mfs {
 		_ = enc.Encode(mf)
-		mf.Reset()
-		m.mfPool.Put(mf)
 	}
 
 	if closer, ok := enc.(io.Closer); ok {
@@ -309,28 +415,118 @@ func (m *prometheusMeter) Set(opts ...meter.Option) meter.Meter {
 	return nm
 }
 
-func labelMetric(labels []string) []*dto.LabelPair {
-	dtoLabels := make([]*dto.LabelPair, 0, len(labels)/2)
-	for idx := 0; idx < len(labels); idx += 2 {
-		dtoLabels = append(dtoLabels, &dto.LabelPair{
-			Name:  &(labels[idx]),
-			Value: &(labels[idx+1]),
-		})
-	}
-	return dtoLabels
+type prometheusCounter struct {
+	c      prometheus.Gauge
+	labels []string
 }
 
-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
+func (c *prometheusCounter) Add(n int) {
+	c.c.Add(float64(n))
+}
+
+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 {
+	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,120 +3,39 @@ 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/v4/client"
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/meter"
+	"go.unistack.org/micro/v4/meter/wrapper"
 )
 
-func TestHistogram(t *testing.T) {
+func TestBuildName(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) {
-	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())
+	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)
 	}
 
-	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 {
-		t.Fatal(err)
-	}
-	buf := bytes.NewBuffer(nil)
-	_ = m.Write(buf)
-	if !bytes.Contains(buf.Bytes(), []byte(`go_goroutine`)) {
-		t.Fatalf("invalid metrics output: %s", buf.Bytes())
-	}
+	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)
 	}
@@ -126,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())
 	}
 }
@@ -134,20 +53,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("micro_server", "endpoint", "ep1", "path", "/path1").Inc()
+	m.Counter("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("micro_server", "endpoint", "ep2", "path", "/path2").Inc()
+	m.Counter("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`)) {
-		t.Fatalf("invalid metrics output: %s", buf.Bytes())
-	}
-	if !bytes.Contains(buf.Bytes(), []byte(`micro_server{endpoint="ep3",path="/path3",status="success"} 1`)) {
+	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())
 	}
 }

summary.go

@@ -1,24 +0,0 @@
-package prometheus
-
-import (
-	"sync/atomic"
-	"time"
-
-	dto "github.com/prometheus/client_model/go"
-)
-
-type prometheusSummary struct {
-	name string
-	c    *dto.Metric
-}
-
-func (c prometheusSummary) Update(n float64) {
-	atomic.AddUint64(c.c.Summary.SampleCount, 1)
-	addFloat64(c.c.Summary.SampleSum, n)
-}
-
-func (c prometheusSummary) UpdateDuration(n time.Time) {
-	x := time.Since(n).Seconds()
-	atomic.AddUint64(c.c.Summary.SampleCount, 1)
-	addFloat64(c.c.Summary.SampleSum, x)
-}