From 567ccde0b6e06dbf7533c5277d28dbc58a0d1c5f Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Tue, 26 Jan 2021 09:35:29 +0100 Subject: [PATCH] Re-introduce https://github.com/grafana/loki/pull/3178. (#3233) Lost during a merge/rebase of https://github.com/grafana/loki/commit/6cc41f92f8adfabe3df4fab7780f56830b408eec :shrug: Signed-off-by: Cyril Tovena --- pkg/distributor/http.go | 62 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/pkg/distributor/http.go b/pkg/distributor/http.go index b829edf548eb..25a45fd4a56d 100644 --- a/pkg/distributor/http.go +++ b/pkg/distributor/http.go @@ -4,17 +4,35 @@ import ( "math" "net/http" - "github.com/weaveworks/common/httpgrpc" - "github.com/cortexproject/cortex/pkg/util" + "github.com/dustin/go-humanize" + "github.com/go-kit/kit/log/level" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/weaveworks/common/httpgrpc" + "github.com/weaveworks/common/user" "github.com/grafana/loki/pkg/loghttp" "github.com/grafana/loki/pkg/logproto" "github.com/grafana/loki/pkg/logql/unmarshal" unmarshal_legacy "github.com/grafana/loki/pkg/logql/unmarshal/legacy" + lokiutil "github.com/grafana/loki/pkg/util" ) -var contentType = http.CanonicalHeaderKey("Content-Type") +var ( + contentType = http.CanonicalHeaderKey("Content-Type") + + bytesIngested = promauto.NewCounterVec(prometheus.CounterOpts{ + Namespace: "loki", + Name: "distributor_bytes_received_total", + Help: "The total number of uncompressed bytes received per tenant", + }, []string{"tenant"}) + linesIngested = promauto.NewCounterVec(prometheus.CounterOpts{ + Namespace: "loki", + Name: "distributor_lines_received_total", + Help: "The total number of lines received per tenant", + }, []string{"tenant"}) +) const applicationJSON = "application/json" @@ -41,8 +59,46 @@ func (d *Distributor) PushHandler(w http.ResponseWriter, r *http.Request) { } func ParseRequest(r *http.Request) (*logproto.PushRequest, error) { + userID, _ := user.ExtractOrgID(r.Context()) + logger := util.WithContext(r.Context(), util.Logger) + body := lokiutil.NewSizeReader(r.Body) + contentType := r.Header.Get(contentType) var req logproto.PushRequest + defer func() { + var ( + entriesSize int64 + streamLabelsSize int64 + totalEntries int64 + ) + + for _, s := range req.Streams { + streamLabelsSize += int64(len(s.Labels)) + for _, e := range s.Entries { + totalEntries++ + entriesSize += int64(len(e.Line)) + } + } + + // incrementing tenant metrics if we have a tenant. + if totalEntries != 0 && userID != "" { + bytesIngested.WithLabelValues(userID).Add(float64(entriesSize)) + linesIngested.WithLabelValues(userID).Add(float64(totalEntries)) + } + + level.Debug(logger).Log( + "msg", "push request parsed", + "path", r.URL.Path, + "contentType", contentType, + "bodySize", humanize.Bytes(uint64(body.Size())), + "streams", len(req.Streams), + "entries", totalEntries, + "streamLabelsSize", humanize.Bytes(uint64(streamLabelsSize)), + "entriesSize", humanize.Bytes(uint64(entriesSize)), + "totalSize", humanize.Bytes(uint64(entriesSize+streamLabelsSize)), + ) + }() + switch r.Header.Get(contentType) { case applicationJSON: var err error