mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-06 17:18:35 +08:00
1afa7433f0
The traceID is not initialized by client_request_id in context. If the client sent valid traceID, milvus log will print two different traceID which is wierd. This PR add the logic to tray parsing incoming `client_request_id` into traceID. If it works just use it the request traceID, otherwise set it to a different field named `client_request_id`. --------- Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
70 lines
2.2 KiB
Go
70 lines
2.2 KiB
Go
package logutil
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"go.uber.org/zap/zapcore"
|
|
"google.golang.org/grpc/metadata"
|
|
|
|
"github.com/milvus-io/milvus/pkg/v2/log"
|
|
)
|
|
|
|
func TestCtxWithLevelAndTrace(t *testing.T) {
|
|
t.Run("debug level", func(t *testing.T) {
|
|
ctx := withMetaData(context.TODO(), zapcore.DebugLevel)
|
|
newctx := withLevelAndTrace(ctx)
|
|
|
|
assert.Equal(t, log.Ctx(log.WithDebugLevel(context.TODO())), log.Ctx(newctx))
|
|
})
|
|
|
|
t.Run("info level", func(t *testing.T) {
|
|
ctx := context.TODO()
|
|
newctx := withLevelAndTrace(withMetaData(ctx, zapcore.InfoLevel))
|
|
assert.Equal(t, log.Ctx(log.WithInfoLevel(ctx)), log.Ctx(newctx))
|
|
})
|
|
|
|
t.Run("warn level", func(t *testing.T) {
|
|
ctx := context.TODO()
|
|
newctx := withLevelAndTrace(withMetaData(ctx, zapcore.WarnLevel))
|
|
assert.Equal(t, log.Ctx(log.WithWarnLevel(ctx)), log.Ctx(newctx))
|
|
})
|
|
|
|
t.Run("error level", func(t *testing.T) {
|
|
ctx := context.TODO()
|
|
newctx := withLevelAndTrace(withMetaData(ctx, zapcore.ErrorLevel))
|
|
assert.Equal(t, log.Ctx(log.WithErrorLevel(ctx)), log.Ctx(newctx))
|
|
})
|
|
|
|
t.Run("fatal level", func(t *testing.T) {
|
|
ctx := context.TODO()
|
|
newctx := withLevelAndTrace(withMetaData(ctx, zapcore.FatalLevel))
|
|
assert.Equal(t, log.Ctx(log.WithFatalLevel(ctx)), log.Ctx(newctx))
|
|
})
|
|
|
|
t.Run(("pass through variables"), func(t *testing.T) {
|
|
md := metadata.New(map[string]string{
|
|
logLevelRPCMetaKey: zapcore.ErrorLevel.String(),
|
|
clientRequestIDKey: "cb1ef460136611f0b3352a4f4aa7d7fd",
|
|
})
|
|
ctx := metadata.NewIncomingContext(context.TODO(), md)
|
|
newctx := withLevelAndTrace(ctx)
|
|
md, ok := metadata.FromOutgoingContext(newctx)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, "cb1ef460136611f0b3352a4f4aa7d7fd", md.Get(clientRequestIDKey)[0])
|
|
assert.Equal(t, zapcore.ErrorLevel.String(), md.Get(logLevelRPCMetaKey)[0])
|
|
expectedctx := context.TODO()
|
|
expectedctx = log.WithErrorLevel(expectedctx)
|
|
expectedctx = log.WithTraceID(expectedctx, md.Get(clientRequestIDKey)[0])
|
|
assert.Equal(t, log.Ctx(expectedctx), log.Ctx(newctx))
|
|
})
|
|
}
|
|
|
|
func withMetaData(ctx context.Context, level zapcore.Level) context.Context {
|
|
md := metadata.New(map[string]string{
|
|
logLevelRPCMetaKey: level.String(),
|
|
})
|
|
return metadata.NewIncomingContext(ctx, md)
|
|
}
|