@@ -2,18 +2,18 @@ package logflags
22
33import (
44 "bytes"
5+ "context"
56 "errors"
67 "fmt"
78 "io"
89 "log"
10+ "log/slog"
911 "net"
1012 "os"
1113 "sort"
1214 "strconv"
1315 "strings"
1416 "time"
15-
16- "github.com/sirupsen/logrus"
1717)
1818
1919var any = false
@@ -29,20 +29,25 @@ var stack = false
2929
3030var logOut io.WriteCloser
3131
32- func makeLogger (flag bool , fields Fields ) Logger {
32+ func makeLogger (flag bool , attrs ... interface {} ) Logger {
3333 if lf := loggerFactory ; lf != nil {
34+ fields := make (Fields )
35+ for i := 0 ; i < len (attrs ); i += 2 {
36+ fields [attrs [i ].(string )] = attrs [i + 1 ]
37+ }
3438 return lf (flag , fields , logOut )
3539 }
36- logger := logrus . New (). WithFields ( logrus . Fields ( fields ))
37- logger . Logger . Formatter = DefaultFormatter ()
40+
41+ var out io. WriteCloser = os . Stderr
3842 if logOut != nil {
39- logger . Logger . Out = logOut
43+ out = logOut
4044 }
41- logger . Logger . Level = logrus . ErrorLevel
45+ level := slog . LevelError
4246 if flag {
43- logger . Logger . Level = logrus . DebugLevel
47+ level = slog . LevelDebug
4448 }
45- return & logrusLogger {logger }
49+ logger := slog .New (newTextHandler (out , & slog.HandlerOptions {Level : level })).With (attrs ... )
50+ return slogLogger {logger }
4651}
4752
4853// Any returns true if any logging is enabled.
@@ -58,7 +63,7 @@ func GdbWire() bool {
5863
5964// GdbWireLogger returns a configured logger for the gdbserial wire protocol.
6065func GdbWireLogger () Logger {
61- return makeLogger (gdbWire , Fields { "layer" : "gdbconn" } )
66+ return makeLogger (gdbWire , "layer" , "gdbconn" )
6267}
6368
6469// Debugger returns true if the debugger package should log.
@@ -68,7 +73,7 @@ func Debugger() bool {
6873
6974// DebuggerLogger returns a logger for the debugger package.
7075func DebuggerLogger () Logger {
71- return makeLogger (debugger , Fields { "layer" : "debugger" } )
76+ return makeLogger (debugger , "layer" , "debugger" )
7277}
7378
7479// LLDBServerOutput returns true if the output of the LLDB server should be
@@ -85,7 +90,7 @@ func DebugLineErrors() bool {
8590
8691// DebugLineLogger returns a logger for the dwarf/line package.
8792func DebugLineLogger () Logger {
88- return makeLogger (debugLineErrors , Fields { "layer" : "dwarf-line" } )
93+ return makeLogger (debugLineErrors , "layer" , "dwarf-line" )
8994}
9095
9196// RPC returns true if RPC messages should be logged.
@@ -100,7 +105,7 @@ func RPCLogger() Logger {
100105
101106// rpcLogger returns a logger for RPC messages set to a specific minimal log level.
102107func rpcLogger (flag bool ) Logger {
103- return makeLogger (flag , Fields { "layer" : "rpc" } )
108+ return makeLogger (flag , "layer" , "rpc" )
104109}
105110
106111// DAP returns true if dap package should log.
@@ -110,7 +115,7 @@ func DAP() bool {
110115
111116// DAPLogger returns a logger for dap package.
112117func DAPLogger () Logger {
113- return makeLogger (dap , Fields { "layer" : "dap" } )
118+ return makeLogger (dap , "layer" , "dap" )
114119}
115120
116121// FnCall returns true if the function call protocol should be logged.
@@ -119,7 +124,7 @@ func FnCall() bool {
119124}
120125
121126func FnCallLogger () Logger {
122- return makeLogger (fnCall , Fields { "layer" : "proc" , "kind" : "fncall" } )
127+ return makeLogger (fnCall , "layer" , "proc" , "kind" , "fncall" )
123128}
124129
125130// Minidump returns true if the minidump loader should be logged.
@@ -128,7 +133,7 @@ func Minidump() bool {
128133}
129134
130135func MinidumpLogger () Logger {
131- return makeLogger (minidump , Fields { "layer" : "core" , "kind" : "minidump" } )
136+ return makeLogger (minidump , "layer" , "core" , "kind" , "minidump" )
132137}
133138
134139// Stack returns true if the stacktracer should be logged.
@@ -137,7 +142,7 @@ func Stack() bool {
137142}
138143
139144func StackLogger () Logger {
140- return makeLogger (stack , Fields { "layer" : "core" , "kind" : "stack" } )
145+ return makeLogger (stack , "layer" , "core" , "kind" , "stack" )
141146}
142147
143148// WriteDAPListeningMessage writes the "DAP server listening" message in dap mode.
@@ -162,7 +167,7 @@ func writeListeningMessage(server string, addr net.Addr) {
162167 return
163168 }
164169 logger := rpcLogger (true )
165- logger .Warn ("Listening for remote connections (connections are not authenticated nor encrypted)" )
170+ logger .Warnf ("Listening for remote connections (connections are not authenticated nor encrypted)" )
166171}
167172
168173func WriteError (msg string ) {
@@ -173,6 +178,10 @@ func WriteError(msg string) {
173178 }
174179}
175180
181+ func WriteCgoFlagsWarning () {
182+ makeLogger (true , "layer" , "dlv" ).Warn ("CGO_CFLAGS already set, Cgo code could be optimized." )
183+ }
184+
176185var errLogstrWithoutLog = errors .New ("--log-output specified without --log" )
177186
178187// Setup sets debugger flags based on the contents of logstr.
@@ -240,59 +249,91 @@ func Close() {
240249 }
241250}
242251
243- // DefaultFormatter provides a simplified version of logrus.TextFormatter that
244- // doesn't make logs unreadable when they are output to a text file or to a
245- // terminal that doesn't support colors.
246- func DefaultFormatter () logrus. Formatter {
247- return textFormatterInstance
252+ type textHandler struct {
253+ out io. WriteCloser
254+ opts slog. HandlerOptions
255+ attrs []slog. Attr
256+ preformattedAttrs string // preformatted version of attrs for optimization purposes
248257}
249258
250- type textFormatter struct {}
259+ func newTextHandler (out io.WriteCloser , opts * slog.HandlerOptions ) * textHandler {
260+ return & textHandler {
261+ out : out ,
262+ opts : * opts ,
263+ }
264+ }
251265
252- var textFormatterInstance = & textFormatter {}
266+ func (h * textHandler ) Enabled (_ context.Context , l slog.Level ) bool {
267+ return l >= h .opts .Level .Level ()
268+ }
253269
254- func (f * textFormatter ) Format (entry * logrus.Entry ) ([]byte , error ) {
255- var b * bytes.Buffer
256- if entry .Buffer != nil {
257- b = entry .Buffer
258- } else {
259- b = & bytes.Buffer {}
270+ func (h * textHandler ) WithAttrs (attrs []slog.Attr ) slog.Handler {
271+ h2 := * h
272+ h2 .attrs = append (h2 .attrs , attrs ... )
273+ m := map [string ]slog.Value {}
274+ keys := []string {}
275+ for i := range attrs {
276+ m [attrs [i ].Key ] = attrs [i ].Value
277+ keys = append (keys , attrs [i ].Key )
278+ }
279+ sort .Strings (keys )
280+ b := new (bytes.Buffer )
281+ for _ , key := range keys {
282+ appendAttr (b , key , m [key ])
260283 }
284+ b .Truncate (b .Len () - 1 )
285+ h2 .preformattedAttrs = b .String ()
286+ return & h2
287+ }
261288
262- keys := make ([]string , 0 , len (entry .Data ))
263- for k := range entry .Data {
264- keys = append (keys , k )
289+ func appendAttr (b * bytes.Buffer , key string , val slog.Value ) {
290+ b .WriteString (key )
291+ b .WriteByte ('=' )
292+ stringVal := val .String ()
293+ if needsQuoting (stringVal ) {
294+ fmt .Fprintf (b , "%q" , stringVal )
295+ } else {
296+ b .WriteString (stringVal )
265297 }
266- sort .Strings (keys )
298+ b .WriteByte (',' )
299+ }
300+
301+ func (h * textHandler ) WithGroup (group string ) slog.Handler {
302+ // group not handled
303+ return h
304+ }
305+
306+ func (h * textHandler ) Handle (_ context.Context , entry slog.Record ) error {
307+ b := & bytes.Buffer {}
267308
268309 b .WriteString (entry .Time .Format (time .RFC3339 ))
269310 b .WriteByte (' ' )
270- b .WriteString (entry .Level .String ())
311+ b .WriteString (strings . ToLower ( entry .Level .String () ))
271312 b .WriteByte (' ' )
272- for i , key := range keys {
273- b .WriteString (key )
274- b .WriteByte ('=' )
275- stringVal , ok := entry .Data [key ].(string )
276- if ! ok {
277- stringVal = fmt .Sprint (entry .Data [key ])
278- }
279- if f .needsQuoting (stringVal ) {
280- fmt .Fprintf (b , "%q" , stringVal )
281- } else {
282- b .WriteString (stringVal )
283- }
284- if i != len (keys )- 1 {
285- b .WriteByte (',' )
286- } else {
313+ b .WriteString (h .preformattedAttrs )
314+
315+ if entry .NumAttrs () > 0 {
316+ if len (h .preformattedAttrs ) > 0 {
287317 b .WriteByte (' ' )
288318 }
319+ entry .Attrs (func (attr slog.Attr ) bool {
320+ appendAttr (b , attr .Key , attr .Value )
321+ return true
322+ })
323+ b .Truncate (b .Len () - 1 )
289324 }
325+
326+ if len (h .preformattedAttrs ) > 0 || entry .NumAttrs () > 0 {
327+ b .WriteByte (' ' )
328+ }
329+
290330 b .WriteString (entry .Message )
291331 b .WriteByte ('\n' )
292- return b .Bytes (), nil
332+ _ , err := h .out .Write (b .Bytes ())
333+ return err
293334}
294335
295- func ( f * textFormatter ) needsQuoting (text string ) bool {
336+ func needsQuoting (text string ) bool {
296337 for _ , ch := range text {
297338 if ! ((ch >= 'a' && ch <= 'z' ) ||
298339 (ch >= 'A' && ch <= 'Z' ) ||
0 commit comments