README.md

@@ -12,8 +12,6 @@ func main(){
 }
 ```
 
-Check out this [simple example file](cmd/simple/main.go) for the basic usage.
-
 ## Multiple Log Instance
 
 Create a new log instance (instead of using the `Default`).
@@ -43,6 +41,7 @@ var myLog := log.NewLogger(
 	[]*Output{output1, output2}
 )
 myLog.Info("My First Info Message")
+
 ```
 
 ## Custom Formatter / Printer

cmd/keyValueFormatter/main.go

@@ -1,30 +0,0 @@
-package main
-
-import (
-	"time"
-
-	"git.martin-riedl.de/golang/log"
-)
-
-func main() {
-	advancedSettings()
-}
-
-func advancedSettings() {
-	// Key Value Formatter with special settings
-	formatter := log.NewFormatterKeyValue()
-	formatter.HighPriorityKeys = []string{"firstField"}
-	formatter.PriorityKeys = []string{"secondField"}
-	formatter.TimeFormat = time.RFC3339Nano
-
-	// create new log instance
-	output := log.NewOutput(log.LevelDebug, formatter, log.NewPrinterStdout())
-	logger := log.NewLogger([]*log.Output{output})
-
-	// log some message
-	logger.WithMap(log.Map{
-		"someField":   "Martin",
-		"firstField":  "John",
-		"secondField": "Doe",
-	}).Info("This is an info message")
-}

cmd/simple/main.go

@@ -1,24 +1,15 @@
 package main
 
 import (
-	"runtime"
-
 	"git.martin-riedl.de/golang/log"
+	"runtime"
 )
 
 func main() {
 	someMethod()
-	anotherMethod()
 }
 
 func someMethod() {
 	log.Default.Info("Hello World")
-	log.Default.With("os", runtime.GOOS).Warning("environment detected")
+	log.Default.With("os", runtime.GOOS).Info("environment detected")
-}
-
-func anotherMethod() {
-	log.Default.WithMap(log.Map{
-		"foo": "bar",
-		"bar": "baz",
-	}).Info("Second Hello World")
 }

entry.go

@@ -34,8 +34,6 @@ type Content struct {
 	Value any    `json:"value"`
 }
 
-type Map map[string]any
-
 func NewEntry(logger *Logger) *Entry {
 	return &Entry{
 		Logger:  logger,
@@ -51,13 +49,6 @@ func (entry *Entry) With(key string, value any) *Entry {
 	return entry
 }
 
-func (entry *Entry) WithMap(entries Map) *Entry {
-	for key, value := range entries {
-		entry.With(key, value)
-	}
-	return entry
-}
-
 func (entry *Entry) WithContent(content []Content) *Entry {
 	entry.Content = append(entry.Content, content...)
 	return entry

formatter_json.go

@@ -24,7 +24,7 @@ import (
 type FormatterJSON struct {
 	FlatContent bool
 	TimeFormat  string
-	data        map[string]any
+	data        map[string]interface{}
 }
 
 func NewFormatterJSON() *FormatterJSON {
@@ -35,7 +35,7 @@ func NewFormatterJSON() *FormatterJSON {
 
 func (formatter *FormatterJSON) Begin(entry *Entry) {
 	// reset formatter
-	formatter.data = make(map[string]any)
+	formatter.data = make(map[string]interface{})
 
 	// add timestamp
 	formatter.data["time"] = entry.Time.Format(formatter.TimeFormat)
@@ -65,7 +65,7 @@ func (formatter *FormatterJSON) Process(entry *Entry) {
 	}
 }
 
-func (formatter *FormatterJSON) End(_ *Entry) []byte {
+func (formatter *FormatterJSON) End(entry *Entry) []byte {
 	// build JSON
 	data, err := json.Marshal(formatter.data)
 	if err != nil {

formatter_keyvalue.go

@@ -16,17 +16,12 @@ package log
 
 import (
 	"fmt"
-	"slices"
 	"strings"
 	"time"
 )
 
 type FormatterKeyValue struct {
-	TimeFormat string
+	TimeFormat       string
-	// HighPriorityKeys are printed before the actual log message
-	HighPriorityKeys []string
-	// PriorityKeys are printed after the log message
-	PriorityKeys     []string
 	builder          strings.Builder
 	isFirstKVWritten bool
 }
@@ -50,23 +45,9 @@ func (formatter *FormatterKeyValue) Begin(entry *Entry) {
 }
 
 func (formatter *FormatterKeyValue) Process(entry *Entry) {
-	// log high priority keys
-	for _, content := range entry.Content {
-		if slices.Contains(formatter.HighPriorityKeys, content.Key) {
-			formatter.addKV(content.Key, content.Value)
-		}
-	}
-
 	// add message
 	formatter.addKV("message", entry.Message)
 
-	// log priority keys
-	for _, content := range entry.Content {
-		if slices.Contains(formatter.PriorityKeys, content.Key) {
-			formatter.addKV(content.Key, content.Value)
-		}
-	}
-
 	// add call stack
 	if len(entry.CallStack) > 0 {
 		caller := entry.CallStack[0]
@@ -76,10 +57,7 @@ func (formatter *FormatterKeyValue) Process(entry *Entry) {
 
 	// add additional fields
 	for _, content := range entry.Content {
-		if !slices.Contains(formatter.HighPriorityKeys, content.Key) &&
+		formatter.addKV(content.Key, content.Value)
-			!slices.Contains(formatter.PriorityKeys, content.Key) {
-			formatter.addKV(content.Key, content.Value)
-		}
 	}
 }
 
@@ -104,7 +82,7 @@ func (formatter *FormatterKeyValue) addKV(key string, value any) {
 	formatter.builder.WriteString(val)
 }
 
-func (formatter *FormatterKeyValue) End(_ *Entry) []byte {
+func (formatter *FormatterKeyValue) End(entry *Entry) []byte {
 	// send data
 	return []byte(formatter.builder.String())
 }

logger.go

@@ -113,12 +113,6 @@ func (logger *Logger) With(key string, value any) *Entry {
 	return entry
 }
 
-func (logger *Logger) WithMap(entries Map) *Entry {
-	entry := NewEntry(logger)
-	entry.WithMap(entries)
-	return entry
-}
-
 func (logger *Logger) WithContent(content []Content) *Entry {
 	entry := NewEntry(logger)
 	entry.WithContent(content)