micro v4 options fix
Some checks failed
autoapprove / autoapprove (pull_request) Failing after 8s
automerge / automerge (pull_request) Failing after 4s
codeql / analyze (go) (pull_request) Failing after 1m46s
dependabot-automerge / automerge (pull_request) Has been skipped
prbuild / test (pull_request) Failing after 52s
prbuild / lint (pull_request) Successful in 14s

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2023-08-16 15:41:33 +03:00
parent bd8eca5f5e
commit 4cdca6cd83
3 changed files with 47 additions and 27 deletions

View File

@@ -12,6 +12,7 @@ import (
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"go.unistack.org/micro/v4/meter"
"go.unistack.org/micro/v4/options"
)
var _ meter.Meter = &prometheusMeter{}
@@ -57,7 +58,7 @@ func newString(v string) *string {
return &nv
}
func NewMeter(opts ...meter.Option) *prometheusMeter {
func NewMeter(opts ...options.Option) *prometheusMeter {
return &prometheusMeter{
set: prometheus.NewRegistry(), // prometheus.DefaultRegisterer,
opts: meter.NewOptions(opts...),
@@ -265,14 +266,14 @@ func (m *prometheusMeter) SummaryExt(name string, window time.Duration, quantile
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)
}
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)
@@ -381,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)
@@ -406,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)