update to latest micro

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2025-03-04 11:25:09 +03:00
parent a8b6d67344
commit a08cbee842
4 changed files with 33 additions and 36 deletions

View File

@@ -6,7 +6,6 @@ import (
"github.com/VictoriaMetrics/metrics"
"go.unistack.org/micro/v4/meter"
"go.unistack.org/micro/v4/options"
)
type victoriametricsMeter struct {
@@ -14,7 +13,7 @@ type victoriametricsMeter struct {
opts meter.Options
}
func NewMeter(opts ...options.Option) meter.Meter {
func NewMeter(opts ...meter.Option) meter.Meter {
return &victoriametricsMeter{set: metrics.NewSet(), opts: meter.NewOptions(opts...)}
}
@@ -22,7 +21,7 @@ func (r *victoriametricsMeter) Name() string {
return r.opts.Name
}
func (r *victoriametricsMeter) Clone(opts ...options.Option) meter.Meter {
func (r *victoriametricsMeter) Clone(opts ...meter.Option) meter.Meter {
options := r.opts
for _, o := range opts {
o(&options)
@@ -31,10 +30,6 @@ func (r *victoriametricsMeter) Clone(opts ...options.Option) meter.Meter {
}
func (r *victoriametricsMeter) buildName(name string, labels ...string) string {
if len(r.opts.MetricPrefix) > 0 {
name = r.opts.MetricPrefix + name
}
nl := len(r.opts.Labels) + len(labels)
if nl == 0 {
return name
@@ -44,14 +39,6 @@ func (r *victoriametricsMeter) buildName(name string, labels ...string) string {
nlabels = append(nlabels, r.opts.Labels...)
nlabels = append(nlabels, labels...)
if len(r.opts.LabelPrefix) == 0 {
return meter.BuildName(name, nlabels...)
}
for idx := 0; idx < nl; idx++ {
nlabels[idx] = r.opts.LabelPrefix + nlabels[idx]
idx++
}
return meter.BuildName(name, nlabels...)
}
@@ -79,7 +66,7 @@ func (r *victoriametricsMeter) SummaryExt(name string, window time.Duration, qua
return r.set.GetOrCreateSummaryExt(r.buildName(name, labels...), window, quantiles)
}
func (r *victoriametricsMeter) Set(opts ...options.Option) meter.Meter {
func (r *victoriametricsMeter) Set(opts ...meter.Option) meter.Meter {
m := &victoriametricsMeter{opts: r.opts}
for _, o := range opts {
o(&m.opts)
@@ -88,7 +75,7 @@ func (r *victoriametricsMeter) Set(opts ...options.Option) meter.Meter {
return m
}
func (r *victoriametricsMeter) Init(opts ...options.Option) error {
func (r *victoriametricsMeter) Init(opts ...meter.Option) error {
for _, o := range opts {
o(&r.opts)
}
@@ -96,7 +83,7 @@ func (r *victoriametricsMeter) Init(opts ...options.Option) error {
return nil
}
func (r *victoriametricsMeter) Write(w io.Writer, opts ...options.Option) error {
func (r *victoriametricsMeter) Write(w io.Writer, opts ...meter.Option) error {
options := r.opts
for _, o := range opts {
o(&options)