From d14ee2d99a5423343afbefd90e6d7ced1b90fac3 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 28 Jul 2022 21:48:17 +0800 Subject: [PATCH] chore: refactoring --- core/logx/contextlogger_test.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/logx/contextlogger_test.go b/core/logx/contextlogger_test.go index 52fbd8391748..8f9314811bac 100644 --- a/core/logx/contextlogger_test.go +++ b/core/logx/contextlogger_test.go @@ -29,7 +29,7 @@ func TestTraceLog(t *testing.T) { otel.SetTracerProvider(tp) defer otel.SetTracerProvider(otp) - ctx, span := tp.Tracer("foo").Start(context.Background(), "bar") + ctx, span := tp.Tracer("trace-id").Start(context.Background(), "span-id") defer span.End() WithContext(ctx).Info(testlog) @@ -50,7 +50,7 @@ func TestTraceError(t *testing.T) { otel.SetTracerProvider(tp) defer otel.SetTracerProvider(otp) - ctx, span := tp.Tracer("foo1").Start(context.Background(), "bar") + ctx, span := tp.Tracer("trace-id").Start(context.Background(), "span-id") defer span.End() var nilCtx context.Context @@ -67,10 +67,10 @@ func TestTraceError(t *testing.T) { l.WithDuration(time.Second).Errorv(testlog) validate(t, w.String(), true, true) w.Reset() - l.WithDuration(time.Second).Errorw(testlog, Field("foo1", "bar")) + l.WithDuration(time.Second).Errorw(testlog, Field("basket", "ball")) validate(t, w.String(), true, true) - assert.True(t, strings.Contains(w.String(), "foo1"), w.String()) - assert.True(t, strings.Contains(w.String(), "bar"), w.String()) + assert.True(t, strings.Contains(w.String(), "basket"), w.String()) + assert.True(t, strings.Contains(w.String(), "ball"), w.String()) } func TestTraceInfo(t *testing.T) { @@ -87,7 +87,7 @@ func TestTraceInfo(t *testing.T) { otel.SetTracerProvider(tp) defer otel.SetTracerProvider(otp) - ctx, span := tp.Tracer("foo1").Start(context.Background(), "bar") + ctx, span := tp.Tracer("trace-id").Start(context.Background(), "span-id") defer span.End() SetLevel(InfoLevel) @@ -101,10 +101,10 @@ func TestTraceInfo(t *testing.T) { l.WithDuration(time.Second).Infov(testlog) validate(t, w.String(), true, true) w.Reset() - l.WithDuration(time.Second).Infow(testlog, Field("foo1", "bar")) + l.WithDuration(time.Second).Infow(testlog, Field("basket", "ball")) validate(t, w.String(), true, true) - assert.True(t, strings.Contains(w.String(), "foo1"), w.String()) - assert.True(t, strings.Contains(w.String(), "bar"), w.String()) + assert.True(t, strings.Contains(w.String(), "basket"), w.String()) + assert.True(t, strings.Contains(w.String(), "ball"), w.String()) } func TestTraceInfoConsole(t *testing.T) { @@ -124,7 +124,7 @@ func TestTraceInfoConsole(t *testing.T) { otel.SetTracerProvider(tp) defer otel.SetTracerProvider(otp) - ctx, span := tp.Tracer("foo").Start(context.Background(), "bar") + ctx, span := tp.Tracer("trace-id").Start(context.Background(), "span-id") defer span.End() l := WithContext(ctx) @@ -153,7 +153,7 @@ func TestTraceSlow(t *testing.T) { otel.SetTracerProvider(tp) defer otel.SetTracerProvider(otp) - ctx, span := tp.Tracer("foo1").Start(context.Background(), "bar") + ctx, span := tp.Tracer("trace-id").Start(context.Background(), "span-id") defer span.End() l := WithContext(ctx) @@ -168,10 +168,10 @@ func TestTraceSlow(t *testing.T) { l.WithDuration(time.Second).Slowv(testlog) validate(t, w.String(), true, true) w.Reset() - l.WithDuration(time.Second).Sloww(testlog, Field("foo1", "bar")) + l.WithDuration(time.Second).Sloww(testlog, Field("basket", "ball")) validate(t, w.String(), true, true) - assert.True(t, strings.Contains(w.String(), "foo1"), w.String()) - assert.True(t, strings.Contains(w.String(), "bar"), w.String()) + assert.True(t, strings.Contains(w.String(), "basket"), w.String()) + assert.True(t, strings.Contains(w.String(), "ball"), w.String()) } func TestTraceWithoutContext(t *testing.T) {