Collect structured entries in logger mock (#6)

Author: vearutop

.github/workflows/bench.yml

@@ -68,8 +68,7 @@ jobs:
         run: |
           export REF_NAME=master
           cd __base
-          BENCH_COUNT=5 make bench-run bench-stat
-          cp bench-master.txt ../bench-master.txt
+          make | grep bench-run && (BENCH_COUNT=5 make bench-run bench-stat && cp bench-master.txt ../bench-master.txt) || echo "No benchmarks in base"
       - name: Benchmark
         id: bench
         run: |

.github/workflows/test-unit.yml

@@ -51,8 +51,7 @@ jobs:
         if: matrix.go-version == '1.16.x' && env.RUN_BASE_COVERAGE == 'on' && steps.benchmark-base.outputs.cache-hit != 'true' && github.event.pull_request.base.sha != ''
         run: |
           cd __base
-          make test-unit
-          go tool cover -func=./unit.coverprofile | sed -e 's/.go:[0-9]*:\t/.go\t/g' | sed -e 's/\t\t*/\t/g'  > ../unit-base.txt
+          make | grep test-unit && (make test-unit && go tool cover -func=./unit.coverprofile | sed -e 's/.go:[0-9]*:\t/.go\t/g' | sed -e 's/\t\t*/\t/g'  > ../unit-base.txt) || echo "No test-unit in base"
       - name: Test
         id: test
         run: |

.golangci.yml

@@ -28,9 +28,10 @@ linters:
     - paralleltest
     - forbidigo
     - exhaustivestruct
-    - interfacer
+    - interfacer # deprecated
     - forcetypeassert
-    - scopelint
+    - scopelint # deprecated
+    - ifshort # too many false positives
 
 issues:
   exclude-use-default: false

go.mod

@@ -3,7 +3,7 @@ module github.com/bool64/ctxd
 go 1.13
 
 require (
-	github.com/bool64/dev v0.1.26
+	github.com/bool64/dev v0.1.28
 	github.com/stretchr/testify v1.4.0
 	github.com/swaggest/usecase v0.1.5
 )

go.sum

@@ -1,16 +1,13 @@
-github.com/bool64/dev v0.1.0/go.mod h1:pn52JC52uSgpazChx9CeXyG+S3sW2V36HHoLNBbscdg=
 github.com/bool64/dev v0.1.25/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
-github.com/bool64/dev v0.1.26 h1:9RppeANjTKsF0ZEROkgh0z8qKTvpNeVmKnz0uuCAkS4=
-github.com/bool64/dev v0.1.26/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
+github.com/bool64/dev v0.1.28 h1:bL7WI4kF5RzjzsQ+8wyWtqQkasw4m4q8l1Cz3CjShZE=
+github.com/bool64/dev v0.1.28/go.mod h1:cTHiTDNc8EewrQPy3p1obNilpMpdmlUesDkFTF2zRWU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/swaggest/usecase v0.0.0-20200928062416-27f47131b0f8 h1:XGJJai6ngqYpy/cTMvGreiO+jradIn1uq7Q5hY2OCF4=
-github.com/swaggest/usecase v0.0.0-20200928062416-27f47131b0f8/go.mod h1:rcngDv7OaBXZyEXdEtimcDeNon7sq3iqLm9hxT06s3c=
 github.com/swaggest/usecase v0.1.5 h1:xMDWXnYGysVaF2f3ZnmDsn2FlZ8fd3FJD+O+8wl4aNQ=
 github.com/swaggest/usecase v0.1.5/go.mod h1:uubX4ZbjQK1Bnl0xX9hOYpb/IUiSoVKk/yQImawbNMU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

mock.go

@@ -5,13 +5,21 @@ import (
 	"context"
 	"encoding/json"
 	"sync"
+	"time"
 )
 
 // LoggerMock logs messages to internal buffer.
 type LoggerMock struct {
-	mu sync.Mutex
-	bytes.Buffer
 	OnError func(err error)
+
+	sync.Mutex
+	bytes.Buffer
+	LoggedEntries []struct {
+		Time    time.Time              `json:"time"`
+		Level   string                 `json:"level"`
+		Message string                 `json:"message"`
+		Data    map[string]interface{} `json:"data,omitempty"`
+	}
 }
 
 func (m *LoggerMock) failed(err error) bool {
@@ -31,14 +39,23 @@ func (m *LoggerMock) failed(err error) bool {
 }
 
 func (m *LoggerMock) log(ctx context.Context, level, msg string, keysAndValues []interface{}) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
+	m.Lock()
+	defer m.Unlock()
+
+	data := Tuples(append(Fields(ctx), keysAndValues...)).Fields()
 
-	jm, err := json.Marshal(Tuples(append(Fields(ctx), keysAndValues...)).Fields())
+	jm, err := json.Marshal(data)
 	if m.failed(err) {
 		return
 	}
 
+	m.LoggedEntries = append(m.LoggedEntries, struct {
+		Time    time.Time              `json:"time"`
+		Level   string                 `json:"level"`
+		Message string                 `json:"message"`
+		Data    map[string]interface{} `json:"data,omitempty"`
+	}{Time: time.Now(), Level: level, Message: msg, Data: data})
+
 	out := LogWriter(ctx)
 	if out == nil {
 		out = m

mock_test.go

@@ -26,3 +26,34 @@ func TestLoggerMock_Error(t *testing.T) {
 	m.Error(context.Background(), "foo", "func", func() {})
 	assert.Equal(t, "json: unsupported type: func()\n", m.String())
 }
+
+func TestLoggerMock_Debug(t *testing.T) {
+	m := ctxd.LoggerMock{}
+
+	ctx := ctxd.AddFields(context.Background(), "foo", 1, "bar", 2)
+
+	m.Debug(ctx, "debug message", "baz", 3)
+	m.Info(ctx, "info message", "baz", 3)
+	m.Warn(ctx, "warn message", "baz", 3)
+	m.Error(ctx, "error message", "baz", 3)
+	m.Important(ctx, "important message", "baz", 3)
+
+	assert.Equal(t, `debug: debug message {"bar":2,"baz":3,"foo":1}
+info: info message {"bar":2,"baz":3,"foo":1}
+warn: warn message {"bar":2,"baz":3,"foo":1}
+error: error message {"bar":2,"baz":3,"foo":1}
+important: important message {"bar":2,"baz":3,"foo":1}`+"\n", m.String(), m.String())
+
+	data := map[string]interface{}{"bar": 2, "baz": 3, "foo": 1}
+
+	assert.Equal(t, "debug message", m.LoggedEntries[0].Message)
+	assert.Equal(t, data, m.LoggedEntries[0].Data)
+	assert.Equal(t, "info message", m.LoggedEntries[1].Message)
+	assert.Equal(t, data, m.LoggedEntries[1].Data)
+	assert.Equal(t, "warn message", m.LoggedEntries[2].Message)
+	assert.Equal(t, data, m.LoggedEntries[2].Data)
+	assert.Equal(t, "error message", m.LoggedEntries[3].Message)
+	assert.Equal(t, data, m.LoggedEntries[3].Data)
+	assert.Equal(t, "important message", m.LoggedEntries[4].Message)
+	assert.Equal(t, data, m.LoggedEntries[4].Data)
+}