Skip to content

Remove MockSpan and MockTracer #1306

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.

Sign up for GitHub

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

Merged
MrAlias merged 3 commits into from
Nov 5, 2020
Merged

Remove MockSpan and MockTracer #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
659671c
Remove MockSpan and MockTracer
Nov 3, 2020
ff05e4a
Update CHANGELOG
Nov 4, 2020
b22ff7d
Merge remote-tracking branch 'upstream/master' into matej-g-remove-mo…
MrAlias Nov 5, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- The `ErrInvalidHexID`, `ErrInvalidTraceIDLength`, `ErrInvalidSpanIDLength`, `ErrInvalidSpanIDLength`, or `ErrNilSpanID` from the `go.opentelemetry.io/otel` package are unexported now. (#1243)
- The `AddEventWithTimestamp` method on the `Span` interface in `go.opentelemetry.io/otel` is removed due to its redundancy.
It is replaced by using the `AddEvent` method with a `WithTimestamp` option. (#1254)
- Structs `MockSpan` and `MockTracer` are removed from `go.opentelemetry.io/otel/oteltest`. `Tracer` and `Span` from the same module should be used in their place instead. (#1306)

### Fixed

Expand Down
4 changes: 0 additions & 4 deletions oteltest/alignment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ func TestMain(m *testing.M) {
Name: "Measurement.Number",
Offset: unsafe.Offsetof(Measurement{}.Number),
},
{
Name: "MockTracer.StartSpanID",
Offset: unsafe.Offsetof(MockTracer{}.StartSpanID),
},
}
if !internaltest.Aligned8Byte(fields, os.Stderr) {
os.Exit(1)
Expand Down
71 changes: 0 additions & 71 deletions oteltest/mock_span.go
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions oteltest/mock_tracer.go
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions oteltest/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,8 @@ func (p *TracerProvider) Tracer(instName string, opts ...otel.TracerOption) otel
}
return t
}

// DefaulTracer returns a default tracer for testing purposes.
func DefaultTracer() otel.Tracer {
return NewTracerProvider().Tracer("")
}
6 changes: 1 addition & 5 deletions propagators/trace_context_benchmark_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,10 @@ func BenchmarkInject(b *testing.B) {

func injectSubBenchmarks(b *testing.B, fn func(context.Context, *testing.B)) {
b.Run("SampledSpanContext", func(b *testing.B) {
var id uint64
spanID, _ := otel.SpanIDFromHex("00f067aa0ba902b7")
traceID, _ := otel.TraceIDFromHex("4bf92f3577b34da6a3ce929d0e0e4736")

mockTracer := &oteltest.MockTracer{
Sampled: false,
StartSpanID: &id,
}
mockTracer := oteltest.DefaultTracer()
b.ReportAllocs()
sc := otel.SpanContext{
TraceID: traceID,
Expand Down
12 changes: 4 additions & 8 deletions propagators/trace_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,7 @@ func TestExtractInvalidTraceContextFromHTTPReq(t *testing.T) {
}

func TestInjectTraceContextToHTTPReq(t *testing.T) {
var id uint64
mockTracer := &oteltest.MockTracer{
Sampled: false,
StartSpanID: &id,
}
mockTracer := oteltest.DefaultTracer()
prop := propagators.TraceContext{}
tests := []struct {
name string
Expand All @@ -227,15 +223,15 @@ func TestInjectTraceContextToHTTPReq(t *testing.T) {
SpanID: spanID,
TraceFlags: otel.FlagsSampled,
},
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000001-01",
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000002-01",
Comment thread
MrAlias marked this conversation as resolved.
},
{
name: "valid spancontext, not sampled",
sc: otel.SpanContext{
TraceID: traceID,
SpanID: spanID,
},
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000002-00",
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000003-00",
},
{
name: "valid spancontext, with unsupported bit set in traceflags",
Expand All @@ -244,7 +240,7 @@ func TestInjectTraceContextToHTTPReq(t *testing.T) {
SpanID: spanID,
TraceFlags: 0xff,
},
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000003-01",
wantHeader: "00-4bf92f3577b34da6a3ce929d0e0e4736-0000000000000004-01",
},
{
name: "invalid spancontext",
Expand Down