Skip to content

Commit 5a32204

Browse files
committed
Fix tracer implementation
1 parent da008bc commit 5a32204

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

coderd/tracing/httpmw_test.go

+17-6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"testing"
1010

1111
"go.opentelemetry.io/otel/trace"
12+
"go.opentelemetry.io/otel/trace/noop"
1213

1314
"github.com/go-chi/chi/v5"
1415
"github.com/stretchr/testify/require"
@@ -17,22 +18,32 @@ import (
1718
"github.com/coder/coder/v2/testutil"
1819
)
1920

20-
type fakeTracer struct {
21+
type fakeTracerProvider struct {
22+
noop.TracerProvider
2123
startCalled int64
2224
}
2325

26+
type fakeTracer struct {
27+
noop.Tracer
28+
prov *fakeTracerProvider
29+
}
30+
2431
var (
25-
_ trace.TracerProvider = &fakeTracer{}
32+
_ trace.TracerProvider = &fakeTracerProvider{}
2633
_ trace.Tracer = &fakeTracer{}
2734
)
2835

36+
func (f *fakeTracer) Start(ctx context.Context, str string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
37+
return f.prov.Start(ctx, str, opts...)
38+
}
39+
2940
// Tracer implements trace.TracerProvider.
30-
func (f *fakeTracer) Tracer(_ string, _ ...trace.TracerOption) trace.Tracer {
31-
return f
41+
func (f *fakeTracerProvider) Tracer(_ string, _ ...trace.TracerOption) trace.Tracer {
42+
return &fakeTracer{prov: f}
3243
}
3344

3445
// Start implements trace.Tracer.
35-
func (f *fakeTracer) Start(ctx context.Context, _ string, _ ...trace.SpanStartOption) (context.Context, trace.Span) {
46+
func (f *fakeTracerProvider) Start(ctx context.Context, _ string, _ ...trace.SpanStartOption) (context.Context, trace.Span) {
3647
atomic.AddInt64(&f.startCalled, 1)
3748
return ctx, tracing.NoopSpan
3849
}
@@ -76,7 +87,7 @@ func Test_Middleware(t *testing.T) {
7687
t.Run(name, func(t *testing.T) {
7788
t.Parallel()
7889

79-
fake := &fakeTracer{}
90+
fake := &fakeTracerProvider{}
8091

8192
rw := &tracing.StatusWriter{ResponseWriter: httptest.NewRecorder()}
8293
r := httptest.NewRequest("GET", c.path, nil)

0 commit comments

Comments
 (0)