Merge pull request #5 from fuyibing/2.x

支持链解析

Author: fuyibing

line.go

@@ -4,14 +4,11 @@
 package log
 
 import (
-	"context"
 	"fmt"
 	"regexp"
 	"strconv"
 	"time"
 
-	"github.com/kataras/iris/v12"
-
 	"github.com/fuyibing/log/v2/interfaces"
 )
 
@@ -25,6 +22,7 @@ var (
 	regexpLineDuration = regexp.MustCompile(`\[d=(\d+\.?\d*)\]`)
 )
 
+// 日志行结构体.
 type Line struct {
 	args        []interface{}
 	duration    float64
@@ -38,18 +36,26 @@ type Line struct {
 	tracing     interfaces.TraceInterface
 }
 
+// 创建日志行实例.
 func NewLine(ctx interface{}, level interfaces.Level, text string, args []interface{}) interfaces.LineInterface {
+	// 行实例.
 	o := &Line{
 		time: time.Now(),
 		text: text, args: args, level: level,
 		pid:         Config.GetPid(),
 		serviceName: Config.AppName(), serviceAddr: Config.AppAddr(),
 	}
+	// 执行时长.
 	o.parseDuration()
-	o.parseTracing(ctx)
+	// 请求链.
+	if tracer := ParseTracing(ctx); tracer != nil {
+		o.tracing = tracer
+		o.offset, _ = o.tracing.IncrOffset()
+	}
 	return o
 }
 
+// 返回带颜色Level文本.
 func (o *Line) ColorLevel() string {
 	if c, ok := colors[o.level]; ok {
 		return fmt.Sprintf("%c[%d;%d;%dm%5s%c[0m",
@@ -62,30 +68,36 @@ func (o *Line) ColorLevel() string {
 	return o.Level()
 }
 
+// 日志正文.
 func (o *Line) Content() string {
 	if o.args != nil && len(o.args) > 0 {
 		return fmt.Sprintf(o.text, o.args...)
 	}
 	return o.text
 }
 
+// 执行时长.
 func (o *Line) Duration() float64 {
 	return o.duration
 }
 
+// 日志级别.
 func (o *Line) Level() string { return Config.GetLevel(o.level) }
 
+// 上级Span.
 func (o *Line) ParentSpanId() string {
 	if o.tracing != nil {
 		return o.tracing.GetParentSpanId()
 	}
 	return ""
 }
 
+// 进程ID.
 func (o *Line) Pid() int {
 	return o.pid
 }
 
+// 请求信息.
 func (o *Line) RequestInfo() (method string, url string) {
 	if o.tracing != nil {
 		method, url = o.tracing.RequestInfo()
@@ -138,35 +150,3 @@ func (o *Line) parseDuration() {
 		}
 	}
 }
-
-// Parse tracing from Context.
-// ctx accept mixed struct instance, allow:
-// iris.Context, context.Context, Tracing
-func (o *Line) parseTracing(ctx interface{}) {
-	// nil.
-	if ctx == nil {
-		return
-	}
-	// Use iris.Context.
-	if ir, ok := ctx.(iris.Context); ok {
-		if x := ir.Values().Get(interfaces.OpenTracingKey); x != nil {
-			o.tracing = x.(interfaces.TraceInterface)
-			o.offset, _ = o.tracing.IncrOffset()
-		}
-		return
-	}
-	// Use context.Context.
-	if cc, ok := ctx.(context.Context); ok {
-		if x := cc.Value(interfaces.OpenTracingKey); x != nil {
-			o.tracing = x.(interfaces.TraceInterface)
-			o.offset, _ = o.tracing.IncrOffset()
-		}
-		return
-	}
-	// Use TraceInterface
-	if ti, ok := ctx.(interfaces.TraceInterface); ok {
-		o.tracing = ti.(interfaces.TraceInterface)
-		o.offset, _ = o.tracing.IncrOffset()
-		return
-	}
-}

tracing.go

@@ -4,6 +4,7 @@
 package log
 
 import (
+	"context"
 	"fmt"
 	"math/rand"
 	"net/http"
@@ -12,6 +13,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/kataras/iris/v12"
 
 	"github.com/fuyibing/log/v2/interfaces"
 )
@@ -94,3 +96,41 @@ func (o *tracing) parseHeader(header http.Header) interfaces.TraceInterface {
 	// with header.
 	return o
 }
+
+// 解析Tracing.
+func ParseTracing(ctx interface{}) interfaces.TraceInterface {
+	// nil.
+	if ctx == nil {
+		return nil
+	}
+	// Use iris.Context.
+	if ir, ok := ctx.(iris.Context); ok {
+		if x := ir.Values().Get(interfaces.OpenTracingKey); x != nil {
+			return x.(interfaces.TraceInterface)
+		}
+	}
+	// Use context.Context.
+	if cc, ok := ctx.(context.Context); ok {
+		if x := cc.Value(interfaces.OpenTracingKey); x != nil {
+			return x.(interfaces.TraceInterface)
+		}
+	}
+	// Use TraceInterface
+	if ti, ok := ctx.(interfaces.TraceInterface); ok {
+		return ti.(interfaces.TraceInterface)
+	}
+	// Undefined.
+	return nil
+}
+
+func ParseTracingToRequest(ctx interface{}, req *http.Request) {
+	trace := ParseTracing(ctx)
+	if trace == nil {
+		return
+	}
+	tracer := trace.(*tracing)
+	traceId, spanId, spanVersion := Config.GetTrace()
+	req.Header.Set(traceId, tracer.traceId)
+	req.Header.Set(spanId, tracer.spanId)
+	req.Header.Set(spanVersion, tracer.GenVersion(tracer.offset-1))
+}