@@ -8,14 +8,9 @@ import (
8
8
"github.com/mattn/go-isatty"
9
9
)
10
10
11
- const lineNumberLabel = "no"
12
-
13
11
// JSONLineHandler serializes log lines into JSON (NDJSON) format. It keywords the line number if specified.
14
12
// 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 ) {
19
14
b := & strings.Builder {}
20
15
b .WriteString ("{" )
21
16
for i , value := range values {
@@ -34,10 +29,7 @@ func JSONLineHandler(labels []string, values []string, lineNumber int, hasLineNu
34
29
}
35
30
36
31
// 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 ) {
41
33
b := & strings.Builder {}
42
34
b .WriteString ("{\n " )
43
35
for i , value := range values {
@@ -56,10 +48,7 @@ func PrettyJSONLineHandler(labels []string, values []string, lineNumber int, has
56
48
}
57
49
58
50
// 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 ) {
63
52
b := & strings.Builder {}
64
53
for i , value := range values {
65
54
if i < len (labels ) {
@@ -75,10 +64,7 @@ func KeyValuePairLineHandler(labels []string, values []string, lineNumber int, h
75
64
}
76
65
77
66
// 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 ) {
82
68
b := & strings.Builder {}
83
69
for i , value := range values {
84
70
if i < len (labels ) {
@@ -98,10 +84,7 @@ func LTSVLineHandler(labels []string, values []string, lineNumber int, hasLineNu
98
84
}
99
85
100
86
// 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 ) {
105
88
b := & strings.Builder {}
106
89
if isFirst {
107
90
header := strings .Join (labels , "\t " )
@@ -125,8 +108,3 @@ func TSVLineHandler(labels []string, values []string, lineNumber int, hasLineNum
125
108
}
126
109
return b .String (), nil
127
110
}
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