Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global trace forwarding implementation #406

Merged
merged 7 commits into from
Jan 2, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions api/global/internal/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ import (
"go.opentelemetry.io/otel/api/global/internal"
"go.opentelemetry.io/otel/api/key"
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/api/trace"
export "go.opentelemetry.io/otel/sdk/export/metric"
sdk "go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/metric/aggregator/counter"
"go.opentelemetry.io/otel/sdk/metric/aggregator/ddsketch"
"go.opentelemetry.io/otel/sdk/metric/aggregator/gauge"
"go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)

// benchFixture is copied from sdk/metric/benchmark_test.go.
Expand Down Expand Up @@ -100,3 +102,42 @@ func BenchmarkGlobalInt64CounterAddWithSDK(b *testing.B) {
cnt.Add(ctx, 1, labs)
}
}

func BenchmarkStartEndSpan(b *testing.B) {
// Comapare with BenchmarkStartEndSpan() in ../../sdk/trace/benchmark_test.go
traceBenchmark(b, func(b *testing.B) {
t := global.TraceProvider().Tracer("Benchmark StartEndSpan")
ctx := context.Background()
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, span := t.Start(ctx, "/foo")
span.End()
}
})
}

func traceBenchmark(b *testing.B, fn func(*testing.B)) {
internal.ResetForTest()
b.Run("No SDK", func(b *testing.B) {
b.ReportAllocs()
fn(b)
})
b.Run("Default SDK (AlwaysSample)", func(b *testing.B) {
b.ReportAllocs()
global.SetTraceProvider(traceProvider(b, sdktrace.AlwaysSample()))
fn(b)
})
b.Run("Default SDK (NeverSample)", func(b *testing.B) {
b.ReportAllocs()
global.SetTraceProvider(traceProvider(b, sdktrace.NeverSample()))
fn(b)
})
}

func traceProvider(b *testing.B, sampler sdktrace.Sampler) trace.Provider {
tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sampler}))
if err != nil {
b.Fatalf("Failed to create trace provider with sampler: %v", err)
}
return tp
}
16 changes: 15 additions & 1 deletion api/global/internal/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var (
globalMeter = defaultMeterValue()

delegateMeterOnce sync.Once
delegateTraceOnce sync.Once
)

