Skip to content

Commit 610d892

Browse files
committed
feat: less LineHandler signatures
1 parent a5b52b6 commit 610d892

File tree

6 files changed

+172
-366
lines changed

6 files changed

+172
-366
lines changed

handler.go

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@ import (
88
"github.com/mattn/go-isatty"
99
)
1010

11-
const lineNumberLabel = "no"
12-
1311
// JSONLineHandler serializes log lines into JSON (NDJSON) format. It keywords the line number if specified.
1412
// Labels and values are combined into key-value pairs, and the result is a single JSON object.
15-
func JSONLineHandler(labels []string, values []string, lineNumber int, hasLineNumber, _ bool) (string, error) {
16-
if hasLineNumber {
17-
labels, values = addLineNumber(labels, values, lineNumber)
18-
}
13+
func JSONLineHandler(labels []string, values []string, _ bool) (string, error) {
1914
b := &strings.Builder{}
2015
b.WriteString("{")
2116
for i, value := range values {
@@ -34,10 +29,7 @@ func JSONLineHandler(labels []string, values []string, lineNumber int, hasLineNu
3429
}
3530

3631
// PrettyJSONLineHandler enhances JSONLineHandler by formatting the output for readability. It uses indentation and new lines.
37-
func PrettyJSONLineHandler(labels []string, values []string, lineNumber int, hasLineNumber, _ bool) (string, error) {
38-
if hasLineNumber {
39-
labels, values = addLineNumber(labels, values, lineNumber)
40-
}
32+
func PrettyJSONLineHandler(labels []string, values []string, _ bool) (string, error) {
4133
b := &strings.Builder{}
4234
b.WriteString("{\n")
4335
for i, value := range values {
@@ -56,10 +48,7 @@ func PrettyJSONLineHandler(labels []string, values []string, lineNumber int, has
5648
}
5749

5850
// KeyValuePairLineHandler converts log lines into a space-separated string of key-value pairs.
59-
func KeyValuePairLineHandler(labels []string, values []string, lineNumber int, hasLineNumber, _ bool) (string, error) {
60-
if hasLineNumber {
61-
labels, values = addLineNumber(labels, values, lineNumber)
62-
}
51+
func KeyValuePairLineHandler(labels []string, values []string, _ bool) (string, error) {
6352
b := &strings.Builder{}
6453
for i, value := range values {
6554
if i < len(labels) {
@@ -75,10 +64,7 @@ func KeyValuePairLineHandler(labels []string, values []string, lineNumber int, h
7564
}
7665

7766
// LTSVLineHandler formats log lines as LTSV (Labeled Tab-separated Values).
78-
func LTSVLineHandler(labels []string, values []string, lineNumber int, hasLineNumber, _ bool) (string, error) {
79-
if hasLineNumber {
80-
labels, values = addLineNumber(labels, values, lineNumber)
81-
}
67+
func LTSVLineHandler(labels []string, values []string, _ bool) (string, error) {
8268
b := &strings.Builder{}
8369
for i, value := range values {
8470
if i < len(labels) {
@@ -98,10 +84,7 @@ func LTSVLineHandler(labels []string, values []string, lineNumber int, hasLineNu
9884
}
9985

10086
// TSVLineHandler formats log lines as TSV (Tab-separated Values).
101-
func TSVLineHandler(labels []string, values []string, lineNumber int, hasLineNumber, isFirst bool) (string, error) {
102-
if hasLineNumber {
103-
labels, values = addLineNumber(labels, values, lineNumber)
104-
}
87+
func TSVLineHandler(labels []string, values []string, isFirst bool) (string, error) {
10588
b := &strings.Builder{}
10689
if isFirst {
10790
header := strings.Join(labels, "\t")
@@ -125,8 +108,3 @@ func TSVLineHandler(labels []string, values []string, lineNumber int, hasLineNum
125108
}
126109
return b.String(), nil
127110
}
128-
129-
// addLineNumber prepends the line number to labels and values.
130-
func addLineNumber(labels []string, values []string, lineNumber int) ([]string, []string) {
131-
return append([]string{lineNumberLabel}, labels...), append([]string{strconv.Itoa(lineNumber)}, values...)
132-
}

0 commit comments

Comments
 (0)