Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: unistack-org/micro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.8
Choose a base ref
...
head repository: unistack-org/micro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.3.9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 29, 2021

  1. meter/handler: more idiomatic option handling

    Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
    vtolstov committed Mar 29, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0e42033 View commit details
Showing with 41 additions and 6 deletions.
  1. +41 −6 meter/handler/handler.go
47 changes: 41 additions & 6 deletions meter/handler/handler.go
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import (
"context"

"github.com/unistack-org/micro/v3/codec"
"github.com/unistack-org/micro/v3/errors"
"github.com/unistack-org/micro/v3/meter"
)

@@ -14,18 +15,52 @@ var (
)

type handler struct {
meter meter.Meter
opts []meter.Option
opts Options
}

func NewHandler(meter meter.Meter, opts ...meter.Option) *handler {
return &handler{meter: meter, opts: opts}
type Option func(*Options)

type Options struct {
Meter meter.Meter
MeterOptions []meter.Option
Name string
}

func Meter(m meter.Meter) Option {
return func(o *Options) {
o.Meter = m
}
}

func Name(name string) Option {
return func(o *Options) {
o.Name = name
}
}

func MeterOptions(opts ...meter.Option) Option {
return func(o *Options) {
o.MeterOptions = append(o.MeterOptions, opts...)
}
}

func NewOptions(opts ...Option) Options {
options := Options{Meter: meter.DefaultMeter}
for _, o := range opts {
o(&options)
}
return options
}

func NewHandler(opts ...Option) *handler {
options := NewOptions(opts...)
return &handler{opts: options}
}

func (h *handler) Metrics(ctx context.Context, req *codec.Frame, rsp *codec.Frame) error {
buf := bytes.NewBuffer(nil)
if err := h.meter.Write(buf, h.opts...); err != nil {
return err
if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil {
return errors.InternalServerError(h.opts.Name, "%v", err)
}

rsp.Data = buf.Bytes()