// TraceProvider is the internal implementation for global.TraceProvider.
Expand All @@ -32,6 +33,18 @@ func TraceProvider() trace.Provider {

// SetTraceProvider is the internal implementation for global.SetTraceProvider.
func SetTraceProvider(tp trace.Provider) {
delegateTraceOnce.Do(func() {
current := TraceProvider()
if current == tp {
// Setting the provider to the prior default is nonsense, panic.
// Panic is acceptable because we are likely still early in the
// process lifetime.
panic("invalid Provider, the global instance cannot be reinstalled")
} else if def, ok := current.(*traceProvider); ok {
def.setDelegate(tp)
}

})
globalTracer.Store(traceProviderHolder{tp: tp})
}

Expand Down Expand Up @@ -59,7 +72,7 @@ func SetMeterProvider(mp metric.Provider) {

func defaultTracerValue() *atomic.Value {
v := &atomic.Value{}
v.Store(traceProviderHolder{tp: trace.NoopProvider{}})
v.Store(traceProviderHolder{tp: &traceProvider{}})
return v
}

Expand All @@ -74,4 +87,5 @@ func ResetForTest() {
globalTracer = defaultTracerValue()
globalMeter = defaultMeterValue()
delegateMeterOnce = sync.Once{}
delegateTraceOnce = sync.Once{}
}
80 changes: 80 additions & 0 deletions api/global/internal/trace.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package internal

import (
"context"
"sync"

"go.opentelemetry.io/otel/api/trace"
)

type traceProvider struct {
lock sync.Mutex
MrAlias marked this conversation as resolved.
Show resolved Hide resolved
tracers []*tracer

delegate trace.Provider
}

var _ trace.Provider = &traceProvider{}
MrAlias marked this conversation as resolved.
Show resolved Hide resolved

func (p *traceProvider) setDelegate(provider trace.Provider) {
if p.delegate != nil {
return
}

p.lock.Lock()
defer p.lock.Unlock()

p.delegate = provider
for _, t := range p.tracers {
t.setDelegate(provider)
}

p.tracers = nil
}

// Tracer creates a trace.Tracer with the given name. When a delegate is set,
// all previously returned trace.Tracers will be swapped to equivalent
// trace.Tracers created from the delegate.
func (p *traceProvider) Tracer(name string) trace.Tracer {
p.lock.Lock()
defer p.lock.Unlock()

if p.delegate != nil {
return p.delegate.Tracer(name)
}

t := &tracer{name: name}
p.tracers = append(p.tracers, t)
return t
}

type tracer struct {
trace.NoopTracer
MrAlias marked this conversation as resolved.
Show resolved Hide resolved

once sync.Once
name string

delegate trace.Tracer
}

var _ trace.Tracer = &tracer{}

func (t *tracer) setDelegate(provider trace.Provider) {
t.once.Do(func() { t.delegate = provider.Tracer(t.name) })
}

// WithSpan wraps around execution of func with delegated Tracer.
func (t *tracer) WithSpan(ctx context.Context, name string, body func(context.Context) error) error {
if t.delegate != nil {
return t.delegate.WithSpan(ctx, name, body)
}
return t.NoopTracer.WithSpan(ctx, name, body)
}

// Start starts a span from the delegated tracer.
func (t *tracer) Start(ctx context.Context, name string, opts ...trace.StartOption) (context.Context, trace.Span) {
if t.delegate != nil {
return t.delegate.Start(ctx, name, opts...)
}
return t.NoopTracer.Start(ctx, name, opts...)
}
75 changes: 75 additions & 0 deletions api/global/internal/trace_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package internal_test

import (
"context"
"testing"

"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/global/internal"
export "go.opentelemetry.io/otel/sdk/export/trace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
)

type testSpanProcesor struct {
// Names of Spans started.
spansStarted []string
// Names of Spans ended.
spansEnded []string
}

func (t *testSpanProcesor) OnStart(s *export.SpanData) {
t.spansStarted = append(t.spansStarted, s.Name)
}

func (t *testSpanProcesor) OnEnd(s *export.SpanData) {
t.spansEnded = append(t.spansEnded, s.Name)
}

func (t *testSpanProcesor) Shutdown() {}

func TestTraceDefaultSDK(t *testing.T) {
internal.ResetForTest()

ctx := context.Background()
gtp := global.TraceProvider()
tracer1 := gtp.Tracer("pre")
_, span1 := tracer1.Start(ctx, "span1")

// This should be dropped.
if err := tracer1.WithSpan(ctx, "withSpan1", func(context.Context) error { return nil }); err != nil {
t.Errorf("failed to wrap function with span prior to initialization: %v", err)
}

tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}))
if err != nil {
t.Fatal(err)
}
tsp := &testSpanProcesor{}
tp.RegisterSpanProcessor(tsp)

global.SetTraceProvider(tp)

// This span was started before initialization, it is expected to be dropped.
span1.End()

// The existing Tracer should have been configured to now use the configured SDK.
_, span2 := tracer1.Start(ctx, "span2")
span2.End()
if err := tracer1.WithSpan(ctx, "withSpan2", func(context.Context) error { return nil }); err != nil {
t.Errorf("failed to wrap function with span post initialization: %v", err)
}

// The global trace Provider should now create Tracers that also use the newly configured SDK.
tracer2 := gtp.Tracer("post")
_, span3 := tracer2.Start(ctx, "span3")
span3.End()
if err := tracer2.WithSpan(ctx, "withSpan3", func(context.Context) error { return nil }); err != nil {
t.Errorf("failed to wrap function with span post initialization with new tracer: %v", err)
}

expected := []string{"pre/span2", "pre/withSpan2", "post/span3", "post/withSpan3"}
require.Equal(t, tsp.spansStarted, expected)
require.Equal(t, tsp.spansEnded, expected)
}