github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-02 16:28:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: opentelemetry traceid not correct (#1108)

Browse Source
This commit is contained in:
Kevin Wan 2021-10-01 22:44:37 +08:00 committed by GitHub
parent 295ec27e1b
commit ed15ca04f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/logx/tracelogger.go
View File

@ -96,7 +96,10 @@ func WithContext(ctx context.Context) Logger {
func spanIdFromContext(ctx context.Context) string {
span := trace.SpanFromContext(ctx)
if span.IsRecording() {
return span.SpanContext().SpanID().String()
spanCtx := span.SpanContext()
if spanCtx.IsValid() {
return spanCtx.SpanID().String()
}
}
t, ok := ctx.Value(tracespec.TracingKey).(tracespec.Trace)
@ -110,7 +113,10 @@ func spanIdFromContext(ctx context.Context) string {
func traceIdFromContext(ctx context.Context) string {
span := trace.SpanFromContext(ctx)
if span.IsRecording() {
return span.SpanContext().SpanID().String()
spanCtx := span.SpanContext()
if spanCtx.IsValid() {
return span.SpanContext().TraceID().String()
}
}
t, ok := ctx.Value(tracespec.TracingKey).(tracespec.Trace)

13
core/service/serviceconf.go
View File

@ -7,6 +7,7 @@ import (
"github.com/tal-tech/go-zero/core/logx"
"github.com/tal-tech/go-zero/core/prometheus"
"github.com/tal-tech/go-zero/core/stat"
"github.com/tal-tech/go-zero/core/trace/opentelemetry"
)
const (
@ -29,8 +30,7 @@ type ServiceConf struct {
Mode string `json:",default=pro,options=dev|test|rt|pre|pro"`
MetricsUrl string `json:",optional"`
Prometheus prometheus.Config `json:",optional"`
// TODO: enable it in v1.2.2
// Telemetry opentelemetry.Config `json:",optional"`
Telemetry opentelemetry.Config `json:",optional"`
}
// MustSetUp sets up the service, exits on error.
@ -52,11 +52,10 @@ func (sc ServiceConf) SetUp() error {
sc.initMode()
prometheus.StartAgent(sc.Prometheus)
// TODO: enable it in v1.2.2
// if len(sc.Telemetry.Name) == 0 {
// sc.Telemetry.Name = sc.Name
// }
// opentelemetry.StartAgent(sc.Telemetry)
if len(sc.Telemetry.Name) == 0 {
sc.Telemetry.Name = sc.Name
}
opentelemetry.StartAgent(sc.Telemetry)
if len(sc.MetricsUrl) > 0 {
stat.SetReportWriter(stat.NewRemoteWriter(sc.MetricsUrl))

4
core/trace/opentelemetry/serverstream.go
View File

@ -6,8 +6,8 @@ import (
"google.golang.org/grpc"
)
// serverStream wraps around the embedded grpc.ServerStream, and intercepts the RecvMsg and
// SendMsg method call.
// serverStream wraps around the embedded grpc.ServerStream,
// and intercepts the RecvMsg and SendMsg method call.
type serverStream struct {
grpc.ServerStream
ctx context.Context

2
rest/engine.go
View File

@ -108,7 +108,7 @@ func (s *engine) bindRoute(fr featuredRoutes, router httpx.Router, metrics *stat
route Route, verifier func(chain alice.Chain) alice.Chain) error {
chain := alice.New(
handler.TracingHandler,
handler.OtelHandler(route.Path),
handler.OtelHandler(s.conf.Name, route.Path),
s.getLogHandler(),
handler.PrometheusHandler(route.Path),
handler.MaxConns(s.conf.MaxConns),

5
rest/handler/otelhandler.go
View File

@ -11,7 +11,7 @@ import (
)
// OtelHandler return a middleware that process the opentelemetry.
func OtelHandler(path string) func(http.Handler) http.Handler {
func OtelHandler(serviceName, path string) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
if !opentelemetry.Enabled() {
return next
@ -26,7 +26,8 @@ func OtelHandler(path string) func(http.Handler) http.Handler {
ctx,
path,
oteltrace.WithSpanKind(oteltrace.SpanKindServer),
oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest("", path, r)...),
oteltrace.WithAttributes(semconv.HTTPServerAttributesFromHTTPRequest(
serviceName, path, r)...),
)
defer span.End()

2
tools/goctl/rpc/generator/genmain.go
View File

@ -21,9 +21,9 @@ import (
{{.imports}}
"github.com/tal-tech/go-zero/core/conf"
"github.com/tal-tech/go-zero/core/service"
"github.com/tal-tech/go-zero/zrpc"
"google.golang.org/grpc"
"github.com/tal-tech/go-zero/core/service"
"google.golang.org/grpc/reflection"
)