Skip to content

Commit dae829e

Browse files
committed
remove unnecessary helper function
1 parent 2940da2 commit dae829e

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

exporter/exporterhelper/internal/queuebatch/persistent_queue.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,6 @@ type spanContext struct {
268268
Remote bool
269269
}
270270

271-
func spanContextFromContext(ctx context.Context) spanContext {
272-
sc := trace.SpanContextFromContext(ctx)
273-
return localSpanContextFromTraceSpanContext(sc)
274-
}
275-
276271
func localSpanContextFromTraceSpanContext(sc trace.SpanContext) spanContext {
277272
return spanContext{
278273
TraceID: sc.TraceID().String(),
@@ -333,7 +328,7 @@ func getAndMarshalSpanContext(ctx context.Context) ([]byte, error) {
333328
if !persistRequestContextFeatureGate.IsEnabled() {
334329
return nil, nil
335330
}
336-
rc := spanContextFromContext(ctx)
331+
rc := localSpanContextFromTraceSpanContext(trace.SpanContextFromContext(ctx))
337332
return json.Marshal(requestContext{SpanContext: rc})
338333
}
339334

exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,7 @@ func TestSpanContextFromContextAndBack(t *testing.T) {
13581358
ctx := trace.ContextWithSpanContext(context.Background(), sc)
13591359

13601360
// Test spanContextFromContext
1361-
local := spanContextFromContext(ctx)
1361+
local := localSpanContextFromTraceSpanContext(trace.SpanContextFromContext(ctx))
13621362
assert.Equal(t, tid.String(), local.TraceID)
13631363
assert.Equal(t, sid.String(), local.SpanID)
13641364
assert.Equal(t, flags.String(), local.TraceFlags)

0 commit comments

Comments
 (0)