unistack-org/micro-server-http
4
0
Fork 3
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 116 Wiki Activity

update #153

Browse Source
This commit is contained in:
Gorbunov Kirill Andreevich 2024-03-11 11:18:57 +03:00
parent cdb4b785f6
commit aa6c32026f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
handler/meter/meter.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
"context" "context"
"io"
"strings" "strings"
"sync" "sync"
@ -73,8 +74,12 @@ func NewHandler(opts ...Option) *Handler {
} }
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 {
log := logger.DefaultLogger() log, ok := logger.FromContext(ctx)
if !ok {
log = logger.DefaultLogger()
}
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
w := io.Writer(buf)
if md, ok := metadata.FromContext(ctx); gzipAccepted(md) && ok { if md, ok := metadata.FromContext(ctx); gzipAccepted(md) && ok {
md.Set(contentEncodingHeader, "gzip") md.Set(contentEncodingHeader, "gzip")
@ -84,12 +89,10 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
gz.Reset(buf) gz.Reset(buf)
defer gz.Close() defer gz.Close()
zw := gzip.NewWriter(buf) w = gz
defer zw.Close()
*zw = *gz
} }
if err := h.opts.Meter.Write(buf, h.opts.MeterOptions...); err != nil { if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil {
log.Error(ctx, errors.InternalServerError(h.opts.Name, "%v", err)) log.Error(ctx, errors.InternalServerError(h.opts.Name, "%v", err))
return nil return nil
} }
@ -105,12 +108,8 @@ func gzipAccepted(md metadata.Metadata) bool {
if !ok { if !ok {
return false return false
} }
parts := strings.Split(a, ",") if strings.Contains(a, "gzip") {
for _, part := range parts {
part = strings.TrimSpace(part)
if part == "gzip" || strings.HasPrefix(part, "gzip;") {
return true return true
} }
}
return false return false
} }