Compare commits

..

No commits in common. "v3" and "v3.11.33" have entirely different histories.
v3 ... v3.11.33

View File

@ -35,7 +35,7 @@ var bufPool = sync.Pool{
var _ MeterServiceServer = &Handler{} var _ MeterServiceServer = &Handler{}
type Handler struct { type Handler struct {
Options Options opts Options
} }
type Option func(*Options) type Option func(*Options)
@ -81,7 +81,7 @@ func NewOptions(opts ...Option) Options {
func NewHandler(opts ...Option) *Handler { func NewHandler(opts ...Option) *Handler {
options := NewOptions(opts...) options := NewOptions(opts...)
return &Handler{Options: options} return &Handler{opts: options}
} }
func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error { func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
@ -96,7 +96,7 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
w := io.Writer(buf) w := io.Writer(buf)
if md, ok := metadata.FromOutgoingContext(ctx); gzipAccepted(md) && ok && !h.Options.DisableCompress { if md, ok := metadata.FromOutgoingContext(ctx); gzipAccepted(md) && ok && !h.opts.DisableCompress {
omd, _ := metadata.FromOutgoingContext(ctx) omd, _ := metadata.FromOutgoingContext(ctx)
omd.Set(contentEncodingHeader, "gzip") omd.Set(contentEncodingHeader, "gzip")
gz := gzipPool.Get().(*gzip.Writer) gz := gzipPool.Get().(*gzip.Writer)
@ -109,7 +109,7 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
gz.Flush() gz.Flush()
} }
if err := h.Options.Meter.Write(w, h.Options.MeterOptions...); err != nil { if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil {
log.Error(ctx, "http/meter write failed", err) log.Error(ctx, "http/meter write failed", err)
return nil return nil
} }