Merge pull request #6 from fuyibing/2.x

child context support for tracing

Author: fuyibing

client.go

@@ -6,6 +6,8 @@ package log
 import (
 	"fmt"
 	"os"
+	"runtime"
+	"strings"
 
 	"github.com/fuyibing/log/v2/interfaces"
 )
@@ -103,6 +105,26 @@ func (o *client) Errorfc(ctx interface{}, text string, args ...interface{}) {
 	}
 }
 
+func (o *client) Panic(text string) {
+	o.Panicfc(nil, text)
+}
+
+func (o *client) Panicf(text string, args ...interface{}) {
+	o.Panicfc(nil, text, args...)
+}
+
+func (o *client) Panicfc(ctx interface{}, text string, args ...interface{}) {
+	str := fmt.Sprintf(text, args...)
+	for i := 1; ; i++ {
+		_, f, l, got := runtime.Caller(i)
+		if !got {
+			break
+		}
+		str += fmt.Sprintf("\n%s:%d", strings.TrimSpace(f), l)
+	}
+	o.Errorfc(ctx, str)
+}
+
 // 日志处理逻辑.
 func (o *client) log(ctx interface{}, level interfaces.Level, text string, args ...interface{}) {
 	if handler := Config.GetHandler(); handler != nil {

context.go

@@ -26,3 +26,18 @@ func IrisBind(ctx iris.Context) {
 func NewContext() context.Context {
 	return context.WithValue(context.TODO(), interfaces.OpenTracingKey, NewTracing().UseDefault())
 }
+
+// 子级上下文.
+func ChildContext(ctx interface{}) context.Context {
+	// 1. return NewContext() if param ctx nil.
+	if ctx == nil {
+		return NewContext()
+	}
+	// 2. parse bound tracing.
+	t := ParseTracing(ctx)
+	if t == nil {
+		return NewContext()
+	}
+	// 3. generate new tracing.
+	return context.WithValue(context.TODO(), interfaces.OpenTracingKey, NewTracing().Use(t.GetTraceId(), t.GenPreviewVersion()))
+}

func.go

@@ -86,3 +86,21 @@ func Errorfc(ctx interface{}, text string, args ...interface{}) {
 		Client.Errorfc(ctx, text, args...)
 	}
 }
+
+func Panic(text string) {
+	if Config.ErrorOn() {
+		Client.Panic(text)
+	}
+}
+
+func Panicf(text string, args ...interface{}) {
+	if Config.ErrorOn() {
+		Client.Panicf(text, args...)
+	}
+}
+
+func Panicfc(ctx interface{}, text string, args ...interface{}) {
+	if Config.ErrorOn() {
+		Client.Panicfc(ctx, text, args...)
+	}
+}

interfaces/client_interface.go

@@ -40,4 +40,8 @@ type ClientInterface interface {
 
 	// 添加Error日志, 支持格式化和请求链.
 	Errorfc(ctx interface{}, text string, args ...interface{})
+
+	Panic(text string)
+	Panicf(text string, args ...interface{})
+	Panicfc(ctx interface{}, text string, args ...interface{})
 }

interfaces/trace_interface.go

@@ -8,13 +8,16 @@ import (
 )
 
 type TraceInterface interface {
+	GenCurrentVersion() string
+	GenPreviewVersion() string
 	GenVersion(i int32) string
 	GetParentSpanId() string
 	GetSpanId() string
 	GetSpanVersion() string
 	GetTraceId() string
 	IncrOffset() (before int32, after int32)
 	RequestInfo() (method string, url string)
+	Use(traceId, spanVersion string) TraceInterface
 	UseDefault() TraceInterface
 	UseRequest(req *http.Request) TraceInterface
 }

tracing.go

@@ -32,6 +32,8 @@ type tracing struct {
 
 // 创建OpenTracing.
 func NewTracing() interfaces.TraceInterface  { return &tracing{spanVersion: "0"} }
+func (o *tracing) GenCurrentVersion() string { return o.GenVersion(o.offset) }
+func (o *tracing) GenPreviewVersion() string { return o.GenVersion(o.offset-1) }
 func (o *tracing) GenVersion(i int32) string { return fmt.Sprintf("%s.%d", o.spanVersion, i) }
 func (o *tracing) GetParentSpanId() string   { return o.parentSpanId }
 func (o *tracing) GetSpanId() string         { return o.spanId }
@@ -48,6 +50,15 @@ func (o *tracing) IncrOffset() (before int32, after int32) {
 // Http请求参数.
 func (o *tracing) RequestInfo() (method string, url string) { return o.method, o.url }
 
+// Use specified.
+func (o *tracing) Use(traceId, spanVersion string) interfaces.TraceInterface {
+	o.offset = 0
+	o.traceId = traceId
+	o.spanId = o.generateUniqId()
+	o.spanVersion = spanVersion
+	return o
+}
+
 // 使用默认模式.
 func (o *tracing) UseDefault() interfaces.TraceInterface {
 	o.offset = 0