|
@@ -4,10 +4,10 @@ import (
|
|
|
"context"
|
|
|
"errors"
|
|
|
"testing"
|
|
|
- "time"
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
"github.com/zeromicro/go-zero/core/logx/logtest"
|
|
|
+ "github.com/zeromicro/go-zero/core/timex"
|
|
|
)
|
|
|
|
|
|
func TestFormatAddrs(t *testing.T) {
|
|
@@ -42,13 +42,148 @@ func Test_logDuration(t *testing.T) {
|
|
|
buf := logtest.NewCollector(t)
|
|
|
|
|
|
buf.Reset()
|
|
|
- logDuration(context.Background(), "foo", "bar", time.Millisecond, nil)
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil)
|
|
|
assert.Contains(t, buf.String(), "foo")
|
|
|
assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
|
|
|
buf.Reset()
|
|
|
- logDuration(context.Background(), "foo", "bar", time.Millisecond, errors.New("bar"))
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil)
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "fail")
|
|
|
+
|
|
|
+ defer func() {
|
|
|
+ logMon.Set(true)
|
|
|
+ logSlowMon.Set(true)
|
|
|
+ }()
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ DisableInfoLog()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil)
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil)
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ DisableLog()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil)
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil)
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "fail")
|
|
|
+}
|
|
|
+
|
|
|
+func Test_logDurationWithDoc(t *testing.T) {
|
|
|
+ buf := logtest.NewCollector(t)
|
|
|
+ buf.Reset()
|
|
|
+
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, make(chan int))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, "{'json': ''}")
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
+ assert.Contains(t, buf.String(), "json")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, make(chan int))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, "{'json': ''}")
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "json")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"), make(chan int))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "fail")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"), "{'json': ''}")
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "fail")
|
|
|
+ assert.Contains(t, buf.String(), "json")
|
|
|
+
|
|
|
+ defer func() {
|
|
|
+ logMon.Set(true)
|
|
|
+ logSlowMon.Set(true)
|
|
|
+ }()
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ DisableInfoLog()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, make(chan int))
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, "{'json': ''}")
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, make(chan int))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, "{'json': ''}")
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "slow")
|
|
|
+ assert.Contains(t, buf.String(), "json")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ DisableLog()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, make(chan int))
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), nil, "{'json': ''}")
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, make(chan int))
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now()-slowThreshold.Load()*2, nil, "{'json': ''}")
|
|
|
+ assert.Empty(t, buf.String())
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"), make(chan int))
|
|
|
+ assert.Contains(t, buf.String(), "foo")
|
|
|
+ assert.Contains(t, buf.String(), "bar")
|
|
|
+ assert.Contains(t, buf.String(), "fail")
|
|
|
+
|
|
|
+ buf.Reset()
|
|
|
+ logDurationWithDoc(context.Background(), "foo", "bar", timex.Now(), errors.New("bar"), "{'json': ''}")
|
|
|
assert.Contains(t, buf.String(), "foo")
|
|
|
assert.Contains(t, buf.String(), "bar")
|
|
|
assert.Contains(t, buf.String(), "fail")
|
|
|
+ assert.Contains(t, buf.String(), "json")
|
|
|
}
|