Revert "Merge pull request #85 from cdr/ctx-log"

This reverts commit 95bc0f1, reversing
changes made to f7a90d8.

Author: nhooyr

README.md

@@ -35,9 +35,9 @@ go get cdr.dev/slog
 Many more examples available at [godoc](https://godoc.org/cdr.dev/slog#pkg-examples).
 
 ```go
-ctx := sloghuman.Make(ctx, os.Stdout)
+log := sloghuman.Make(os.Stdout)
 
-slog.Info(ctx, "my message here",
+log.Info(context.Background(), "my message here",
     slog.F("field_name", "something or the other"),
     slog.F("some_map", slog.M(
         slog.F("nested_fields", time.Date(2000, time.February, 5, 4, 4, 4, 0, time.UTC)),
@@ -87,8 +87,6 @@ Here is a list of reasons how we improved on zap with slog.
 
 1. Full [context.Context](https://blog.golang.org/context) support
     - `slog` lets you set fields in a `context.Context` such that any log with the context prints those fields.
-    - `slog` stores the actual logger in the `context.Context`, following the example of
-    [the Go trace library](https://golang.org/pkg/runtime/trace/). Our logger doesn't bloat type and function signatures.
     - We wanted to be able to pull up all relevant logs for a given trace, user or request. With zap, we were plugging
       these fields in for every relevant log or passing around a logger with the fields set. This became very verbose.
 

context.go

@@ -12,12 +12,12 @@ import (
 func httpLogHelper(ctx context.Context, status int) {
 	slog.Helper()
 
-	slog.Info(ctx, "sending HTTP response",
+	l.Info(ctx, "sending HTTP response",
 		slog.F("status", status),
 	)
 }
 
-var l = sloghuman.Make(context.Background(), os.Stdout)
+var l = sloghuman.Make(os.Stdout)
 
 func ExampleHelper() {
 	ctx := context.Background()

example_helper_test.go

@@ -21,9 +21,9 @@ func (s myStruct) MarshalJSON() ([]byte, error) {
 }
 
 func Example_marshaller() {
-	ctx := sloghuman.Make(context.Background(), os.Stdout)
+	l := sloghuman.Make(os.Stdout)
 
-	slog.Info(ctx, "wow",
+	l.Info(context.Background(), "wow",
 		slog.F("myStruct", myStruct{
 			foo: 1,
 			bar: 2,

example_marshaller_test.go

@@ -18,14 +18,14 @@ import (
 )
 
 func Example() {
-	ctx := sloghuman.Make(context.Background(), os.Stdout)
+	log := sloghuman.Make(os.Stdout)
 
-	slog.Info(ctx, "my message here",
+	log.Info(context.Background(), "my message here",
 		slog.F("field_name", "something or the other"),
 		slog.F("some_map", slog.M(
 			slog.F("nested_fields", time.Date(2000, time.February, 5, 4, 4, 4, 0, time.UTC)),
 		)),
-		slog.Err(
+		slog.Error(
 			xerrors.Errorf("wrap1: %w",
 				xerrors.Errorf("wrap2: %w",
 					io.EOF,
@@ -45,15 +45,15 @@ func Example() {
 }
 
 func Example_struct() {
-	ctx := sloghuman.Make(context.Background(), os.Stdout)
+	l := sloghuman.Make(os.Stdout)
 
 	type hello struct {
 		Meow int       `json:"meow"`
 		Bar  string    `json:"bar"`
 		M    time.Time `json:"m"`
 	}
 
-	slog.Info(ctx, "check out my structure",
+	l.Info(context.Background(), "check out my structure",
 		slog.F("hello", hello{
 			Meow: 1,
 			Bar:  "barbar",
@@ -76,69 +76,68 @@ func Example_testing() {
 }
 
 func Example_tracing() {
-	var ctx context.Context
-	ctx = sloghuman.Make(context.Background(), os.Stdout)
+	log := sloghuman.Make(os.Stdout)
 
-	ctx, _ = trace.StartSpan(ctx, "spanName")
+	ctx, _ := trace.StartSpan(context.Background(), "spanName")
 
-	slog.Info(ctx, "my msg", slog.F("hello", "hi"))
+	log.Info(ctx, "my msg", slog.F("hello", "hi"))
 
 	// 2019-12-09 21:59:48.110 [INFO]	<example_test.go:62>	my msg	{"trace": "f143d018d00de835688453d8dc55c9fd", "span": "f214167bf550afc3", "hello": "hi"}
 }
 
 func Example_multiple() {
-	ctx := sloghuman.Make(context.Background(), os.Stdout)
+	l := sloghuman.Make(os.Stdout)
 
 	f, err := os.OpenFile("stackdriver", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
 	if err != nil {
-		slog.Fatal(ctx, "failed to open stackdriver log file", slog.Err(err))
+		l.Fatal(context.Background(), "failed to open stackdriver log file", slog.Error(err))
 	}
 
-	ctx = slog.Make(l, slogstackdriver.Make(ctx, f))
+	l = slog.Make(l, slogstackdriver.Make(f))
 
-	slog.Info(ctx, "log to stdout and stackdriver")
+	l.Info(context.Background(), "log to stdout and stackdriver")
 
 	// 2019-12-07 20:59:55.790 [INFO]	<example_test.go:46>	log to stdout and stackdriver
 }
 
 func ExampleWith() {
 	ctx := slog.With(context.Background(), slog.F("field", 1))
 
-	ctx = sloghuman.Make(ctx, os.Stdout)
-	slog.Info(ctx, "msg")
+	l := sloghuman.Make(os.Stdout)
+	l.Info(ctx, "msg")
 
 	// 2019-12-07 20:54:23.986 [INFO]	<example_test.go:20>	msg	{"field": 1}
 }
 
 func ExampleStdlib() {
 	ctx := slog.With(context.Background(), slog.F("field", 1))
-	l := slog.Stdlib(sloghuman.Make(ctx, os.Stdout))
+	l := slog.Stdlib(ctx, sloghuman.Make(os.Stdout))
 
 	l.Print("msg")
 
 	// 2019-12-07 20:54:23.986 [INFO]	(stdlib)	<example_test.go:29>	msg	{"field": 1}
 }
 
-func ExampleNamed() {
+func ExampleLogger_Named() {
 	ctx := context.Background()
 
-	ctx = sloghuman.Make(ctx, os.Stdout)
-	ctx = slog.Named(ctx, "http")
-	slog.Info(ctx, "received request", slog.F("remote address", net.IPv4(127, 0, 0, 1)))
+	l := sloghuman.Make(os.Stdout)
+	l = l.Named("http")
+	l.Info(ctx, "received request", slog.F("remote address", net.IPv4(127, 0, 0, 1)))
 
 	// 2019-12-07 21:20:56.974 [INFO]	(http)	<example_test.go:85>	received request	{"remote address": "127.0.0.1"}
 }
 
-func ExampleLeveled() {
+func ExampleLogger_Leveled() {
 	ctx := context.Background()
 
-	ctx = sloghuman.Make(ctx, os.Stdout)
-	slog.Debug(ctx, "testing1")
-	slog.Info(ctx, "received request")
+	l := sloghuman.Make(os.Stdout)
+	l.Debug(ctx, "testing1")
+	l.Info(ctx, "received request")
 
-	ctx = slog.Leveled(ctx, slog.LevelDebug)
+	l = l.Leveled(slog.LevelDebug)
 
-	slog.Debug(ctx, "testing2")
+	l.Debug(ctx, "testing2")
 
 	// 2019-12-07 21:26:20.945 [INFO]	<example_test.go:95>	received request
 	// 2019-12-07 21:26:20.945 [DEBUG]	<example_test.go:99>	testing2

example_test.go

@@ -1,12 +1,5 @@
 package slog
 
-import "context"
-
-func SetExit(ctx context.Context, fn func(int)) context.Context {
-	l, ok := loggerFromContext(ctx)
-	if !ok {
-		return ctx
-	}
+func (l *Logger) SetExit(fn func(int)) {
 	l.exit = fn
-	return contextWithLogger(ctx, l)
 }

export_test.go

@@ -128,7 +128,7 @@ func encodeJSON(v interface{}) []byte {
 	b, err := json.Marshal(v)
 	if err != nil {
 		return encode(M(
-			Err(xerrors.Errorf("failed to marshal to JSON: %w", err)),
+			Error(xerrors.Errorf("failed to marshal to JSON: %w", err)),
 			F("type", reflect.TypeOf(v)),
 			F("value", fmt.Sprintf("%+v", v)),
 		))

map.go

@@ -37,7 +37,7 @@ func TestMap(t *testing.T) {
 		}
 
 		test(t, slog.M(
-			slog.Err(
+			slog.Error(
 				xerrors.Errorf("wrap1: %w",
 					xerrors.Errorf("wrap2: %w",
 						io.EOF,
@@ -222,6 +222,10 @@ func TestMap(t *testing.T) {
 	})
 }
 
+type meow struct {
+	a int
+}
+
 func indentJSON(t *testing.T, j string) string {
 	b := &bytes.Buffer{}
 	err := json.Indent(b, []byte(j), "", strings.Repeat(" ", 4))

map_test.go

@@ -3,7 +3,6 @@ package slog
 import (
 	"context"
 	"log"
-	"os"
 	"strings"
 )
 
@@ -16,26 +15,22 @@ import (
 // You can redirect the stdlib default logger with log.SetOutput
 // to the Writer on the logger returned by this function.
 // See the example.
-func Stdlib(ctx context.Context) *log.Logger {
-	ctx = Named(ctx, "stdlib")
-
-	l, ok := loggerFromContext(ctx)
-	if !ok {
-		// Give stderr logger if no slog.
-		return log.New(os.Stderr, "", 0)
-	}
+func Stdlib(ctx context.Context, l Logger) *log.Logger {
 	l.skip += 3
-	ctx = contextWithLogger(ctx, l)
+
+	l = l.Named("stdlib")
 
 	w := &stdlogWriter{
 		ctx: ctx,
+		l:   l,
 	}
 
 	return log.New(w, "", 0)
 }
 
 type stdlogWriter struct {
 	ctx context.Context
+	l   Logger
 }
 
 func (w stdlogWriter) Write(p []byte) (n int, err error) {
@@ -44,7 +39,7 @@ func (w stdlogWriter) Write(p []byte) (n int, err error) {
 	// we do not want.
 	msg = strings.TrimSuffix(msg, "\n")
 
-	Info(w.ctx, msg)
+	w.l.Info(w.ctx, msg)
 
 	return len(p), nil
 }

s.go

@@ -2,7 +2,6 @@ package slog_test
 
 import (
 	"bytes"
-	"context"
 	"testing"
 
 	"cdr.dev/slog"
@@ -15,16 +14,14 @@ func TestStdlib(t *testing.T) {
 	t.Parallel()
 
 	b := &bytes.Buffer{}
-	ctx := context.Background()
-	ctx = slog.Make(sloghuman.Make(ctx, b))
-	ctx = slog.With(ctx,
+	l := slog.Make(sloghuman.Make(b)).With(
 		slog.F("hi", "we"),
 	)
-	stdlibLog := slog.Stdlib(ctx)
+	stdlibLog := slog.Stdlib(bg, l)
 	stdlibLog.Println("stdlib")
 
 	et, rest, err := entryhuman.StripTimestamp(b.String())
 	assert.Success(t, "strip timestamp", err)
 	assert.False(t, "timestamp", et.IsZero())
-	assert.Equal(t, "entry", " [INFO]\t(stdlib)\t<s_test.go:24>\tstdlib\t{\"hi\": \"we\"}\n", rest)
+	assert.Equal(t, "entry", " [INFO]\t(stdlib)\t<s_test.go:21>\tstdlib\t{\"hi\": \"we\"}\n", rest)
 }