Diff
1diff --git a/go.mod b/go.mod
2index 314db4c0646a7cce491624a52f53465232282863..e54434e230826d31e5ce7917785767ec09d18432 100644
3--- a/go.mod
4+++ b/go.mod
5@@ -6,10 +6,14 @@ require (
6 github.com/fatih/color v1.16.0
7 github.com/go-logfmt/logfmt v0.6.0
8 github.com/jessevdk/go-flags v1.5.0
9+ github.com/stretchr/testify v1.10.0
10 )
11
12 require (
13+ github.com/davecgh/go-spew v1.1.1 // indirect
14 github.com/mattn/go-colorable v0.1.13 // indirect
15 github.com/mattn/go-isatty v0.0.20 // indirect
16+ github.com/pmezard/go-difflib v1.0.0 // indirect
17 golang.org/x/sys v0.14.0 // indirect
18+ gopkg.in/yaml.v3 v3.0.1 // indirect
19 )
20diff --git a/go.sum b/go.sum
21index e594d0fb25879ea01ac4554b5b61b727215f5b29..e569e67e806d5e30c77d3fbd6b07a026e744b474 100644
22--- a/go.sum
23+++ b/go.sum
24@@ -1,3 +1,5 @@
25+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
26+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
27 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
28 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
29 github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
30@@ -9,8 +11,16 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
31 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
32 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
33 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
34+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
35+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
36+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
37+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
38 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
39 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
40 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
41 golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
42 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
43+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
44+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
45+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
46+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
47diff --git a/parser/parser_test.go b/parser/parser_test.go
48index aa43255597809c783840abf0bc9796c962b84af7..d4cd31cb41fb85ad7c1db13fc08c0a5a35d2c0d3 100644
49--- a/parser/parser_test.go
50+++ b/parser/parser_test.go
51@@ -1,20 +1,61 @@
52 package parser_test
53
54 import (
55- "os"
56+ "bytes"
57+ "strings"
58 "testing"
59
60+ "github.com/stretchr/testify/assert"
61+ "github.com/stretchr/testify/require"
62+
63 "github.com/TheEdgeOfRage/logfmt/config"
64 "github.com/TheEdgeOfRage/logfmt/parser"
65 )
66
67-func TestParseInvalidFile(t *testing.T) {
68- f, err := os.Open("../testdata/log.txt")
69- if err != nil {
70- t.Fatal(err)
71- }
72- p := parser.NewParser(&config.Config{}, f, os.Stdout)
73- if err := p.Start(); err == nil {
74- t.Error("expected error, got nil")
75- }
76+func TestParseLevels(t *testing.T) {
77+ data := strings.NewReader(`time="2025-03-15T10:32:23Z" level=debug msg="bar"
78+time="2025-03-15T10:32:24Z" level=info msg="foo"
79+time="2025-03-15T10:32:25Z" level=warn msg="oopsie"
80+time="2025-03-15T10:32:26Z" level=error msg="oh no"
81+time="2025-03-15T10:32:27Z" level=fatal msg="AAAAAA"`)
82+ w := &bytes.Buffer{}
83+
84+ p := parser.NewParser(&config.Config{}, data, w)
85+ err := p.Start()
86+ require.NoError(t, err)
87+
88+ assert.Equal(t, `2025-03-15 10:32:23 [DEBUG] msg=bar
89+2025-03-15 10:32:24 [INFO] msg=foo
90+2025-03-15 10:32:25 [WARN] msg=oopsie
91+2025-03-15 10:32:26 [ERROR] msg="oh no"
92+2025-03-15 10:32:27 [FATAL] msg=AAAAAA
93+`, w.String())
94+}
95+
96+func TestParseTimestamps(t *testing.T) {
97+ data := strings.NewReader(`timestamp="2025-03-15T10:32:23Z" level=info
98+time="2025-03-15T10:32:24Z" level=info
99+ts="2025-03-15T10:32:25Z" level=info
100+datetime="2025-03-15T10:32:26Z" level=info`)
101+ w := &bytes.Buffer{}
102+
103+ p := parser.NewParser(&config.Config{}, data, w)
104+ err := p.Start()
105+ require.NoError(t, err)
106+
107+ assert.Equal(t, `2025-03-15 10:32:23 [INFO]
108+2025-03-15 10:32:24 [INFO]
109+2025-03-15 10:32:25 [INFO]
110+2025-03-15 10:32:26 [INFO]
111+`, w.String())
112+}
113+
114+func TestParseInvalidLogs(t *testing.T) {
115+ data := strings.NewReader(`
116+time="2025-03-15T10:32:23Z" level=info msg="loading"
117+time="`)
118+ w := &bytes.Buffer{}
119+ p := parser.NewParser(&config.Config{}, data, w)
120+ err := p.Start()
121+ require.Error(t, err)
122 }
123diff --git a/parser/record.go b/parser/record.go
124index 33d7fd05aef98ba96960df53c55c6e22598528d4..187d2128c6df326caece97c8a98f80cae4d84cd6 100644
125--- a/parser/record.go
126+++ b/parser/record.go
127@@ -13,8 +13,9 @@ import (
128 )
129
130 var (
131- levelStrings map[int]string
132- levelColors map[int]*color.Color
133+ levelStrings map[int]string
134+ levelColors map[int]*color.Color
135+ timestampLabels = []string{"time", "timestamp", "datetime", "ts"}
136 )
137
138 func init() {
139@@ -58,7 +59,7 @@ func NewRecord(decoder *logfmt.Decoder) (*Record, error) {
140 record.parseLevel(value)
141 continue
142 }
143- if key == "time" || key == "timestamp" {
144+ if slices.Contains(timestampLabels, key) {
145 err := record.parseTime(value)
146 if err != nil {
147 return nil, err
148@@ -151,7 +152,7 @@ func (r *Record) String(cfg *config.Config) string {
149 }
150 value := r.fields[key]
151 key = color.HiBlueString(key)
152- line += fmt.Sprintf("%s=%s ", key, getFormattedValue(value))
153+ line += fmt.Sprintf(" %s=%s", key, getFormattedValue(value))
154 }
155
156 var fmtString strings.Builder
157@@ -160,9 +161,9 @@ func (r *Record) String(cfg *config.Config) string {
158 }
159
160 if color.NoColor {
161- fmtString.WriteString("%7s %s")
162+ fmtString.WriteString("%7s%s")
163 } else {
164- fmtString.WriteString("%26s %s")
165+ fmtString.WriteString("%26s%s")
166 }
167
168 if cfg.NoTime {