pkgerrors: quick refactoring for better readibility

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      interval: weekly

.github/workflows/test.yml

@@ -1,27 +0,0 @@
-on: [push, pull_request]
-name: Test
-jobs:
-  test:
-    strategy:
-      matrix:
-        go-version: [1.15.x, 1.16.x]
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - uses: actions/cache@v3.0.5
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
-    - name: Test
-      run: go test -race -bench . -benchmem ./...
-    - name: Test CBOR
-      run: go test -tags binary_log ./...
-

.travis.yml

@@ -0,0 +1,13 @@
+language: go
+go:
+- "1.7"
+- "1.8"
+- "1.9"
+- "1.10"
+- "master"
+matrix:
+  allow_failures:
+      - go: "master"
+script:
+  - go test -v -race -cpu=1,2,4 -bench . -benchmem ./...
+  - go test -v -tags binary_log -race -cpu=1,2,4 -bench . -benchmem ./...

README.md

@@ -18,21 +18,20 @@ Find out [who uses zerolog](https://github.com/rs/zerolog/wiki/Who-uses-zerolog)
 
 ## Features
 
-* [Blazing fast](#benchmarks)
-* [Low to zero allocation](#benchmarks)
-* [Leveled logging](#leveled-logging)
-* [Sampling](#log-sampling)
-* [Hooks](#hooks)
-* [Contextual fields](#contextual-logging)
+* Blazing fast
+* Low to zero allocation
+* Level logging
+* Sampling
+* Hooks
+* Contextual fields
 * `context.Context` integration
-* [Integration with `net/http`](#integration-with-nethttp)
-* [JSON and CBOR encoding formats](#binary-encoding)
-* [Pretty logging for development](#pretty-logging)
-* [Error Logging (with optional Stacktrace)](#error-logging)
+* `net/http` helpers
+* JSON and CBOR encoding formats
+* Pretty logging for development
 
 ## Installation
 
-```bash
+```go
 go get -u github.com/rs/zerolog/log
 ```
 
@@ -52,7 +51,9 @@ import (
 
 func main() {
     // UNIX Time is faster and smaller than most timestamps
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    // If you set zerolog.TimeFieldFormat to an empty string,
+    // logs will write with UNIX time
+    zerolog.TimeFieldFormat = ""
 
     log.Print("hello world")
 }
@@ -75,20 +76,15 @@ import (
 )
 
 func main() {
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    zerolog.TimeFieldFormat = ""
 
     log.Debug().
         Str("Scale", "833 cents").
         Float64("Interval", 833.09).
         Msg("Fibonacci is everywhere")
-    
-    log.Debug().
-        Str("Name", "Tom").
-        Send()
 }
 
-// Output: {"level":"debug","Scale":"833 cents","Interval":833.09,"time":1562212768,"message":"Fibonacci is everywhere"}
-// Output: {"level":"debug","Name":"Tom","time":1562212768}
+// Output: {"time":1524104936,"level":"debug","Scale":"833 cents","Interval":833.09,"message":"Fibonacci is everywhere"}
 ```
 
 > You'll note in the above example that when adding contextual fields, the fields are strongly typed. You can find the full list of supported fields [here](#standard-types)
@@ -106,7 +102,7 @@ import (
 )
 
 func main() {
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    zerolog.TimeFieldFormat = ""
 
     log.Info().Msg("hello world")
 }
@@ -124,7 +120,6 @@ func main() {
 * warn (`zerolog.WarnLevel`, 2)
 * info (`zerolog.InfoLevel`, 1)
 * debug (`zerolog.DebugLevel`, 0)
-* trace (`zerolog.TraceLevel`, -1)
 
 You can set the Global logging level to any of these options using the `SetGlobalLevel` function in the zerolog package, passing in one of the given constants above, e.g. `zerolog.InfoLevel` would be the "info" level.  Whichever level is chosen, all logs with a level greater than or equal to that level will be written. To turn off logging entirely, pass the `zerolog.Disabled` constant.
 
@@ -143,7 +138,7 @@ import (
 )
 
 func main() {
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    zerolog.TimeFieldFormat = ""
     debug := flag.Bool("debug", false, "sets log level to debug")
 
     flag.Parse()
@@ -194,7 +189,7 @@ import (
 )
 
 func main() {
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    zerolog.TimeFieldFormat = ""
 
     log.Log().
         Str("foo", "bar").
@@ -204,80 +199,6 @@ func main() {
 // Output: {"time":1494567715,"foo":"bar"}
 ```
 
-### Error Logging
-
-You can log errors using the `Err` method
-
-```go
-package main
-
-import (
-	"errors"
-
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-)
-
-func main() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-
-	err := errors.New("seems we have an error here")
-	log.Error().Err(err).Msg("")
-}
-
-// Output: {"level":"error","error":"seems we have an error here","time":1609085256}
-```
-
-> The default field name for errors is `error`, you can change this by setting `zerolog.ErrorFieldName` to meet your needs.
-
-#### Error Logging with Stacktrace
-
-Using `github.com/pkg/errors`, you can add a formatted stacktrace to your errors. 
-
-```go
-package main
-
-import (
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/pkgerrors"
-
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-)
-
-func main() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
-
-	err := outer()
-	log.Error().Stack().Err(err).Msg("")
-}
-
-func inner() error {
-	return errors.New("seems we have an error here")
-}
-
-func middle() error {
-	err := inner()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func outer() error {
-	err := middle()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// Output: {"level":"error","stack":[{"func":"inner","line":"20","source":"errors.go"},{"func":"middle","line":"24","source":"errors.go"},{"func":"outer","line":"32","source":"errors.go"},{"func":"main","line":"15","source":"errors.go"},{"func":"main","line":"204","source":"proc.go"},{"func":"goexit","line":"1374","source":"asm_amd64.s"}],"error":"seems we have an error here","time":1609086683}
-```
-
-> zerolog.ErrorStackMarshaler must be set in order for the stack to output anything.
-
 #### Logging Fatal Messages
 
 ```go
@@ -294,7 +215,7 @@ func main() {
     err := errors.New("A repo man spends his life getting into tense situations")
     service := "myservice"
 
-    zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+    zerolog.TimeFieldFormat = ""
 
     log.Fatal().
         Err(err).
@@ -308,7 +229,6 @@ func main() {
 
 > NOTE: Using `Msgf` generates one allocation even when the logger is disabled.
 
-
 ### Create logger instance to manage different outputs
 
 ```go
@@ -399,8 +319,6 @@ log.Logger = log.With().Str("foo", "bar").Logger()
 
 ### Add file and line number to log
 
-Equivalent of `Llongfile`:
-
 ```go
 log.Logger = log.With().Caller().Logger()
 log.Info().Msg("hello world")
@@ -408,35 +326,16 @@ log.Info().Msg("hello world")
 // Output: {"level": "info", "message": "hello world", "caller": "/go/src/your_project/some_file:21"}
 ```
 
-Equivalent of `Lshortfile`:
-
-```go
-zerolog.CallerMarshalFunc = func(file string, line int) string {
-    short := file
-    for i := len(file) - 1; i > 0; i-- {
-        if file[i] == '/' {
-            short = file[i+1:]
-            break
-        }
-    }
-    file = short
-    return file + ":" + strconv.Itoa(line)
-}
-log.Logger = log.With().Caller().Logger()
-log.Info().Msg("hello world")
-
-// Output: {"level": "info", "message": "hello world", "caller": "some_file:21"}
-```
 
 ### Thread-safe, lock-free, non-blocking writer
 
-If your writer might be slow or not thread-safe and you need your log producers to never get slowed down by a slow writer, you can use a `diode.Writer` as follows:
+If your writer might be slow or not thread-safe and you need your log producers to never get slowed down by a slow writer, you can use a `diode.Writer` as follow:
 
 ```go
 wr := diode.NewWriter(os.Stdout, 1000, 10*time.Millisecond, func(missed int) {
 		fmt.Printf("Logger Dropped %d messages", missed)
 	})
-log := zerolog.New(wr)
+log := zerolog.New(w)
 log.Print("test")
 ```
 
@@ -530,11 +429,11 @@ c := alice.New()
 c = c.Append(hlog.NewHandler(log))
 
 // Install some provided extra handler to set some request's context fields.
-// Thanks to that handler, all our logs will come with some prepopulated fields.
+// Thanks to those handler, all our logs will come with some pre-populated fields.
 c = c.Append(hlog.AccessHandler(func(r *http.Request, status, size int, duration time.Duration) {
     hlog.FromRequest(r).Info().
         Str("method", r.Method).
-        Stringer("url", r.URL).
+        Str("url", r.URL.String()).
         Int("status", status).
         Int("size", size).
         Dur("duration", duration).
@@ -564,40 +463,23 @@ if err := http.ListenAndServe(":8080", nil); err != nil {
 }
 ```
 
-## Multiple Log Output
-`zerolog.MultiLevelWriter` may be used to send the log message to multiple outputs. 
-In this example, we send the log message to both `os.Stdout` and the in-built ConsoleWriter.
-```go
-func main() {
-	consoleWriter := zerolog.ConsoleWriter{Out: os.Stdout}
-
-	multi := zerolog.MultiLevelWriter(consoleWriter, os.Stdout)
-
-	logger := zerolog.New(multi).With().Timestamp().Logger()
-
-	logger.Info().Msg("Hello World!")
-}
-
-// Output (Line 1: Console; Line 2: Stdout)
-// 12:36PM INF Hello World!
-// {"level":"info","time":"2019-11-07T12:36:38+03:00","message":"Hello World!"}
-```
-
 ## Global Settings
 
-Some settings can be changed and will be applied to all loggers:
+Some settings can be changed and will by applied to all loggers:
 
 * `log.Logger`: You can set this value to customize the global logger (the one used by package level methods).
-* `zerolog.SetGlobalLevel`: Can raise the minimum level of all loggers. Call this with `zerolog.Disabled` to disable logging altogether (quiet mode).
+* `zerolog.SetGlobalLevel`: Can raise the minimum level of all loggers. Set this to `zerolog.Disabled` to disable logging altogether (quiet mode).
 * `zerolog.DisableSampling`: If argument is `true`, all sampled loggers will stop sampling and issue 100% of their log events.
 * `zerolog.TimestampFieldName`: Can be set to customize `Timestamp` field name.
 * `zerolog.LevelFieldName`: Can be set to customize level field name.
 * `zerolog.MessageFieldName`: Can be set to customize message field name.
 * `zerolog.ErrorFieldName`: Can be set to customize `Err` field name.
-* `zerolog.TimeFieldFormat`: Can be set to customize `Time` field value formatting. If set with `zerolog.TimeFormatUnix`, `zerolog.TimeFormatUnixMs` or `zerolog.TimeFormatUnixMicro`, times are formated as UNIX timestamp.
-* `zerolog.DurationFieldUnit`: Can be set to customize the unit for time.Duration type fields added by `Dur` (default: `time.Millisecond`).
-* `zerolog.DurationFieldInteger`: If set to `true`, `Dur` fields are formatted as integers instead of floats (default: `false`). 
-* `zerolog.ErrorHandler`: Called whenever zerolog fails to write an event on its output. If not set, an error is printed on the stderr. This handler must be thread safe and non-blocking.
+* `zerolog.TimeFieldFormat`: Can be set to customize `Time` field value formatting. If set with an empty string, times are formated as UNIX timestamp.
+    // DurationFieldUnit defines the unit for time.Duration type fields added
+    // using the Dur method.
+* `DurationFieldUnit`: Sets the unit of the fields added by `Dur` (default: `time.Millisecond`).
+* `DurationFieldInteger`: If set to true, `Dur` fields are formatted as integers instead of floats.
+* `ErrorHandler`: Called whenever zerolog fails to write an event on its output. If not set, an error is printed on the stderr. This handler must be thread safe and non-blocking.
 
 ## Field Types
 
@@ -611,21 +493,16 @@ Some settings can be changed and will be applied to all loggers:
 
 ### Advanced Fields
 
-* `Err`: Takes an `error` and renders it as a string using the `zerolog.ErrorFieldName` field name.
-* `Func`: Run a `func` only if the level is enabled.
-* `Timestamp`: Inserts a timestamp field with `zerolog.TimestampFieldName` field name, formatted using `zerolog.TimeFieldFormat`.
-* `Time`: Adds a field with time formatted with `zerolog.TimeFieldFormat`.
-* `Dur`: Adds a field with `time.Duration`.
+* `Err`: Takes an `error` and render it as a string using the `zerolog.ErrorFieldName` field name.
+* `Timestamp`: Insert a timestamp field with `zerolog.TimestampFieldName` field name and formatted using `zerolog.TimeFieldFormat`.
+* `Time`: Adds a field with the time formated with the `zerolog.TimeFieldFormat`.
+* `Dur`: Adds a field with a `time.Duration`.
 * `Dict`: Adds a sub-key/value as a field of the event.
-* `RawJSON`: Adds a field with an already encoded JSON (`[]byte`)
-* `Hex`: Adds a field with value formatted as a hexadecimal string (`[]byte`)
 * `Interface`: Uses reflection to marshal the type.
 
-Most fields are also available in the slice format (`Strs` for `[]string`, `Errs` for `[]error` etc.)
-
 ## Binary Encoding
 
-In addition to the default JSON encoding, `zerolog` can produce binary logs using [CBOR](https://cbor.io) encoding. The choice of encoding can be decided at compile time using the build tag `binary_log` as follows:
+In addition to the default JSON encoding, `zerolog` can produce binary logs using [CBOR](http://cbor.io) encoding. The choice of encoding can be decided at compile time using the build tag `binary_log` as follows:
 
 ```bash
 go build -tags binary_log .
@@ -637,8 +514,6 @@ with zerolog library is [CSD](https://github.com/toravir/csd/).
 ## Related Projects
 
 * [grpc-zerolog](https://github.com/cheapRoc/grpc-zerolog): Implementation of `grpclog.LoggerV2` interface using `zerolog`
-* [overlog](https://github.com/Trendyol/overlog): Implementation of `Mapped Diagnostic Context` interface using `zerolog`
-* [zerologr](https://github.com/go-logr/zerologr): Implementation of `logr.LogSink` interface using `zerolog`
 
 ## Benchmarks
 
@@ -703,7 +578,7 @@ Log a static string, without any context or `printf`-style templating:
 
 ## Caveats
 
-Note that zerolog does no de-duplication of fields. Using the same key multiple times creates multiple keys in final JSON:
+Note that zerolog does de-duplication fields. Using the same key multiple times creates multiple keys in final JSON:
 
 ```go
 logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
@@ -713,4 +588,4 @@ logger.Info().
 // Output: {"level":"info","time":1494567715,"time":1494567715,"message":"dup"}
 ```
 
-In this case, many consumers will take the last value, but this is not guaranteed; check yours if in doubt.
+However, it’s not a big deal as JSON accepts dup keys; the last one prevails.

array.go

@@ -49,7 +49,7 @@ func (*Array) MarshalZerologArray(*Array) {
 func (a *Array) write(dst []byte) []byte {
 	dst = enc.AppendArrayStart(dst)
 	if len(a.buf) > 0 {
-		dst = append(dst, a.buf...)
+		dst = append(append(dst, a.buf...))
 	}
 	dst = enc.AppendArrayEnd(dst)
 	putArray(a)
@@ -85,15 +85,10 @@ func (a *Array) Hex(val []byte) *Array {
 	return a
 }
 
-// RawJSON adds already encoded JSON to the array.
-func (a *Array) RawJSON(val []byte) *Array {
-	a.buf = appendJSON(enc.AppendArrayDelim(a.buf), val)
-	return a
-}
-
 // Err serializes and appends the err to the array.
 func (a *Array) Err(err error) *Array {
-	switch m := ErrorMarshalFunc(err).(type) {
+	marshaled := ErrorMarshalFunc(err)
+	switch m := marshaled.(type) {
 	case LogObjectMarshaler:
 		e := newEvent(nil, 0)
 		e.buf = e.buf[:0]
@@ -101,11 +96,7 @@ func (a *Array) Err(err error) *Array {
 		a.buf = append(enc.AppendArrayDelim(a.buf), e.buf...)
 		putEvent(e)
 	case error:
-		if m == nil || isNilValue(m) {
-			a.buf = enc.AppendNil(enc.AppendArrayDelim(a.buf))
-		} else {
-			a.buf = enc.AppendString(enc.AppendArrayDelim(a.buf), m.Error())
-		}
+		a.buf = enc.AppendString(enc.AppendArrayDelim(a.buf), m.Error())
 	case string:
 		a.buf = enc.AppendString(enc.AppendArrayDelim(a.buf), m)
 	default:
@@ -193,7 +184,7 @@ func (a *Array) Float64(f float64) *Array {
 	return a
 }
 
-// Time append append t formatted as string using zerolog.TimeFieldFormat.
+// Time append append t formated as string using zerolog.TimeFieldFormat.
 func (a *Array) Time(t time.Time) *Array {
 	a.buf = enc.AppendTime(enc.AppendArrayDelim(a.buf), t, TimeFieldFormat)
 	return a
@@ -231,10 +222,3 @@ func (a *Array) MACAddr(ha net.HardwareAddr) *Array {
 	a.buf = enc.AppendMACAddr(enc.AppendArrayDelim(a.buf), ha)
 	return a
 }
-
-// Dict adds the dict Event to the array
-func (a *Array) Dict(dict *Event) *Array {
-	dict.buf = enc.AppendEndMarker(dict.buf)
-	a.buf = append(enc.AppendArrayDelim(a.buf), dict.buf...)
-	return a
-}

array_test.go

@@ -24,15 +24,10 @@ func TestArray(t *testing.T) {
 		Str("a").
 		Bytes([]byte("b")).
 		Hex([]byte{0x1f}).
-		RawJSON([]byte(`{"some":"json"}`)).
 		Time(time.Time{}).
 		IPAddr(net.IP{192, 168, 0, 10}).
-		Dur(0).
-		Dict(Dict().
-			Str("bar", "baz").
-			Int("n", 1),
-		)
-	want := `[true,1,2,3,4,5,6,7,8,9,10,11.98122,12.987654321,"a","b","1f",{"some":"json"},"0001-01-01T00:00:00Z","192.168.0.10",0,{"bar":"baz","n":1}]`
+		Dur(0)
+	want := `[true,1,2,3,4,5,6,7,8,9,10,11.98122,12.987654321,"a","b","1f","0001-01-01T00:00:00Z","192.168.0.10",0]`
 	if got := decodeObjectToStr(a.write([]byte{})); got != want {
 		t.Errorf("Array.write()\ngot:  %s\nwant: %s", got, want)
 	}

benchmark_test.go

@@ -3,7 +3,6 @@ package zerolog
 import (
 	"errors"
 	"io/ioutil"
-	"net"
 	"testing"
 	"time"
 )
@@ -148,16 +147,16 @@ func BenchmarkLogFieldType(b *testing.B) {
 		{"a", "a", 0},
 	}
 	objects := []obj{
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
 	}
 	errs := []error{errors.New("a"), errors.New("b"), errors.New("c"), errors.New("d"), errors.New("e")}
 	types := map[string]func(e *Event) *Event{
@@ -235,13 +234,12 @@ func BenchmarkLogFieldType(b *testing.B) {
 
 func BenchmarkContextFieldType(b *testing.B) {
 	oldFormat := TimeFieldFormat
-	TimeFieldFormat = TimeFormatUnix
+	TimeFieldFormat = ""
 	defer func() { TimeFieldFormat = oldFormat }()
 	bools := []bool{true, false, true, false, true, false, true, false, true, false}
 	ints := []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
 	floats := []float64{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
 	strings := []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"}
-	stringer := net.IP{127, 0, 0, 1}
 	durations := []time.Duration{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}
 	times := []time.Time{
 		time.Unix(0, 0),
@@ -272,16 +270,16 @@ func BenchmarkContextFieldType(b *testing.B) {
 		{"a", "a", 0},
 	}
 	objects := []obj{
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
-		{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
+		obj{"a", "a", 0},
 	}
 	errs := []error{errors.New("a"), errors.New("b"), errors.New("c"), errors.New("d"), errors.New("e")}
 	types := map[string]func(c Context) Context{
@@ -309,9 +307,6 @@ func BenchmarkContextFieldType(b *testing.B) {
 		"Strs": func(c Context) Context {
 			return c.Strs("k", strings)
 		},
-		"Stringer": func(c Context) Context {
-			return c.Stringer("k", stringer)
-		},
 		"Err": func(c Context) Context {
 			return c.Err(errs[0])
 		},

binary_test.go

@@ -108,19 +108,6 @@ func ExampleLogger_Printf() {
 	// Output: {"level":"debug","message":"hello world"}
 }
 
-func ExampleLogger_Trace() {
-	dst := bytes.Buffer{}
-	log := New(&dst)
-
-	log.Trace().
-		Str("foo", "bar").
-		Int("n", 123).
-		Msg("hello world")
-
-	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
-	// Output: {"level":"trace","foo":"bar","n":123,"message":"hello world"}
-}
-
 func ExampleLogger_Debug() {
 	dst := bytes.Buffer{}
 	log := New(&dst)
@@ -364,42 +351,6 @@ func ExampleEvent_Durs() {
 	// Output: {"foo":"bar","durs":[10000,20000],"message":"hello world"}
 }
 
-func ExampleEvent_Fields_map() {
-	fields := map[string]interface{}{
-		"bar": "baz",
-		"n":   1,
-	}
-
-	dst := bytes.Buffer{}
-	log := New(&dst)
-
-	log.Log().
-		Str("foo", "bar").
-		Fields(fields).
-		Msg("hello world")
-
-	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
-func ExampleEvent_Fields_slice() {
-	fields := []interface{}{
-		"bar", "baz",
-		"n", 1,
-	}
-
-	dst := bytes.Buffer{}
-	log := New(&dst)
-
-	log.Log().
-		Str("foo", "bar").
-		Fields(fields).
-		Msg("hello world")
-
-	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
 func ExampleContext_Dict() {
 	dst := bytes.Buffer{}
 	log := New(&dst).With().
@@ -546,39 +497,3 @@ func ExampleContext_Durs() {
 	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
 	// Output: {"foo":"bar","durs":[10000,20000],"message":"hello world"}
 }
-
-func ExampleContext_Fields_map() {
-	fields := map[string]interface{}{
-		"bar": "baz",
-		"n":   1,
-	}
-
-	dst := bytes.Buffer{}
-	log := New(&dst).With().
-		Str("foo", "bar").
-		Fields(fields).
-		Logger()
-
-	log.Log().Msg("hello world")
-
-	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
-func ExampleContext_Fields_slice() {
-	fields := []interface{}{
-		"bar", "baz",
-		"n", 1,
-	}
-
-	dst := bytes.Buffer{}
-	log := New(&dst).With().
-		Str("foo", "bar").
-		Fields(fields).
-		Logger()
-
-	log.Log().Msg("hello world")
-
-	fmt.Println(decodeIfBinaryToString(dst.Bytes()))
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}

cmd/lint/go.mod

@@ -1,5 +0,0 @@
-module github.com/rs/zerolog/cmd/lint
-
-go 1.15
-
-require golang.org/x/tools v0.1.8

cmd/lint/go.sum

@@ -1,28 +0,0 @@
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

cmd/lint/readme.md

@@ -27,7 +27,7 @@ The command accepts only one argument - the package to be inspected - and 4 opti
 - ignoreFile
     - which files to ignore, either by full path or by go path (package/file.go)
 - ignorePkg
-    - do not inspect the specified package if found in the dependency tree
+    - do not inspect the specified package if found in the dependecy tree
 - ignorePkgRecursively
     - do not inspect the specified package or its subpackages if found in the dependency tree
 

console.go

@@ -6,14 +6,16 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
+)
 
-	"github.com/mattn/go-colorable"
+const (
+	colorBold = iota + 1
+	colorFaint
 )
 
 const (
@@ -25,9 +27,6 @@ const (
 	colorMagenta
 	colorCyan
 	colorWhite
-
-	colorBold     = 1
-	colorDarkGray = 90
 )
 
 var (
@@ -60,12 +59,6 @@ type ConsoleWriter struct {
 	// PartsOrder defines the order of parts in output.
 	PartsOrder []string
 
-	// PartsExclude defines parts to not display in output.
-	PartsExclude []string
-
-	// FieldsExclude defines contextual fields to not display in output.
-	FieldsExclude []string
-
 	FormatTimestamp     Formatter
 	FormatLevel         Formatter
 	FormatCaller        Formatter
@@ -74,8 +67,6 @@ type ConsoleWriter struct {
 	FormatFieldValue    Formatter
 	FormatErrFieldName  Formatter
 	FormatErrFieldValue Formatter
-
-	FormatExtra func(map[string]interface{}, *bytes.Buffer) error
 }
 
 // NewConsoleWriter creates and initializes a new ConsoleWriter.
@@ -90,21 +81,11 @@ func NewConsoleWriter(options ...func(w *ConsoleWriter)) ConsoleWriter {
 		opt(&w)
 	}
 
-	// Fix color on Windows
-	if w.Out == os.Stdout || w.Out == os.Stderr {
-		w.Out = colorable.NewColorable(w.Out.(*os.File))
-	}
-
 	return w
 }
 
 // Write transforms the JSON input with formatters and appends to w.Out.
 func (w ConsoleWriter) Write(p []byte) (n int, err error) {
-	// Fix color on Windows
-	if w.Out == os.Stdout || w.Out == os.Stderr {
-		w.Out = colorable.NewColorable(w.Out.(*os.File))
-	}
-
 	if w.PartsOrder == nil {
 		w.PartsOrder = consoleDefaultPartsOrder()
 	}
@@ -130,18 +111,10 @@ func (w ConsoleWriter) Write(p []byte) (n int, err error) {
 
 	w.writeFields(evt, buf)
 
-	if w.FormatExtra != nil {
-		err = w.FormatExtra(evt, buf)
-		if err != nil {
-			return n, err
-		}
-	}
-
 	err = buf.WriteByte('\n')
 	if err != nil {
 		return n, err
 	}
-
 	_, err = buf.WriteTo(w.Out)
 	return len(p), err
 }
@@ -150,17 +123,6 @@ func (w ConsoleWriter) Write(p []byte) (n int, err error) {
 func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer) {
 	var fields = make([]string, 0, len(evt))
 	for field := range evt {
-		var isExcluded bool
-		for _, excluded := range w.FieldsExclude {
-			if field == excluded {
-				isExcluded = true
-				break
-			}
-		}
-		if isExcluded {
-			continue
-		}
-
 		switch field {
 		case LevelFieldName, TimestampFieldName, MessageFieldName, CallerFieldName:
 			continue
@@ -169,8 +131,7 @@ func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer
 	}
 	sort.Strings(fields)
 
-	// Write space only if something has already been written to the buffer, and if there are fields.
-	if buf.Len() > 0 && len(fields) > 0 {
+	if len(fields) > 0 {
 		buf.WriteByte(' ')
 	}
 
@@ -231,7 +192,7 @@ func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer
 		case json.Number:
 			buf.WriteString(fv(fValue))
 		default:
-			b, err := InterfaceMarshalFunc(fValue)
+			b, err := json.Marshal(fValue)
 			if err != nil {
 				fmt.Fprintf(buf, colorize("[error: %v]", colorRed, w.NoColor), err)
 			} else {
@@ -249,14 +210,6 @@ func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer
 func (w ConsoleWriter) writePart(buf *bytes.Buffer, evt map[string]interface{}, p string) {
 	var f Formatter
 
-	if w.PartsExclude != nil && len(w.PartsExclude) > 0 {
-		for _, exclude := range w.PartsExclude {
-			if exclude == p {
-				return
-			}
-		}
-	}
-
 	switch p {
 	case LevelFieldName:
 		if w.FormatLevel == nil {
@@ -293,10 +246,10 @@ func (w ConsoleWriter) writePart(buf *bytes.Buffer, evt map[string]interface{},
 	var s = f(evt[p])
 
 	if len(s) > 0 {
-		if buf.Len() > 0 {
-			buf.WriteByte(' ') // Write space only if not the first part
-		}
 		buf.WriteString(s)
+		if p != w.PartsOrder[len(w.PartsOrder)-1] { // Skip space for last part
+			buf.WriteByte(' ')
+		}
 	}
 }
 
@@ -341,27 +294,12 @@ func consoleDefaultFormatTimestamp(timeFormat string, noColor bool) Formatter {
 			if err != nil {
 				t = tt
 			} else {
-				t = ts.Local().Format(timeFormat)
-			}
-		case json.Number:
-			i, err := tt.Int64()
-			if err != nil {
-				t = tt.String()
-			} else {
-				var sec, nsec int64 = i, 0
-				switch TimeFieldFormat {
-				case TimeFormatUnixMs:
-					nsec = int64(time.Duration(i) * time.Millisecond)
-					sec = 0
-				case TimeFormatUnixMicro:
-					nsec = int64(time.Duration(i) * time.Microsecond)
-					sec = 0
-				}
-				ts := time.Unix(sec, nsec)
 				t = ts.Format(timeFormat)
 			}
+		case json.Number:
+			t = tt.String()
 		}
-		return colorize(t, colorDarkGray, noColor)
+		return colorize(t, colorFaint, noColor)
 	}
 }
 
@@ -370,29 +308,23 @@ func consoleDefaultFormatLevel(noColor bool) Formatter {
 		var l string
 		if ll, ok := i.(string); ok {
 			switch ll {
-			case LevelTraceValue:
-				l = colorize("TRC", colorMagenta, noColor)
-			case LevelDebugValue:
+			case "debug":
 				l = colorize("DBG", colorYellow, noColor)
-			case LevelInfoValue:
+			case "info":
 				l = colorize("INF", colorGreen, noColor)
-			case LevelWarnValue:
+			case "warn":
 				l = colorize("WRN", colorRed, noColor)
-			case LevelErrorValue:
+			case "error":
 				l = colorize(colorize("ERR", colorRed, noColor), colorBold, noColor)
-			case LevelFatalValue:
+			case "fatal":
 				l = colorize(colorize("FTL", colorRed, noColor), colorBold, noColor)
-			case LevelPanicValue:
+			case "panic":
 				l = colorize(colorize("PNC", colorRed, noColor), colorBold, noColor)
 			default:
 				l = colorize("???", colorBold, noColor)
 			}
 		} else {
-			if i == nil {
-				l = colorize("???", colorBold, noColor)
-			} else {
-				l = strings.ToUpper(fmt.Sprintf("%s", i))[0:3]
-			}
+			l = strings.ToUpper(fmt.Sprintf("%s", i))[0:3]
 		}
 		return l
 	}
@@ -405,27 +337,24 @@ func consoleDefaultFormatCaller(noColor bool) Formatter {
 			c = cc
 		}
 		if len(c) > 0 {
-			if cwd, err := os.Getwd(); err == nil {
-				if rel, err := filepath.Rel(cwd, c); err == nil {
-					c = rel
-				}
+			cwd, err := os.Getwd()
+			if err == nil {
+				c = strings.TrimPrefix(c, cwd)
+				c = strings.TrimPrefix(c, "/")
 			}
-			c = colorize(c, colorBold, noColor) + colorize(" >", colorCyan, noColor)
+			c = colorize(c, colorBold, noColor) + colorize(" >", colorFaint, noColor)
 		}
 		return c
 	}
 }
 
 func consoleDefaultFormatMessage(i interface{}) string {
-	if i == nil {
-		return ""
-	}
 	return fmt.Sprintf("%s", i)
 }
 
 func consoleDefaultFormatFieldName(noColor bool) Formatter {
 	return func(i interface{}) string {
-		return colorize(fmt.Sprintf("%s=", i), colorCyan, noColor)
+		return colorize(fmt.Sprintf("%s=", i), colorFaint, noColor)
 	}
 }
 
@@ -435,7 +364,7 @@ func consoleDefaultFormatFieldValue(i interface{}) string {
 
 func consoleDefaultFormatErrFieldName(noColor bool) Formatter {
 	return func(i interface{}) string {
-		return colorize(fmt.Sprintf("%s=", i), colorCyan, noColor)
+		return colorize(fmt.Sprintf("%s=", i), colorRed, noColor)
 	}
 }
 

console_test.go

@@ -76,7 +76,7 @@ func TestConsoleWriter(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true, PartsOrder: []string{"foo"}}
 
-		_, err := w.Write([]byte(`{"foo": "DEFAULT"}`))
+		_, err := w.Write([]byte(`{"foo" : "DEFAULT"}`))
 		if err != nil {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
@@ -92,12 +92,12 @@ func TestConsoleWriter(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: false}
 
-		_, err := w.Write([]byte(`{"level": "warn", "message": "Foobar"}`))
+		_, err := w.Write([]byte(`{"level" : "warn", "message" : "Foobar"}`))
 		if err != nil {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
 
-		expectedOutput := "\x1b[90m<nil>\x1b[0m \x1b[31mWRN\x1b[0m Foobar\n"
+		expectedOutput := "\x1b[2m<nil>\x1b[0m \x1b[31mWRN\x1b[0m Foobar\n"
 		actualOutput := buf.String()
 		if actualOutput != expectedOutput {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
@@ -108,128 +108,13 @@ func TestConsoleWriter(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true}
 
-		ts := time.Unix(0, 0)
-		d := ts.UTC().Format(time.RFC3339)
-		_, err := w.Write([]byte(`{"time": "` + d + `", "level": "debug", "message": "Foobar", "foo": "bar"}`))
+		d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+		_, err := w.Write([]byte(`{"time" : "` + d + `", "level" : "debug", "message" : "Foobar", "foo" : "bar"}`))
 		if err != nil {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
 
-		expectedOutput := ts.Format(time.Kitchen) + " DBG Foobar foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Unix timestamp input format", func(t *testing.T) {
-		of := zerolog.TimeFieldFormat
-		defer func() {
-			zerolog.TimeFieldFormat = of
-		}()
-		zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.StampMilli, NoColor: true}
-
-		_, err := w.Write([]byte(`{"time": 1234, "level": "debug", "message": "Foobar", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := time.Unix(1234, 0).Format(time.StampMilli) + " DBG Foobar foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Unix timestamp ms input format", func(t *testing.T) {
-		of := zerolog.TimeFieldFormat
-		defer func() {
-			zerolog.TimeFieldFormat = of
-		}()
-		zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMs
-
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.StampMilli, NoColor: true}
-
-		_, err := w.Write([]byte(`{"time": 1234567, "level": "debug", "message": "Foobar", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := time.Unix(1234, 567000000).Format(time.StampMilli) + " DBG Foobar foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Unix timestamp us input format", func(t *testing.T) {
-		of := zerolog.TimeFieldFormat
-		defer func() {
-			zerolog.TimeFieldFormat = of
-		}()
-		zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMicro
-
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, TimeFormat: time.StampMicro, NoColor: true}
-
-		_, err := w.Write([]byte(`{"time": 1234567891, "level": "debug", "message": "Foobar", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := time.Unix(1234, 567891000).Format(time.StampMicro) + " DBG Foobar foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("No message field", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, NoColor: true}
-
-		_, err := w.Write([]byte(`{"level": "debug", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "<nil> DBG foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("No level field", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, NoColor: true}
-
-		_, err := w.Write([]byte(`{"message": "Foobar", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "<nil> ??? Foobar foo=bar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Write colorized fields", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, NoColor: false}
-
-		_, err := w.Write([]byte(`{"level": "warn", "message": "Foobar", "foo": "bar"}`))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "\x1b[90m<nil>\x1b[0m \x1b[31mWRN\x1b[0m Foobar \x1b[36mfoo=\x1b[0mbar\n"
+		expectedOutput := "12:00AM DBG Foobar foo=bar\n"
 		actualOutput := buf.String()
 		if actualOutput != expectedOutput {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
@@ -240,9 +125,8 @@ func TestConsoleWriter(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true}
 
-		ts := time.Unix(0, 0)
-		d := ts.UTC().Format(time.RFC3339)
-		evt := `{"time": "` + d + `", "level": "error", "message": "Foobar", "aaa": "bbb", "error": "Error"}`
+		d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+		evt := `{"time" : "` + d + `", "level" : "error", "message" : "Foobar", "aaa" : "bbb", "error" : "Error"}`
 		// t.Log(evt)
 
 		_, err := w.Write([]byte(evt))
@@ -250,7 +134,7 @@ func TestConsoleWriter(t *testing.T) {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
 
-		expectedOutput := ts.Format(time.Kitchen) + " ERR Foobar error=Error aaa=bbb\n"
+		expectedOutput := "12:00AM ERR Foobar error=Error aaa=bbb\n"
 		actualOutput := buf.String()
 		if actualOutput != expectedOutput {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
@@ -266,9 +150,8 @@ func TestConsoleWriter(t *testing.T) {
 			t.Fatalf("Cannot get working directory: %s", err)
 		}
 
-		ts := time.Unix(0, 0)
-		d := ts.UTC().Format(time.RFC3339)
-		evt := `{"time": "` + d + `", "level": "debug", "message": "Foobar", "foo": "bar", "caller": "` + cwd + `/foo/bar.go"}`
+		d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+		evt := `{"time" : "` + d + `", "level" : "debug", "message" : "Foobar", "foo" : "bar", "caller" : "` + cwd + `/foo/bar.go"}`
 		// t.Log(evt)
 
 		_, err = w.Write([]byte(evt))
@@ -276,7 +159,7 @@ func TestConsoleWriter(t *testing.T) {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
 
-		expectedOutput := ts.Format(time.Kitchen) + " DBG foo/bar.go > Foobar foo=bar\n"
+		expectedOutput := "12:00AM DBG foo/bar.go > Foobar foo=bar\n"
 		actualOutput := buf.String()
 		if actualOutput != expectedOutput {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
@@ -287,7 +170,7 @@ func TestConsoleWriter(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true}
 
-		evt := `{"level": "debug", "message": "Foobar", "foo": [1, 2, 3], "bar": true}`
+		evt := `{"level" : "debug", "message" : "Foobar", "foo" : [1, 2, 3], "bar" : true}`
 		// t.Log(evt)
 
 		_, err := w.Write([]byte(evt))
@@ -308,16 +191,15 @@ func TestConsoleWriterConfiguration(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true, TimeFormat: time.RFC3339}
 
-		ts := time.Unix(0, 0)
-		d := ts.UTC().Format(time.RFC3339)
-		evt := `{"time": "` + d + `", "level": "info", "message": "Foobar"}`
+		d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+		evt := `{"time" : "` + d + `", "level" : "info", "message" : "Foobar"}`
 
 		_, err := w.Write([]byte(evt))
 		if err != nil {
 			t.Errorf("Unexpected error when writing output: %s", err)
 		}
 
-		expectedOutput := ts.Format(time.RFC3339) + " INF Foobar\n"
+		expectedOutput := "1970-01-01T00:00:00Z INF Foobar\n"
 		actualOutput := buf.String()
 		if actualOutput != expectedOutput {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
@@ -328,7 +210,7 @@ func TestConsoleWriterConfiguration(t *testing.T) {
 		buf := &bytes.Buffer{}
 		w := zerolog.ConsoleWriter{Out: buf, NoColor: true, PartsOrder: []string{"message", "level"}}
 
-		evt := `{"level": "info", "message": "Foobar"}`
+		evt := `{"level" : "info", "message" : "Foobar"}`
 		_, err := w.Write([]byte(evt))
 		if err != nil {
 			t.Errorf("Unexpected error when writing output: %s", err)
@@ -340,71 +222,13 @@ func TestConsoleWriterConfiguration(t *testing.T) {
 			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
 		}
 	})
-
-	t.Run("Sets PartsExclude", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, NoColor: true, PartsExclude: []string{"time"}}
-
-		d := time.Unix(0, 0).UTC().Format(time.RFC3339)
-		evt := `{"time": "` + d + `", "level": "info", "message": "Foobar"}`
-		_, err := w.Write([]byte(evt))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "INF Foobar\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Sets FieldsExclude", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{Out: buf, NoColor: true, FieldsExclude: []string{"foo"}}
-
-		evt := `{"level": "info", "message": "Foobar", "foo":"bar", "baz":"quux"}`
-		_, err := w.Write([]byte(evt))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "<nil> INF Foobar baz=quux\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
-
-	t.Run("Sets FormatExtra", func(t *testing.T) {
-		buf := &bytes.Buffer{}
-		w := zerolog.ConsoleWriter{
-			Out: buf, NoColor: true, PartsOrder: []string{"level", "message"},
-			FormatExtra: func(evt map[string]interface{}, buf *bytes.Buffer) error {
-				buf.WriteString("\nAdditional stacktrace")
-				return nil
-			},
-		}
-
-		evt := `{"level": "info", "message": "Foobar"}`
-		_, err := w.Write([]byte(evt))
-		if err != nil {
-			t.Errorf("Unexpected error when writing output: %s", err)
-		}
-
-		expectedOutput := "INF Foobar\nAdditional stacktrace\n"
-		actualOutput := buf.String()
-		if actualOutput != expectedOutput {
-			t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
-		}
-	})
 }
 
 func BenchmarkConsoleWriter(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
 
-	var msg = []byte(`{"level": "info", "foo": "bar", "message": "HELLO", "time": "1990-01-01"}`)
+	var msg = []byte(`{"level" : "info", "foo" : "bar", "message" : "HELLO", "time" : "1990-01-01"}`)
 
 	w := zerolog.ConsoleWriter{Out: ioutil.Discard, NoColor: false}
 

context.go

@@ -1,9 +1,7 @@
 package zerolog
 
 import (
-	"fmt"
 	"io/ioutil"
-	"math"
 	"net"
 	"time"
 )
@@ -18,10 +16,8 @@ func (c Context) Logger() Logger {
 	return c.l
 }
 
-// Fields is a helper function to use a map or slice to set fields using type assertion.
-// Only map[string]interface{} and []interface{} are accepted. []interface{} must
-// alternate string keys and arbitrary values, and extraneous ones are ignored.
-func (c Context) Fields(fields interface{}) Context {
+// Fields is a helper function to use a map to set fields using type assertion.
+func (c Context) Fields(fields map[string]interface{}) Context {
 	c.l.context = appendFields(c.l.context, fields)
 	return c
 }
@@ -84,17 +80,6 @@ func (c Context) Strs(key string, vals []string) Context {
 	return c
 }
 
-// Stringer adds the field key with val.String() (or null if val is nil) to the logger context.
-func (c Context) Stringer(key string, val fmt.Stringer) Context {
-	if val != nil {
-		c.l.context = enc.AppendString(enc.AppendKey(c.l.context, key), val.String())
-		return c
-	}
-
-	c.l.context = enc.AppendInterface(enc.AppendKey(c.l.context, key), nil)
-	return c
-}
-
 // Bytes adds the field key with val as a []byte to the logger context.
 func (c Context) Bytes(key string, val []byte) Context {
 	c.l.context = enc.AppendBytes(enc.AppendKey(c.l.context, key), val)
@@ -118,17 +103,14 @@ func (c Context) RawJSON(key string, b []byte) Context {
 
 // AnErr adds the field key with serialized err to the logger context.
 func (c Context) AnErr(key string, err error) Context {
-	switch m := ErrorMarshalFunc(err).(type) {
+	marshaled := ErrorMarshalFunc(err)
+	switch m := marshaled.(type) {
 	case nil:
 		return c
 	case LogObjectMarshaler:
 		return c.Object(key, m)
 	case error:
-		if m == nil || isNilValue(m) {
-			return c
-		} else {
-			return c.Str(key, m.Error())
-		}
+		return c.Str(key, m.Error())
 	case string:
 		return c.Str(key, m)
 	default:
@@ -141,15 +123,12 @@ func (c Context) AnErr(key string, err error) Context {
 func (c Context) Errs(key string, errs []error) Context {
 	arr := Arr()
 	for _, err := range errs {
-		switch m := ErrorMarshalFunc(err).(type) {
+		marshaled := ErrorMarshalFunc(err)
+		switch m := marshaled.(type) {
 		case LogObjectMarshaler:
 			arr = arr.Object(m)
 		case error:
-			if m == nil || isNilValue(m) {
-				arr = arr.Interface(nil)
-			} else {
-				arr = arr.Str(m.Error())
-			}
+			arr = arr.Str(m.Error())
 		case string:
 			arr = arr.Str(m)
 		default:
@@ -368,31 +347,14 @@ func (c Context) Interface(key string, i interface{}) Context {
 	return c
 }
 
-type callerHook struct {
-	callerSkipFrameCount int
-}
-
-func newCallerHook(skipFrameCount int) callerHook {
-	return callerHook{callerSkipFrameCount: skipFrameCount}
-}
+type callerHook struct{}
 
 func (ch callerHook) Run(e *Event, level Level, msg string) {
-	switch ch.callerSkipFrameCount {
-	case useGlobalSkipFrameCount:
-		// Extra frames to skip (added by hook infra).
-		e.caller(CallerSkipFrameCount + contextCallerSkipFrameCount)
-	default:
-		// Extra frames to skip (added by hook infra).
-		e.caller(ch.callerSkipFrameCount + contextCallerSkipFrameCount)
-	}
+	// Three extra frames to skip (added by hook infra).
+	e.caller(CallerSkipFrameCount + 3)
 }
 
-// useGlobalSkipFrameCount acts as a flag to informat callerHook.Run
-// to use the global CallerSkipFrameCount.
-const useGlobalSkipFrameCount = math.MinInt32
-
-// ch is the default caller hook using the global CallerSkipFrameCount.
-var ch = newCallerHook(useGlobalSkipFrameCount)
+var ch = callerHook{}
 
 // Caller adds the file:line of the caller with the zerolog.CallerFieldName key.
 func (c Context) Caller() Context {
@@ -400,17 +362,17 @@ func (c Context) Caller() Context {
 	return c
 }
 
-// CallerWithSkipFrameCount adds the file:line of the caller with the zerolog.CallerFieldName key.
-// The specified skipFrameCount int will override the global CallerSkipFrameCount for this context's respective logger.
-// If set to -1 the global CallerSkipFrameCount will be used.
-func (c Context) CallerWithSkipFrameCount(skipFrameCount int) Context {
-	c.l = c.l.Hook(newCallerHook(skipFrameCount))
-	return c
+type stackTraceHook struct{}
+
+func (sh stackTraceHook) Run(e *Event, level Level, msg string) {
+	e.Stack()
 }
 
+var sh = stackTraceHook{}
+
 // Stack enables stack trace printing for the error passed to Err().
 func (c Context) Stack() Context {
-	c.l.stack = true
+	c.l = c.l.Hook(sh)
 	return c
 }
 

ctx.go

@@ -7,7 +7,6 @@ import (
 var disabledLogger *Logger
 
 func init() {
-	SetGlobalLevel(TraceLevel)
 	l := Nop()
 	disabledLogger = &l
 }
@@ -25,9 +24,9 @@ type ctxKey struct{}
 //     l.UpdateContext(func(c Context) Context {
 //         return c.Str("bar", "baz")
 //     })
-func (l Logger) WithContext(ctx context.Context) context.Context {
+func (l *Logger) WithContext(ctx context.Context) context.Context {
 	if lp, ok := ctx.Value(ctxKey{}).(*Logger); ok {
-		if lp == &l {
+		if lp == l {
 			// Do not store same logger.
 			return ctx
 		}
@@ -35,17 +34,14 @@ func (l Logger) WithContext(ctx context.Context) context.Context {
 		// Do not store disabled logger.
 		return ctx
 	}
-	return context.WithValue(ctx, ctxKey{}, &l)
+	return context.WithValue(ctx, ctxKey{}, l)
 }
 
 // Ctx returns the Logger associated with the ctx. If no logger
-// is associated, DefaultContextLogger is returned, unless DefaultContextLogger
-// is nil, in which case a disabled logger is returned.
+// is associated, a disabled logger is returned.
 func Ctx(ctx context.Context) *Logger {
 	if l, ok := ctx.Value(ctxKey{}).(*Logger); ok {
 		return l
-	} else if l = DefaultContextLogger; l != nil {
-		return l
 	}
 	return disabledLogger
 }

ctx_test.go

@@ -27,13 +27,6 @@ func TestCtx(t *testing.T) {
 	if log2 != disabledLogger {
 		t.Error("Ctx did not return the expected logger")
 	}
-
-	DefaultContextLogger = &log
-	t.Cleanup(func() { DefaultContextLogger = nil })
-	log2 = Ctx(context.Background())
-	if log2 != &log {
-		t.Error("Ctx did not return the expected logger")
-	}
 }
 
 func TestCtxDisabled(t *testing.T) {
@@ -45,7 +38,7 @@ func TestCtxDisabled(t *testing.T) {
 
 	l := New(ioutil.Discard).With().Str("foo", "bar").Logger()
 	ctx = l.WithContext(ctx)
-	if !reflect.DeepEqual(Ctx(ctx), &l) {
+	if Ctx(ctx) != &l {
 		t.Error("WithContext did not store logger")
 	}
 
@@ -53,18 +46,18 @@ func TestCtxDisabled(t *testing.T) {
 		return c.Str("bar", "baz")
 	})
 	ctx = l.WithContext(ctx)
-	if !reflect.DeepEqual(Ctx(ctx), &l) {
+	if Ctx(ctx) != &l {
 		t.Error("WithContext did not store updated logger")
 	}
 
 	l = l.Level(DebugLevel)
 	ctx = l.WithContext(ctx)
-	if !reflect.DeepEqual(Ctx(ctx), &l) {
+	if Ctx(ctx) != &l {
 		t.Error("WithContext did not store copied logger")
 	}
 
 	ctx = dl.WithContext(ctx)
-	if !reflect.DeepEqual(Ctx(ctx), &dl) {
-		t.Error("WithContext did not override logger with a disabled logger")
+	if Ctx(ctx) != &dl {
+		t.Error("WithContext did not overide logger with a disabled logger")
 	}
 }

diode/diode.go

@@ -48,7 +48,7 @@ type Writer struct {
 // used.
 //
 // See code.cloudfoundry.org/go-diodes for more info on diode.
-func NewWriter(w io.Writer, size int, pollInterval time.Duration, f Alerter) Writer {
+func NewWriter(w io.Writer, size int, poolInterval time.Duration, f Alerter) Writer {
 	ctx, cancel := context.WithCancel(context.Background())
 	dw := Writer{
 		w:    w,
@@ -59,9 +59,9 @@ func NewWriter(w io.Writer, size int, pollInterval time.Duration, f Alerter) Wri
 		f = func(int) {}
 	}
 	d := diodes.NewManyToOne(size, diodes.AlertFunc(f))
-	if pollInterval > 0 {
+	if poolInterval > 0 {
 		dw.d = diodes.NewPoller(d,
-			diodes.WithPollingInterval(pollInterval),
+			diodes.WithPollingInterval(poolInterval),
 			diodes.WithPollingContext(ctx))
 	} else {
 		dw.d = diodes.NewWaiter(d,

diode/internal/diodes/many_to_one.go

@@ -9,14 +9,14 @@ import (
 // ManyToOne diode is optimal for many writers (go-routines B-n) and a single
 // reader (go-routine A). It is not thread safe for multiple readers.
 type ManyToOne struct {
+	buffer     []unsafe.Pointer
 	writeIndex uint64
 	readIndex  uint64
-	buffer     []unsafe.Pointer
 	alerter    Alerter
 }
 
 // NewManyToOne creates a new diode (ring buffer). The ManyToOne diode
-// is optimized for many writers (on go-routines B-n) and a single reader
+// is optimzed for many writers (on go-routines B-n) and a single reader
 // (on go-routine A). The alerter is invoked on the read's go-routine. It is
 // called when it notices that the writer go-routine has passed it and wrote
 // over data. A nil can be used to ignore alerts.
@@ -66,7 +66,7 @@ func (d *ManyToOne) Set(data GenericDataType) {
 }
 
 // TryNext will attempt to read from the next slot of the ring buffer.
-// If there is no data available, it will return (nil, false).
+// If there is not data available, it will return (nil, false).
 func (d *ManyToOne) TryNext() (data GenericDataType, ok bool) {
 	// Read a value from the ring buffer based on the readIndex.
 	idx := d.readIndex % uint64(len(d.buffer))
@@ -80,7 +80,7 @@ func (d *ManyToOne) TryNext() (data GenericDataType, ok bool) {
 	}
 
 	// When the seq value is less than the current read index that means a
-	// value was read from idx that was previously written but since has
+	// value was read from idx that was previously written but has since has
 	// been dropped. This value must be ignored and the read head must not
 	// increment.
 	//

diode/internal/diodes/one_to_one.go

@@ -31,9 +31,9 @@ type bucket struct {
 // OneToOne diode is meant to be used by a single reader and a single writer.
 // It is not thread safe if used otherwise.
 type OneToOne struct {
+	buffer     []unsafe.Pointer
 	writeIndex uint64
 	readIndex  uint64
-	buffer     []unsafe.Pointer
 	alerter    Alerter
 }
 
@@ -80,7 +80,7 @@ func (d *OneToOne) TryNext() (data GenericDataType, ok bool) {
 	}
 
 	// When the seq value is less than the current read index that means a
-	// value was read from idx that was previously written but since has
+	// value was read from idx that was previously written but has since has
 	// been dropped. This value must be ignored and the read head must not
 	// increment.
 	//

diode/internal/diodes/poller.go

@@ -24,18 +24,18 @@ type PollerConfigOption func(*Poller)
 // WithPollingInterval sets the interval at which the diode is queried
 // for new data. The default is 10ms.
 func WithPollingInterval(interval time.Duration) PollerConfigOption {
-	return func(c *Poller) {
+	return PollerConfigOption(func(c *Poller) {
 		c.interval = interval
-	}
+	})
 }
 
 // WithPollingContext sets the context to cancel any retrieval (Next()). It
 // will not change any results for adding data (Set()). Default is
 // context.Background().
 func WithPollingContext(ctx context.Context) PollerConfigOption {
-	return func(c *Poller) {
+	return PollerConfigOption(func(c *Poller) {
 		c.ctx = ctx
-	}
+	})
 }
 
 // NewPoller returns a new Poller that wraps the given diode.

diode/internal/diodes/waiter.go

@@ -21,9 +21,9 @@ type WaiterConfigOption func(*Waiter)
 // will not change any results for adding data (Set()). Default is
 // context.Background().
 func WithWaiterContext(ctx context.Context) WaiterConfigOption {
-	return func(c *Waiter) {
+	return WaiterConfigOption(func(c *Waiter) {
 		c.ctx = ctx
-	}
+	})
 }
 
 // NewWaiter returns a new Waiter that wraps the given diode.

encoder_cbor.go

@@ -14,13 +14,6 @@ var (
 	enc = cbor.Encoder{}
 )
 
-func init() {
-	// using closure to reflect the changes at runtime.
-	cbor.JSONMarshalFunc = func(v interface{}) ([]byte, error) {
-		return InterfaceMarshalFunc(v)
-	}
-}
-
 func appendJSON(dst []byte, j []byte) []byte {
 	return cbor.AppendEmbeddedJSON(dst, j)
 }

encoder_json.go

@@ -15,13 +15,6 @@ var (
 	enc = json.Encoder{}
 )
 
-func init() {
-	// using closure to reflect the changes at runtime.
-	json.JSONMarshalFunc = func(v interface{}) ([]byte, error) {
-		return InterfaceMarshalFunc(v)
-	}
-}
-
 func appendJSON(dst []byte, j []byte) []byte {
 	return append(dst, j...)
 }

event.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"os"
 	"runtime"
+	"strconv"
 	"sync"
 	"time"
 )
@@ -20,13 +21,12 @@ var eventPool = &sync.Pool{
 // Event represents a log event. It is instanced by one of the level method of
 // Logger and finalized by the Msg or Msgf method.
 type Event struct {
-	buf       []byte
-	w         LevelWriter
-	level     Level
-	done      func(msg string)
-	stack     bool   // enable error stack trace
-	ch        []Hook // hooks from context
-	skipFrame int    // The number of additional frames to skip when printing the caller.
+	buf   []byte
+	w     LevelWriter
+	level Level
+	done  func(msg string)
+	stack bool   // enable error stack trace
+	ch    []Hook // hooks from context
 }
 
 func putEvent(e *Event) {
@@ -62,8 +62,6 @@ func newEvent(w LevelWriter, level Level) *Event {
 	e.buf = enc.AppendBeginMarker(e.buf)
 	e.w = w
 	e.level = level
-	e.stack = false
-	e.skipFrame = 0
 	return e
 }
 
@@ -108,20 +106,10 @@ func (e *Event) Msg(msg string) {
 	e.msg(msg)
 }
 
-// Send is equivalent to calling Msg("").
+// Msgf sends the event with formated msg added as the message field if not empty.
 //
-// NOTICE: once this method is called, the *Event should be disposed.
-func (e *Event) Send() {
-	if e == nil {
-		return
-	}
-	e.msg("")
-}
-
-// Msgf sends the event with formatted msg added as the message field if not empty.
-//
-// NOTICE: once this method is called, the *Event should be disposed.
-// Calling Msgf twice can have unexpected result.
+// NOTICE: once this methid is called, the *Event should be disposed.
+// Calling Msg twice can have unexpected result.
 func (e *Event) Msgf(format string, v ...interface{}) {
 	if e == nil {
 		return
@@ -129,16 +117,14 @@ func (e *Event) Msgf(format string, v ...interface{}) {
 	e.msg(fmt.Sprintf(format, v...))
 }
 
-func (e *Event) MsgFunc(createMsg func() string) {
-	if e == nil {
-		return
-	}
-	e.msg(createMsg())
-}
-
 func (e *Event) msg(msg string) {
-	for _, hook := range e.ch {
-		hook.Run(e, e.level, msg)
+	if len(e.ch) > 0 {
+		e.ch[0].Run(e, e.level, msg)
+		if len(e.ch) > 1 {
+			for _, hook := range e.ch[1:] {
+				hook.Run(e, e.level, msg)
+			}
+		}
 	}
 	if msg != "" {
 		e.buf = enc.AppendString(enc.AppendKey(e.buf, MessageFieldName), msg)
@@ -155,10 +141,8 @@ func (e *Event) msg(msg string) {
 	}
 }
 
-// Fields is a helper function to use a map or slice to set fields using type assertion.
-// Only map[string]interface{} and []interface{} are accepted. []interface{} must
-// alternate string keys and arbitrary values, and extraneous ones are ignored.
-func (e *Event) Fields(fields interface{}) *Event {
+// Fields is a helper function to use a map to set fields using type assertion.
+func (e *Event) Fields(fields map[string]interface{}) *Event {
 	if e == nil {
 		return e
 	}
@@ -216,32 +200,15 @@ func (e *Event) Object(key string, obj LogObjectMarshaler) *Event {
 		return e
 	}
 	e.buf = enc.AppendKey(e.buf, key)
-	if obj == nil {
-		e.buf = enc.AppendNil(e.buf)
-
-		return e
-	}
-
 	e.appendObject(obj)
 	return e
 }
 
-// Func allows an anonymous func to run only if the event is enabled.
-func (e *Event) Func(f func(e *Event)) *Event {
-	if e != nil && e.Enabled() {
-		f(e)
-	}
-	return e
-}
-
-// EmbedObject marshals an object that implement the LogObjectMarshaler interface.
+// Object marshals an object that implement the LogObjectMarshaler interface.
 func (e *Event) EmbedObject(obj LogObjectMarshaler) *Event {
 	if e == nil {
 		return e
 	}
-	if obj == nil {
-		return e
-	}
 	obj.MarshalZerologObject(e)
 	return e
 }
@@ -264,27 +231,6 @@ func (e *Event) Strs(key string, vals []string) *Event {
 	return e
 }
 
-// Stringer adds the field key with val.String() (or null if val is nil)
-// to the *Event context.
-func (e *Event) Stringer(key string, val fmt.Stringer) *Event {
-	if e == nil {
-		return e
-	}
-	e.buf = enc.AppendStringer(enc.AppendKey(e.buf, key), val)
-	return e
-}
-
-// Stringers adds the field key with vals where each individual val
-// is used as val.String() (or null if val is empty) to the *Event
-// context.
-func (e *Event) Stringers(key string, vals []fmt.Stringer) *Event {
-	if e == nil {
-		return e
-	}
-	e.buf = enc.AppendStringers(enc.AppendKey(e.buf, key), vals)
-	return e
-}
-
 // Bytes adds the field key with val as a string to the *Event context.
 //
 // Runes outside of normal ASCII ranges will be hex-encoded in the resulting
@@ -330,11 +276,7 @@ func (e *Event) AnErr(key string, err error) *Event {
 	case LogObjectMarshaler:
 		return e.Object(key, m)
 	case error:
-		if m == nil || isNilValue(m) {
-			return e
-		} else {
-			return e.Str(key, m.Error())
-		}
+		return e.Str(key, m.Error())
 	case string:
 		return e.Str(key, m)
 	default:
@@ -367,6 +309,7 @@ func (e *Event) Errs(key string, errs []error) *Event {
 
 // Err adds the field "error" with serialized err to the *Event context.
 // If err is nil, no field is added.
+// To customize the key name, change zerolog.ErrorFieldName.
 //
 // To customize the key name, change zerolog.ErrorFieldName.
 //
@@ -383,9 +326,7 @@ func (e *Event) Err(err error) *Event {
 		case LogObjectMarshaler:
 			e.Object(ErrorStackFieldName, m)
 		case error:
-			if m != nil && !isNilValue(m) {
-				e.Str(ErrorStackFieldName, m.Error())
-			}
+			e.Str(ErrorStackFieldName, m.Error())
 		case string:
 			e.Str(ErrorStackFieldName, m)
 		default:
@@ -652,7 +593,7 @@ func (e *Event) Timestamp() *Event {
 	return e
 }
 
-// Time adds the field key with t formatted as string using zerolog.TimeFieldFormat.
+// Time adds the field key with t formated as string using zerolog.TimeFieldFormat.
 func (e *Event) Time(key string, t time.Time) *Event {
 	if e == nil {
 		return e
@@ -661,7 +602,7 @@ func (e *Event) Time(key string, t time.Time) *Event {
 	return e
 }
 
-// Times adds the field key with t formatted as string using zerolog.TimeFieldFormat.
+// Times adds the field key with t formated as string using zerolog.TimeFieldFormat.
 func (e *Event) Times(key string, t []time.Time) *Event {
 	if e == nil {
 		return e
@@ -719,36 +660,20 @@ func (e *Event) Interface(key string, i interface{}) *Event {
 	return e
 }
 
-// CallerSkipFrame instructs any future Caller calls to skip the specified number of frames.
-// This includes those added via hooks from the context.
-func (e *Event) CallerSkipFrame(skip int) *Event {
-	if e == nil {
-		return e
-	}
-	e.skipFrame += skip
-	return e
-}
-
 // Caller adds the file:line of the caller with the zerolog.CallerFieldName key.
-// The argument skip is the number of stack frames to ascend
-// Skip If not passed, use the global variable CallerSkipFrameCount
-func (e *Event) Caller(skip ...int) *Event {
-	sk := CallerSkipFrameCount
-	if len(skip) > 0 {
-		sk = skip[0] + CallerSkipFrameCount
-	}
-	return e.caller(sk)
+func (e *Event) Caller() *Event {
+	return e.caller(CallerSkipFrameCount)
 }
 
 func (e *Event) caller(skip int) *Event {
 	if e == nil {
 		return e
 	}
-	pc, file, line, ok := runtime.Caller(skip + e.skipFrame)
+	_, file, line, ok := runtime.Caller(skip)
 	if !ok {
 		return e
 	}
-	e.buf = enc.AppendString(enc.AppendKey(e.buf, CallerFieldName), CallerMarshalFunc(pc, file, line))
+	e.buf = enc.AppendString(enc.AppendKey(e.buf, CallerFieldName), file+":"+strconv.Itoa(line))
 	return e
 }
 

event_test.go

@@ -1,65 +0,0 @@
-// +build !binary_log
-
-package zerolog
-
-import (
-	"bytes"
-	"errors"
-	"strings"
-	"testing"
-)
-
-type nilError struct{}
-
-func (nilError) Error() string {
-	return ""
-}
-
-func TestEvent_AnErr(t *testing.T) {
-	tests := []struct {
-		name string
-		err  error
-		want string
-	}{
-		{"nil", nil, `{}`},
-		{"error", errors.New("test"), `{"err":"test"}`},
-		{"nil interface", func() *nilError { return nil }(), `{}`},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var buf bytes.Buffer
-			e := newEvent(levelWriterAdapter{&buf}, DebugLevel)
-			e.AnErr("err", tt.err)
-			_ = e.write()
-			if got, want := strings.TrimSpace(buf.String()), tt.want; got != want {
-				t.Errorf("Event.AnErr() = %v, want %v", got, want)
-			}
-		})
-	}
-}
-
-func TestEvent_ObjectWithNil(t *testing.T) {
-	var buf bytes.Buffer
-	e := newEvent(levelWriterAdapter{&buf}, DebugLevel)
-	_ = e.Object("obj", nil)
-	_ = e.write()
-
-	want := `{"obj":null}`
-	got := strings.TrimSpace(buf.String())
-	if got != want {
-		t.Errorf("Event.Object() = %q, want %q", got, want)
-	}
-}
-
-func TestEvent_EmbedObjectWithNil(t *testing.T) {
-	var buf bytes.Buffer
-	e := newEvent(levelWriterAdapter{&buf}, DebugLevel)
-	_ = e.EmbedObject(nil)
-	_ = e.write()
-
-	want := "{}"
-	got := strings.TrimSpace(buf.String())
-	if got != want {
-		t.Errorf("Event.EmbedObject() = %q, want %q", got, want)
-	}
-}

fields.go

@@ -1,47 +1,20 @@
 package zerolog
 
 import (
-	"encoding/json"
 	"net"
 	"sort"
 	"time"
-	"unsafe"
 )
 
-func isNilValue(i interface{}) bool {
-	return (*[2]uintptr)(unsafe.Pointer(&i))[1] == 0
-}
-
-func appendFields(dst []byte, fields interface{}) []byte {
-	switch fields := fields.(type) {
-	case []interface{}:
-		if n := len(fields); n&0x1 == 1 { // odd number
-			fields = fields[:n-1]
-		}
-		dst = appendFieldList(dst, fields)
-	case map[string]interface{}:
-		keys := make([]string, 0, len(fields))
-		for key := range fields {
-			keys = append(keys, key)
-		}
-		sort.Strings(keys)
-		kv := make([]interface{}, 2)
-		for _, key := range keys {
-			kv[0], kv[1] = key, fields[key]
-			dst = appendFieldList(dst, kv)
-		}
+func appendFields(dst []byte, fields map[string]interface{}) []byte {
+	keys := make([]string, 0, len(fields))
+	for key := range fields {
+		keys = append(keys, key)
 	}
-	return dst
-}
-
-func appendFieldList(dst []byte, kvList []interface{}) []byte {
-	for i, n := 0, len(kvList); i < n; i += 2 {
-		key, val := kvList[i], kvList[i+1]
-		if key, ok := key.(string); ok {
-			dst = enc.AppendKey(dst, key)
-		} else {
-			continue
-		}
+	sort.Strings(keys)
+	for _, key := range keys {
+		dst = enc.AppendKey(dst, key)
+		val := fields[key]
 		if val, ok := val.(LogObjectMarshaler); ok {
 			e := newEvent(nil, 0)
 			e.buf = e.buf[:0]
@@ -56,7 +29,8 @@ func appendFieldList(dst []byte, kvList []interface{}) []byte {
 		case []byte:
 			dst = enc.AppendBytes(dst, val)
 		case error:
-			switch m := ErrorMarshalFunc(val).(type) {
+			marshaled := ErrorMarshalFunc(val)
+			switch m := marshaled.(type) {
 			case LogObjectMarshaler:
 				e := newEvent(nil, 0)
 				e.buf = e.buf[:0]
@@ -64,11 +38,7 @@ func appendFieldList(dst []byte, kvList []interface{}) []byte {
 				dst = append(dst, e.buf...)
 				putEvent(e)
 			case error:
-				if m == nil || isNilValue(m) {
-					dst = enc.AppendNil(dst)
-				} else {
-					dst = enc.AppendString(dst, m.Error())
-				}
+				dst = enc.AppendString(dst, m.Error())
 			case string:
 				dst = enc.AppendString(dst, m)
 			default:
@@ -77,7 +47,8 @@ func appendFieldList(dst []byte, kvList []interface{}) []byte {
 		case []error:
 			dst = enc.AppendArrayStart(dst)
 			for i, err := range val {
-				switch m := ErrorMarshalFunc(err).(type) {
+				marshaled := ErrorMarshalFunc(err)
+				switch m := marshaled.(type) {
 				case LogObjectMarshaler:
 					e := newEvent(nil, 0)
 					e.buf = e.buf[:0]
@@ -85,11 +56,7 @@ func appendFieldList(dst []byte, kvList []interface{}) []byte {
 					dst = append(dst, e.buf...)
 					putEvent(e)
 				case error:
-					if m == nil || isNilValue(m) {
-						dst = enc.AppendNil(dst)
-					} else {
-						dst = enc.AppendString(dst, m.Error())
-					}
+					dst = enc.AppendString(dst, m.Error())
 				case string:
 					dst = enc.AppendString(dst, m)
 				default:
@@ -267,8 +234,6 @@ func appendFieldList(dst []byte, kvList []interface{}) []byte {
 			dst = enc.AppendIPPrefix(dst, val)
 		case net.HardwareAddr:
 			dst = enc.AppendMACAddr(dst, val)
-		case json.RawMessage:
-			dst = appendJSON(dst, val)
 		default:
 			dst = enc.AppendInterface(dst, val)
 		}

globals.go

@@ -1,29 +1,7 @@
 package zerolog
 
-import (
-	"encoding/json"
-	"strconv"
-	"sync/atomic"
-	"time"
-)
-
-const (
-	// TimeFormatUnix defines a time format that makes time fields to be
-	// serialized as Unix timestamp integers.
-	TimeFormatUnix = ""
-
-	// TimeFormatUnixMs defines a time format that makes time fields to be
-	// serialized as Unix timestamp integers in milliseconds.
-	TimeFormatUnixMs = "UNIXMS"
-
-	// TimeFormatUnixMicro defines a time format that makes time fields to be
-	// serialized as Unix timestamp integers in microseconds.
-	TimeFormatUnixMicro = "UNIXMICRO"
-
-	// TimeFormatUnixNano defines a time format that makes time fields to be
-	// serialized as Unix timestamp integers in nanoseconds.
-	TimeFormatUnixNano = "UNIXNANO"
-)
+import "time"
+import "sync/atomic"
 
 var (
 	// TimestampFieldName is the field name used for the timestamp field.
@@ -32,26 +10,6 @@ var (
 	// LevelFieldName is the field name used for the level field.
 	LevelFieldName = "level"
 
-	// LevelTraceValue is the value used for the trace level field.
-	LevelTraceValue = "trace"
-	// LevelDebugValue is the value used for the debug level field.
-	LevelDebugValue = "debug"
-	// LevelInfoValue is the value used for the info level field.
-	LevelInfoValue = "info"
-	// LevelWarnValue is the value used for the warn level field.
-	LevelWarnValue = "warn"
-	// LevelErrorValue is the value used for the error level field.
-	LevelErrorValue = "error"
-	// LevelFatalValue is the value used for the fatal level field.
-	LevelFatalValue = "fatal"
-	// LevelPanicValue is the value used for the panic level field.
-	LevelPanicValue = "panic"
-
-	// LevelFieldMarshalFunc allows customization of global level field marshaling.
-	LevelFieldMarshalFunc = func(l Level) string {
-		return l.String()
-	}
-
 	// MessageFieldName is the field name used for the message field.
 	MessageFieldName = "message"
 
@@ -64,11 +22,6 @@ var (
 	// CallerSkipFrameCount is the number of stack frames to skip to find the caller.
 	CallerSkipFrameCount = 2
 
-	// CallerMarshalFunc allows customization of global caller marshaling
-	CallerMarshalFunc = func(pc uintptr, file string, line int) string {
-		return file + ":" + strconv.Itoa(line)
-	}
-
 	// ErrorStackFieldName is the field name used for error stacks.
 	ErrorStackFieldName = "stack"
 
@@ -80,13 +33,9 @@ var (
 		return err
 	}
 
-	// InterfaceMarshalFunc allows customization of interface marshaling.
-	// Default: "encoding/json.Marshal"
-	InterfaceMarshalFunc = json.Marshal
-
-	// TimeFieldFormat defines the time format of the Time field type. If set to
-	// TimeFormatUnix, TimeFormatUnixMs, TimeFormatUnixMicro or TimeFormatUnixNano, the time is formatted as a UNIX
-	// timestamp as integer.
+	// TimeFieldFormat defines the time format of the Time field type.
+	// If set to an empty string, the time is formatted as an UNIX timestamp
+	// as integer.
 	TimeFieldFormat = time.RFC3339
 
 	// TimestampFunc defines the function called to generate a timestamp.
@@ -104,15 +53,11 @@ var (
 	// output. If not set, an error is printed on the stderr. This handler must
 	// be thread safe and non-blocking.
 	ErrorHandler func(err error)
-
-	// DefaultContextLogger is returned from Ctx() if there is no logger associated
-	// with the context.
-	DefaultContextLogger *Logger
 )
 
 var (
-	gLevel          = new(int32)
-	disableSampling = new(int32)
+	gLevel          = new(uint32)
+	disableSampling = new(uint32)
 )
 
 // SetGlobalLevel sets the global override for log level. If this
@@ -120,23 +65,23 @@ var (
 //
 // To globally disable logs, set GlobalLevel to Disabled.
 func SetGlobalLevel(l Level) {
-	atomic.StoreInt32(gLevel, int32(l))
+	atomic.StoreUint32(gLevel, uint32(l))
 }
 
 // GlobalLevel returns the current global log level
 func GlobalLevel() Level {
-	return Level(atomic.LoadInt32(gLevel))
+	return Level(atomic.LoadUint32(gLevel))
 }
 
 // DisableSampling will disable sampling in all Loggers if true.
 func DisableSampling(v bool) {
-	var i int32
+	var i uint32
 	if v {
 		i = 1
 	}
-	atomic.StoreInt32(disableSampling, i)
+	atomic.StoreUint32(disableSampling, i)
 }
 
 func samplingDisabled() bool {
-	return atomic.LoadInt32(disableSampling) == 1
+	return atomic.LoadUint32(disableSampling) == 1
 }

go.mod

@@ -1,10 +1 @@
 module github.com/rs/zerolog
-
-go 1.15
-
-require (
-	github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534
-	github.com/mattn/go-colorable v0.1.12
-	github.com/pkg/errors v0.9.1
-	github.com/rs/xid v1.4.0
-)

go.sum

@@ -1,14 +0,0 @@
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/rs/xid v1.4.0 h1:qd7wPTDkN6KQx2VmMBLrpHkiyQwgFXRnkOLacUiaSNY=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

go112.go

@@ -1,7 +0,0 @@
-// +build go1.12
-
-package zerolog
-
-// Since go 1.12, some auto generated init functions are hidden from
-// runtime.Caller.
-const contextCallerSkipFrameCount = 2

hlog/hlog.go

@@ -3,13 +3,14 @@ package hlog
 
 import (
 	"context"
+	"net"
 	"net/http"
 	"time"
 
 	"github.com/rs/xid"
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/hlog/internal/mutil"
 	"github.com/rs/zerolog/log"
+	"github.com/zenazn/goji/web/mutil"
 )
 
 // FromRequest gets the logger in the request's context.
@@ -78,10 +79,10 @@ func RequestHandler(fieldKey string) func(next http.Handler) http.Handler {
 func RemoteAddrHandler(fieldKey string) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if r.RemoteAddr != "" {
+			if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
 				log := zerolog.Ctx(r.Context())
 				log.UpdateContext(func(c zerolog.Context) zerolog.Context {
-					return c.Str(fieldKey, r.RemoteAddr)
+					return c.Str(fieldKey, host)
 				})
 			}
 			next.ServeHTTP(w, r)
@@ -121,20 +122,6 @@ func RefererHandler(fieldKey string) func(next http.Handler) http.Handler {
 	}
 }
 
-// ProtoHandler adds the requests protocol version as a field to the context logger
-// using fieldKey as field Key.
-func ProtoHandler(fieldKey string) func(next http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			log := zerolog.Ctx(r.Context())
-			log.UpdateContext(func(c zerolog.Context) zerolog.Context {
-				return c.Str(fieldKey, r.Proto)
-			})
-			next.ServeHTTP(w, r)
-		})
-	}
-}
-
 type idKey struct{}
 
 // IDFromRequest returns the unique id associated to the request if any.
@@ -151,11 +138,6 @@ func IDFromCtx(ctx context.Context) (id xid.ID, ok bool) {
 	return
 }
 
-// CtxWithID adds the given xid.ID to the context
-func CtxWithID(ctx context.Context, id xid.ID) context.Context {
-	return context.WithValue(ctx, idKey{}, id)
-}
-
 // RequestIDHandler returns a handler setting a unique id to the request which can
 // be gathered using IDFromRequest(req). This generated id is added as a field to the
 // logger using the passed fieldKey as field name. The id is also added as a response
@@ -172,7 +154,7 @@ func RequestIDHandler(fieldKey, headerName string) func(next http.Handler) http.
 			id, ok := IDFromRequest(r)
 			if !ok {
 				id = xid.New()
-				ctx = CtxWithID(ctx, id)
+				ctx = context.WithValue(ctx, idKey{}, id)
 				r = r.WithContext(ctx)
 			}
 			if fieldKey != "" {
@@ -189,22 +171,6 @@ func RequestIDHandler(fieldKey, headerName string) func(next http.Handler) http.
 	}
 }
 
-// CustomHeaderHandler adds given header from request's header as a field to
-// the context's logger using fieldKey as field key.
-func CustomHeaderHandler(fieldKey, header string) func(next http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			if val := r.Header.Get(header); val != "" {
-				log := zerolog.Ctx(r.Context())
-				log.UpdateContext(func(c zerolog.Context) zerolog.Context {
-					return c.Str(fieldKey, val)
-				})
-			}
-			next.ServeHTTP(w, r)
-		})
-	}
-}
-
 // AccessHandler returns a handler that call f after each request.
 func AccessHandler(f func(r *http.Request, status, size int, duration time.Duration)) func(next http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {

hlog/hlog_example_test.go

@@ -48,8 +48,8 @@ func Example_handler() {
 	// Install the logger handler with default output on the console
 	c = c.Append(hlog.NewHandler(log))
 
-	// Install some provided extra handlers to set some request's context fields.
-	// Thanks to those handlers, all our logs will come with some pre-populated fields.
+	// Install some provided extra handler to set some request's context fields.
+	// Thanks to those handler, all our logs will come with some pre-populated fields.
 	c = c.Append(hlog.RemoteAddrHandler("ip"))
 	c = c.Append(hlog.UserAgentHandler("user_agent"))
 	c = c.Append(hlog.RefererHandler("referer"))
@@ -63,11 +63,11 @@ func Example_handler() {
 		hlog.FromRequest(r).Info().
 			Str("user", "current user").
 			Str("status", "ok").
-			Msg("Something happened")
+			Msg("Something happend")
 	}))
 	http.Handle("/", h)
 
 	h.ServeHTTP(httptest.NewRecorder(), &http.Request{})
 
-	// Output: {"level":"info","role":"my-service","host":"local-hostname","user":"current user","status":"ok","time":"2001-02-03T04:05:06Z","message":"Something happened"}
+	// Output: {"level":"info","role":"my-service","host":"local-hostname","user":"current user","status":"ok","time":"2001-02-03T04:05:06Z","message":"Something happend"}
 }

hlog/hlog_test.go

@@ -1,20 +1,19 @@
-//go:build go1.7
 // +build go1.7
 
 package hlog
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"net/http/httptest"
 	"net/url"
-	"reflect"
 	"testing"
 
-	"github.com/rs/xid"
+	"reflect"
+
+	"net/http/httptest"
+
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/internal/cbor"
 )
@@ -101,7 +100,7 @@ func TestRemoteAddrHandler(t *testing.T) {
 	}))
 	h = NewHandler(zerolog.New(out))(h)
 	h.ServeHTTP(nil, r)
-	if want, got := `{"ip":"1.2.3.4:1234"}`+"\n", decodeIfBinary(out); want != got {
+	if want, got := `{"ip":"1.2.3.4"}`+"\n", decodeIfBinary(out); want != got {
 		t.Errorf("Invalid log output, got: %s, want: %s", got, want)
 	}
 }
@@ -117,7 +116,7 @@ func TestRemoteAddrHandlerIPv6(t *testing.T) {
 	}))
 	h = NewHandler(zerolog.New(out))(h)
 	h.ServeHTTP(nil, r)
-	if want, got := `{"ip":"[2001:db8:a0b:12f0::1]:1234"}`+"\n", decodeIfBinary(out); want != got {
+	if want, got := `{"ip":"2001:db8:a0b:12f0::1"}`+"\n", decodeIfBinary(out); want != got {
 		t.Errorf("Invalid log output, got: %s, want: %s", got, want)
 	}
 }
@@ -183,40 +182,6 @@ func TestRequestIDHandler(t *testing.T) {
 	h.ServeHTTP(httptest.NewRecorder(), r)
 }
 
-func TestCustomHeaderHandler(t *testing.T) {
-	out := &bytes.Buffer{}
-	r := &http.Request{
-		Header: http.Header{
-			"X-Request-Id": []string{"514bbe5bb5251c92bd07a9846f4a1ab6"},
-		},
-	}
-	h := CustomHeaderHandler("reqID", "X-Request-Id")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		l := FromRequest(r)
-		l.Log().Msg("")
-	}))
-	h = NewHandler(zerolog.New(out))(h)
-	h.ServeHTTP(nil, r)
-	if want, got := `{"reqID":"514bbe5bb5251c92bd07a9846f4a1ab6"}`+"\n", decodeIfBinary(out); want != got {
-		t.Errorf("Invalid log output, got: %s, want: %s", got, want)
-	}
-}
-
-func TestProtoHandler(t *testing.T) {
-	out := &bytes.Buffer{}
-	r := &http.Request{
-		Proto: "test",
-	}
-	h := ProtoHandler("proto")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		l := FromRequest(r)
-		l.Log().Msg("")
-	}))
-	h = NewHandler(zerolog.New(out))(h)
-	h.ServeHTTP(nil, r)
-	if want, got := `{"proto":"test"}`+"\n", decodeIfBinary(out); want != got {
-		t.Errorf("Invalid log output, got: %s, want: %s", got, want)
-	}
-}
-
 func TestCombinedHandlers(t *testing.T) {
 	out := &bytes.Buffer{}
 	r := &http.Request{
@@ -279,16 +244,3 @@ func BenchmarkDataRace(b *testing.B) {
 		}
 	})
 }
-
-func TestCtxWithID(t *testing.T) {
-	ctx := context.Background()
-
-	id, _ := xid.FromString(`c0umremcie6smuu506pg`)
-
-	want := context.Background()
-	want = context.WithValue(want, idKey{}, id)
-
-	if got := CtxWithID(ctx, id); !reflect.DeepEqual(got, want) {
-		t.Errorf("CtxWithID() = %v, want %v", got, want)
-	}
-}

hlog/internal/mutil/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2014, 2015, 2016 Carl Jackson (carl@avtok.com)
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

hlog/internal/mutil/mutil.go

@@ -1,6 +0,0 @@
-// Package mutil contains various functions that are helpful when writing http
-// middleware.
-//
-// It has been vendored from Goji v1.0, with the exception of the code for Go 1.8:
-// https://github.com/zenazn/goji/
-package mutil

hlog/internal/mutil/writer_proxy.go

@@ -1,154 +0,0 @@
-package mutil
-
-import (
-	"bufio"
-	"io"
-	"net"
-	"net/http"
-)
-
-// WriterProxy is a proxy around an http.ResponseWriter that allows you to hook
-// into various parts of the response process.
-type WriterProxy interface {
-	http.ResponseWriter
-	// Status returns the HTTP status of the request, or 0 if one has not
-	// yet been sent.
-	Status() int
-	// BytesWritten returns the total number of bytes sent to the client.
-	BytesWritten() int
-	// Tee causes the response body to be written to the given io.Writer in
-	// addition to proxying the writes through. Only one io.Writer can be
-	// tee'd to at once: setting a second one will overwrite the first.
-	// Writes will be sent to the proxy before being written to this
-	// io.Writer. It is illegal for the tee'd writer to be modified
-	// concurrently with writes.
-	Tee(io.Writer)
-	// Unwrap returns the original proxied target.
-	Unwrap() http.ResponseWriter
-}
-
-// WrapWriter wraps an http.ResponseWriter, returning a proxy that allows you to
-// hook into various parts of the response process.
-func WrapWriter(w http.ResponseWriter) WriterProxy {
-	_, cn := w.(http.CloseNotifier)
-	_, fl := w.(http.Flusher)
-	_, hj := w.(http.Hijacker)
-	_, rf := w.(io.ReaderFrom)
-
-	bw := basicWriter{ResponseWriter: w}
-	if cn && fl && hj && rf {
-		return &fancyWriter{bw}
-	}
-	if fl {
-		return &flushWriter{bw}
-	}
-	return &bw
-}
-
-// basicWriter wraps a http.ResponseWriter that implements the minimal
-// http.ResponseWriter interface.
-type basicWriter struct {
-	http.ResponseWriter
-	wroteHeader bool
-	code        int
-	bytes       int
-	tee         io.Writer
-}
-
-func (b *basicWriter) WriteHeader(code int) {
-	if !b.wroteHeader {
-		b.code = code
-		b.wroteHeader = true
-		b.ResponseWriter.WriteHeader(code)
-	}
-}
-
-func (b *basicWriter) Write(buf []byte) (int, error) {
-	b.WriteHeader(http.StatusOK)
-	n, err := b.ResponseWriter.Write(buf)
-	if b.tee != nil {
-		_, err2 := b.tee.Write(buf[:n])
-		// Prefer errors generated by the proxied writer.
-		if err == nil {
-			err = err2
-		}
-	}
-	b.bytes += n
-	return n, err
-}
-
-func (b *basicWriter) maybeWriteHeader() {
-	if !b.wroteHeader {
-		b.WriteHeader(http.StatusOK)
-	}
-}
-
-func (b *basicWriter) Status() int {
-	return b.code
-}
-
-func (b *basicWriter) BytesWritten() int {
-	return b.bytes
-}
-
-func (b *basicWriter) Tee(w io.Writer) {
-	b.tee = w
-}
-
-func (b *basicWriter) Unwrap() http.ResponseWriter {
-	return b.ResponseWriter
-}
-
-// fancyWriter is a writer that additionally satisfies http.CloseNotifier,
-// http.Flusher, http.Hijacker, and io.ReaderFrom. It exists for the common case
-// of wrapping the http.ResponseWriter that package http gives you, in order to
-// make the proxied object support the full method set of the proxied object.
-type fancyWriter struct {
-	basicWriter
-}
-
-func (f *fancyWriter) CloseNotify() <-chan bool {
-	cn := f.basicWriter.ResponseWriter.(http.CloseNotifier)
-	return cn.CloseNotify()
-}
-
-func (f *fancyWriter) Flush() {
-	fl := f.basicWriter.ResponseWriter.(http.Flusher)
-	fl.Flush()
-}
-
-func (f *fancyWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-	hj := f.basicWriter.ResponseWriter.(http.Hijacker)
-	return hj.Hijack()
-}
-
-func (f *fancyWriter) ReadFrom(r io.Reader) (int64, error) {
-	if f.basicWriter.tee != nil {
-		n, err := io.Copy(&f.basicWriter, r)
-		f.bytes += int(n)
-		return n, err
-	}
-	rf := f.basicWriter.ResponseWriter.(io.ReaderFrom)
-	f.basicWriter.maybeWriteHeader()
-
-	n, err := rf.ReadFrom(r)
-	f.bytes += int(n)
-	return n, err
-}
-
-type flushWriter struct {
-	basicWriter
-}
-
-func (f *flushWriter) Flush() {
-	fl := f.basicWriter.ResponseWriter.(http.Flusher)
-	fl.Flush()
-}
-
-var (
-	_ http.CloseNotifier = &fancyWriter{}
-	_ http.Flusher       = &fancyWriter{}
-	_ http.Hijacker      = &fancyWriter{}
-	_ io.ReaderFrom      = &fancyWriter{}
-	_ http.Flusher       = &flushWriter{}
-)

hook.go

@@ -17,16 +17,12 @@ func (h HookFunc) Run(e *Event, level Level, message string) {
 
 // LevelHook applies a different hook for each level.
 type LevelHook struct {
-	NoLevelHook, TraceHook, DebugHook, InfoHook, WarnHook, ErrorHook, FatalHook, PanicHook Hook
+	NoLevelHook, DebugHook, InfoHook, WarnHook, ErrorHook, FatalHook, PanicHook Hook
 }
 
 // Run implements the Hook interface.
 func (h LevelHook) Run(e *Event, level Level, message string) {
 	switch level {
-	case TraceLevel:
-		if h.TraceHook != nil {
-			h.TraceHook.Run(e, level, message)
-		}
 	case DebugLevel:
 		if h.DebugHook != nil {
 			h.DebugHook.Run(e, level, message)

internal/cbor/base.go

@@ -1,13 +1,5 @@
 package cbor
 
-// JSONMarshalFunc is used to marshal interface to JSON encoded byte slice.
-// Making it package level instead of embedded in Encoder brings
-// some extra efforts at importing, but avoids value copy when the functions
-// of Encoder being invoked.
-// DO REMEMBER to set this variable at importing, or
-// you might get a nil pointer dereference panic at runtime.
-var JSONMarshalFunc func(v interface{}) ([]byte, error)
-
 type Encoder struct{}
 
 // AppendKey adds a key (string) to the binary encoded log message
@@ -16,4 +8,4 @@ func (e Encoder) AppendKey(dst []byte, key string) []byte {
 		dst = e.AppendBeginMarker(dst)
 	}
 	return e.AppendString(dst, key)
-}
+}

internal/cbor/cbor.go

@@ -67,7 +67,7 @@ const (
 var IntegerTimeFieldFormat = time.RFC3339
 
 // NanoTimeFieldFormat indicates the format of timestamp decoded
-// from a float value (time in seconds and nanoseconds).
+// from a float value (time in seconds and nano seconds).
 var NanoTimeFieldFormat = time.RFC3339Nano
 
 func appendCborTypePrefix(dst []byte, major byte, number uint64) []byte {
@@ -91,8 +91,7 @@ func appendCborTypePrefix(dst []byte, major byte, number uint64) []byte {
 		minor = additionalTypeIntUint64
 
 	}
-
-	dst = append(dst, major|minor)
+	dst = append(dst, byte(major|minor))
 	byteCount--
 	for ; byteCount >= 0; byteCount-- {
 		dst = append(dst, byte(number>>(uint(byteCount)*8)))

internal/cbor/decode_stream.go

@@ -43,7 +43,7 @@ func readByte(src *bufio.Reader) byte {
 	return b
 }
 
-func decodeIntAdditionalType(src *bufio.Reader, minor byte) int64 {
+func decodeIntAdditonalType(src *bufio.Reader, minor byte) int64 {
 	val := int64(0)
 	if minor <= 23 {
 		val = int64(minor)
@@ -77,7 +77,7 @@ func decodeInteger(src *bufio.Reader) int64 {
 	if major != majorTypeUnsignedInt && major != majorTypeNegativeInt {
 		panic(fmt.Errorf("Major type is: %d in decodeInteger!! (expected 0 or 1)", major))
 	}
-	val := decodeIntAdditionalType(src, minor)
+	val := decodeIntAdditonalType(src, minor)
 	if major == 0 {
 		return val
 	}
@@ -204,7 +204,7 @@ func decodeString(src *bufio.Reader, noQuotes bool) []byte {
 	if !noQuotes {
 		result = append(result, '"')
 	}
-	length := decodeIntAdditionalType(src, minor)
+	length := decodeIntAdditonalType(src, minor)
 	len := int(length)
 	pbs := readNBytes(src, len)
 	result = append(result, pbs...)
@@ -222,7 +222,7 @@ func decodeUTF8String(src *bufio.Reader) []byte {
 		panic(fmt.Errorf("Major type is: %d in decodeUTF8String", major))
 	}
 	result := []byte{'"'}
-	length := decodeIntAdditionalType(src, minor)
+	length := decodeIntAdditonalType(src, minor)
 	len := int(length)
 	pbs := readNBytes(src, len)
 
@@ -238,7 +238,7 @@ func decodeUTF8String(src *bufio.Reader) []byte {
 			return append(dst, '"')
 		}
 	}
-	// The string has no need for encoding and therefore is directly
+	// The string has no need for encoding an therefore is directly
 	// appended to the byte slice.
 	result = append(result, pbs...)
 	return append(result, '"')
@@ -257,7 +257,7 @@ func array2Json(src *bufio.Reader, dst io.Writer) {
 	if minor == additionalTypeInfiniteCount {
 		unSpecifiedCount = true
 	} else {
-		length := decodeIntAdditionalType(src, minor)
+		length := decodeIntAdditonalType(src, minor)
 		len = int(length)
 	}
 	for i := 0; unSpecifiedCount || i < len; i++ {
@@ -266,7 +266,7 @@ func array2Json(src *bufio.Reader, dst io.Writer) {
 			if e != nil {
 				panic(e)
 			}
-			if pb[0] == majorTypeSimpleAndFloat|additionalTypeBreak {
+			if pb[0] == byte(majorTypeSimpleAndFloat|additionalTypeBreak) {
 				readByte(src)
 				break
 			}
@@ -277,7 +277,7 @@ func array2Json(src *bufio.Reader, dst io.Writer) {
 			if e != nil {
 				panic(e)
 			}
-			if pb[0] == majorTypeSimpleAndFloat|additionalTypeBreak {
+			if pb[0] == byte(majorTypeSimpleAndFloat|additionalTypeBreak) {
 				readByte(src)
 				break
 			}
@@ -301,7 +301,7 @@ func map2Json(src *bufio.Reader, dst io.Writer) {
 	if minor == additionalTypeInfiniteCount {
 		unSpecifiedCount = true
 	} else {
-		length := decodeIntAdditionalType(src, minor)
+		length := decodeIntAdditonalType(src, minor)
 		len = int(length)
 	}
 	dst.Write([]byte{'{'})
@@ -311,7 +311,7 @@ func map2Json(src *bufio.Reader, dst io.Writer) {
 			if e != nil {
 				panic(e)
 			}
-			if pb[0] == majorTypeSimpleAndFloat|additionalTypeBreak {
+			if pb[0] == byte(majorTypeSimpleAndFloat|additionalTypeBreak) {
 				readByte(src)
 				break
 			}
@@ -326,7 +326,7 @@ func map2Json(src *bufio.Reader, dst io.Writer) {
 				if e != nil {
 					panic(e)
 				}
-				if pb[0] == majorTypeSimpleAndFloat|additionalTypeBreak {
+				if pb[0] == byte(majorTypeSimpleAndFloat|additionalTypeBreak) {
 					readByte(src)
 					break
 				}
@@ -352,7 +352,7 @@ func decodeTagData(src *bufio.Reader) []byte {
 
 	// Tag value is larger than 256 (so uint16).
 	case additionalTypeIntUint16:
-		val := decodeIntAdditionalType(src, minor)
+		val := decodeIntAdditonalType(src, minor)
 
 		switch uint16(val) {
 		case additionalTypeEmbeddedJSON:
@@ -383,7 +383,7 @@ func decodeTagData(src *bufio.Reader) []byte {
 
 		case additionalTypeTagNetworkPrefix:
 			pb := readByte(src)
-			if pb != majorTypeMap|0x1 {
+			if pb != byte(majorTypeMap|0x1) {
 				panic(fmt.Errorf("IP Prefix is NOT of MAP of 1 elements as expected"))
 			}
 			octets := decodeString(src, true)

internal/cbor/string.go

@@ -1,14 +1,12 @@
 package cbor
 
-import "fmt"
-
 // AppendStrings encodes and adds an array of strings to the dst byte array.
 func (e Encoder) AppendStrings(dst []byte, vals []string) []byte {
 	major := majorTypeArray
 	l := len(vals)
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -25,38 +23,13 @@ func (Encoder) AppendString(dst []byte, s string) []byte {
 	l := len(s)
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, majorTypeUtf8String, uint64(l))
 	}
 	return append(dst, s...)
 }
 
-// AppendStringers encodes and adds an array of Stringer values
-// to the dst byte array.
-func (e Encoder) AppendStringers(dst []byte, vals []fmt.Stringer) []byte {
-	if len(vals) == 0 {
-		return e.AppendArrayEnd(e.AppendArrayStart(dst))
-	}
-	dst = e.AppendArrayStart(dst)
-	dst = e.AppendStringer(dst, vals[0])
-	if len(vals) > 1 {
-		for _, val := range vals[1:] {
-			dst = e.AppendStringer(dst, val)
-		}
-	}
-	return e.AppendArrayEnd(dst)
-}
-
-// AppendStringer encodes and adds the Stringer value to the dst
-// byte array.
-func (e Encoder) AppendStringer(dst []byte, val fmt.Stringer) []byte {
-	if val == nil {
-		return e.AppendNil(dst)
-	}
-	return e.AppendString(dst, val.String())
-}
-
 // AppendBytes encodes and adds an array of bytes to the dst byte array.
 func (Encoder) AppendBytes(dst, s []byte) []byte {
 	major := majorTypeByteString
@@ -64,7 +37,7 @@ func (Encoder) AppendBytes(dst, s []byte) []byte {
 	l := len(s)
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -77,7 +50,7 @@ func AppendEmbeddedJSON(dst, s []byte) []byte {
 	minor := additionalTypeEmbeddedJSON
 
 	// Append the TAG to indicate this is Embedded JSON.
-	dst = append(dst, major|additionalTypeIntUint16)
+	dst = append(dst, byte(major|additionalTypeIntUint16))
 	dst = append(dst, byte(minor>>8))
 	dst = append(dst, byte(minor&0xff))
 
@@ -87,7 +60,7 @@ func AppendEmbeddedJSON(dst, s []byte) []byte {
 	l := len(s)
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}

internal/cbor/time.go

@@ -7,7 +7,7 @@ import (
 func appendIntegerTimestamp(dst []byte, t time.Time) []byte {
 	major := majorTypeTags
 	minor := additionalTypeTimestamp
-	dst = append(dst, major|minor)
+	dst = append(dst, byte(major|minor))
 	secs := t.Unix()
 	var val uint64
 	if secs < 0 {
@@ -17,18 +17,18 @@ func appendIntegerTimestamp(dst []byte, t time.Time) []byte {
 		major = majorTypeUnsignedInt
 		val = uint64(secs)
 	}
-	dst = appendCborTypePrefix(dst, major, val)
+	dst = appendCborTypePrefix(dst, major, uint64(val))
 	return dst
 }
 
 func (e Encoder) appendFloatTimestamp(dst []byte, t time.Time) []byte {
 	major := majorTypeTags
 	minor := additionalTypeTimestamp
-	dst = append(dst, major|minor)
+	dst = append(dst, byte(major|minor))
 	secs := t.Unix()
 	nanos := t.Nanosecond()
 	var val float64
-	val = float64(secs)*1.0 + float64(nanos)*1e-9
+	val = float64(secs)*1.0 + float64(nanos)*1E-9
 	return e.AppendFloat64(dst, val)
 }
 
@@ -50,7 +50,7 @@ func (e Encoder) AppendTimes(dst []byte, vals []time.Time, unused string) []byte
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -82,7 +82,7 @@ func (e Encoder) AppendDurations(dst []byte, vals []time.Duration, unit time.Dur
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}

internal/cbor/types.go

@@ -1,6 +1,7 @@
 package cbor
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"net"
@@ -8,34 +9,34 @@ import (
 
 // AppendNil inserts a 'Nil' object into the dst byte array.
 func (Encoder) AppendNil(dst []byte) []byte {
-	return append(dst, majorTypeSimpleAndFloat|additionalTypeNull)
+	return append(dst, byte(majorTypeSimpleAndFloat|additionalTypeNull))
 }
 
 // AppendBeginMarker inserts a map start into the dst byte array.
 func (Encoder) AppendBeginMarker(dst []byte) []byte {
-	return append(dst, majorTypeMap|additionalTypeInfiniteCount)
+	return append(dst, byte(majorTypeMap|additionalTypeInfiniteCount))
 }
 
 // AppendEndMarker inserts a map end into the dst byte array.
 func (Encoder) AppendEndMarker(dst []byte) []byte {
-	return append(dst, majorTypeSimpleAndFloat|additionalTypeBreak)
+	return append(dst, byte(majorTypeSimpleAndFloat|additionalTypeBreak))
 }
 
 // AppendObjectData takes an object in form of a byte array and appends to dst.
 func (Encoder) AppendObjectData(dst []byte, o []byte) []byte {
-	// BeginMarker is present in the dst, which
-	// should not be copied when appending to existing data.
-	return append(dst, o[1:]...)
+        // BeginMarker is present in the dst, which
+        // should not be copied when appending to existing data.
+        return append(dst, o[1:]...)
 }
 
 // AppendArrayStart adds markers to indicate the start of an array.
 func (Encoder) AppendArrayStart(dst []byte) []byte {
-	return append(dst, majorTypeArray|additionalTypeInfiniteCount)
+	return append(dst, byte(majorTypeArray|additionalTypeInfiniteCount))
 }
 
 // AppendArrayEnd adds markers to indicate the end of an array.
 func (Encoder) AppendArrayEnd(dst []byte) []byte {
-	return append(dst, majorTypeSimpleAndFloat|additionalTypeBreak)
+	return append(dst, byte(majorTypeSimpleAndFloat|additionalTypeBreak))
 }
 
 // AppendArrayDelim adds markers to indicate end of a particular array element.
@@ -56,7 +57,7 @@ func (Encoder) AppendBool(dst []byte, val bool) []byte {
 	if val {
 		b = additionalTypeBoolTrue
 	}
-	return append(dst, majorTypeSimpleAndFloat|b)
+	return append(dst, byte(majorTypeSimpleAndFloat|b))
 }
 
 // AppendBools encodes and inserts an array of boolean values into the dst byte array.
@@ -68,7 +69,7 @@ func (e Encoder) AppendBools(dst []byte, vals []bool) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -88,7 +89,7 @@ func (Encoder) AppendInt(dst []byte, val int) []byte {
 	}
 	if contentVal <= additionalMax {
 		lb := byte(contentVal)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(contentVal))
 	}
@@ -104,7 +105,7 @@ func (e Encoder) AppendInts(dst []byte, vals []int) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -128,7 +129,7 @@ func (e Encoder) AppendInts8(dst []byte, vals []int8) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -152,7 +153,7 @@ func (e Encoder) AppendInts16(dst []byte, vals []int16) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -176,7 +177,7 @@ func (e Encoder) AppendInts32(dst []byte, vals []int32) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -196,7 +197,7 @@ func (Encoder) AppendInt64(dst []byte, val int64) []byte {
 	}
 	if contentVal <= additionalMax {
 		lb := byte(contentVal)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(contentVal))
 	}
@@ -212,7 +213,7 @@ func (e Encoder) AppendInts64(dst []byte, vals []int64) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -236,7 +237,7 @@ func (e Encoder) AppendUints(dst []byte, vals []uint) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -260,7 +261,7 @@ func (e Encoder) AppendUints8(dst []byte, vals []uint8) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -284,7 +285,7 @@ func (e Encoder) AppendUints16(dst []byte, vals []uint16) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -308,7 +309,7 @@ func (e Encoder) AppendUints32(dst []byte, vals []uint32) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -324,9 +325,9 @@ func (Encoder) AppendUint64(dst []byte, val uint64) []byte {
 	contentVal := val
 	if contentVal <= additionalMax {
 		lb := byte(contentVal)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
-		dst = appendCborTypePrefix(dst, major, contentVal)
+		dst = appendCborTypePrefix(dst, major, uint64(contentVal))
 	}
 	return dst
 }
@@ -340,7 +341,7 @@ func (e Encoder) AppendUints64(dst []byte, vals []uint64) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -367,7 +368,7 @@ func (Encoder) AppendFloat32(dst []byte, val float32) []byte {
 	for i := uint(0); i < 4; i++ {
 		buf[i] = byte(n >> ((3 - i) * 8))
 	}
-	return append(append(dst, major|subType), buf[0], buf[1], buf[2], buf[3])
+	return append(append(dst, byte(major|subType)), buf[0], buf[1], buf[2], buf[3])
 }
 
 // AppendFloats32 encodes and inserts an array of single precision float value into the dst byte array.
@@ -379,7 +380,7 @@ func (e Encoder) AppendFloats32(dst []byte, vals []float32) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -402,7 +403,7 @@ func (Encoder) AppendFloat64(dst []byte, val float64) []byte {
 	major := majorTypeSimpleAndFloat
 	subType := additionalTypeFloat64
 	n := math.Float64bits(val)
-	dst = append(dst, major|subType)
+	dst = append(dst, byte(major|subType))
 	for i := uint(1); i <= 8; i++ {
 		b := byte(n >> ((8 - i) * 8))
 		dst = append(dst, b)
@@ -419,7 +420,7 @@ func (e Encoder) AppendFloats64(dst []byte, vals []float64) []byte {
 	}
 	if l <= additionalMax {
 		lb := byte(l)
-		dst = append(dst, major|lb)
+		dst = append(dst, byte(major|lb))
 	} else {
 		dst = appendCborTypePrefix(dst, major, uint64(l))
 	}
@@ -431,7 +432,7 @@ func (e Encoder) AppendFloats64(dst []byte, vals []float64) []byte {
 
 // AppendInterface takes an arbitrary object and converts it to JSON and embeds it dst.
 func (e Encoder) AppendInterface(dst []byte, i interface{}) []byte {
-	marshaled, err := JSONMarshalFunc(i)
+	marshaled, err := json.Marshal(i)
 	if err != nil {
 		return e.AppendString(dst, fmt.Sprintf("marshaling error: %v", err))
 	}
@@ -440,7 +441,7 @@ func (e Encoder) AppendInterface(dst []byte, i interface{}) []byte {
 
 // AppendIPAddr encodes and inserts an IP Address (IPv4 or IPv6).
 func (e Encoder) AppendIPAddr(dst []byte, ip net.IP) []byte {
-	dst = append(dst, majorTypeTags|additionalTypeIntUint16)
+	dst = append(dst, byte(majorTypeTags|additionalTypeIntUint16))
 	dst = append(dst, byte(additionalTypeTagNetworkAddr>>8))
 	dst = append(dst, byte(additionalTypeTagNetworkAddr&0xff))
 	return e.AppendBytes(dst, ip)
@@ -448,21 +449,21 @@ func (e Encoder) AppendIPAddr(dst []byte, ip net.IP) []byte {
 
 // AppendIPPrefix encodes and inserts an IP Address Prefix (Address + Mask Length).
 func (e Encoder) AppendIPPrefix(dst []byte, pfx net.IPNet) []byte {
-	dst = append(dst, majorTypeTags|additionalTypeIntUint16)
+	dst = append(dst, byte(majorTypeTags|additionalTypeIntUint16))
 	dst = append(dst, byte(additionalTypeTagNetworkPrefix>>8))
 	dst = append(dst, byte(additionalTypeTagNetworkPrefix&0xff))
 
 	// Prefix is a tuple (aka MAP of 1 pair of elements) -
 	// first element is prefix, second is mask length.
-	dst = append(dst, majorTypeMap|0x1)
+	dst = append(dst, byte(majorTypeMap|0x1))
 	dst = e.AppendBytes(dst, pfx.IP)
 	maskLen, _ := pfx.Mask.Size()
 	return e.AppendUint8(dst, uint8(maskLen))
 }
 
-// AppendMACAddr encodes and inserts a Hardware (MAC) address.
+// AppendMACAddr encodes and inserts an Hardware (MAC) address.
 func (e Encoder) AppendMACAddr(dst []byte, ha net.HardwareAddr) []byte {
-	dst = append(dst, majorTypeTags|additionalTypeIntUint16)
+	dst = append(dst, byte(majorTypeTags|additionalTypeIntUint16))
 	dst = append(dst, byte(additionalTypeTagNetworkAddr>>8))
 	dst = append(dst, byte(additionalTypeTagNetworkAddr&0xff))
 	return e.AppendBytes(dst, ha)
@@ -470,7 +471,7 @@ func (e Encoder) AppendMACAddr(dst []byte, ha net.HardwareAddr) []byte {
 
 // AppendHex adds a TAG and inserts a hex bytes as a string.
 func (e Encoder) AppendHex(dst []byte, val []byte) []byte {
-	dst = append(dst, majorTypeTags|additionalTypeIntUint16)
+	dst = append(dst, byte(majorTypeTags|additionalTypeIntUint16))
 	dst = append(dst, byte(additionalTypeTagHexString>>8))
 	dst = append(dst, byte(additionalTypeTagHexString&0xff))
 	return e.AppendBytes(dst, val)

internal/cbor/types_64_test.go

@@ -1,34 +0,0 @@
-// +build !386
-
-package cbor
-
-import (
-	"encoding/hex"
-	"testing"
-)
-
-var enc2 = Encoder{}
-
-var integerTestCases_64bit = []struct {
-	val    int
-	binary string
-}{
-	// Value in 8 bytes.
-	{0xabcd100000000, "\x1b\x00\x0a\xbc\xd1\x00\x00\x00\x00"},
-	{1000000000000, "\x1b\x00\x00\x00\xe8\xd4\xa5\x10\x00"},
-	// Value in 8 bytes.
-	{-0xabcd100000001, "\x3b\x00\x0a\xbc\xd1\x00\x00\x00\x00"},
-	{-1000000000001, "\x3b\x00\x00\x00\xe8\xd4\xa5\x10\x00"},
-}
-
-func TestAppendInt_64bit(t *testing.T) {
-	for _, tc := range integerTestCases_64bit {
-		s := enc2.AppendInt([]byte{}, tc.val)
-		got := string(s)
-		if got != tc.binary {
-			t.Errorf("AppendInt(0x%x)=0x%s, want: 0x%s",
-				tc.val, hex.EncodeToString(s),
-				hex.EncodeToString([]byte(tc.binary)))
-		}
-	}
-}

internal/cbor/types_test.go

@@ -88,8 +88,11 @@ var integerTestCases = []struct {
 	{0xFFFF, "\x19\xff\xff"},
 	// Value in 4 bytes.
 	{0x10000, "\x1a\x00\x01\x00\x00"},
-	{0x7FFFFFFE, "\x1a\x7f\xff\xff\xfe"},
+	{0xFFFFFFFE, "\x1a\xff\xff\xff\xfe"},
 	{1000000, "\x1a\x00\x0f\x42\x40"},
+	// Value in 8 bytes.
+	{0xabcd100000000, "\x1b\x00\x0a\xbc\xd1\x00\x00\x00\x00"},
+	{1000000000000, "\x1b\x00\x00\x00\xe8\xd4\xa5\x10\x00"},
 	// Negative number test cases.
 	// Value included in the type.
 	{-1, "\x20"},
@@ -113,8 +116,11 @@ var integerTestCases = []struct {
 	{-1000, "\x39\x03\xe7"},
 	// Value in 4 bytes.
 	{-0x10001, "\x3a\x00\x01\x00\x00"},
-	{-0x7FFFFFFE, "\x3a\x7f\xff\xff\xfd"},
+	{-0xFFFFFFFE, "\x3a\xff\xff\xff\xfd"},
 	{-1000000, "\x3a\x00\x0f\x42\x3f"},
+	// Value in 8 bytes.
+	{-0xabcd100000001, "\x3b\x00\x0a\xbc\xd1\x00\x00\x00\x00"},
+	{-1000000000001, "\x3b\x00\x00\x00\xe8\xd4\xa5\x10\x00"},
 }
 
 func TestAppendInt(t *testing.T) {
@@ -211,7 +217,7 @@ var macAddrTestCases = []struct {
 	{net.HardwareAddr{0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3}, "\"20:01:0d:b8:85:a3\"", "\xd9\x01\x04\x46\x20\x01\x0d\xb8\x85\xa3"},
 }
 
-func TestAppendMACAddr(t *testing.T) {
+func TestAppendMacAddr(t *testing.T) {
 	for _, tc := range macAddrTestCases {
 		s := enc.AppendMACAddr([]byte{}, tc.macaddr)
 		got := string(s)

internal/json/base.go

@@ -1,19 +1,12 @@
 package json
 
-// JSONMarshalFunc is used to marshal interface to JSON encoded byte slice.
-// Making it package level instead of embedded in Encoder brings
-// some extra efforts at importing, but avoids value copy when the functions
-// of Encoder being invoked.
-// DO REMEMBER to set this variable at importing, or
-// you might get a nil pointer dereference panic at runtime.
-var JSONMarshalFunc func(v interface{}) ([]byte, error)
-
 type Encoder struct{}
 
 // AppendKey appends a new key to the output JSON.
 func (e Encoder) AppendKey(dst []byte, key string) []byte {
-	if dst[len(dst)-1] != '{' {
+	if len(dst) > 1 && dst[len(dst)-1] != '{' {
 		dst = append(dst, ',')
 	}
-	return append(e.AppendString(dst, key), ':')
-}
+	dst = e.AppendString(dst, key)
+	return append(dst, ':')
+}

internal/json/string.go

@@ -1,9 +1,6 @@
 package json
 
-import (
-	"fmt"
-	"unicode/utf8"
-)
+import "unicode/utf8"
 
 const hex = "0123456789abcdef"
 
@@ -37,7 +34,7 @@ func (e Encoder) AppendStrings(dst []byte, vals []string) []byte {
 //
 // The operation loops though each byte in the string looking
 // for characters that need json or utf8 encoding. If the string
-// does not need encoding, then the string is appended in its
+// does not need encoding, then the string is appended in it's
 // entirety to the byte slice.
 // If we encounter a byte that does need encoding, switch up
 // the operation and perform a byte-by-byte read-encode-append.
@@ -56,39 +53,14 @@ func (Encoder) AppendString(dst []byte, s string) []byte {
 			return append(dst, '"')
 		}
 	}
-	// The string has no need for encoding and therefore is directly
+	// The string has no need for encoding an therefore is directly
 	// appended to the byte slice.
 	dst = append(dst, s...)
 	// End with a double quote
 	return append(dst, '"')
 }
 
-// AppendStringers encodes the provided Stringer list to json and
-// appends the encoded Stringer list to the input byte slice.
-func (e Encoder) AppendStringers(dst []byte, vals []fmt.Stringer) []byte {
-	if len(vals) == 0 {
-		return append(dst, '[', ']')
-	}
-	dst = append(dst, '[')
-	dst = e.AppendStringer(dst, vals[0])
-	if len(vals) > 1 {
-		for _, val := range vals[1:] {
-			dst = e.AppendStringer(append(dst, ','), val)
-		}
-	}
-	return append(dst, ']')
-}
-
-// AppendStringer encodes the input Stringer to json and appends the
-// encoded Stringer value to the input byte slice.
-func (e Encoder) AppendStringer(dst []byte, val fmt.Stringer) []byte {
-	if val == nil {
-		return e.AppendInterface(dst, nil)
-	}
-	return e.AppendString(dst, val.String())
-}
-
-//// appendStringComplex is used by appendString to take over an in
+// appendStringComplex is used by appendString to take over an in
 // progress JSON string encoding that encountered a character that needs
 // to be encoded.
 func appendStringComplex(dst []byte, s string, i int) []byte {
@@ -99,7 +71,7 @@ func appendStringComplex(dst []byte, s string, i int) []byte {
 			r, size := utf8.DecodeRuneInString(s[i:])
 			if r == utf8.RuneError && size == 1 {
 				// In case of error, first append previous simple characters to
-				// the byte slice if any and append a replacement character code
+				// the byte slice if any and append a remplacement character code
 				// in place of the invalid sequence.
 				if start < i {
 					dst = append(dst, s[start:i]...)

internal/json/time.go

@@ -5,26 +5,11 @@ import (
 	"time"
 )
 
-const (
-	// Import from zerolog/global.go
-	timeFormatUnix      = ""
-	timeFormatUnixMs    = "UNIXMS"
-	timeFormatUnixMicro = "UNIXMICRO"
-	timeFormatUnixNano  = "UNIXNANO"
-)
-
 // AppendTime formats the input time with the given format
 // and appends the encoded string to the input byte slice.
 func (e Encoder) AppendTime(dst []byte, t time.Time, format string) []byte {
-	switch format {
-	case timeFormatUnix:
+	if format == "" {
 		return e.AppendInt64(dst, t.Unix())
-	case timeFormatUnixMs:
-		return e.AppendInt64(dst, t.UnixNano()/1000000)
-	case timeFormatUnixMicro:
-		return e.AppendInt64(dst, t.UnixNano()/1000)
-	case timeFormatUnixNano:
-		return e.AppendInt64(dst, t.UnixNano())
 	}
 	return append(t.AppendFormat(append(dst, '"'), format), '"')
 }
@@ -32,15 +17,8 @@ func (e Encoder) AppendTime(dst []byte, t time.Time, format string) []byte {
 // AppendTimes converts the input times with the given format
 // and appends the encoded string list to the input byte slice.
 func (Encoder) AppendTimes(dst []byte, vals []time.Time, format string) []byte {
-	switch format {
-	case timeFormatUnix:
+	if format == "" {
 		return appendUnixTimes(dst, vals)
-	case timeFormatUnixMs:
-		return appendUnixNanoTimes(dst, vals, 1000000)
-	case timeFormatUnixMicro:
-		return appendUnixNanoTimes(dst, vals, 1000)
-	case timeFormatUnixNano:
-		return appendUnixNanoTimes(dst, vals, 1)
 	}
 	if len(vals) == 0 {
 		return append(dst, '[', ']')
@@ -71,21 +49,6 @@ func appendUnixTimes(dst []byte, vals []time.Time) []byte {
 	return dst
 }
 
-func appendUnixNanoTimes(dst []byte, vals []time.Time, div int64) []byte {
-	if len(vals) == 0 {
-		return append(dst, '[', ']')
-	}
-	dst = append(dst, '[')
-	dst = strconv.AppendInt(dst, vals[0].UnixNano()/div, 10)
-	if len(vals) > 1 {
-		for _, t := range vals[1:] {
-			dst = strconv.AppendInt(append(dst, ','), t.UnixNano()/div, 10)
-		}
-	}
-	dst = append(dst, ']')
-	return dst
-}
-
 // AppendDuration formats the input duration with the given unit & format
 // and appends the encoded string to the input byte slice.
 func (e Encoder) AppendDuration(dst []byte, d time.Duration, unit time.Duration, useInt bool) []byte {

internal/json/types.go

@@ -1,6 +1,7 @@
 package json
 
 import (
+	"encoding/json"
 	"fmt"
 	"math"
 	"net"
@@ -278,7 +279,7 @@ func (Encoder) AppendUints32(dst []byte, vals []uint32) []byte {
 // AppendUint64 converts the input uint64 to a string and
 // appends the encoded string to the input byte slice.
 func (Encoder) AppendUint64(dst []byte, val uint64) []byte {
-	return strconv.AppendUint(dst, val, 10)
+	return strconv.AppendUint(dst, uint64(val), 10)
 }
 
 // AppendUints64 encodes the input uint64s to json and
@@ -300,7 +301,7 @@ func (Encoder) AppendUints64(dst []byte, vals []uint64) []byte {
 
 func appendFloat(dst []byte, val float64, bitSize int) []byte {
 	// JSON does not permit NaN or Infinity. A typical JSON encoder would fail
-	// with an error, but a logging library wants the data to get through so we
+	// with an error, but a logging library wants the data to get thru so we
 	// make a tradeoff and store those types as string.
 	switch {
 	case math.IsNaN(val):
@@ -349,7 +350,7 @@ func (Encoder) AppendFloats64(dst []byte, vals []float64) []byte {
 		return append(dst, '[', ']')
 	}
 	dst = append(dst, '[')
-	dst = appendFloat(dst, vals[0], 64)
+	dst = appendFloat(dst, vals[0], 32)
 	if len(vals) > 1 {
 		for _, val := range vals[1:] {
 			dst = appendFloat(append(dst, ','), val, 64)
@@ -362,7 +363,7 @@ func (Encoder) AppendFloats64(dst []byte, vals []float64) []byte {
 // AppendInterface marshals the input interface to a string and
 // appends the encoded string to the input byte slice.
 func (e Encoder) AppendInterface(dst []byte, i interface{}) []byte {
-	marshaled, err := JSONMarshalFunc(i)
+	marshaled, err := json.Marshal(i)
 	if err != nil {
 		return e.AppendString(dst, fmt.Sprintf("marshaling error: %v", err))
 	}
@@ -372,16 +373,12 @@ func (e Encoder) AppendInterface(dst []byte, i interface{}) []byte {
 // AppendObjectData takes in an object that is already in a byte array
 // and adds it to the dst.
 func (Encoder) AppendObjectData(dst []byte, o []byte) []byte {
-	// Three conditions apply here:
-	// 1. new content starts with '{' - which should be dropped   OR
-	// 2. new content starts with '{' - which should be replaced with ','
-	//    to separate with existing content OR
-	// 3. existing content has already other fields
+	// Two conditions we want to put a ',' between existing content and
+	// new content:
+	// 1. new content starts with '{' - which shd be dropped   OR
+	// 2. existing content has already other fields
 	if o[0] == '{' {
-		if len(dst) > 1 {
-			dst = append(dst, ',')
-		}
-		o = o[1:]
+		o[0] = ','
 	} else if len(dst) > 1 {
 		dst = append(dst, ',')
 	}

internal/json/types_test.go

@@ -165,23 +165,3 @@ func Test_appendMac(t *testing.T) {
 		})
 	}
 }
-
-func Test_appendObjectData(t *testing.T) {
-	tests := []struct {
-		dst  []byte
-		obj  []byte
-		want []byte
-	}{
-		{[]byte{}, []byte(`{"foo":"bar"}`), []byte(`"foo":"bar"}`)},
-		{[]byte(`{"qux":"quz"`), []byte(`{"foo":"bar"}`), []byte(`{"qux":"quz","foo":"bar"}`)},
-		{[]byte{}, []byte(`"foo":"bar"`), []byte(`"foo":"bar"`)},
-		{[]byte(`{"qux":"quz"`), []byte(`"foo":"bar"`), []byte(`{"qux":"quz","foo":"bar"`)},
-	}
-	for _, tt := range tests {
-		t.Run("ObjectData", func(t *testing.T) {
-			if got := enc.AppendObjectData(tt.dst, tt.obj); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("appendObjectData() = %s, want %s", got, tt.want)
-			}
-		})
-	}
-}

journald/journald.go

@@ -1,4 +1,3 @@
-//go:build !windows
 // +build !windows
 
 // Package journald provides a io.Writer to send the logs
@@ -21,12 +20,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"strings"
-
-	"github.com/coreos/go-systemd/v22/journal"
+	"github.com/coreos/go-systemd/journal"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/internal/cbor"
+	"io"
+	"strings"
 )
 
 const defaultJournalDPrio = journal.PriNotice
@@ -49,8 +47,6 @@ func levelToJPrio(zLevel string) journal.Priority {
 	lvl, _ := zerolog.ParseLevel(zLevel)
 
 	switch lvl {
-	case zerolog.TraceLevel:
-		return journal.PriDebug
 	case zerolog.DebugLevel:
 		return journal.PriDebug
 	case zerolog.InfoLevel:
@@ -70,14 +66,17 @@ func levelToJPrio(zLevel string) journal.Priority {
 }
 
 func (w journalWriter) Write(p []byte) (n int, err error) {
+	if !journal.Enabled() {
+		err = fmt.Errorf("Cannot connect to journalD!!")
+		return
+	}
 	var event map[string]interface{}
-	origPLen := len(p)
 	p = cbor.DecodeIfBinaryToBytes(p)
 	d := json.NewDecoder(bytes.NewReader(p))
 	d.UseNumber()
 	err = d.Decode(&event)
 	jPrio := defaultJournalDPrio
-	args := make(map[string]string)
+	args := make(map[string]string, 0)
 	if err != nil {
 		return
 	}
@@ -96,13 +95,13 @@ func (w journalWriter) Write(p []byte) (n int, err error) {
 			continue
 		}
 
-		switch v := value.(type) {
+		switch value.(type) {
 		case string:
-			args[jKey] = v
+			args[jKey], _ = value.(string)
 		case json.Number:
 			args[jKey] = fmt.Sprint(value)
 		default:
-			b, err := zerolog.InterfaceMarshalFunc(value)
+			b, err := json.Marshal(value)
 			if err != nil {
 				args[jKey] = fmt.Sprintf("[error: %v]", err)
 			} else {
@@ -112,10 +111,5 @@ func (w journalWriter) Write(p []byte) (n int, err error) {
 	}
 	args["JSON"] = string(p)
 	err = journal.Send(msg, jPrio, args)
-
-	if err == nil {
-		n = origPLen
-	}
-
 	return
 }

journald/journald_test.go

@@ -1,15 +1,9 @@
-// +build linux
+// +build !windows
 
 package journald_test
 
-import (
-	"bytes"
-	"io"
-	"testing"
-
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/journald"
-)
+import "github.com/rs/zerolog"
+import "github.com/rs/zerolog/journald"
 
 func ExampleNewJournalDWriter() {
 	log := zerolog.New(journald.NewJournalDWriter())
@@ -48,39 +42,3 @@ Thu 2018-04-26 22:30:20.768136 PDT [s=3284d695bde946e4b5017c77a399237f;i=329f0;b
     _PID=27103
     _SOURCE_REALTIME_TIMESTAMP=1524807020768136
 */
-
-func TestWriteReturnsNoOfWrittenBytes(t *testing.T) {
-	input := []byte(`{"level":"info","time":1570912626,"message":"Starting..."}`)
-	wr := journald.NewJournalDWriter()
-	want := len(input)
-	got, err := wr.Write(input)
-
-	if err != nil {
-		t.Errorf("Unexpected error %v", err)
-	}
-
-	if want != got {
-		t.Errorf("Expected %d bytes to be written got %d", want, got)
-	}
-}
-
-func TestMultiWrite(t *testing.T) {
-	var (
-		w1 = new(bytes.Buffer)
-		w2 = new(bytes.Buffer)
-		w3 = journald.NewJournalDWriter()
-	)
-
-	zerolog.ErrorHandler = func(err error) {
-		if err == io.ErrShortWrite {
-			t.Errorf("Unexpected ShortWriteError")
-			t.FailNow()
-		}
-	}
-
-	log := zerolog.New(io.MultiWriter(w1, w2, w3)).With().Logger()
-
-	for i := 0; i < 10; i++ {
-		log.Info().Msg("Tick!")
-	}
-}

log.go

@@ -94,12 +94,11 @@
 //            Msg("dup")
 //     // Output: {"level":"info","time":1494567715,"time":1494567715,"message":"dup"}
 //
-// In this case, many consumers will take the last value,
-// but this is not guaranteed; check yours if in doubt.
+// However, it’s not a big deal though as JSON accepts dup keys,
+// the last one prevails.
 package zerolog
 
 import (
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -108,7 +107,7 @@ import (
 )
 
 // Level defines log levels.
-type Level int8
+type Level uint8
 
 const (
 	// DebugLevel defines debug log level.
@@ -127,87 +126,53 @@ const (
 	NoLevel
 	// Disabled disables the logger.
 	Disabled
-
-	// TraceLevel defines trace log level.
-	TraceLevel Level = -1
-	// Values less than TraceLevel are handled as numbers.
 )
 
 func (l Level) String() string {
 	switch l {
-	case TraceLevel:
-		return LevelTraceValue
 	case DebugLevel:
-		return LevelDebugValue
+		return "debug"
 	case InfoLevel:
-		return LevelInfoValue
+		return "info"
 	case WarnLevel:
-		return LevelWarnValue
+		return "warn"
 	case ErrorLevel:
-		return LevelErrorValue
+		return "error"
 	case FatalLevel:
-		return LevelFatalValue
+		return "fatal"
 	case PanicLevel:
-		return LevelPanicValue
-	case Disabled:
-		return "disabled"
+		return "panic"
 	case NoLevel:
 		return ""
 	}
-	return strconv.Itoa(int(l))
+	return ""
 }
 
 // ParseLevel converts a level string into a zerolog Level value.
 // returns an error if the input string does not match known values.
 func ParseLevel(levelStr string) (Level, error) {
 	switch levelStr {
-	case LevelFieldMarshalFunc(TraceLevel):
-		return TraceLevel, nil
-	case LevelFieldMarshalFunc(DebugLevel):
+	case DebugLevel.String():
 		return DebugLevel, nil
-	case LevelFieldMarshalFunc(InfoLevel):
+	case InfoLevel.String():
 		return InfoLevel, nil
-	case LevelFieldMarshalFunc(WarnLevel):
+	case WarnLevel.String():
 		return WarnLevel, nil
-	case LevelFieldMarshalFunc(ErrorLevel):
+	case ErrorLevel.String():
 		return ErrorLevel, nil
-	case LevelFieldMarshalFunc(FatalLevel):
+	case FatalLevel.String():
 		return FatalLevel, nil
-	case LevelFieldMarshalFunc(PanicLevel):
+	case PanicLevel.String():
 		return PanicLevel, nil
-	case LevelFieldMarshalFunc(Disabled):
-		return Disabled, nil
-	case LevelFieldMarshalFunc(NoLevel):
+	case NoLevel.String():
 		return NoLevel, nil
 	}
-	i, err := strconv.Atoi(levelStr)
-	if err != nil {
-		return NoLevel, fmt.Errorf("Unknown Level String: '%s', defaulting to NoLevel", levelStr)
-	}
-	if i > 127 || i < -128 {
-		return NoLevel, fmt.Errorf("Out-Of-Bounds Level: '%d', defaulting to NoLevel", i)
-	}
-	return Level(i), nil
-}
-
-// UnmarshalText implements encoding.TextUnmarshaler to allow for easy reading from toml/yaml/json formats
-func (l *Level) UnmarshalText(text []byte) error {
-	if l == nil {
-		return errors.New("can't unmarshal a nil *Level")
-	}
-	var err error
-	*l, err = ParseLevel(string(text))
-	return err
-}
-
-// MarshalText implements encoding.TextMarshaler to allow for easy writing into toml/yaml/json formats
-func (l Level) MarshalText() ([]byte, error) {
-	return []byte(LevelFieldMarshalFunc(l)), nil
+	return NoLevel, fmt.Errorf("Unknown Level String: '%s', defaulting to NoLevel", levelStr)
 }
 
 // A Logger represents an active logging object that generates lines
 // of JSON output to an io.Writer. Each logging operation makes a single
-// call to the Writer's Write method. There is no guarantee on access
+// call to the Writer's Write method. There is no guaranty on access
 // serialization to the Writer. If your Writer is not thread safe,
 // you may consider a sync wrapper.
 type Logger struct {
@@ -216,7 +181,6 @@ type Logger struct {
 	sampler Sampler
 	context []byte
 	hooks   []Hook
-	stack   bool
 }
 
 // New creates a root logger with given output writer. If the output writer implements
@@ -224,7 +188,7 @@ type Logger struct {
 // one.
 //
 // Each logging operation makes a single call to the Writer's Write method. There is no
-// guarantee on access serialization to the Writer. If your Writer is not thread safe,
+// guaranty on access serialization to the Writer. If your Writer is not thread safe,
 // you may consider using sync wrapper.
 func New(w io.Writer) Logger {
 	if w == nil {
@@ -234,7 +198,7 @@ func New(w io.Writer) Logger {
 	if !ok {
 		lw = levelWriterAdapter{w}
 	}
-	return Logger{w: lw, level: TraceLevel}
+	return Logger{w: lw}
 }
 
 // Nop returns a disabled logger for which all operation are no-op.
@@ -247,7 +211,6 @@ func (l Logger) Output(w io.Writer) Logger {
 	l2 := New(w)
 	l2.level = l.level
 	l2.sampler = l.sampler
-	l2.stack = l.stack
 	if len(l.hooks) > 0 {
 		l2.hooks = append(l2.hooks, l.hooks...)
 	}
@@ -264,10 +227,6 @@ func (l Logger) With() Context {
 	l.context = make([]byte, 0, 500)
 	if context != nil {
 		l.context = append(l.context, context...)
-	} else {
-		// This is needed for AppendKey to not check len of input
-		// thus making it inlinable
-		l.context = enc.AppendBeginMarker(l.context)
 	}
 	return Context{l}
 }
@@ -282,9 +241,6 @@ func (l *Logger) UpdateContext(update func(c Context) Context) {
 	if cap(l.context) == 0 {
 		l.context = make([]byte, 0, 500)
 	}
-	if len(l.context) == 0 {
-		l.context = enc.AppendBeginMarker(l.context)
-	}
 	c := update(Context{*l})
 	l.context = c.l.context
 }
@@ -295,11 +251,6 @@ func (l Logger) Level(lvl Level) Logger {
 	return l
 }
 
-// GetLevel returns the current Level of l.
-func (l Logger) GetLevel() Level {
-	return l.level
-}
-
 // Sample returns a logger with the s sampler.
 func (l Logger) Sample(s Sampler) Logger {
 	l.sampler = s
@@ -312,13 +263,6 @@ func (l Logger) Hook(h Hook) Logger {
 	return l
 }
 
-// Trace starts a new message with trace level.
-//
-// You must call Msg on the returned event in order to send the event.
-func (l *Logger) Trace() *Event {
-	return l.newEvent(TraceLevel, nil)
-}
-
 // Debug starts a new message with debug level.
 //
 // You must call Msg on the returned event in order to send the event.
@@ -347,18 +291,6 @@ func (l *Logger) Error() *Event {
 	return l.newEvent(ErrorLevel, nil)
 }
 
-// Err starts a new message with error level with err as a field if not nil or
-// with info level if err is nil.
-//
-// You must call Msg on the returned event in order to send the event.
-func (l *Logger) Err(err error) *Event {
-	if err != nil {
-		return l.Error().Err(err)
-	}
-
-	return l.Info()
-}
-
 // Fatal starts a new message with fatal level. The os.Exit(1) function
 // is called by the Msg method, which terminates the program immediately.
 //
@@ -377,13 +309,11 @@ func (l *Logger) Panic() *Event {
 
 // WithLevel starts a new message with level. Unlike Fatal and Panic
 // methods, WithLevel does not terminate the program or stop the ordinary
-// flow of a goroutine when used with their respective levels.
+// flow of a gourotine when used with their respective levels.
 //
 // You must call Msg on the returned event in order to send the event.
 func (l *Logger) WithLevel(level Level) *Event {
 	switch level {
-	case TraceLevel:
-		return l.Trace()
 	case DebugLevel:
 		return l.Debug()
 	case InfoLevel:
@@ -401,7 +331,7 @@ func (l *Logger) WithLevel(level Level) *Event {
 	case Disabled:
 		return nil
 	default:
-		return l.newEvent(level, nil)
+		panic("zerolog: WithLevel(): invalid level: " + strconv.Itoa(int(level)))
 	}
 }
 
@@ -417,7 +347,7 @@ func (l *Logger) Log() *Event {
 // Arguments are handled in the manner of fmt.Print.
 func (l *Logger) Print(v ...interface{}) {
 	if e := l.Debug(); e.Enabled() {
-		e.CallerSkipFrame(1).Msg(fmt.Sprint(v...))
+		e.Msg(fmt.Sprint(v...))
 	}
 }
 
@@ -425,7 +355,7 @@ func (l *Logger) Print(v ...interface{}) {
 // Arguments are handled in the manner of fmt.Printf.
 func (l *Logger) Printf(format string, v ...interface{}) {
 	if e := l.Debug(); e.Enabled() {
-		e.CallerSkipFrame(1).Msg(fmt.Sprintf(format, v...))
+		e.Msg(fmt.Sprintf(format, v...))
 	}
 }
 
@@ -437,30 +367,24 @@ func (l Logger) Write(p []byte) (n int, err error) {
 		// Trim CR added by stdlog.
 		p = p[0 : n-1]
 	}
-	l.Log().CallerSkipFrame(1).Msg(string(p))
+	l.Log().Msg(string(p))
 	return
 }
 
 func (l *Logger) newEvent(level Level, done func(string)) *Event {
 	enabled := l.should(level)
 	if !enabled {
-		if done != nil {
-			done("")
-		}
 		return nil
 	}
 	e := newEvent(l.w, level)
 	e.done = done
 	e.ch = l.hooks
-	if level != NoLevel && LevelFieldName != "" {
-		e.Str(LevelFieldName, LevelFieldMarshalFunc(level))
+	if level != NoLevel {
+		e.Str(LevelFieldName, level.String())
 	}
-	if l.context != nil && len(l.context) > 1 {
+	if l.context != nil && len(l.context) > 0 {
 		e.buf = enc.AppendObjectData(e.buf, l.context)
 	}
-	if l.stack {
-		e.Stack()
-	}
 	return e
 }
 

log/log.go

@@ -3,7 +3,6 @@ package log
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"os"
 
@@ -38,21 +37,6 @@ func Hook(h zerolog.Hook) zerolog.Logger {
 	return Logger.Hook(h)
 }
 
-// Err starts a new message with error level with err as a field if not nil or
-// with info level if err is nil.
-//
-// You must call Msg on the returned event in order to send the event.
-func Err(err error) *zerolog.Event {
-	return Logger.Err(err)
-}
-
-// Trace starts a new message with trace level.
-//
-// You must call Msg on the returned event in order to send the event.
-func Trace() *zerolog.Event {
-	return Logger.Trace()
-}
-
 // Debug starts a new message with debug level.
 //
 // You must call Msg on the returned event in order to send the event.
@@ -115,13 +99,13 @@ func Log() *zerolog.Event {
 // Print sends a log event using debug level and no extra field.
 // Arguments are handled in the manner of fmt.Print.
 func Print(v ...interface{}) {
-	Logger.Debug().CallerSkipFrame(1).Msg(fmt.Sprint(v...))
+	Logger.Print(v...)
 }
 
 // Printf sends a log event using debug level and no extra field.
 // Arguments are handled in the manner of fmt.Printf.
 func Printf(format string, v ...interface{}) {
-	Logger.Debug().CallerSkipFrame(1).Msgf(format, v...)
+	Logger.Printf(format, v...)
 }
 
 // Ctx returns the Logger associated with the ctx. If no logger

log/log_example_test.go

@@ -54,25 +54,6 @@ func ExampleLog() {
 	// Output: {"time":1199811905,"message":"hello world"}
 }
 
-// Example of a conditional level based on the presence of an error.
-func ExampleErr() {
-	setup()
-	err := errors.New("some error")
-	log.Err(err).Msg("hello world")
-	log.Err(nil).Msg("hello world")
-
-	// Output: {"level":"error","error":"some error","time":1199811905,"message":"hello world"}
-	// {"level":"info","time":1199811905,"message":"hello world"}
-}
-
-// Example of a log at a particular "level" (in this case, "trace")
-func ExampleTrace() {
-	setup()
-	log.Trace().Msg("hello world")
-
-	// Output: {"level":"trace","time":1199811905,"message":"hello world"}
-}
-
 // Example of a log at a particular "level" (in this case, "debug")
 func ExampleDebug() {
 	setup()

log_example_test.go

@@ -95,17 +95,6 @@ func ExampleLogger_Printf() {
 	// Output: {"level":"debug","message":"hello world"}
 }
 
-func ExampleLogger_Trace() {
-	log := zerolog.New(os.Stdout)
-
-	log.Trace().
-		Str("foo", "bar").
-		Int("n", 123).
-		Msg("hello world")
-
-	// Output: {"level":"trace","foo":"bar","n":123,"message":"hello world"}
-}
-
 func ExampleLogger_Debug() {
 	log := zerolog.New(os.Stdout)
 
@@ -238,15 +227,11 @@ func ExampleEvent_Array() {
 		Str("foo", "bar").
 		Array("array", zerolog.Arr().
 			Str("baz").
-			Int(1).
-			Dict(zerolog.Dict().
-				Str("bar", "baz").
-				Int("n", 1),
-			),
+			Int(1),
 		).
 		Msg("hello world")
 
-	// Output: {"foo":"bar","array":["baz",1,{"bar":"baz","n":1}],"message":"hello world"}
+	// Output: {"foo":"bar","array":["baz",1],"message":"hello world"}
 }
 
 func ExampleEvent_Array_object() {
@@ -311,7 +296,7 @@ func ExampleEvent_Interface() {
 }
 
 func ExampleEvent_Dur() {
-	d := 10 * time.Second
+	d := time.Duration(10 * time.Second)
 
 	log := zerolog.New(os.Stdout)
 
@@ -325,8 +310,8 @@ func ExampleEvent_Dur() {
 
 func ExampleEvent_Durs() {
 	d := []time.Duration{
-		10 * time.Second,
-		20 * time.Second,
+		time.Duration(10 * time.Second),
+		time.Duration(20 * time.Second),
 	}
 
 	log := zerolog.New(os.Stdout)
@@ -339,38 +324,6 @@ func ExampleEvent_Durs() {
 	// Output: {"foo":"bar","durs":[10000,20000],"message":"hello world"}
 }
 
-func ExampleEvent_Fields_map() {
-	fields := map[string]interface{}{
-		"bar": "baz",
-		"n":   1,
-	}
-
-	log := zerolog.New(os.Stdout)
-
-	log.Log().
-		Str("foo", "bar").
-		Fields(fields).
-		Msg("hello world")
-
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
-func ExampleEvent_Fields_slice() {
-	fields := []interface{}{
-		"bar", "baz",
-		"n", 1,
-	}
-
-	log := zerolog.New(os.Stdout)
-
-	log.Log().
-		Str("foo", "bar").
-		Fields(fields).
-		Msg("hello world")
-
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
 func ExampleContext_Dict() {
 	log := zerolog.New(os.Stdout).With().
 		Str("foo", "bar").
@@ -460,7 +413,7 @@ func ExampleContext_Interface() {
 }
 
 func ExampleContext_Dur() {
-	d := 10 * time.Second
+	d := time.Duration(10 * time.Second)
 
 	log := zerolog.New(os.Stdout).With().
 		Str("foo", "bar").
@@ -474,8 +427,8 @@ func ExampleContext_Dur() {
 
 func ExampleContext_Durs() {
 	d := []time.Duration{
-		10 * time.Second,
-		20 * time.Second,
+		time.Duration(10 * time.Second),
+		time.Duration(20 * time.Second),
 	}
 
 	log := zerolog.New(os.Stdout).With().
@@ -510,7 +463,7 @@ func ExampleContext_IPPrefix() {
 	// Output: {"Route":"192.168.0.0/24","message":"hello world"}
 }
 
-func ExampleContext_MACAddr() {
+func ExampleContext_MacAddr() {
 	mac := net.HardwareAddr{0x00, 0x14, 0x22, 0x01, 0x23, 0x45}
 	log := zerolog.New(os.Stdout).With().
 		MACAddr("hostMAC", mac).
@@ -520,35 +473,3 @@ func ExampleContext_MACAddr() {
 
 	// Output: {"hostMAC":"00:14:22:01:23:45","message":"hello world"}
 }
-
-func ExampleContext_Fields_map() {
-	fields := map[string]interface{}{
-		"bar": "baz",
-		"n":   1,
-	}
-
-	log := zerolog.New(os.Stdout).With().
-		Str("foo", "bar").
-		Fields(fields).
-		Logger()
-
-	log.Log().Msg("hello world")
-
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}
-
-func ExampleContext_Fields_slice() {
-	fields := []interface{}{
-		"bar", "baz",
-		"n", 1,
-	}
-
-	log := zerolog.New(os.Stdout).With().
-		Str("foo", "bar").
-		Fields(fields).
-		Logger()
-
-	log.Log().Msg("hello world")
-
-	// Output: {"foo":"bar","bar":"baz","n":1,"message":"hello world"}
-}

log_test.go

@@ -7,8 +7,6 @@ import (
 	"net"
 	"reflect"
 	"runtime"
-	"strconv"
-	"strings"
 	"testing"
 	"time"
 )
@@ -77,30 +75,10 @@ func TestInfo(t *testing.T) {
 	})
 }
 
-func TestEmptyLevelFieldName(t *testing.T) {
-	fieldName := LevelFieldName
-	LevelFieldName = ""
-
-	t.Run("empty setting", func(t *testing.T) {
-		out := &bytes.Buffer{}
-		log := New(out)
-		log.Info().
-			Str("foo", "bar").
-			Int("n", 123).
-			Msg("")
-		if got, want := decodeIfBinaryToString(out.Bytes()), `{"foo":"bar","n":123}`+"\n"; got != want {
-			t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-		}
-	})
-	LevelFieldName = fieldName
-}
-
 func TestWith(t *testing.T) {
 	out := &bytes.Buffer{}
 	ctx := New(out).With().
 		Str("string", "foo").
-		Stringer("stringer", net.IP{127, 0, 0, 1}).
-		Stringer("stringer_nil", nil).
 		Bytes("bytes", []byte("bar")).
 		Hex("hex", []byte{0x12, 0xef}).
 		RawJSON("json", []byte(`{"some":"json"}`)).
@@ -124,21 +102,7 @@ func TestWith(t *testing.T) {
 	caller := fmt.Sprintf("%s:%d", file, line+3)
 	log := ctx.Caller().Logger()
 	log.Log().Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":"foo","stringer":"127.0.0.1","stringer_nil":null,"bytes":"bar","hex":"12ef","json":{"some":"json"},"error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"float32":11.101,"float64":12.30303,"time":"0001-01-01T00:00:00Z","caller":"`+caller+`"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-
-	// Validate CallerWithSkipFrameCount.
-	out.Reset()
-	_, file, line, _ = runtime.Caller(0)
-	caller = fmt.Sprintf("%s:%d", file, line+5)
-	log = ctx.CallerWithSkipFrameCount(3).Logger()
-	func() {
-		log.Log().Msg("")
-	}()
-	// The above line is a little contrived, but the line above should be the line due
-	// to the extra frame skip.
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":"foo","stringer":"127.0.0.1","stringer_nil":null,"bytes":"bar","hex":"12ef","json":{"some":"json"},"error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"float32":11.101,"float64":12.30303,"time":"0001-01-01T00:00:00Z","caller":"`+caller+`"}`+"\n"; got != want {
+	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":"foo","bytes":"bar","hex":"12ef","json":{"some":"json"},"error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"float32":11.101,"float64":12.30303,"time":"0001-01-01T00:00:00Z","caller":"`+caller+`"}`+"\n"; got != want {
 		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
 	}
 }
@@ -246,66 +210,6 @@ func TestFieldsMapNilPnt(t *testing.T) {
 	}
 }
 
-func TestFieldsSlice(t *testing.T) {
-	out := &bytes.Buffer{}
-	log := New(out)
-	log.Log().Fields([]interface{}{
-		"nil", nil,
-		"string", "foo",
-		"bytes", []byte("bar"),
-		"error", errors.New("some error"),
-		"bool", true,
-		"int", int(1),
-		"int8", int8(2),
-		"int16", int16(3),
-		"int32", int32(4),
-		"int64", int64(5),
-		"uint", uint(6),
-		"uint8", uint8(7),
-		"uint16", uint16(8),
-		"uint32", uint32(9),
-		"uint64", uint64(10),
-		"float32", float32(11),
-		"float64", float64(12),
-		"ipv6", net.IP{0x20, 0x01, 0x0d, 0xb8, 0x85, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x8a, 0x2e, 0x03, 0x70, 0x73, 0x34},
-		"dur", 1 * time.Second,
-		"time", time.Time{},
-		"obj", obj{"a", "b", 1},
-	}).Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"nil":null,"string":"foo","bytes":"bar","error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"float32":11,"float64":12,"ipv6":"2001:db8:85a3::8a2e:370:7334","dur":1000,"time":"0001-01-01T00:00:00Z","obj":{"Pub":"a","Tag":"b","priv":1}}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
-func TestFieldsSliceExtraneous(t *testing.T) {
-	out := &bytes.Buffer{}
-	log := New(out)
-	log.Log().Fields([]interface{}{
-		"string", "foo",
-		"error", errors.New("some error"),
-		32, "valueForNonStringKey",
-		"bool", true,
-		"int", int(1),
-		"keyWithoutValue",
-	}).Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":"foo","error":"some error","bool":true,"int":1}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
-func TestFieldsNotMapSlice(t *testing.T) {
-	out := &bytes.Buffer{}
-	log := New(out)
-	log.Log().
-		Fields(obj{"a", "b", 1}).
-		Fields("string").
-		Fields(1).
-		Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
 func TestFields(t *testing.T) {
 	out := &bytes.Buffer{}
 	log := New(out)
@@ -315,12 +219,9 @@ func TestFields(t *testing.T) {
 	log.Log().
 		Caller().
 		Str("string", "foo").
-		Stringer("stringer", net.IP{127, 0, 0, 1}).
-		Stringer("stringer_nil", nil).
 		Bytes("bytes", []byte("bar")).
 		Hex("hex", []byte{0x12, 0xef}).
 		RawJSON("json", []byte(`{"some":"json"}`)).
-		Func(func(e *Event) { e.Str("func", "func_output") }).
 		AnErr("some_err", nil).
 		Err(errors.New("some error")).
 		Bool("bool", true).
@@ -344,7 +245,7 @@ func TestFields(t *testing.T) {
 		Time("time", time.Time{}).
 		TimeDiff("diff", now, now.Add(-10*time.Second)).
 		Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"caller":"`+caller+`","string":"foo","stringer":"127.0.0.1","stringer_nil":null,"bytes":"bar","hex":"12ef","json":{"some":"json"},"func":"func_output","error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"IPv4":"192.168.0.100","IPv6":"2001:db8:85a3::8a2e:370:7334","Mac":"00:14:22:01:23:45","Prefix":"192.168.0.100/24","float32":11.1234,"float64":12.321321321,"dur":1000,"time":"0001-01-01T00:00:00Z","diff":10000}`+"\n"; got != want {
+	if got, want := decodeIfBinaryToString(out.Bytes()), `{"caller":"`+caller+`","string":"foo","bytes":"bar","hex":"12ef","json":{"some":"json"},"error":"some error","bool":true,"int":1,"int8":2,"int16":3,"int32":4,"int64":5,"uint":6,"uint8":7,"uint16":8,"uint32":9,"uint64":10,"IPv4":"192.168.0.100","IPv6":"2001:db8:85a3::8a2e:370:7334","Mac":"00:14:22:01:23:45","Prefix":"192.168.0.100/24","float32":11.1234,"float64":12.321321321,"dur":1000,"time":"0001-01-01T00:00:00Z","diff":10000}`+"\n"; got != want {
 		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
 	}
 }
@@ -354,7 +255,6 @@ func TestFieldsArrayEmpty(t *testing.T) {
 	log := New(out)
 	log.Log().
 		Strs("string", []string{}).
-		Stringers("stringer", []fmt.Stringer{}).
 		Errs("err", []error{}).
 		Bools("bool", []bool{}).
 		Ints("int", []int{}).
@@ -372,7 +272,7 @@ func TestFieldsArrayEmpty(t *testing.T) {
 		Durs("dur", []time.Duration{}).
 		Times("time", []time.Time{}).
 		Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":[],"stringer":[],"err":[],"bool":[],"int":[],"int8":[],"int16":[],"int32":[],"int64":[],"uint":[],"uint8":[],"uint16":[],"uint32":[],"uint64":[],"float32":[],"float64":[],"dur":[],"time":[]}`+"\n"; got != want {
+	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":[],"err":[],"bool":[],"int":[],"int8":[],"int16":[],"int32":[],"int64":[],"uint":[],"uint8":[],"uint16":[],"uint32":[],"uint64":[],"float32":[],"float64":[],"dur":[],"time":[]}`+"\n"; got != want {
 		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
 	}
 }
@@ -382,7 +282,6 @@ func TestFieldsArraySingleElement(t *testing.T) {
 	log := New(out)
 	log.Log().
 		Strs("string", []string{"foo"}).
-		Stringers("stringer", []fmt.Stringer{net.IP{127, 0, 0, 1}}).
 		Errs("err", []error{errors.New("some error")}).
 		Bools("bool", []bool{true}).
 		Ints("int", []int{1}).
@@ -398,9 +297,9 @@ func TestFieldsArraySingleElement(t *testing.T) {
 		Floats32("float32", []float32{11}).
 		Floats64("float64", []float64{12}).
 		Durs("dur", []time.Duration{1 * time.Second}).
-		Times("time", []time.Time{{}}).
+		Times("time", []time.Time{time.Time{}}).
 		Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":["foo"],"stringer":["127.0.0.1"],"err":["some error"],"bool":[true],"int":[1],"int8":[2],"int16":[3],"int32":[4],"int64":[5],"uint":[6],"uint8":[7],"uint16":[8],"uint32":[9],"uint64":[10],"float32":[11],"float64":[12],"dur":[1000],"time":["0001-01-01T00:00:00Z"]}`+"\n"; got != want {
+	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":["foo"],"err":["some error"],"bool":[true],"int":[1],"int8":[2],"int16":[3],"int32":[4],"int64":[5],"uint":[6],"uint8":[7],"uint16":[8],"uint32":[9],"uint64":[10],"float32":[11],"float64":[12],"dur":[1000],"time":["0001-01-01T00:00:00Z"]}`+"\n"; got != want {
 		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
 	}
 }
@@ -410,7 +309,6 @@ func TestFieldsArrayMultipleElement(t *testing.T) {
 	log := New(out)
 	log.Log().
 		Strs("string", []string{"foo", "bar"}).
-		Stringers("stringer", []fmt.Stringer{nil, net.IP{127, 0, 0, 1}}).
 		Errs("err", []error{errors.New("some error"), nil}).
 		Bools("bool", []bool{true, false}).
 		Ints("int", []int{1, 0}).
@@ -426,9 +324,9 @@ func TestFieldsArrayMultipleElement(t *testing.T) {
 		Floats32("float32", []float32{11, 0}).
 		Floats64("float64", []float64{12, 0}).
 		Durs("dur", []time.Duration{1 * time.Second, 0}).
-		Times("time", []time.Time{{}, {}}).
+		Times("time", []time.Time{time.Time{}, time.Time{}}).
 		Msg("")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":["foo","bar"],"stringer":[null,"127.0.0.1"],"err":["some error",null],"bool":[true,false],"int":[1,0],"int8":[2,0],"int16":[3,0],"int32":[4,0],"int64":[5,0],"uint":[6,0],"uint8":[7,0],"uint16":[8,0],"uint32":[9,0],"uint64":[10,0],"float32":[11,0],"float64":[12,0],"dur":[1000,0],"time":["0001-01-01T00:00:00Z","0001-01-01T00:00:00Z"]}`+"\n"; got != want {
+	if got, want := decodeIfBinaryToString(out.Bytes()), `{"string":["foo","bar"],"err":["some error",null],"bool":[true,false],"int":[1,0],"int8":[2,0],"int16":[3,0],"int32":[4,0],"int64":[5,0],"uint":[6,0],"uint8":[7,0],"uint16":[8,0],"uint32":[9,0],"uint64":[10,0],"float32":[11,0],"float64":[12,0],"dur":[1000,0],"time":["0001-01-01T00:00:00Z","0001-01-01T00:00:00Z"]}`+"\n"; got != want {
 		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
 	}
 }
@@ -439,12 +337,10 @@ func TestFieldsDisabled(t *testing.T) {
 	now := time.Now()
 	log.Debug().
 		Str("string", "foo").
-		Stringer("stringer", net.IP{127, 0, 0, 1}).
 		Bytes("bytes", []byte("bar")).
 		Hex("hex", []byte{0x12, 0xef}).
 		AnErr("some_err", nil).
 		Err(errors.New("some error")).
-		Func(func(e *Event) { e.Str("func", "func_output") }).
 		Bool("bool", true).
 		Int("int", 1).
 		Int8("int8", 2).
@@ -541,24 +437,6 @@ func TestLevel(t *testing.T) {
 	})
 }
 
-func TestGetLevel(t *testing.T) {
-	levels := []Level{
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-		NoLevel,
-		Disabled,
-	}
-	for _, level := range levels {
-		if got, want := New(nil).Level(level).GetLevel(), level; got != want {
-			t.Errorf("GetLevel() = %v, want: %v", got, want)
-		}
-	}
-}
-
 func TestSampling(t *testing.T) {
 	out := &bytes.Buffer{}
 	log := New(out).Sample(&BasicSampler{N: 2})
@@ -613,45 +491,32 @@ func TestLevelWriter(t *testing.T) {
 			p string
 		}{},
 	}
-
-	// Allow extra-verbose logs.
-	SetGlobalLevel(TraceLevel - 1)
-	log := New(lw).Level(TraceLevel - 1)
-
-	log.Trace().Msg("0")
+	log := New(lw)
 	log.Debug().Msg("1")
 	log.Info().Msg("2")
 	log.Warn().Msg("3")
 	log.Error().Msg("4")
 	log.Log().Msg("nolevel-1")
-	log.WithLevel(TraceLevel).Msg("5")
-	log.WithLevel(DebugLevel).Msg("6")
-	log.WithLevel(InfoLevel).Msg("7")
-	log.WithLevel(WarnLevel).Msg("8")
-	log.WithLevel(ErrorLevel).Msg("9")
+	log.WithLevel(DebugLevel).Msg("5")
+	log.WithLevel(InfoLevel).Msg("6")
+	log.WithLevel(WarnLevel).Msg("7")
+	log.WithLevel(ErrorLevel).Msg("8")
 	log.WithLevel(NoLevel).Msg("nolevel-2")
-	log.WithLevel(-1).Msg("-1") // Same as TraceLevel
-	log.WithLevel(-2).Msg("-2") // Will log
-	log.WithLevel(-3).Msg("-3") // Will not log
 
 	want := []struct {
 		l Level
 		p string
 	}{
-		{TraceLevel, `{"level":"trace","message":"0"}` + "\n"},
 		{DebugLevel, `{"level":"debug","message":"1"}` + "\n"},
 		{InfoLevel, `{"level":"info","message":"2"}` + "\n"},
 		{WarnLevel, `{"level":"warn","message":"3"}` + "\n"},
 		{ErrorLevel, `{"level":"error","message":"4"}` + "\n"},
 		{NoLevel, `{"message":"nolevel-1"}` + "\n"},
-		{TraceLevel, `{"level":"trace","message":"5"}` + "\n"},
-		{DebugLevel, `{"level":"debug","message":"6"}` + "\n"},
-		{InfoLevel, `{"level":"info","message":"7"}` + "\n"},
-		{WarnLevel, `{"level":"warn","message":"8"}` + "\n"},
-		{ErrorLevel, `{"level":"error","message":"9"}` + "\n"},
+		{DebugLevel, `{"level":"debug","message":"5"}` + "\n"},
+		{InfoLevel, `{"level":"info","message":"6"}` + "\n"},
+		{WarnLevel, `{"level":"warn","message":"7"}` + "\n"},
+		{ErrorLevel, `{"level":"error","message":"8"}` + "\n"},
 		{NoLevel, `{"message":"nolevel-2"}` + "\n"},
-		{Level(-1), `{"level":"trace","message":"-1"}` + "\n"},
-		{Level(-2), `{"level":"-2","message":"-2"}` + "\n"},
 	}
 	if got := lw.ops; !reflect.DeepEqual(got, want) {
 		t.Errorf("invalid ops:\ngot:\n%v\nwant:\n%v", got, want)
@@ -776,75 +641,6 @@ func TestErrorMarshalFunc(t *testing.T) {
 	}
 }
 
-func TestCallerMarshalFunc(t *testing.T) {
-	out := &bytes.Buffer{}
-	log := New(out)
-
-	// test default behaviour this is really brittle due to the line numbers
-	// actually mattering for validation
-	pc, file, line, _ := runtime.Caller(0)
-	caller := fmt.Sprintf("%s:%d", file, line+2)
-	log.Log().Caller().Msg("msg")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"caller":"`+caller+`","message":"msg"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-	out.Reset()
-
-	// test custom behavior. In this case we'll take just the last directory
-	origCallerMarshalFunc := CallerMarshalFunc
-	defer func() { CallerMarshalFunc = origCallerMarshalFunc }()
-	CallerMarshalFunc = func(pc uintptr, file string, line int) string {
-		parts := strings.Split(file, "/")
-		if len(parts) > 1 {
-			return strings.Join(parts[len(parts)-2:], "/") + ":" + strconv.Itoa(line)
-		}
-
-		return runtime.FuncForPC(pc).Name() + ":" + file + ":" + strconv.Itoa(line)
-	}
-	pc, file, line, _ = runtime.Caller(0)
-	caller = CallerMarshalFunc(pc, file, line+2)
-	log.Log().Caller().Msg("msg")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"caller":"`+caller+`","message":"msg"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
-func TestLevelFieldMarshalFunc(t *testing.T) {
-	origLevelFieldMarshalFunc := LevelFieldMarshalFunc
-	LevelFieldMarshalFunc = func(l Level) string {
-		return strings.ToUpper(l.String())
-	}
-	defer func() {
-		LevelFieldMarshalFunc = origLevelFieldMarshalFunc
-	}()
-	out := &bytes.Buffer{}
-	log := New(out)
-
-	log.Debug().Msg("test")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"level":"DEBUG","message":"test"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-	out.Reset()
-
-	log.Info().Msg("test")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"level":"INFO","message":"test"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-	out.Reset()
-
-	log.Warn().Msg("test")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"level":"WARN","message":"test"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-	out.Reset()
-
-	log.Error().Msg("test")
-	if got, want := decodeIfBinaryToString(out.Bytes()), `{"level":"ERROR","message":"test"}`+"\n"; got != want {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-	out.Reset()
-}
-
 type errWriter struct {
 	error
 }
@@ -865,146 +661,3 @@ func TestErrorHandler(t *testing.T) {
 		t.Errorf("ErrorHandler err = %#v, want %#v", got, want)
 	}
 }
-
-func TestUpdateEmptyContext(t *testing.T) {
-	var buf bytes.Buffer
-	log := New(&buf)
-
-	log.UpdateContext(func(c Context) Context {
-		return c.Str("foo", "bar")
-	})
-	log.Info().Msg("no panic")
-
-	want := `{"level":"info","foo":"bar","message":"no panic"}` + "\n"
-
-	if got := decodeIfBinaryToString(buf.Bytes()); got != want {
-		t.Errorf("invalid log output:\ngot:  %q\nwant: %q", got, want)
-	}
-}
-
-func TestLevel_String(t *testing.T) {
-	tests := []struct {
-		name string
-		l    Level
-		want string
-	}{
-		{"trace", TraceLevel, "trace"},
-		{"debug", DebugLevel, "debug"},
-		{"info", InfoLevel, "info"},
-		{"warn", WarnLevel, "warn"},
-		{"error", ErrorLevel, "error"},
-		{"fatal", FatalLevel, "fatal"},
-		{"panic", PanicLevel, "panic"},
-		{"disabled", Disabled, "disabled"},
-		{"nolevel", NoLevel, ""},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.l.String(); got != tt.want {
-				t.Errorf("String() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestLevel_MarshalText(t *testing.T) {
-	tests := []struct {
-		name string
-		l    Level
-		want string
-	}{
-		{"trace", TraceLevel, "trace"},
-		{"debug", DebugLevel, "debug"},
-		{"info", InfoLevel, "info"},
-		{"warn", WarnLevel, "warn"},
-		{"error", ErrorLevel, "error"},
-		{"fatal", FatalLevel, "fatal"},
-		{"panic", PanicLevel, "panic"},
-		{"disabled", Disabled, "disabled"},
-		{"nolevel", NoLevel, ""},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got, err := tt.l.MarshalText(); err != nil {
-				t.Errorf("MarshalText couldn't marshal: %v", tt.l)
-			} else if string(got) != tt.want {
-				t.Errorf("String() = %v, want %v", string(got), tt.want)
-			}
-		})
-	}
-}
-
-func TestParseLevel(t *testing.T) {
-	type args struct {
-		levelStr string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    Level
-		wantErr bool
-	}{
-		{"trace", args{"trace"}, TraceLevel, false},
-		{"debug", args{"debug"}, DebugLevel, false},
-		{"info", args{"info"}, InfoLevel, false},
-		{"warn", args{"warn"}, WarnLevel, false},
-		{"error", args{"error"}, ErrorLevel, false},
-		{"fatal", args{"fatal"}, FatalLevel, false},
-		{"panic", args{"panic"}, PanicLevel, false},
-		{"disabled", args{"disabled"}, Disabled, false},
-		{"nolevel", args{""}, NoLevel, false},
-		{"-1", args{"-1"}, TraceLevel, false},
-		{"-2", args{"-2"}, Level(-2), false},
-		{"-3", args{"-3"}, Level(-3), false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseLevel(tt.args.levelStr)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ParseLevel() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if got != tt.want {
-				t.Errorf("ParseLevel() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestUnmarshalTextLevel(t *testing.T) {
-	type args struct {
-		levelStr string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    Level
-		wantErr bool
-	}{
-		{"trace", args{"trace"}, TraceLevel, false},
-		{"debug", args{"debug"}, DebugLevel, false},
-		{"info", args{"info"}, InfoLevel, false},
-		{"warn", args{"warn"}, WarnLevel, false},
-		{"error", args{"error"}, ErrorLevel, false},
-		{"fatal", args{"fatal"}, FatalLevel, false},
-		{"panic", args{"panic"}, PanicLevel, false},
-		{"disabled", args{"disabled"}, Disabled, false},
-		{"nolevel", args{""}, NoLevel, false},
-		{"-1", args{"-1"}, TraceLevel, false},
-		{"-2", args{"-2"}, Level(-2), false},
-		{"-3", args{"-3"}, Level(-3), false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var l Level
-			err := l.UnmarshalText([]byte(tt.args.levelStr))
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UnmarshalText() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if l != tt.want {
-				t.Errorf("UnmarshalText() got = %v, want %v", l, tt.want)
-			}
-		})
-	}
-}

not_go112.go

@@ -1,5 +0,0 @@
-// +build !go1.12
-
-package zerolog
-
-const contextCallerSkipFrameCount = 3

pkgerrors/stacktrace_test.go

@@ -27,22 +27,6 @@ func TestLogStack(t *testing.T) {
 	}
 }
 
-func TestLogStackFromContext(t *testing.T) {
-	zerolog.ErrorStackMarshaler = MarshalStack
-
-	out := &bytes.Buffer{}
-	log := zerolog.New(out).With().Stack().Logger() // calling Stack() on log context instead of event
-
-	err := errors.Wrap(errors.New("error message"), "from error")
-	log.Log().Err(err).Msg("") // not explicitly calling Stack()
-
-	got := out.String()
-	want := `\{"stack":\[\{"func":"TestLogStackFromContext","line":"36","source":"stacktrace_test.go"\},.*\],"error":"from error: error message"\}\n`
-	if ok, _ := regexp.MatchString(want, got); !ok {
-		t.Errorf("invalid log output:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
 func BenchmarkLogStack(b *testing.B) {
 	zerolog.ErrorStackMarshaler = MarshalStack
 	out := &bytes.Buffer{}

sampler.go

@@ -38,7 +38,7 @@ func (s RandomSampler) Sample(lvl Level) bool {
 }
 
 // BasicSampler is a sampler that will send every Nth events, regardless of
-// their level.
+// there level.
 type BasicSampler struct {
 	N       uint32
 	counter uint32
@@ -46,12 +46,8 @@ type BasicSampler struct {
 
 // Sample implements the Sampler interface.
 func (s *BasicSampler) Sample(lvl Level) bool {
-	n := s.N
-	if n == 1 {
-		return true
-	}
 	c := atomic.AddUint32(&s.counter, 1)
-	return c%n == 1
+	return c%s.N == s.N-1
 }
 
 // BurstSampler lets Burst events pass per Period then pass the decision to
@@ -104,15 +100,11 @@ func (s *BurstSampler) inc() uint32 {
 
 // LevelSampler applies a different sampler for each level.
 type LevelSampler struct {
-	TraceSampler, DebugSampler, InfoSampler, WarnSampler, ErrorSampler Sampler
+	DebugSampler, InfoSampler, WarnSampler, ErrorSampler Sampler
 }
 
 func (s LevelSampler) Sample(lvl Level) bool {
 	switch lvl {
-	case TraceLevel:
-		if s.TraceSampler != nil {
-			return s.TraceSampler.Sample(lvl)
-		}
 	case DebugLevel:
 		if s.DebugSampler != nil {
 			return s.DebugSampler.Sample(lvl)

syslog.go

@@ -7,10 +7,6 @@ import (
 	"io"
 )
 
-// See http://cee.mitre.org/language/1.0-beta1/clt.html#syslog
-// or https://www.rsyslog.com/json-elasticsearch/
-const ceePrefix = "@cee:"
-
 // SyslogWriter is an interface matching a syslog.Writer struct.
 type SyslogWriter interface {
 	io.Writer
@@ -23,58 +19,39 @@ type SyslogWriter interface {
 }
 
 type syslogWriter struct {
-	w      SyslogWriter
-	prefix string
+	w SyslogWriter
 }
 
 // SyslogLevelWriter wraps a SyslogWriter and call the right syslog level
 // method matching the zerolog level.
 func SyslogLevelWriter(w SyslogWriter) LevelWriter {
-	return syslogWriter{w, ""}
-}
-
-// SyslogCEEWriter wraps a SyslogWriter with a SyslogLevelWriter that adds a
-// MITRE CEE prefix for JSON syslog entries, compatible with rsyslog 
-// and syslog-ng JSON logging support. 
-// See https://www.rsyslog.com/json-elasticsearch/
-func SyslogCEEWriter(w SyslogWriter) LevelWriter {
-	return syslogWriter{w, ceePrefix}
+	return syslogWriter{w}
 }
 
 func (sw syslogWriter) Write(p []byte) (n int, err error) {
-	var pn int
-	if sw.prefix != "" {
-		pn, err = sw.w.Write([]byte(sw.prefix))
-		if err != nil {
-			return pn, err
-		}
-	}
-	n, err = sw.w.Write(p)
-	return pn + n, err
+	return sw.w.Write(p)
 }
 
 // WriteLevel implements LevelWriter interface.
 func (sw syslogWriter) WriteLevel(level Level, p []byte) (n int, err error) {
 	switch level {
-	case TraceLevel:
 	case DebugLevel:
-		err = sw.w.Debug(sw.prefix + string(p))
+		err = sw.w.Debug(string(p))
 	case InfoLevel:
-		err = sw.w.Info(sw.prefix + string(p))
+		err = sw.w.Info(string(p))
 	case WarnLevel:
-		err = sw.w.Warning(sw.prefix + string(p))
+		err = sw.w.Warning(string(p))
 	case ErrorLevel:
-		err = sw.w.Err(sw.prefix + string(p))
+		err = sw.w.Err(string(p))
 	case FatalLevel:
-		err = sw.w.Emerg(sw.prefix + string(p))
+		err = sw.w.Emerg(string(p))
 	case PanicLevel:
-		err = sw.w.Crit(sw.prefix + string(p))
+		err = sw.w.Crit(string(p))
 	case NoLevel:
-		err = sw.w.Info(sw.prefix + string(p))
+		err = sw.w.Info(string(p))
 	default:
 		panic("invalid level")
 	}
-	// Any CEE prefix is not part of the message, so we don't include its length
 	n = len(p)
 	return
 }

syslog_test.go

@@ -3,12 +3,8 @@
 
 package zerolog
 
-import (
-	"bytes"
-	"reflect"
-	"strings"
-	"testing"
-)
+import "testing"
+import "reflect"
 
 type syslogEvent struct {
 	level string
@@ -21,10 +17,6 @@ type syslogTestWriter struct {
 func (w *syslogTestWriter) Write(p []byte) (int, error) {
 	return 0, nil
 }
-func (w *syslogTestWriter) Trace(m string) error {
-	w.events = append(w.events, syslogEvent{"Trace", m})
-	return nil
-}
 func (w *syslogTestWriter) Debug(m string) error {
 	w.events = append(w.events, syslogEvent{"Debug", m})
 	return nil
@@ -53,7 +45,6 @@ func (w *syslogTestWriter) Crit(m string) error {
 func TestSyslogWriter(t *testing.T) {
 	sw := &syslogTestWriter{}
 	log := New(SyslogLevelWriter(sw))
-	log.Trace().Msg("trace")
 	log.Debug().Msg("debug")
 	log.Info().Msg("info")
 	log.Warn().Msg("warn")
@@ -70,39 +61,3 @@ func TestSyslogWriter(t *testing.T) {
 		t.Errorf("Invalid syslog message routing: want %v, got %v", want, got)
 	}
 }
-
-type testCEEwriter struct {
-	buf *bytes.Buffer
-}
-
-// Only implement one method as we're just testing the prefixing
-func (c testCEEwriter) Debug(m string) error { return nil }
-
-func (c testCEEwriter) Info(m string) error {
-	_, err := c.buf.Write([]byte(m))
-	return err
-}
-
-func (c testCEEwriter) Warning(m string) error { return nil }
-
-func (c testCEEwriter) Err(m string) error { return nil }
-
-func (c testCEEwriter) Emerg(m string) error { return nil }
-
-func (c testCEEwriter) Crit(m string) error { return nil }
-
-func (c testCEEwriter) Write(b []byte) (int, error) {
-	return c.buf.Write(b)
-}
-
-func TestSyslogWriter_WithCEE(t *testing.T) {
-	var buf bytes.Buffer
-	sw := testCEEwriter{&buf}
-	log := New(SyslogCEEWriter(sw))
-	log.Info().Str("key", "value").Msg("message string")
-	got := string(buf.Bytes())
-	want := "@cee:{"
-	if !strings.HasPrefix(got, want) {
-		t.Errorf("Bad CEE message start: want %v, got %v", want, got)
-	}
-}

writer.go

@@ -1,12 +1,7 @@
 package zerolog
 
 import (
-	"bytes"
 	"io"
-	"path"
-	"runtime"
-	"strconv"
-	"strings"
 	"sync"
 )
 
@@ -31,9 +26,11 @@ type syncWriter struct {
 }
 
 // SyncWriter wraps w so that each call to Write is synchronized with a mutex.
-// This syncer can be used to wrap the call to writer's Write method if it is
-// not thread safe. Note that you do not need this wrapper for os.File Write
-// operations on POSIX and Windows systems as they are already thread-safe.
+// This syncer can be the call to writer's Write method is not thread safe.
+// Note that os.File Write operation is using write() syscall which is supposed
+// to be thread-safe on POSIX systems. So there is no need to use this with
+// os.File on such systems as zerolog guaranties to issue a single Write call
+// per log event.
 func SyncWriter(w io.Writer) io.Writer {
 	if lw, ok := w.(LevelWriter); ok {
 		return &syncWriter{lw: lw}
@@ -61,30 +58,30 @@ type multiLevelWriter struct {
 
 func (t multiLevelWriter) Write(p []byte) (n int, err error) {
 	for _, w := range t.writers {
-		if _n, _err := w.Write(p); err == nil {
-			n = _n
-			if _err != nil {
-				err = _err
-			} else if _n != len(p) {
-				err = io.ErrShortWrite
-			}
+		n, err = w.Write(p)
+		if err != nil {
+			return
+		}
+		if n != len(p) {
+			err = io.ErrShortWrite
+			return
 		}
 	}
-	return n, err
+	return len(p), nil
 }
 
 func (t multiLevelWriter) WriteLevel(l Level, p []byte) (n int, err error) {
 	for _, w := range t.writers {
-		if _n, _err := w.WriteLevel(l, p); err == nil {
-			n = _n
-			if _err != nil {
-				err = _err
-			} else if _n != len(p) {
-				err = io.ErrShortWrite
-			}
+		n, err = w.WriteLevel(l, p)
+		if err != nil {
+			return
+		}
+		if n != len(p) {
+			err = io.ErrShortWrite
+			return
 		}
 	}
-	return n, err
+	return len(p), nil
 }
 
 // MultiLevelWriter creates a writer that duplicates its writes to all the
@@ -101,54 +98,3 @@ func MultiLevelWriter(writers ...io.Writer) LevelWriter {
 	}
 	return multiLevelWriter{lwriters}
 }
-
-// TestingLog is the logging interface of testing.TB.
-type TestingLog interface {
-	Log(args ...interface{})
-	Logf(format string, args ...interface{})
-	Helper()
-}
-
-// TestWriter is a writer that writes to testing.TB.
-type TestWriter struct {
-	T TestingLog
-
-	// Frame skips caller frames to capture the original file and line numbers.
-	Frame int
-}
-
-// NewTestWriter creates a writer that logs to the testing.TB.
-func NewTestWriter(t TestingLog) TestWriter {
-	return TestWriter{T: t}
-}
-
-// Write to testing.TB.
-func (t TestWriter) Write(p []byte) (n int, err error) {
-	t.T.Helper()
-
-	n = len(p)
-
-	// Strip trailing newline because t.Log always adds one.
-	p = bytes.TrimRight(p, "\n")
-
-	// Try to correct the log file and line number to the caller.
-	if t.Frame > 0 {
-		_, origFile, origLine, _ := runtime.Caller(1)
-		_, frameFile, frameLine, ok := runtime.Caller(1 + t.Frame)
-		if ok {
-			erase := strings.Repeat("\b", len(path.Base(origFile))+len(strconv.Itoa(origLine))+3)
-			t.T.Logf("%s%s:%d: %s", erase, path.Base(frameFile), frameLine, p)
-			return n, err
-		}
-	}
-	t.T.Log(string(p))
-
-	return n, err
-}
-
-// ConsoleTestWriter creates an option that correctly sets the file frame depth for testing.TB log.
-func ConsoleTestWriter(t TestingLog) func(w *ConsoleWriter) {
-	return func(w *ConsoleWriter) {
-		w.Out = TestWriter{T: t, Frame: 6}
-	}
-}

writer_test.go

@@ -1,13 +1,9 @@
-//go:build !binary_log && !windows
-// +build !binary_log,!windows
+// +build !binary_log
+// +build !windows
 
 package zerolog
 
 import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
 	"reflect"
 	"testing"
 )
@@ -31,147 +27,3 @@ func TestMultiSyslogWriter(t *testing.T) {
 		t.Errorf("Invalid syslog message routing: want %v, got %v", want, got)
 	}
 }
-
-var writeCalls int
-
-type mockedWriter struct {
-	wantErr bool
-}
-
-func (c mockedWriter) Write(p []byte) (int, error) {
-	writeCalls++
-
-	if c.wantErr {
-		return -1, errors.New("Expected error")
-	}
-
-	return len(p), nil
-}
-
-// Tests that a new writer is only used if it actually works.
-func TestResilientMultiWriter(t *testing.T) {
-	tests := []struct {
-		name    string
-		writers []io.Writer
-	}{
-		{
-			name: "All valid writers",
-			writers: []io.Writer{
-				mockedWriter{
-					wantErr: false,
-				},
-				mockedWriter{
-					wantErr: false,
-				},
-			},
-		},
-		{
-			name: "All invalid writers",
-			writers: []io.Writer{
-				mockedWriter{
-					wantErr: true,
-				},
-				mockedWriter{
-					wantErr: true,
-				},
-			},
-		},
-		{
-			name: "First invalid writer",
-			writers: []io.Writer{
-				mockedWriter{
-					wantErr: true,
-				},
-				mockedWriter{
-					wantErr: false,
-				},
-			},
-		},
-		{
-			name: "First valid writer",
-			writers: []io.Writer{
-				mockedWriter{
-					wantErr: false,
-				},
-				mockedWriter{
-					wantErr: true,
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		writers := tt.writers
-		multiWriter := MultiLevelWriter(writers...)
-
-		logger := New(multiWriter).With().Timestamp().Logger().Level(InfoLevel)
-		logger.Info().Msg("Test msg")
-
-		if len(writers) != writeCalls {
-			t.Errorf("Expected %d writers to have been called but only %d were.", len(writers), writeCalls)
-		}
-		writeCalls = 0
-	}
-}
-
-type testingLog struct {
-	testing.TB
-	buf bytes.Buffer
-}
-
-func (t *testingLog) Log(args ...interface{}) {
-	if _, err := t.buf.WriteString(fmt.Sprint(args...)); err != nil {
-		t.Error(err)
-	}
-}
-
-func (t *testingLog) Logf(format string, args ...interface{}) {
-	if _, err := t.buf.WriteString(fmt.Sprintf(format, args...)); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestTestWriter(t *testing.T) {
-	tests := []struct {
-		name  string
-		write []byte
-		want  []byte
-	}{{
-		name:  "newline",
-		write: []byte("newline\n"),
-		want:  []byte("newline"),
-	}, {
-		name:  "oneline",
-		write: []byte("oneline"),
-		want:  []byte("oneline"),
-	}, {
-		name:  "twoline",
-		write: []byte("twoline\n\n"),
-		want:  []byte("twoline"),
-	}}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tb := &testingLog{TB: t} // Capture TB log buffer.
-			w := TestWriter{T: tb}
-
-			n, err := w.Write(tt.write)
-			if err != nil {
-				t.Error(err)
-			}
-			if n != len(tt.write) {
-				t.Errorf("Expected %d write length but got %d", len(tt.write), n)
-			}
-			p := tb.buf.Bytes()
-			if !bytes.Equal(tt.want, p) {
-				t.Errorf("Expected %q, got %q.", tt.want, p)
-			}
-
-			log := New(NewConsoleWriter(ConsoleTestWriter(t)))
-			log.Info().Str("name", tt.name).Msg("Success!")
-
-			tb.buf.Reset()
-		})
-	}
-
-}