zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开启otel后，tracelog自动获取otle的traceId和spanId (#946)

Browse Source 
* 开启otel后，tracelog自动获取otle的traceId和spanId

* 去除opentelemetry判断

* 通过 IsRecording 判断span是否活跃
This commit is contained in:
SunJun
2021-09-06 14:31:54 +08:00
committed by GitHub
parent 84d2b64e7c
commit a4d8286e36
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/logx/tracelogger.go
View File

@@ -6,6 +6,8 @@ import (
"io"
"time"
"go.opentelemetry.io/otel/trace"
"github.com/tal-tech/go-zero/core/timex"
"github.com/tal-tech/go-zero/core/trace/tracespec"
)
@@ -93,6 +95,11 @@ func WithContext(ctx context.Context) Logger {
}
func spanIdFromContext(ctx context.Context) string {
span := trace.SpanFromContext(ctx)
if span.IsRecording() {
return span.SpanContext().SpanID().String()
}
t, ok := ctx.Value(tracespec.TracingKey).(tracespec.Trace)
if !ok {
return ""
@@ -102,6 +109,11 @@ func spanIdFromContext(ctx context.Context) string {
}
func traceIdFromContext(ctx context.Context) string {
span := trace.SpanFromContext(ctx)
if span.IsRecording() {
return span.SpanContext().SpanID().String()
}
t, ok := ctx.Value(tracespec.TracingKey).(tracespec.Trace)
if !ok {
return ""