zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: refine tests (#1864)

Browse Source
This commit is contained in:
Kevin Wan
2022-05-04 17:52:58 +08:00
committed by GitHub
parent 974ba5c9aa
commit aa5118c2aa
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/logx/tracelogger_test.go
View File

@@ -25,7 +25,9 @@ func TestTraceLog(t *testing.T) {
otel.SetTracerProvider(tp) otel.SetTracerProvider(tp)
defer otel.SetTracerProvider(otp) defer otel.SetTracerProvider(otp)
ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar") ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
defer span.End()
WithContext(ctx).Info(testlog) WithContext(ctx).Info(testlog)
validate(t, w.String(), true, true) validate(t, w.String(), true, true)
} }
@@ -34,14 +36,17 @@ func TestTraceError(t *testing.T) {
w := new(mockWriter) w := new(mockWriter)
old := writer.Swap(w) old := writer.Swap(w)
defer writer.Store(old) defer writer.Store(old)
otp := otel.GetTracerProvider() otp := otel.GetTracerProvider()
tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample())) tp := sdktrace.NewTracerProvider(sdktrace.WithSampler(sdktrace.AlwaysSample()))
otel.SetTracerProvider(tp) otel.SetTracerProvider(tp)
defer otel.SetTracerProvider(otp) defer otel.SetTracerProvider(otp)
l := WithContext(context.Background()) ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar") defer span.End()
var nilCtx context.Context var nilCtx context.Context
l := WithContext(context.Background())
l = l.WithContext(nilCtx) l = l.WithContext(nilCtx)
l = l.WithContext(ctx) l = l.WithContext(ctx)
SetLevel(InfoLevel) SetLevel(InfoLevel)
@@ -71,9 +76,11 @@ func TestTraceInfo(t *testing.T) {
otel.SetTracerProvider(tp) otel.SetTracerProvider(tp)
defer otel.SetTracerProvider(otp) defer otel.SetTracerProvider(otp)
ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar") ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
l := WithContext(ctx) defer span.End()
SetLevel(InfoLevel) SetLevel(InfoLevel)
l := WithContext(ctx)
l.WithDuration(time.Second).Info(testlog) l.WithDuration(time.Second).Info(testlog)
validate(t, w.String(), true, true) validate(t, w.String(), true, true)
w.Reset() w.Reset()
@@ -90,11 +97,8 @@ func TestTraceInfo(t *testing.T) {
} }
func TestTraceInfoConsole(t *testing.T) { func TestTraceInfoConsole(t *testing.T) {
old := atomic.LoadUint32(&encoding) old := atomic.SwapUint32(&encoding, jsonEncodingType)
atomic.StoreUint32(&encoding, jsonEncodingType) defer atomic.StoreUint32(&encoding, old)
defer func() {
atomic.StoreUint32(&encoding, old)
}()
w := new(mockWriter) w := new(mockWriter)
o := writer.Swap(w) o := writer.Swap(w)
@@ -105,7 +109,9 @@ func TestTraceInfoConsole(t *testing.T) {
otel.SetTracerProvider(tp) otel.SetTracerProvider(tp)
defer otel.SetTracerProvider(otp) defer otel.SetTracerProvider(otp)
ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar") ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
defer span.End()
l := WithContext(ctx) l := WithContext(ctx)
SetLevel(InfoLevel) SetLevel(InfoLevel)
l.WithDuration(time.Second).Info(testlog) l.WithDuration(time.Second).Info(testlog)
@@ -128,7 +134,9 @@ func TestTraceSlow(t *testing.T) {
otel.SetTracerProvider(tp) otel.SetTracerProvider(tp)
defer otel.SetTracerProvider(otp) defer otel.SetTracerProvider(otp)
ctx, _ := tp.Tracer("foo").Start(context.Background(), "bar") ctx, span := tp.Tracer("foo").Start(context.Background(), "bar")
defer span.End()
l := WithContext(ctx) l := WithContext(ctx)
SetLevel(InfoLevel) SetLevel(InfoLevel)
l.WithDuration(time.Second).Slow(testlog) l.WithDuration(time.Second).Slow(testlog)
@@ -164,9 +172,9 @@ func TestTraceWithoutContext(t *testing.T) {
func validate(t *testing.T, body string, expectedTrace, expectedSpan bool) { func validate(t *testing.T, body string, expectedTrace, expectedSpan bool) {
var val mockValue var val mockValue
assert.Nil(t, json.Unmarshal([]byte(body), &val)) assert.Nil(t, json.Unmarshal([]byte(body), &val), body)
assert.Equal(t, expectedTrace, len(val.Trace) > 0) assert.Equal(t, expectedTrace, len(val.Trace) > 0, body)
assert.Equal(t, expectedSpan, len(val.Span) > 0) assert.Equal(t, expectedSpan, len(val.Span) > 0, body)
} }
type mockValue struct { type mockValue struct {