feat: improve pretty formatting

Author: mroyme

README.md

@@ -63,7 +63,7 @@ Running **dogstatsd-local** with the `-out raw` flag will output the plain udp p
 
 ```bash
 $ docker run -t -e "TERM=$TERM" -p 8125:8125/udp mroyme/dogstatsd-local -out pretty
-COUNTER    namespace | metric                                1.00           TAGS = test
+COUNTER    namespace | metric                                1.00            test
 ```
 
 The output will be colored if your shell supports colors.

cmd/dogstatsd-local/main.go

@@ -25,7 +25,8 @@ func main() {
 	out := flag.String("out", "pretty", "Output format: json|pretty|raw|short")
 	rawTags := flag.String("tags", "", "Extra tags, comma delimited")
 	maxNameWidth := flag.Int("max-name-width", 50,
-		"Maximum length of name. Only used for 'pretty' format, increase if name is truncated")
+		"Maximum length of name. Only used for 'pretty' format, increase if name is truncated."+
+			" Values below 50 have no effect.")
 	maxValueWidth := flag.Int("max-value-width", 15,
 		"Maximum length of value. Only used for 'pretty' format, increase if value is truncated")
 	debug := flag.Bool("debug", false, "Enable debug mode")

internal/format/pretty/pretty.go

@@ -28,16 +28,16 @@ func (h *Handler) New() messages.OutputHandler {
 			return nil
 		}
 
-		str := h.styledMetricType(metric)
-		str += h.styledMetricName(metric, h.NameWidth)
-		str += h.styledMetricValue(metric, h.ValueWidth)
-		str += h.styledTags(metric, h.ExtraTags)
+		str := h.StyledMetricType(metric)
+		str += h.StyledMetricName(metric, h.NameWidth)
+		str += h.StyledMetricValue(metric, h.ValueWidth)
+		str += h.StyledTags(metric, h.ExtraTags)
 		fmt.Println(str)
 		return nil
 	}
 }
 
-func (h *Handler) styledMetricType(metric messages.DogStatsDMetric) string {
+func (h *Handler) StyledMetricType(metric messages.DogStatsDMetric) string {
 	var fg lipgloss.AdaptiveColor
 	metricType := metric.MetricType
 	switch metricType {
@@ -56,44 +56,70 @@ func (h *Handler) styledMetricType(metric messages.DogStatsDMetric) string {
 	}
 	style := lipgloss.NewStyle().
 		Width(11).
+		Underline(true).
 		Foreground(fg)
 	return style.Render(strings.ToUpper(metricType.String()))
 }
 
-func (h *Handler) styledMetricName(metric messages.DogStatsDMetric, width int) string {
-	text := fmt.Sprintf("%s | %s", metric.Namespace, metric.Name)
-	if len(text) > width {
-		text = text[:width-3] + "..."
+func (h *Handler) StyledMetricName(metric messages.DogStatsDMetric, width int) string {
+	// Minimum supported width is 50
+	if width < 50 {
+		width = 50
 	}
-	style := lipgloss.NewStyle().
-		Width(50).
-		MaxWidth(50).
-		Foreground(h.Theme.Lavender())
-	return style.Render(text)
+	namespace := metric.Namespace
+	name := metric.Name
+	lenNamespace := len(namespace)
+	lenName := len(name)
+	textLen := lenNamespace + lenName
+
+	// 3 for the separator " | " + 1 for gap with the next field
+	if textLen > width-4 {
+		diff := textLen - (width - 4)
+		if lenName-diff > 20 {
+			name = name[:lenName-diff-1] + "~"
+		} else if lenNamespace-diff > 20 {
+			namespace = namespace[:lenNamespace-diff-1] + "~"
+		} else {
+			sub := diff / 2
+			name = name[:lenName-sub-1] + "~"
+			if diff%2 != 0 {
+				sub++
+			}
+			namespace = namespace[:lenNamespace-sub-1] + "~"
+		}
+	}
+	text := fmt.Sprintf("%s | %s",
+		lipgloss.NewStyle().Foreground(h.Theme.Lavender()).Render(namespace),
+		lipgloss.NewStyle().Bold(true).Foreground(h.Theme.Pink()).Render(name))
+	return lipgloss.NewStyle().
+		Width(width).
+		MaxWidth(width).
+		Render(text)
 }
 
-func (h *Handler) styledMetricValue(metric messages.DogStatsDMetric, width int) string {
+func (h *Handler) StyledMetricValue(metric messages.DogStatsDMetric, width int) string {
 	value := fmt.Sprintf("%.2f", metric.FloatValue)
 	if len(value) > width {
 		value = value[:width-3] + "..."
 	}
 	style := lipgloss.NewStyle().
 		Width(15).
 		MaxWidth(15).
+		Bold(true).
 		Foreground(h.Theme.Sapphire())
 	if metric.MetricType == messages.TimerMetricType {
 		value += "ms"
 	}
 	return style.Render(value)
 }
 
-func (h *Handler) styledTags(metric messages.DogStatsDMetric, extraTags []string) string {
+func (h *Handler) StyledTags(metric messages.DogStatsDMetric, extraTags []string) string {
 	style := lipgloss.NewStyle().
-		Foreground(h.Theme.Subtext0())
+		Foreground(h.Theme.Overlay0()).
+		Italic(true)
 	var tags []string
 	for _, tag := range append(extraTags, metric.Tags...) {
 		tags = append(tags, strings.TrimSpace(tag))
 	}
-	prefix := style.Foreground(h.Theme.Overlay0()).Render("TAGS =")
-	return prefix + style.SetString(tags...).Render()
+	return style.SetString(tags...).Render()
 }