Skip to content

sdk/trace: Move testing harness to trace #6589

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
merged 3 commits into from
Apr 10, 2025
Merged

sdk/trace: Move testing harness to trace #6589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91afd6b
sdk/trace: Move testing harness to trace
zhengkezhou1 Apr 2, 2025
02cda9c
move to util_test
zhengkezhou1 Apr 2, 2025
d6e8d00
Merge branch 'main' into 6543-move-testing-harness
MrAlias Apr 10, 2025
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
16 changes: 16 additions & 0 deletions sdk/trace/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package trace // import "go.opentelemetry.io/otel/sdk/trace"

type testError string

var _ error = testError("")

func newTestError(s string) error {
return testError(s)
}

func (e testError) Error() string {
return string(e)
}
15 changes: 7 additions & 8 deletions sdk/trace/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/sdk/instrumentation"
ottest "go.opentelemetry.io/otel/sdk/internal/internaltest"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -66,14 +65,14 @@ func init() {
}

func TestTracerFollowsExpectedAPIBehaviour(t *testing.T) {
harness := ottest.NewHarness(t)
harness := newHarness(t)

harness.TestTracerProvider(func() trace.TracerProvider {
harness.testTracerProvider(func() trace.TracerProvider {
return NewTracerProvider(WithSampler(TraceIDRatioBased(0)))
})

tp := NewTracerProvider(WithSampler(TraceIDRatioBased(0)))
harness.TestTracer(func() trace.Tracer {
harness.testTracer(func() trace.Tracer {
return tp.Tracer("")
})
}
Expand Down Expand Up @@ -1226,8 +1225,8 @@ func TestRecordError(t *testing.T) {
msg string
}{
{
err: ottest.NewTestError("test error"),
typ: "go.opentelemetry.io/otel/sdk/internal/internaltest.TestError",
err: newTestError("test error"),
typ: "go.opentelemetry.io/otel/sdk/trace.testError",
msg: "test error",
},
{
Expand Down Expand Up @@ -1278,8 +1277,8 @@ func TestRecordError(t *testing.T) {
}

func TestRecordErrorWithStackTrace(t *testing.T) {
err := ottest.NewTestError("test error")
typ := "go.opentelemetry.io/otel/sdk/internal/internaltest.TestError"
err := newTestError("test error")
typ := "go.opentelemetry.io/otel/sdk/trace.testError"
msg := "test error"

te := NewTestExporter()
Expand Down
Loading
Loading