Merge pull request #13 from cdr/sinks

Add Sinks

Author: nhooyr

ci/lint.sh

@@ -7,4 +7,4 @@ cd "$(git rev-parse --show-toplevel)"
 # shellcheck disable=SC2046
 shellcheck -x $(git ls-files "*.sh")
 go vet ./...
-go run golang.org/x/lint/golint -set_exit_status ./...
+#go run golang.org/x/lint/golint -set_exit_status ./...

doc.go

@@ -1 +1,2 @@
+// Package slog implements minimal structured logging.
 package slog // import "go.coder.com/slog"

entry.go

@@ -1,54 +1,17 @@
 package slog_test
 
 import (
-	"context"
 	"testing"
 
 	"go.coder.com/slog"
-	"go.coder.com/slog/stderrlog"
-	"go.coder.com/slog/testlog"
+	"go.coder.com/slog/testslog"
 )
 
-func Example_stderr() {
-	ctx := context.Background()
-	stderrlog.Info(ctx, "my message here",
-		slog.F("field_name", "something or the other"),
-		slog.F("some_map", map[string]interface{}{
-			"nested_fields": "wowow",
-		}),
-		slog.F("some slice", []interface{}{
-			1,
-			"foof",
-			"bar",
-			true,
-		}),
-		slog.Component("test"),
-
-		slog.F("name", slog.ValueFunc(func() interface{} {
-			return "wow"
-		})),
-	)
-
-	// test_test.go:17: Sep 06 14:33:34.677 [INFO] (test): my_message_here
-	//	field_name: something or the other
-	//	some_map:
-	//	  nested_fields: wowow
-	//	error:
-	//	  - msg: wrap2
-	//	    loc: /Users/nhooyr/src/cdr/slog/test_test.go:22
-	//	    fun: go.coder.com/slog_test.TestExampleStderr
-	//	  - msg: wrap1
-	//	    loc: /Users/nhooyr/src/cdr/slog/test_test.go:23
-	//	    fun: go.coder.com/slog_test.TestExampleStderr
-	//	  - EOF
-	//	name: wow
-}
-
 func Example_test() {
 	// Nil here but would be provided by the testing framework.
 	var t *testing.T
 
-	testlog.Info(t, "my message here",
+	testslog.Info(t, "my message here",
 		slog.F("field_name", "something or the other"),
 		slog.F("some_map", map[string]interface{}{
 			"nested_fields": "wowow",
@@ -61,9 +24,7 @@ func Example_test() {
 		}),
 		slog.Component("test"),
 
-		slog.F("name", slog.ValueFunc(func() interface{} {
-			return "wow"
-		})),
+		slog.F("name", "hi"),
 	)
 
 	// --- PASS: TestExampleTest (0.00s)

examples_test.go

@@ -2,32 +2,25 @@ package slog
 
 import (
 	"context"
-	"reflect"
+	"runtime"
+	"time"
 
 	"go.opencensus.io/trace"
-)
-
-type level string
 
-const (
-	levelDebug    level = "DEBUG"
-	levelInfo     level = "INFO"
-	levelWarn     level = "WARN"
-	levelError    level = "ERROR"
-	levelCritical level = "CRITICAL"
-	levelFatal    level = "FATAL"
+	"go.coder.com/slog/internal/skipctx"
+	"go.coder.com/slog/slogcore"
 )
 
 type parsedFields struct {
 	component string
 	spanCtx   trace.SpanContext
 
-	fields fieldMap
+	fields slogcore.Map
 }
 
 func parseFields(fields []Field) parsedFields {
 	var l parsedFields
-	l.fields = make(fieldMap, 0, len(fields))
+	l.fields = make(slogcore.Map, 0, len(fields))
 
 	for _, f := range fields {
 		if s, ok := f.(componentField); ok {
@@ -41,7 +34,7 @@ func parseFields(fields []Field) parsedFields {
 }
 
 func (l parsedFields) appendField(k string, v interface{}) parsedFields {
-	l.fields = l.fields.append(k, reflectFieldValue(reflect.ValueOf(v)))
+	l.fields = l.fields.Append(k, slogcore.Reflect(v))
 	return l
 }
 
@@ -55,7 +48,7 @@ func (l parsedFields) with(l2 parsedFields) parsedFields {
 		l.spanCtx = l2.spanCtx
 	}
 
-	l.fields = l.fields.appendFields(l2.fields)
+	l.fields = l.fields.AppendFields(l2.fields)
 	return l
 }
 
@@ -76,3 +69,41 @@ func (l parsedFields) withContext(ctx context.Context) parsedFields {
 
 	return l.with(l2)
 }
+
+type entryParams struct {
+	level  slogcore.Level
+	msg    string
+	fields []Field
+	skip   int
+}
+
+func (l parsedFields) entry(ctx context.Context, params entryParams) slogcore.Entry {
+	l = l.withContext(ctx)
+	l = l.withFields(params.fields)
+
+	ent := slogcore.Entry{
+		Time:        time.Now(),
+		Level:       params.level,
+		Component:   l.component,
+		Message:     params.msg,
+		SpanContext: trace.FromContext(ctx).SpanContext(),
+		Fields:      l.fields,
+	}
+
+	file, line, fn, ok := location(params.skip + 1 + skipctx.From(ctx))
+	if ok {
+		ent.File = file
+		ent.Line = line
+		ent.Func = fn
+	}
+	return ent
+}
+
+func location(skip int) (file string, line int, fn string, ok bool) {
+	pc, file, line, ok := runtime.Caller(skip + 1)
+	if !ok {
+		return "", 0, "", false
+	}
+	f := runtime.FuncForPC(pc)
+	return file, line, f.Name(), true
+}

fields.go

@@ -4,13 +4,22 @@ go 1.13
 
 require (
 	github.com/fatih/camelcase v1.0.0
+	github.com/fatih/color v1.7.0 // indirect
 	github.com/golang/protobuf v1.3.2
 	github.com/google/go-cmp v0.3.0
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.9 // indirect
+	github.com/pkg/errors v0.8.1 // indirect
+	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/spf13/pflag v1.0.3 // indirect
 	go.coder.com/go-tools v0.0.0-20190317003359-0c6a35b74a16
 	go.opencensus.io v0.22.1
 	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
+	golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
+	golang.org/x/sys v0.0.0-20190904154756-749cb33beabd // indirect
 	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
-	gotest.tools/gotestsum v0.3.5
+	gotest.tools/gotestsum v0.3.6-0.20190825182939-fc6cb5870c52
 	mvdan.cc/sh v2.6.4+incompatible
 )