[LOG]Support logging with context(#596)

1. add composite logger to manage main/sql/tx logger
2. support to parse and propagate the trace context to logging
3. make the logger achieve context level isolation

cmd/admin/admin.go

@@ -87,7 +87,7 @@ func Run(bootstrapPath string, addr string) error {
 	registryConf := discovery.GetServiceRegistry(context.Background())
 	serviceDiscovery, err := registry.InitDiscovery(registryConf.Name, registryConf.Options)
 	if err != nil {
-		log.Fatal("init service discovert failed: %v", err)
+		log.Fatal("init service discovery failed: %v", err)
 		return err
 	}
 

conf/bootstrap.yaml

@@ -67,7 +67,7 @@ supervisor:
   password: root
 
 logging_config:
-  log_name: arana_log
+  log_name: arana.log
   log_path: log
   log_level: 7 #KERN_DEBUG
   log_max_size: 10

pkg/executor/redirect.go

@@ -34,6 +34,10 @@ import (
 
 	"github.com/pkg/errors"
 
+	rtrace "go.opentelemetry.io/otel/trace"
+
+	"go.uber.org/zap"
+
 	"golang.org/x/exp/slices"
 )
 
@@ -174,7 +178,15 @@ func (executor *RedirectExecutor) doExecutorComQuery(ctx *proto.Context, act ast
 		hints = append(hints, h)
 	}
 
-	trace.Extract(ctx, hints)
+	// extract trace context
+	if trace.Extract(ctx, hints) {
+		traceBytes, err := rtrace.SpanFromContext(ctx).SpanContext().MarshalJSON()
+		if err != nil {
+			return nil, 0, err
+		}
+		ctx.Context = log.NewContext(ctx.Context, ctx.C.ID(), zap.String("trace-context", strings.ReplaceAll(string(traceBytes), "\"", "")))
+	}
+
 	metrics.ParserDuration.Observe(time.Since(start).Seconds())
 
 	if len(ctx.C.Schema()) < 1 {

pkg/trace/jaeger/jaeger.go

@@ -55,6 +55,7 @@ func (j *Jaeger) Initialize(_ context.Context, traceCfg *config.Trace) error {
 	// Register our TracerProvider as the global so any imported
 	// instrumentation in the future will default to using it.
 	otel.SetTracerProvider(tp)
+	otel.SetTextMapPropagator(&propagation.TraceContext{})
 	return nil
 }
 
@@ -76,17 +77,20 @@ func (j *Jaeger) tracerProvider(traceCfg *config.Trace) (*tracesdk.TracerProvide
 	return tp, nil
 }
 
-func (j *Jaeger) Extract(ctx *proto.Context, hints []*hint.Hint) {
-	var traceId string
+func (j *Jaeger) Extract(ctx *proto.Context, hints []*hint.Hint) bool {
+	var (
+		traceContext string
+	)
 	for _, h := range hints {
 		if h.Type != hint.TypeTrace {
 			continue
 		}
-		traceId = h.Inputs[0].V
+		traceContext = h.Inputs[0].V
 		break
 	}
-	if len(traceId) == 0 {
-		return
+	if len(traceContext) == 0 {
+		return false
 	}
-	ctx.Context = otel.GetTextMapPropagator().Extract(ctx.Context, propagation.MapCarrier{parentKey: traceId})
+	ctx.Context = otel.GetTextMapPropagator().Extract(ctx.Context, propagation.MapCarrier{parentKey: traceContext})
+	return true
 }

pkg/trace/trace.go

@@ -63,11 +63,11 @@ func Initialize(ctx context.Context, traceCfg *config.Trace) error {
 	return err
 }
 
-func Extract(ctx *proto.Context, hints []*hint.Hint) {
-	currentProvider.Extract(ctx, hints)
+func Extract(ctx *proto.Context, hints []*hint.Hint) bool {
+	return currentProvider.Extract(ctx, hints)
 }
 
 type Provider interface {
 	Initialize(ctx context.Context, traceCfg *config.Trace) error
-	Extract(ctx *proto.Context, hints []*hint.Hint)
+	Extract(ctx *proto.Context, hints []*hint.Hint) bool
 }