changing the log length histogram to be a normal histogram with only …

…a `path` label, also removing the label values when no longer tailing the file. Following the same pattern we used for readBytes and totalBytes.
grafana · Jul 2, 2019 · 922b2d0 · 922b2d0
1 parent 2f46a3c
commit 922b2d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pkg/promtail/targets/filetarget.go b/pkg/promtail/targets/filetarget.go
@@ -31,18 +31,22 @@ var (
 		Name:      "file_bytes_total",
 		Help:      "Number of bytes total.",
 	}, []string{"path"})
-
 	readLines = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: "promtail",
 		Name:      "read_lines_total",
 		Help:      "Number of lines read.",
 	}, []string{"path"})
-
 	filesActive = promauto.NewGauge(prometheus.GaugeOpts{
 		Namespace: "promtail",
 		Name:      "files_active_total",
 		Help:      "Number of active files.",
 	})
+	logLengthHistogram = promauto.NewHistogramVec(prometheus.HistogramOpts{
+		Namespace: "promtail",
+		Name:      "log_entries_bytes",
+		Help:      "the total count of bytes",
+		Buckets:   prometheus.ExponentialBuckets(16, 2, 8),
+	}, []string{"path"})
 )
 
 const (

diff --git a/pkg/promtail/targets/filetargetmanager.go b/pkg/promtail/targets/filetargetmanager.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/grafana/loki/pkg/logentry/metric"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/prometheus/client_golang/prometheus"
@@ -113,7 +111,7 @@ func NewFileTargetManager(
 			targets:        map[string]*FileTarget{},
 			droppedTargets: []Target{},
 			hostname:       hostname,
-			entryHandler:   pipeline.Wrap(metric.LogSize(prometheus.DefaultRegisterer, client)),
+			entryHandler:   pipeline.Wrap(client),
 			targetConfig:   targetConfig,
 		}
 		tm.syncers[cfg.JobName] = s

diff --git a/pkg/promtail/targets/tailer.go b/pkg/promtail/targets/tailer.go
@@ -93,7 +93,7 @@ func (t *tailer) run() {
 			}
 
 			readLines.WithLabelValues(t.path).Inc()
-
+			logLengthHistogram.WithLabelValues(t.path).Observe(float64(len(line.Text)))
 			if err := t.handler.Handle(model.LabelSet{}, line.Time, line.Text); err != nil {
 				level.Error(t.logger).Log("msg", "error handling line", "path", t.path, "error", err)
 			}
@@ -128,6 +128,7 @@ func (t *tailer) stop() error {
 	// When we stop tailing the file, also un-export metrics related to the file
 	readBytes.DeleteLabelValues(t.path)
 	totalBytes.DeleteLabelValues(t.path)
+	logLengthHistogram.DeleteLabelValues(t.path)
 	level.Info(t.logger).Log("msg", "stopped tailing file", "path", t.path)
 	return err
 }