@@ -4,17 +4,15 @@ package entryhuman
44
55import (
66 "bytes"
7- "encoding/json"
87 "fmt"
98 "io"
109 "os"
11- "path/filepath"
12- "runtime/debug"
1310 "strconv"
1411 "strings"
1512 "time"
1613
17- "github.com/fatih/color"
14+ "github.com/charmbracelet/lipgloss"
15+ "github.com/muesli/termenv"
1816 "go.opencensus.io/trace"
1917 "golang.org/x/crypto/ssh/terminal"
2018 "golang.org/x/xerrors"
@@ -34,13 +32,20 @@ func StripTimestamp(ent string) (time.Time, string, error) {
3432// TimeFormat is a simplified RFC3339 format.
3533const TimeFormat = "2006-01-02 15:04:05.000"
3634
37- func c (w io.Writer , attrs ... color.Attribute ) * color.Color {
38- c := color .New (attrs ... )
39- c .DisableColor ()
35+ var (
36+ renderer = lipgloss .NewRenderer (os .Stdout , termenv .WithUnsafe ())
37+
38+ loggerNameStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#A47DFF" ))
39+ keyStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#606366" ))
40+ multiLineKeyStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#79b8ff" ))
41+ )
42+
43+ func render (w io.Writer , st lipgloss.Style , s string ) string {
4044 if shouldColor (w ) {
41- c .EnableColor ()
45+ ss := st .Render (s )
46+ return ss
4247 }
43- return c
48+ return s
4449}
4550
4651// Fmt returns a human readable format for ent.
@@ -50,36 +55,36 @@ func c(w io.Writer, attrs ...color.Attribute) *color.Color {
5055// We also do not indent the fields as go's test does that automatically
5156// for extra lines in a log so if we did it here, the fields would be indented
5257// twice in test logs. So the Stderr logger indents all the fields itself.
53- func Fmt (w io.Writer , ent slog.SinkEntry ) string {
54- ents := c ( w , color . Reset ). Sprint ( "" )
58+ func Fmt (buf io.StringWriter , termW io. Writer , ent slog.SinkEntry ,
59+ ) {
5560 ts := ent .Time .Format (TimeFormat )
56- ents += ts + " "
61+ buf . WriteString ( ts + " " )
5762
58- level := "[" + ent .Level .String () + "]"
59- level = c (w , levelColor (ent .Level )).Sprint (level )
60- ents += fmt .Sprintf ("%v\t " , level )
63+ level := ent .Level .String ()
64+ if len (level ) > 4 {
65+ level = level [:4 ]
66+ }
67+ level = "[" + level + "]"
68+ buf .WriteString (render (termW , levelStyle (ent .Level ), level ))
69+ buf .WriteString ("\t " )
6170
6271 if len (ent .LoggerNames ) > 0 {
6372 loggerName := "(" + quoteKey (strings .Join (ent .LoggerNames , "." )) + ")"
64- loggerName = c ( w , color . FgMagenta ). Sprint ( loggerName )
65- ents += fmt . Sprintf ( "%v \t ", loggerName )
73+ buf . WriteString ( render ( termW , loggerNameStyle , loggerName ) )
74+ buf . WriteString ( " \t "
6675 }
6776
68- hpath , hfn := humanPathAndFunc (ent .File , ent .Func )
69- loc := fmt .Sprintf ("<%v:%v>\t %v" , hpath , ent .Line , hfn )
70- loc = c (w , color .FgCyan ).Sprint (loc )
71- ents += fmt .Sprintf ("%v\t " , loc )
72-
7377 var multilineKey string
7478 var multilineVal string
7579 msg := strings .TrimSpace (ent .Message )
7680 if strings .Contains (msg , "\n " ) {
7781 multilineKey = "msg"
7882 multilineVal = msg
7983 msg = "..."
84+ msg = quote (msg )
85+ buf .WriteString (msg )
86+
8087 }
81- msg = quote (msg )
82- ents += msg
8388
8489 if ent .SpanContext != (trace.SpanContext {}) {
8590 ent .Fields = append (slog .M (
@@ -111,48 +116,56 @@ func Fmt(w io.Writer, ent slog.SinkEntry) string {
111116 multilineVal = s
112117 }
113118
114- if len ( ent .Fields ) > 0 {
115- // No error is guaranteed due to slog.Map handling errors itself.
116- fields , _ := json . MarshalIndent ( ent . Fields , "" , " "
117- fields = bytes . ReplaceAll ( fields , [] byte ( ", \n " ), [] byte ( ", " ))
118- fields = bytes . ReplaceAll ( fields , [] byte ( " \n " ), [] byte ( " "
119- fields = formatJSON ( w , fields )
120- ents += " \t " + string ( fields )
119+ for i , f := range ent .Fields {
120+ if i < len ( ent . Fields ) {
121+ buf . WriteString ( " \t "
122+ }
123+ buf . WriteString ( render ( termW , keyStyle , f . Name + "= "
124+ valueStr := fmt . Sprintf ( "%+v" , f . Value )
125+ buf . WriteString ( quote ( valueStr ) )
121126 }
122127
123128 if multilineVal != "" {
124129 if msg != "..." {
125- ents += " ..."
130+ buf . WriteString ( " ..." )
126131 }
127132
128133 // Proper indentation.
129134 lines := strings .Split (multilineVal , "\n " )
130135 for i , line := range lines [1 :] {
131136 if line != "" {
132- lines [i + 1 ] = c ( w , color . Reset ). Sprint ( "" ) + strings .Repeat (" " , len (multilineKey )+ 4 ) + line
137+ lines [i + 1 ] = strings .Repeat (" " , len (multilineKey )+ 4 ) + line
133138 }
134139 }
135140 multilineVal = strings .Join (lines , "\n " )
136141
137- multilineKey = c (w , color .FgBlue ).Sprintf (`"%v"` , multilineKey )
138- ents += fmt .Sprintf ("\n %v: %v" , multilineKey , multilineVal )
142+ multilineKey = render (termW , multiLineKeyStyle , multilineKey )
143+ buf .WriteString ("\n " )
144+ buf .WriteString (multilineKey )
145+ buf .WriteString ("= " )
146+ buf .WriteString (multilineVal )
139147 }
140-
141- return ents
142148}
143149
144- func levelColor (level slog.Level ) color.Attribute {
150+ var (
151+ levelDebugStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#ffffff" ))
152+ levelInfoStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#0091FF" ))
153+ levelWarnStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#FFCF0D" ))
154+ levelErrorStyle = renderer .NewStyle ().Foreground (lipgloss .Color ("#FF5A0D" ))
155+ )
156+
157+ func levelStyle (level slog.Level ) lipgloss.Style {
145158 switch level {
146159 case slog .LevelDebug :
147- return color . Reset
160+ return levelDebugStyle
148161 case slog .LevelInfo :
149- return color . FgBlue
162+ return levelInfoStyle
150163 case slog .LevelWarn :
151- return color . FgYellow
152- case slog .LevelError :
153- return color . FgRed
164+ return levelWarnStyle
165+ case slog .LevelError , slog . LevelFatal , slog . LevelCritical :
166+ return levelErrorStyle
154167 default :
155- return color . FgHiRed
168+ panic ( "unknown level" )
156169 }
157170}
158171
@@ -196,64 +209,3 @@ func quoteKey(key string) string {
196209 // Replace spaces in the map keys with underscores.
197210 return strings .ReplaceAll (key , " " , "_" )
198211}
199-
200- var mainPackagePath string
201- var mainModulePath string
202-
203- func init () {
204- // Unfortunately does not work for tests yet :(
205- // See https://github.com/golang/go/issues/33976
206- bi , ok := debug .ReadBuildInfo ()
207- if ! ok {
208- return
209- }
210- mainPackagePath = bi .Path
211- mainModulePath = bi .Main .Path
212- }
213-
214- // humanPathAndFunc takes the absolute path to a file and an absolute module path to a
215- // function in that file and returns the module path to the file. It also returns
216- // the path to the function stripped of its module prefix.
217- //
218- // If the file is in the main Go module then its path is returned
219- // relative to the main Go module's root.
220- //
221- // fn is from https://pkg.go.dev/runtime#Func.Name
222- func humanPathAndFunc (filename , fn string ) (hpath , hfn string ) {
223- // pkgDir is the dir of the pkg.
224- // e.g. cdr.dev/slog/internal
225- // base is the package name and the function name separated by a period.
226- // e.g. entryhuman.humanPathAndFunc
227- // There can be multiple periods when methods of types are involved.
228- pkgDir , base := filepath .Split (fn )
229- s := strings .Split (base , "." )
230- pkg := s [0 ]
231- hfn = strings .Join (s [1 :], "." )
232-
233- if pkg == "main" {
234- // This happens with go build main.go
235- if mainPackagePath == "command-line-arguments" {
236- // Without a real mainPath, we can't find the path to the file
237- // relative to the module. So we just return the base.
238- return filepath .Base (filename ), hfn
239- }
240- // Go doesn't return the full main path in runtime.Func.Name()
241- // It just returns the path "main"
242- // Only runtime.ReadBuildInfo returns it so we have to check and replace.
243- pkgDir = mainPackagePath
244- // pkg main isn't reflected on the disk so we should not add it
245- // into the pkgpath.
246- pkg = ""
247- }
248-
249- hpath = filepath .Join (pkgDir , pkg , filepath .Base (filename ))
250-
251- if mainModulePath != "" {
252- relhpath , err := filepath .Rel (mainModulePath , hpath )
253- if err == nil {
254- hpath = "./" + relhpath
255- }
256- }
257-
258- return hpath , hfn
259- }
0 commit comments