diff --git a/CHANGELOG.md b/CHANGELOG.md index c852a3db9..47be305c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Move the `go.opentelemetry.io/otel/api/metric`, `go.opentelemetry.io/otel/api/metric/metrictest`, and `go.opentelemetry.io/otel/api/metric/registry` packages into `go.opentelemetry.io/otel` as part of #964. (#1252) - The function signature of the Span `AddEvent` method in `go.opentelemetry.io/otel` is updated to no longer take an unused context and instead take a required name and a variable number of `EventOption`s. (#1254) - The function signature of the Span `RecordError` method in `go.opentelemetry.io/otel` is updated to no longer take an unused context and instead take a required error value and a variable number of `EventOption`s. (#1254) +- Move the `go.opentelemetry.io/otel/api/global` package to `go.opentelemetry.io/otel/global`. (#1262) ### Removed diff --git a/bridge/opentracing/bridge.go b/bridge/opentracing/bridge.go index b8190f412..ad702d38f 100644 --- a/bridge/opentracing/bridge.go +++ b/bridge/opentracing/bridge.go @@ -26,8 +26,8 @@ import ( otlog "github.com/opentracing/opentracing-go/log" "go.opentelemetry.io/otel" - otelglobal "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" + otelglobal "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/internal/baggage" "go.opentelemetry.io/otel/internal/trace/noop" otelparent "go.opentelemetry.io/otel/internal/trace/parent" diff --git a/bridge/opentracing/mix_test.go b/bridge/opentracing/mix_test.go index fc12819f2..f09928305 100644 --- a/bridge/opentracing/mix_test.go +++ b/bridge/opentracing/mix_test.go @@ -22,7 +22,7 @@ import ( ot "github.com/opentracing/opentracing-go" "go.opentelemetry.io/otel" - otelglobal "go.opentelemetry.io/otel/api/global" + otelglobal "go.opentelemetry.io/otel/global" otelbaggage "go.opentelemetry.io/otel/internal/baggage" "go.opentelemetry.io/otel/label" diff --git a/doc.go b/doc.go index 5cd3f1916..737bf5938 100644 --- a/doc.go +++ b/doc.go @@ -42,8 +42,8 @@ operation being performed as part of a traced workflow. It its simplest form: A Tracer is unique to the instrumentation and is used to create Spans. Instrumentation should be designed to accept a TracerProvider from which it can create its own unique Tracer. Alternatively, the registered global -TracerProvider from the go.opentelemetry.io/otel/api/global package can be -used as a default. +TracerProvider from the go.opentelemetry.io/otel/global package can be used as +a default. const ( name = "instrumentation/package/name" diff --git a/example/basic/main.go b/example/basic/main.go index d9f27ff46..2f615d5f6 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -19,8 +19,8 @@ import ( "log" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/stdout" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/propagators" "go.opentelemetry.io/otel/sdk/metric/controller/push" diff --git a/example/jaeger/main.go b/example/jaeger/main.go index 80a6857fc..59ae31b8e 100644 --- a/example/jaeger/main.go +++ b/example/jaeger/main.go @@ -20,7 +20,7 @@ import ( "context" "log" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/exporters/trace/jaeger" diff --git a/example/namedtracer/foo/foo.go b/example/namedtracer/foo/foo.go index c4e50c8f8..b83b07efd 100644 --- a/example/namedtracer/foo/foo.go +++ b/example/namedtracer/foo/foo.go @@ -18,7 +18,7 @@ import ( "context" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" ) diff --git a/example/namedtracer/main.go b/example/namedtracer/main.go index 67cba82d0..beb02466f 100644 --- a/example/namedtracer/main.go +++ b/example/namedtracer/main.go @@ -19,9 +19,9 @@ import ( "log" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/example/namedtracer/foo" "go.opentelemetry.io/otel/exporters/stdout" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/otel-collector/main.go b/example/otel-collector/main.go index 854fb1dc4..2c96facb1 100644 --- a/example/otel-collector/main.go +++ b/example/otel-collector/main.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/otlp" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/propagators" "go.opentelemetry.io/otel/sdk/metric/controller/push" diff --git a/example/prometheus/main.go b/example/prometheus/main.go index da92372d1..d22910889 100644 --- a/example/prometheus/main.go +++ b/example/prometheus/main.go @@ -23,8 +23,8 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/metric/prometheus" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" ) diff --git a/example/zipkin/main.go b/example/zipkin/main.go index ef583dba2..202253ee9 100644 --- a/example/zipkin/main.go +++ b/example/zipkin/main.go @@ -23,7 +23,7 @@ import ( "os" "time" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/exporters/trace/zipkin" sdktrace "go.opentelemetry.io/otel/sdk/trace" diff --git a/exporters/metric/prometheus/prometheus.go b/exporters/metric/prometheus/prometheus.go index f88442fe6..4f211852f 100644 --- a/exporters/metric/prometheus/prometheus.go +++ b/exporters/metric/prometheus/prometheus.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregation" diff --git a/exporters/otlp/example_test.go b/exporters/otlp/example_test.go index 05dcf413f..e3bae99cf 100644 --- a/exporters/otlp/example_test.go +++ b/exporters/otlp/example_test.go @@ -22,8 +22,8 @@ import ( "google.golang.org/grpc/credentials" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/otlp" + "go.opentelemetry.io/otel/global" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/exporters/stdout/example_test.go b/exporters/stdout/example_test.go index df9bd69b9..21b30d234 100644 --- a/exporters/stdout/example_test.go +++ b/exporters/stdout/example_test.go @@ -19,8 +19,8 @@ import ( "log" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/exporters/stdout" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" ) diff --git a/exporters/stdout/exporter.go b/exporters/stdout/exporter.go index 2d850a0ad..0745c6f06 100644 --- a/exporters/stdout/exporter.go +++ b/exporters/stdout/exporter.go @@ -16,7 +16,7 @@ package stdout import ( "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/sdk/export/metric" exporttrace "go.opentelemetry.io/otel/sdk/export/trace" "go.opentelemetry.io/otel/sdk/metric/controller/push" diff --git a/exporters/trace/jaeger/env.go b/exporters/trace/jaeger/env.go index e4aa4d009..6c6226e20 100644 --- a/exporters/trace/jaeger/env.go +++ b/exporters/trace/jaeger/env.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" ) diff --git a/exporters/trace/jaeger/jaeger.go b/exporters/trace/jaeger/jaeger.go index 96e123239..f27ce5a08 100644 --- a/exporters/trace/jaeger/jaeger.go +++ b/exporters/trace/jaeger/jaeger.go @@ -23,9 +23,9 @@ import ( "google.golang.org/api/support/bundler" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace" diff --git a/exporters/trace/jaeger/jaeger_test.go b/exporters/trace/jaeger/jaeger_test.go index bb7cc52b9..5489788bd 100644 --- a/exporters/trace/jaeger/jaeger_test.go +++ b/exporters/trace/jaeger/jaeger_test.go @@ -29,9 +29,9 @@ import ( "google.golang.org/api/support/bundler" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/global" ottest "go.opentelemetry.io/otel/internal/testing" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/trace" diff --git a/exporters/trace/zipkin/zipkin.go b/exporters/trace/zipkin/zipkin.go index b759880b7..d20d35f92 100644 --- a/exporters/trace/zipkin/zipkin.go +++ b/exporters/trace/zipkin/zipkin.go @@ -26,7 +26,7 @@ import ( "net/url" "sync" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" export "go.opentelemetry.io/otel/sdk/export/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/exporters/trace/zipkin/zipkin_test.go b/exporters/trace/zipkin/zipkin_test.go index 7725d9e53..5bd3b4e39 100644 --- a/exporters/trace/zipkin/zipkin_test.go +++ b/exporters/trace/zipkin/zipkin_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/global" export "go.opentelemetry.io/otel/sdk/export/trace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/api/global/doc.go b/global/doc.go similarity index 91% rename from api/global/doc.go rename to global/doc.go index fce69e9e7..ccf409fc9 100644 --- a/api/global/doc.go +++ b/global/doc.go @@ -13,4 +13,4 @@ // limitations under the License. // Package global provides global providers, propagators and more. -package global // import "go.opentelemetry.io/otel/api/global" +package global // import "go.opentelemetry.io/otel/global" diff --git a/api/global/handler.go b/global/handler.go similarity index 100% rename from api/global/handler.go rename to global/handler.go diff --git a/api/global/handler_test.go b/global/handler_test.go similarity index 100% rename from api/global/handler_test.go rename to global/handler_test.go diff --git a/api/global/internal/benchmark_test.go b/global/internal/benchmark_test.go similarity index 94% rename from api/global/internal/benchmark_test.go rename to global/internal/benchmark_test.go index 4abada40d..0a33ba281 100644 --- a/api/global/internal/benchmark_test.go +++ b/global/internal/benchmark_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global" + "go.opentelemetry.io/otel/global/internal" "go.opentelemetry.io/otel/label" ) diff --git a/api/global/internal/internal_test.go b/global/internal/internal_test.go similarity index 95% rename from api/global/internal/internal_test.go rename to global/internal/internal_test.go index e6242e0e8..13cd72be0 100644 --- a/api/global/internal/internal_test.go +++ b/global/internal/internal_test.go @@ -18,7 +18,7 @@ import ( "os" "testing" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" ottest "go.opentelemetry.io/otel/internal/testing" ) diff --git a/api/global/internal/meter.go b/global/internal/meter.go similarity index 100% rename from api/global/internal/meter.go rename to global/internal/meter.go diff --git a/api/global/internal/meter_test.go b/global/internal/meter_test.go similarity index 99% rename from api/global/internal/meter_test.go rename to global/internal/meter_test.go index d5a654a5c..7c7b887c2 100644 --- a/api/global/internal/meter_test.go +++ b/global/internal/meter_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global" + "go.opentelemetry.io/otel/global/internal" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/oteltest" ) diff --git a/api/global/internal/propagator.go b/global/internal/propagator.go similarity index 100% rename from api/global/internal/propagator.go rename to global/internal/propagator.go diff --git a/api/global/internal/propagator_test.go b/global/internal/propagator_test.go similarity index 98% rename from api/global/internal/propagator_test.go rename to global/internal/propagator_test.go index 4500df89f..58bc995ab 100644 --- a/api/global/internal/propagator_test.go +++ b/global/internal/propagator_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" "go.opentelemetry.io/otel/oteltest" ) diff --git a/api/global/internal/registry_test.go b/global/internal/registry_test.go similarity index 100% rename from api/global/internal/registry_test.go rename to global/internal/registry_test.go diff --git a/api/global/internal/state.go b/global/internal/state.go similarity index 100% rename from api/global/internal/state.go rename to global/internal/state.go diff --git a/api/global/internal/state_test.go b/global/internal/state_test.go similarity index 96% rename from api/global/internal/state_test.go rename to global/internal/state_test.go index 704e3782a..a2228c8ad 100644 --- a/api/global/internal/state_test.go +++ b/global/internal/state_test.go @@ -17,7 +17,7 @@ package internal_test import ( "testing" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" ) func TestResetsOfGlobalsPanic(t *testing.T) { diff --git a/api/global/internal/trace.go b/global/internal/trace.go similarity index 100% rename from api/global/internal/trace.go rename to global/internal/trace.go diff --git a/api/global/internal/trace_test.go b/global/internal/trace_test.go similarity index 95% rename from api/global/internal/trace_test.go rename to global/internal/trace_test.go index 8cd26747f..39baa07d2 100644 --- a/api/global/internal/trace_test.go +++ b/global/internal/trace_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global" + "go.opentelemetry.io/otel/global/internal" "go.opentelemetry.io/otel/oteltest" ) diff --git a/api/global/metric.go b/global/metric.go similarity index 97% rename from api/global/metric.go rename to global/metric.go index e7568dc4e..41bd64e66 100644 --- a/api/global/metric.go +++ b/global/metric.go @@ -16,7 +16,7 @@ package global import ( "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" ) // Meter creates an implementation of the Meter interface from the global diff --git a/api/global/metric_test.go b/global/metric_test.go similarity index 96% rename from api/global/metric_test.go rename to global/metric_test.go index 077fa1b9d..bd768b59d 100644 --- a/api/global/metric_test.go +++ b/global/metric_test.go @@ -18,7 +18,7 @@ import ( "testing" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" ) type testMeterProvider struct{} diff --git a/api/global/propagation.go b/global/propagation.go similarity index 95% rename from api/global/propagation.go rename to global/propagation.go index c5f4c2b28..ebe3edb30 100644 --- a/api/global/propagation.go +++ b/global/propagation.go @@ -16,7 +16,7 @@ package global import ( "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" ) // TextMapPropagator returns the global TextMapPropagator. If none has been diff --git a/api/global/trace.go b/global/trace.go similarity index 96% rename from api/global/trace.go rename to global/trace.go index 5c5b6f634..d1a82c8a1 100644 --- a/api/global/trace.go +++ b/global/trace.go @@ -16,7 +16,7 @@ package global import ( "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global/internal" + "go.opentelemetry.io/otel/global/internal" ) // Tracer creates a named tracer that implements Tracer interface. diff --git a/api/global/trace_test.go b/global/trace_test.go similarity index 96% rename from api/global/trace_test.go rename to global/trace_test.go index ea68405d8..cbcbeef74 100644 --- a/api/global/trace_test.go +++ b/global/trace_test.go @@ -18,7 +18,7 @@ import ( "testing" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/internal/trace/noop" ) diff --git a/internal/metric/async.go b/internal/metric/async.go index ba4618a5f..fa1b2ead1 100644 --- a/internal/metric/async.go +++ b/internal/metric/async.go @@ -21,7 +21,7 @@ import ( "sync" api "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" ) diff --git a/propagators/trace_context_example_test.go b/propagators/trace_context_example_test.go index 38fb26d4c..e871b66f2 100644 --- a/propagators/trace_context_example_test.go +++ b/propagators/trace_context_example_test.go @@ -15,7 +15,7 @@ package propagators_test import ( - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/propagators" ) diff --git a/sdk/metric/benchmark_test.go b/sdk/metric/benchmark_test.go index 6dbfff827..8c5d761a9 100644 --- a/sdk/metric/benchmark_test.go +++ b/sdk/metric/benchmark_test.go @@ -21,7 +21,7 @@ import ( "testing" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" diff --git a/sdk/metric/controller/push/push.go b/sdk/metric/controller/push/push.go index 4698d7a85..1261f0a0e 100644 --- a/sdk/metric/controller/push/push.go +++ b/sdk/metric/controller/push/push.go @@ -20,7 +20,7 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/registry" export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" diff --git a/sdk/metric/controller/push/push_test.go b/sdk/metric/controller/push/push_test.go index c8436e1f7..22096214d 100644 --- a/sdk/metric/controller/push/push_test.go +++ b/sdk/metric/controller/push/push_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregation" diff --git a/sdk/metric/correct_test.go b/sdk/metric/correct_test.go index 6f9bb5d67..1d1f113f1 100644 --- a/sdk/metric/correct_test.go +++ b/sdk/metric/correct_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregation" diff --git a/sdk/metric/sdk.go b/sdk/metric/sdk.go index f8e55ba24..dc7e1a8f2 100644 --- a/sdk/metric/sdk.go +++ b/sdk/metric/sdk.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel" api "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" internal "go.opentelemetry.io/otel/internal/metric" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/sdk/trace/batch_span_processor.go b/sdk/trace/batch_span_processor.go index 76607ab68..82a4722ba 100644 --- a/sdk/trace/batch_span_processor.go +++ b/sdk/trace/batch_span_processor.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" export "go.opentelemetry.io/otel/sdk/export/trace" ) diff --git a/sdk/trace/simple_span_processor.go b/sdk/trace/simple_span_processor.go index e4fcf34f2..d0cef298c 100644 --- a/sdk/trace/simple_span_processor.go +++ b/sdk/trace/simple_span_processor.go @@ -17,7 +17,7 @@ package trace import ( "context" - "go.opentelemetry.io/otel/api/global" + "go.opentelemetry.io/otel/global" export "go.opentelemetry.io/otel/sdk/export/trace" ) diff --git a/sdk/trace/span.go b/sdk/trace/span.go index e6557ca71..37279f961 100644 --- a/sdk/trace/span.go +++ b/sdk/trace/span.go @@ -22,8 +22,8 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" export "go.opentelemetry.io/otel/sdk/export/trace" "go.opentelemetry.io/otel/sdk/internal" diff --git a/sdk/trace/trace_test.go b/sdk/trace/trace_test.go index d76f26f10..03f797a83 100644 --- a/sdk/trace/trace_test.go +++ b/sdk/trace/trace_test.go @@ -26,8 +26,8 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/codes" + "go.opentelemetry.io/otel/global" "go.opentelemetry.io/otel/label" "go.opentelemetry.io/otel/oteltest"