Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Otel was working well, but it was heavy and required a otel specific log collector. The journal is a lot lighter weight. Journal entries are collected during a reconcile and logged once at the end. As this produces a good sized log line per reconcile, debug logging was added so that this is opt in only. Signed-off-by: Jacob Weinstock <[email protected]>
- Loading branch information
1 parent
11b1878
commit 68ff0e4
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package journal | ||
|
|
||
| import ( | ||
| "context" | ||
| "log/slog" | ||
| "path/filepath" | ||
| "runtime" | ||
| "strings" | ||
| "time" | ||
| ) | ||
|
|
||
| type CtxKey string | ||
|
|
||
| const Name CtxKey = "journal" | ||
|
|
||
| type Entry struct { | ||
| Msg string `json:"msg"` | ||
| Args map[string]any `json:"args,omitempty"` | ||
| Source slog.Source `json:"source"` | ||
| Time string `json:"time"` | ||
| } | ||
|
|
||
| // New creates a slice of Entries in the provided context. | ||
| func New(ctx context.Context) context.Context { | ||
| e := &[]Entry{} | ||
| return context.WithValue(ctx, Name, e) | ||
| } | ||
|
|
||
| // Log adds a new Entry to the journal in the provided context. | ||
| // Log is not thread-safe. | ||
| func Log(ctx context.Context, msg string, args ...any) { | ||
| t := time.Now().UTC().Format(time.RFC3339Nano) | ||
| m := make(map[string]any) | ||
| for i := 0; i < len(args); i += 2 { | ||
| m[args[i].(string)] = args[i+1] | ||
| } | ||
| e, ok := ctx.Value(Name).(*[]Entry) | ||
| if !ok { | ||
| e = &[]Entry{{Msg: msg, Args: m, Source: fileAndLine(), Time: t}} | ||
| return | ||
| } | ||
| *e = append(*e, Entry{Msg: msg, Args: m, Source: fileAndLine(), Time: t}) | ||
| } | ||
|
|
||
| // Journal returns the journal from the provided context. | ||
| func Journal(ctx context.Context) []Entry { | ||
| e, ok := ctx.Value(Name).(*[]Entry) | ||
| if !ok { | ||
| return nil | ||
| } | ||
| return *e | ||
| } | ||
|
|
||
| func fileAndLine() slog.Source { | ||
| pc, file, line, _ := runtime.Caller(2) | ||
| fn := runtime.FuncForPC(pc) | ||
| var fnName string | ||
| if fn == nil { | ||
| fnName = "?()" | ||
| } else { | ||
| fnName = strings.TrimLeft(filepath.Ext(fn.Name()), ".") + "()" | ||
| } | ||
|
|
||
| return slog.Source{ | ||
| Function: fnName, | ||
| File: filepath.Base(file), | ||
| Line: line, | ||
| } | ||
| } | ||
Oops, something went wrong.