Skip to content

Commit 562d119

Browse files
committed
unite traceid
Signed-off-by: jyjiangkai <[email protected]>
1 parent 24da846 commit 562d119

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

internal/gateway/gateway.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (ga *ceGateway) receive(ctx context.Context, event v2.Event) (re *v2.Event,
106106
ctx, span := ga.tracer.Start(ctx, "receive")
107107
defer span.End()
108108

109-
event.SetExtension("spancontext", ctx)
109+
event.SetExtension("traceid", span.SpanContext().TraceID().String())
110110
span.SetName("EventTracing")
111111
span.SetAttributes(attribute.String("event_id", event.ID()))
112112
span.AddEvent("received from source", trace.WithTimestamp(time.Now()))

internal/trigger/reader/reader.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ func (elReader *eventlogReader) newSpan(ctx context.Context, event ce.Event) (co
240240
if event.Extensions() == nil {
241241
return elReader.config.Tracer.Start(ctx, event.ID())
242242
}
243-
if _, ok := event.Extensions()["spancontext"]; !ok {
243+
if _, ok := event.Extensions()["traceid"]; !ok {
244244
return elReader.config.Tracer.Start(ctx, event.ID())
245245
}
246-
var spanCtx context.Context
247-
if err := event.ExtensionAs("spancontext", &spanCtx); err != nil {
248-
return elReader.config.Tracer.Start(ctx, event.ID())
249-
}
250-
return elReader.config.Tracer.Start(spanCtx, event.ID())
246+
traceid, _ := trace.TraceIDFromHex(event.Extensions()["traceid"].(string))
247+
_ctx := trace.ContextWithSpanContext(ctx, trace.NewSpanContext(trace.SpanContextConfig{
248+
TraceID: traceid,
249+
}))
250+
return elReader.config.Tracer.Start(_ctx, event.ID())
251251
}
252252

253253
func (elReader *eventlogReader) putEvent(ctx context.Context, event info.EventRecord) error {

0 commit comments

Comments
 (0)