From ae923088551afbbb645bc5dbd93c3b03ccea6f47 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Fri, 12 Nov 2021 15:31:28 -0800 Subject: [PATCH] Remove sdk/export/metric module, embed into the sdk/metric Signed-off-by: Bogdan Drutu --- CHANGELOG.md | 5 ++ bridge/opencensus/aggregation.go | 2 +- bridge/opencensus/aggregation_test.go | 2 +- bridge/opencensus/exporter.go | 4 +- bridge/opencensus/exporter_test.go | 12 ++- bridge/opencensus/go.mod | 3 - bridge/opencensus/test/go.mod | 2 - bridge/opentracing/go.mod | 2 - bridge/opentracing/internal/mock.go | 3 +- bridge/opentracing/mix_test.go | 3 +- bridge/opentracing/wrapper.go | 3 +- example/fib/go.mod | 2 - example/jaeger/go.mod | 2 - example/jaeger/main.go | 1 - example/namedtracer/go.mod | 2 - example/opencensus/go.mod | 4 +- example/opencensus/main.go | 7 +- example/otel-collector/go.mod | 2 - example/passthrough/go.mod | 2 - example/prometheus/go.mod | 3 - example/prometheus/main.go | 2 +- example/zipkin/go.mod | 2 - exporters/jaeger/agent.go | 3 +- exporters/jaeger/go.mod | 2 - exporters/jaeger/uploader.go | 3 +- exporters/otlp/otlpmetric/exporter.go | 8 +- exporters/otlp/otlpmetric/exporter_test.go | 18 ++--- exporters/otlp/otlpmetric/go.mod | 3 - .../internal/connection/connection.go | 10 +-- .../internal/connection/connection_test.go | 1 - .../internal/metrictransform/attribute.go | 3 +- .../internal/metrictransform/metric.go | 9 +-- .../internal/metrictransform/metric_test.go | 6 +- .../internal/metrictransform/resource.go | 3 +- .../internal/otlpconfig/options_test.go | 4 +- .../internal/otlpmetrictest/data.go | 16 ++-- .../internal/otlpmetrictest/otlptest.go | 7 +- exporters/otlp/otlpmetric/options.go | 2 +- .../otlp/otlpmetric/otlpmetricgrpc/client.go | 1 - .../otlpmetric/otlpmetricgrpc/client_test.go | 18 ++--- .../otlpmetric/otlpmetricgrpc/example_test.go | 7 +- .../otlp/otlpmetric/otlpmetricgrpc/go.mod | 2 - .../otlpmetricgrpc/mock_collector_test.go | 4 +- .../otlp/otlpmetric/otlpmetricgrpc/options.go | 3 +- .../otlp/otlpmetric/otlpmetrichttp/client.go | 8 +- .../otlpmetric/otlpmetrichttp/client_test.go | 5 +- .../otlp/otlpmetric/otlpmetrichttp/go.mod | 2 - .../otlpmetrichttp/mock_collector_test.go | 5 +- exporters/otlp/otlptrace/exporter.go | 1 - exporters/otlp/otlptrace/go.mod | 2 - .../internal/connection/connection.go | 8 +- .../internal/connection/connection_test.go | 5 +- .../internal/otlpconfig/options_test.go | 4 +- .../internal/otlptracetest/otlptest.go | 3 +- .../internal/tracetransform/attribute.go | 3 +- .../tracetransform/instrumentation.go | 3 +- .../internal/tracetransform/resource.go | 3 +- .../otlptrace/internal/tracetransform/span.go | 3 +- .../otlp/otlptrace/otlptracegrpc/client.go | 6 +- .../otlptrace/otlptracegrpc/client_test.go | 13 ++-- exporters/otlp/otlptrace/otlptracegrpc/go.mod | 2 - .../otlptracegrpc/mock_collector_test.go | 3 +- .../otlp/otlptrace/otlptracegrpc/options.go | 6 +- .../otlp/otlptrace/otlptracehttp/client.go | 8 +- .../otlptrace/otlptracehttp/client_test.go | 3 +- exporters/otlp/otlptrace/otlptracehttp/go.mod | 2 - .../otlptracehttp/mock_collector_test.go | 5 +- exporters/prometheus/go.mod | 3 - exporters/prometheus/prometheus.go | 4 +- exporters/prometheus/prometheus_test.go | 2 +- exporters/stdout/stdoutmetric/example_test.go | 3 +- exporters/stdout/stdoutmetric/exporter.go | 6 +- exporters/stdout/stdoutmetric/go.mod | 3 - exporters/stdout/stdoutmetric/metric.go | 12 +-- exporters/stdout/stdoutmetric/metric_test.go | 5 +- exporters/stdout/stdouttrace/go.mod | 2 - exporters/zipkin/go.mod | 2 - exporters/zipkin/model.go | 9 +-- go.mod | 2 - internal/metric/go.mod | 2 - internal/tools/go.mod | 2 - metric/go.mod | 2 - metric/metric_test.go | 8 +- schema/go.mod | 2 - sdk/export/metric/go.mod | 74 ------------------- sdk/export/metric/go.sum | 17 ----- sdk/go.mod | 2 - sdk/metric/aggregator/aggregator.go | 4 +- sdk/metric/aggregator/aggregator_test.go | 2 +- sdk/metric/aggregator/aggregatortest/test.go | 4 +- sdk/metric/aggregator/exact/exact.go | 4 +- sdk/metric/aggregator/exact/exact_test.go | 4 +- sdk/metric/aggregator/histogram/histogram.go | 4 +- .../aggregator/histogram/histogram_test.go | 2 +- sdk/metric/aggregator/lastvalue/lastvalue.go | 4 +- .../aggregator/lastvalue/lastvalue_test.go | 4 +- sdk/metric/aggregator/minmaxsumcount/mmsc.go | 4 +- .../aggregator/minmaxsumcount/mmsc_test.go | 4 +- sdk/metric/aggregator/sum/sum.go | 4 +- sdk/metric/aggregator/sum/sum_test.go | 2 +- sdk/metric/benchmark_test.go | 2 +- sdk/metric/controller/basic/config.go | 2 +- sdk/metric/controller/basic/controller.go | 2 +- .../controller/basic/controller_test.go | 4 +- sdk/metric/controller/basic/pull_test.go | 2 +- sdk/metric/controller/basic/push_test.go | 4 +- sdk/metric/controller/controllertest/test.go | 4 +- sdk/metric/correct_test.go | 4 +- sdk/metric/doc.go | 2 +- .../export}/aggregation/aggregation.go | 2 +- .../export}/aggregation/temporality.go | 2 +- .../export}/aggregation/temporality_string.go | 0 .../export}/aggregation/temporality_test.go | 0 .../metric => metric/export}/metric.go | 4 +- .../metric => metric/export}/metric_test.go | 2 +- sdk/metric/go.mod | 3 - sdk/metric/processor/basic/basic.go | 4 +- sdk/metric/processor/basic/basic_test.go | 4 +- sdk/metric/processor/processortest/test.go | 4 +- .../processor/processortest/test_test.go | 4 +- sdk/metric/processor/reducer/reducer.go | 2 +- sdk/metric/processor/reducer/reducer_test.go | 2 +- sdk/metric/sdk.go | 2 +- sdk/metric/selector/simple/simple.go | 2 +- sdk/metric/selector/simple/simple_test.go | 2 +- sdk/metric/stress_test.go | 4 +- sdk/resource/os_unix_test.go | 3 +- sdk/trace/batch_span_processor_test.go | 4 +- sdk/trace/benchmark_test.go | 3 +- sdk/trace/provider.go | 3 +- sdk/trace/simple_span_processor_test.go | 3 +- sdk/trace/span.go | 5 +- sdk/trace/trace_test.go | 12 ++- sdk/trace/tracer.go | 3 +- trace/go.mod | 2 - trace/trace_test.go | 3 +- 136 files changed, 205 insertions(+), 419 deletions(-) delete mode 100644 sdk/export/metric/go.mod delete mode 100644 sdk/export/metric/go.sum rename sdk/{export/metric => metric/export}/aggregation/aggregation.go (98%) rename sdk/{export/metric => metric/export}/aggregation/temporality.go (97%) rename sdk/{export/metric => metric/export}/aggregation/temporality_string.go (100%) rename sdk/{export/metric => metric/export}/aggregation/temporality_test.go (100%) rename sdk/{export/metric => metric/export}/metric.go (99%) rename sdk/{export/metric => metric/export}/metric_test.go (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbe91d2797e..deaef149819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +## Changed + +- Move export module `"go.opentelemetry.io/otel/sdk/export/metric"` into the "go.opentelemetry.io/otel/sdk/metric" module: + - Import path changed `import "go.opentelemetry.io/otel/sdk/export/metric"` to `import go.opentelemetry.io/otel/sdk/metric/export` (#2382). + ## [1.2.0] - 2021-11-12 ## Changed diff --git a/bridge/opencensus/aggregation.go b/bridge/opencensus/aggregation.go index 44015d96cd9..28ca79a0045 100644 --- a/bridge/opencensus/aggregation.go +++ b/bridge/opencensus/aggregation.go @@ -22,7 +22,7 @@ import ( "go.opencensus.io/metric/metricdata" "go.opentelemetry.io/otel/metric/number" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) var ( diff --git a/bridge/opencensus/aggregation_test.go b/bridge/opencensus/aggregation_test.go index d6cf8e4944c..920bca54e20 100644 --- a/bridge/opencensus/aggregation_test.go +++ b/bridge/opencensus/aggregation_test.go @@ -21,7 +21,7 @@ import ( "go.opencensus.io/metric/metricdata" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) func TestNewAggregationFromPoints(t *testing.T) { diff --git a/bridge/opencensus/exporter.go b/bridge/opencensus/exporter.go index d52494367d1..10a49b52784 100644 --- a/bridge/opencensus/exporter.go +++ b/bridge/opencensus/exporter.go @@ -30,9 +30,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" "go.opentelemetry.io/otel/metric/unit" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/bridge/opencensus/exporter_test.go b/bridge/opencensus/exporter_test.go index 710369ba5bb..255fafdd4bc 100644 --- a/bridge/opencensus/exporter_test.go +++ b/bridge/opencensus/exporter_test.go @@ -21,22 +21,20 @@ import ( "testing" "time" - "go.opentelemetry.io/otel" - "go.opencensus.io/metric/metricdata" ocresource "go.opencensus.io/resource" + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" "go.opentelemetry.io/otel/metric/unit" - export "go.opentelemetry.io/otel/sdk/export/metric" - exportmetric "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/metric/controller/controllertest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) @@ -47,9 +45,9 @@ type fakeExporter struct { err error } -func (f *fakeExporter) Export(ctx context.Context, res *resource.Resource, ilr exportmetric.InstrumentationLibraryReader) error { +func (f *fakeExporter) Export(ctx context.Context, res *resource.Resource, ilr export.InstrumentationLibraryReader) error { return controllertest.ReadAll(ilr, aggregation.StatelessTemporalitySelector(), - func(_ instrumentation.Library, record exportmetric.Record) error { + func(_ instrumentation.Library, record export.Record) error { f.resource = res f.records = append(f.records, record) return f.err diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 131310b3f74..aadbdf975e6 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -7,7 +7,6 @@ require ( go.opentelemetry.io/otel v1.2.0 go.opentelemetry.io/otel/metric v0.25.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 go.opentelemetry.io/otel/sdk/metric v0.25.0 go.opentelemetry.io/otel/trace v1.2.0 ) @@ -44,8 +43,6 @@ replace go.opentelemetry.io/otel/sdk => ../../sdk replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod index 42940a1900a..e7d68399ec1 100644 --- a/bridge/opencensus/test/go.mod +++ b/bridge/opencensus/test/go.mod @@ -62,8 +62,6 @@ replace go.opentelemetry.io/otel/metric => ../../../metric replace go.opentelemetry.io/otel/sdk => ../../../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../trace diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod index d0a4ac5e73f..59c2fcd3ce5 100644 --- a/bridge/opentracing/go.mod +++ b/bridge/opentracing/go.mod @@ -40,8 +40,6 @@ replace go.opentelemetry.io/otel/sdk => ../../sdk replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/bridge/opentracing/internal/mock.go b/bridge/opentracing/internal/mock.go index 8409c167a95..4694a8e9b28 100644 --- a/bridge/opentracing/internal/mock.go +++ b/bridge/opentracing/internal/mock.go @@ -22,11 +22,10 @@ import ( "time" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/bridge/opentracing/migration" "go.opentelemetry.io/otel/codes" semconv "go.opentelemetry.io/otel/semconv/v1.7.0" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/otel/bridge/opentracing/migration" ) //nolint:revive // ignoring missing comments for unexported global variables in an internal package. diff --git a/bridge/opentracing/mix_test.go b/bridge/opentracing/mix_test.go index 5324274bb5a..2d0de4ccd67 100644 --- a/bridge/opentracing/mix_test.go +++ b/bridge/opentracing/mix_test.go @@ -24,9 +24,8 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/baggage" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/bridge/opentracing/internal" + "go.opentelemetry.io/otel/trace" ) type mixedAPIsTestCase struct { diff --git a/bridge/opentracing/wrapper.go b/bridge/opentracing/wrapper.go index d199a22adfd..3b6fa7bdb9a 100644 --- a/bridge/opentracing/wrapper.go +++ b/bridge/opentracing/wrapper.go @@ -17,9 +17,8 @@ package opentracing // import "go.opentelemetry.io/otel/bridge/opentracing" import ( "context" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/bridge/opentracing/migration" + "go.opentelemetry.io/otel/trace" ) type WrapperTracerProvider struct { diff --git a/example/fib/go.mod b/example/fib/go.mod index 9c5f4224645..28cac6cc174 100644 --- a/example/fib/go.mod +++ b/example/fib/go.mod @@ -61,8 +61,6 @@ replace go.opentelemetry.io/otel/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index d3bfefdb511..fdf91bd662a 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -40,8 +40,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/jaeger/main.go b/example/jaeger/main.go index ac0348dee40..5cfff89c4f9 100644 --- a/example/jaeger/main.go +++ b/example/jaeger/main.go @@ -22,7 +22,6 @@ import ( "time" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/sdk/resource" diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 17ca9a2ed2b..bfc060a5953 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -42,8 +42,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index fc03db32dfc..00fa1431a2f 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.25.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.2.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 + go.opentelemetry.io/otel/sdk/metric v0.25.0 ) replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing @@ -44,8 +44,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/opencensus/main.go b/example/opencensus/main.go index a20f9e706cd..ceccb82d083 100644 --- a/example/opencensus/main.go +++ b/example/opencensus/main.go @@ -20,9 +20,8 @@ import ( "log" "time" - "go.opencensus.io/metric/metricdata" - "go.opencensus.io/metric" + "go.opencensus.io/metric/metricdata" "go.opencensus.io/metric/metricexport" "go.opencensus.io/metric/metricproducer" "go.opencensus.io/stats" @@ -34,7 +33,7 @@ import ( "go.opentelemetry.io/otel/bridge/opencensus" "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" "go.opentelemetry.io/otel/exporters/stdout/stdouttrace" - otmetricexport "go.opentelemetry.io/otel/sdk/export/metric" + "go.opentelemetry.io/otel/sdk/metric/export" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) @@ -101,7 +100,7 @@ func tracing(otExporter sdktrace.SpanExporter) { // monitoring demonstrates creating an IntervalReader using the OpenTelemetry // exporter to send metrics to the exporter by using either an OpenCensus // registry or an OpenCensus view. -func monitoring(otExporter otmetricexport.Exporter) { +func monitoring(otExporter export.Exporter) { log.Println("Using the OpenTelemetry stdoutmetric exporter to export OpenCensus metrics. This allows routing telemetry from both OpenTelemetry and OpenCensus to a single exporter.") ocExporter := opencensus.NewMetricExporter(otExporter) intervalReader, err := metricexport.NewIntervalReader(&metricexport.Reader{}, ocExporter) diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index 153c85dc673..ce8370c0486 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -43,8 +43,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index f9c0630e105..6e37e67e65e 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -45,8 +45,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/sdk/trace => ../../sdk/trace diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index c5e0343e865..3a202c5bb82 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -12,7 +12,6 @@ require ( go.opentelemetry.io/otel v1.2.0 go.opentelemetry.io/otel/exporters/prometheus v0.25.0 go.opentelemetry.io/otel/metric v0.25.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 go.opentelemetry.io/otel/sdk/metric v0.25.0 ) @@ -42,8 +41,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/example/prometheus/main.go b/example/prometheus/main.go index 968beb3d483..4ef0f2e89e2 100644 --- a/example/prometheus/main.go +++ b/example/prometheus/main.go @@ -26,9 +26,9 @@ import ( "go.opentelemetry.io/otel/exporters/prometheus" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" selector "go.opentelemetry.io/otel/sdk/metric/selector/simple" ) diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index fa2494c9217..ce6ae60c17c 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -41,8 +41,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/exporters/jaeger/agent.go b/exporters/jaeger/agent.go index 80cc1d2f628..5dbb5805c9b 100644 --- a/exporters/jaeger/agent.go +++ b/exporters/jaeger/agent.go @@ -23,10 +23,9 @@ import ( "strings" "time" - "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" - genAgent "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/agent" gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // udpPacketMaxLength is the max size of UDP packet we want to send, synced with jaeger-agent diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod index 9c87adb9775..d6e34de710e 100644 --- a/exporters/jaeger/go.mod +++ b/exporters/jaeger/go.mod @@ -38,8 +38,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/exporters/jaeger/uploader.go b/exporters/jaeger/uploader.go index 26fbf1cb61f..84a517985a7 100644 --- a/exporters/jaeger/uploader.go +++ b/exporters/jaeger/uploader.go @@ -24,9 +24,8 @@ import ( "net/http" "time" - "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" - gen "go.opentelemetry.io/otel/exporters/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/jaeger/internal/third_party/thrift/lib/go/thrift" ) // batchUploader send a batch of spans to Jaeger diff --git a/exporters/otlp/otlpmetric/exporter.go b/exporters/otlp/otlpmetric/exporter.go index 798b690be01..d6c9a6f4e76 100644 --- a/exporters/otlp/otlpmetric/exporter.go +++ b/exporters/otlp/otlpmetric/exporter.go @@ -21,8 +21,8 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/metrictransform" "go.opentelemetry.io/otel/metric/sdkapi" - metricsdk "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) @@ -44,7 +44,7 @@ type Exporter struct { } // Export exports a batch of metrics. -func (e *Exporter) Export(ctx context.Context, res *resource.Resource, ilr metricsdk.InstrumentationLibraryReader) error { +func (e *Exporter) Export(ctx context.Context, res *resource.Resource, ilr export.InstrumentationLibraryReader) error { rm, err := metrictransform.InstrumentationLibraryReader(ctx, e, res, ilr, 1) if err != nil { return err @@ -100,7 +100,7 @@ func (e *Exporter) TemporalityFor(descriptor *sdkapi.Descriptor, kind aggregatio return e.temporalitySelector.TemporalityFor(descriptor, kind) } -var _ metricsdk.Exporter = (*Exporter)(nil) +var _ export.Exporter = (*Exporter)(nil) // New constructs a new Exporter and starts it. func New(ctx context.Context, client Client, opts ...Option) (*Exporter, error) { diff --git a/exporters/otlp/otlpmetric/exporter_test.go b/exporters/otlp/otlpmetric/exporter_test.go index 733d1978826..229d8838e27 100644 --- a/exporters/otlp/otlpmetric/exporter_test.go +++ b/exporters/otlp/otlpmetric/exporter_test.go @@ -32,11 +32,11 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - metricsdk "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" commonpb "go.opentelemetry.io/proto/otlp/common/v1" @@ -675,14 +675,14 @@ func TestStatelessAggregationTemporality(t *testing.T) { func runMetricExportTests(t *testing.T, opts []otlpmetric.Option, res *resource.Resource, records []testRecord, expected []*metricpb.ResourceMetrics) { exp, driver := newExporter(t, opts...) - libraryRecs := map[instrumentation.Library][]metricsdk.Record{} + libraryRecs := map[instrumentation.Library][]export.Record{} for _, r := range records { lcopy := make([]attribute.KeyValue, len(r.labels)) copy(lcopy, r.labels) desc := metrictest.NewDescriptor(r.name, r.iKind, r.nKind) labs := attribute.NewSet(lcopy...) - var agg, ckpt metricsdk.Aggregator + var agg, ckpt export.Aggregator if r.iKind.Adding() { sums := sum.New(2) agg, ckpt = &sums[0], &sums[1] @@ -723,7 +723,7 @@ func runMetricExportTests(t *testing.T, opts []otlpmetric.Option, res *resource. Version: meterCfg.InstrumentationVersion(), SchemaURL: meterCfg.SchemaURL(), } - libraryRecs[lib] = append(libraryRecs[lib], metricsdk.NewRecord(&desc, &labs, ckpt.Aggregation(), intervalStart, intervalEnd)) + libraryRecs[lib] = append(libraryRecs[lib], export.NewRecord(&desc, &labs, ckpt.Aggregation(), intervalStart, intervalEnd)) } assert.NoError(t, exp.Export(context.Background(), res, processortest.MultiInstrumentationLibraryReader(libraryRecs))) @@ -772,20 +772,20 @@ func TestEmptyMetricExport(t *testing.T) { exp, driver := newExporter(t) for _, test := range []struct { - records []metricsdk.Record + records []export.Record want []*metricpb.ResourceMetrics }{ { - []metricsdk.Record(nil), + []export.Record(nil), []*metricpb.ResourceMetrics(nil), }, { - []metricsdk.Record{}, + []export.Record{}, []*metricpb.ResourceMetrics(nil), }, } { driver.Reset() - require.NoError(t, exp.Export(context.Background(), resource.Empty(), processortest.MultiInstrumentationLibraryReader(map[instrumentation.Library][]metricsdk.Record{ + require.NoError(t, exp.Export(context.Background(), resource.Empty(), processortest.MultiInstrumentationLibraryReader(map[instrumentation.Library][]export.Record{ { Name: testLibName, }: test.records, diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index d67813c1e27..4c945724296 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -9,7 +9,6 @@ require ( go.opentelemetry.io/otel v1.2.0 go.opentelemetry.io/otel/metric v0.25.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 go.opentelemetry.io/otel/sdk/metric v0.25.0 go.opentelemetry.io/proto/otlp v0.10.0 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 @@ -27,8 +26,6 @@ replace go.opentelemetry.io/otel/metric => ../../../metric replace go.opentelemetry.io/otel/trace => ../../../trace -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus diff --git a/exporters/otlp/otlpmetric/internal/connection/connection.go b/exporters/otlp/otlpmetric/internal/connection/connection.go index 3e6a938f8c6..dcb6db403fb 100644 --- a/exporters/otlp/otlpmetric/internal/connection/connection.go +++ b/exporters/otlp/otlpmetric/internal/connection/connection.go @@ -23,17 +23,15 @@ import ( "time" "unsafe" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - "github.com/cenkalti/backoff/v4" "google.golang.org/genproto/googleapis/rpc/errdetails" + "google.golang.org/grpc" "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "google.golang.org/grpc/encoding/gzip" - - "google.golang.org/grpc" "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" + + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" ) type Connection struct { diff --git a/exporters/otlp/otlpmetric/internal/connection/connection_test.go b/exporters/otlp/otlpmetric/internal/connection/connection_test.go index 0b4ac2ff23b..f842fbd48e7 100644 --- a/exporters/otlp/otlpmetric/internal/connection/connection_test.go +++ b/exporters/otlp/otlpmetric/internal/connection/connection_test.go @@ -19,7 +19,6 @@ import ( "time" "github.com/stretchr/testify/require" - "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/exporters/otlp/otlpmetric/internal/metrictransform/attribute.go b/exporters/otlp/otlpmetric/internal/metrictransform/attribute.go index 0414bf5261f..4a59073824c 100644 --- a/exporters/otlp/otlpmetric/internal/metrictransform/attribute.go +++ b/exporters/otlp/otlpmetric/internal/metrictransform/attribute.go @@ -16,9 +16,8 @@ package metrictransform // import "go.opentelemetry.io/otel/exporters/otlp/otlpm import ( "go.opentelemetry.io/otel/attribute" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" - "go.opentelemetry.io/otel/sdk/resource" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) // KeyValues transforms a slice of attribute KeyValues into OTLP key-values. diff --git a/exporters/otlp/otlpmetric/internal/metrictransform/metric.go b/exporters/otlp/otlpmetric/internal/metrictransform/metric.go index 5358e9ab7f7..943cc069e09 100644 --- a/exporters/otlp/otlpmetric/internal/metrictransform/metric.go +++ b/exporters/otlp/otlpmetric/internal/metrictransform/metric.go @@ -24,14 +24,13 @@ import ( "sync" "time" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" - "go.opentelemetry.io/otel/metric/number" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) var ( diff --git a/exporters/otlp/otlpmetric/internal/metrictransform/metric_test.go b/exporters/otlp/otlpmetric/internal/metrictransform/metric_test.go index c3454659f45..0bd24068023 100644 --- a/exporters/otlp/otlpmetric/internal/metrictransform/metric_test.go +++ b/exporters/otlp/otlpmetric/internal/metrictransform/metric_test.go @@ -28,14 +28,14 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" arrAgg "go.opentelemetry.io/otel/sdk/metric/aggregator/exact" - "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" lvAgg "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" + "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" sumAgg "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" commonpb "go.opentelemetry.io/proto/otlp/common/v1" metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) diff --git a/exporters/otlp/otlpmetric/internal/metrictransform/resource.go b/exporters/otlp/otlpmetric/internal/metrictransform/resource.go index e8622d794b7..dbf0c5e490a 100644 --- a/exporters/otlp/otlpmetric/internal/metrictransform/resource.go +++ b/exporters/otlp/otlpmetric/internal/metrictransform/resource.go @@ -15,9 +15,8 @@ package metrictransform // import "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/metrictransform" import ( - resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" - "go.opentelemetry.io/otel/sdk/resource" + resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" ) // Resource transforms a Resource into an OTLP Resource. diff --git a/exporters/otlp/otlpmetric/internal/otlpconfig/options_test.go b/exporters/otlp/otlpmetric/internal/otlpconfig/options_test.go index 3f82f633faf..2d47e7c285f 100644 --- a/exporters/otlp/otlpmetric/internal/otlpconfig/options_test.go +++ b/exporters/otlp/otlpmetric/internal/otlpconfig/options_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" ) const ( diff --git a/exporters/otlp/otlpmetric/internal/otlpmetrictest/data.go b/exporters/otlp/otlpmetric/internal/otlpmetrictest/data.go index 65f79594ee6..cc3f7871598 100644 --- a/exporters/otlp/otlpmetric/internal/otlpmetrictest/data.go +++ b/exporters/otlp/otlpmetric/internal/otlpmetrictest/data.go @@ -23,16 +23,16 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - exportmetric "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" ) // OneRecordReader is a Reader that returns just one // filled record. It may be useful for testing driver's metrics // export. -func OneRecordReader() exportmetric.InstrumentationLibraryReader { +func OneRecordReader() export.InstrumentationLibraryReader { desc := metrictest.NewDescriptor( "foo", sdkapi.CounterInstrumentKind, @@ -45,17 +45,17 @@ func OneRecordReader() exportmetric.InstrumentationLibraryReader { start := time.Date(2020, time.December, 8, 19, 15, 0, 0, time.UTC) end := time.Date(2020, time.December, 8, 19, 16, 0, 0, time.UTC) labels := attribute.NewSet(attribute.String("abc", "def"), attribute.Int64("one", 1)) - rec := exportmetric.NewRecord(&desc, &labels, agg[0].Aggregation(), start, end) + rec := export.NewRecord(&desc, &labels, agg[0].Aggregation(), start, end) return processortest.MultiInstrumentationLibraryReader( - map[instrumentation.Library][]exportmetric.Record{ + map[instrumentation.Library][]export.Record{ { Name: "onelib", }: {rec}, }) } -func EmptyReader() exportmetric.InstrumentationLibraryReader { +func EmptyReader() export.InstrumentationLibraryReader { return processortest.MultiInstrumentationLibraryReader(nil) } @@ -63,9 +63,9 @@ func EmptyReader() exportmetric.InstrumentationLibraryReader { // ForEach. type FailReader struct{} -var _ exportmetric.InstrumentationLibraryReader = FailReader{} +var _ export.InstrumentationLibraryReader = FailReader{} -// ForEach implements exportmetric.Reader. It always fails. -func (FailReader) ForEach(readerFunc func(instrumentation.Library, exportmetric.Reader) error) error { +// ForEach implements export.Reader. It always fails. +func (FailReader) ForEach(readerFunc func(instrumentation.Library, export.Reader) error) error { return fmt.Errorf("fail") } diff --git a/exporters/otlp/otlpmetric/internal/otlpmetrictest/otlptest.go b/exporters/otlp/otlpmetric/internal/otlpmetrictest/otlptest.go index 3a65ef099ef..c2947249638 100644 --- a/exporters/otlp/otlpmetric/internal/otlpmetrictest/otlptest.go +++ b/exporters/otlp/otlpmetric/internal/otlpmetrictest/otlptest.go @@ -20,20 +20,19 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/selector/simple" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) // RunEndToEndTest can be used by protocol driver tests to validate diff --git a/exporters/otlp/otlpmetric/options.go b/exporters/otlp/otlpmetric/options.go index dab33127be6..ce8a5f58c5a 100644 --- a/exporters/otlp/otlpmetric/options.go +++ b/exporters/otlp/otlpmetric/options.go @@ -14,7 +14,7 @@ package otlpmetric // import "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" -import "go.opentelemetry.io/otel/sdk/export/metric/aggregation" +import "go.opentelemetry.io/otel/sdk/metric/export/aggregation" // Option are setting options passed to an Exporter on creation. type Option interface { diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go index 97729b9f052..c70be399fc7 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/client.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/connection" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go index 68db12f1e4f..bf55eccfb8b 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/client_test.go @@ -22,21 +22,19 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" - "go.opentelemetry.io/otel/sdk/resource" - + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "google.golang.org/genproto/googleapis/rpc/errdetails" + "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/durationpb" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "google.golang.org/grpc" - "google.golang.org/grpc/encoding/gzip" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" + "go.opentelemetry.io/otel/sdk/resource" ) var ( diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/example_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/example_test.go index 76a6f1ee03a..ec9b4fd68c5 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/example_test.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/example_test.go @@ -19,17 +19,16 @@ import ( "log" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" - "go.opentelemetry.io/otel/sdk/metric/selector/simple" - "google.golang.org/grpc/credentials" "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" + "go.opentelemetry.io/otel/sdk/metric/selector/simple" ) func Example_insecure() { diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index bff5ae43280..5d2bed58d1f 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -59,8 +59,6 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../.. replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric - replace go.opentelemetry.io/otel/internal/metric => ../../../../internal/metric replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/mock_collector_test.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/mock_collector_test.go index af07531ed0d..ea28c1a7fad 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/mock_collector_test.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/mock_collector_test.go @@ -24,12 +24,10 @@ import ( "testing" "time" + "google.golang.org/grpc" "google.golang.org/grpc/metadata" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" - - "google.golang.org/grpc" - collectormetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go b/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go index c4dc9973e3c..1145fdc9f5e 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/options.go @@ -18,12 +18,11 @@ import ( "fmt" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - "google.golang.org/grpc" "google.golang.org/grpc/credentials" "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" ) // Option applies an option to the gRPC client. diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/client.go b/exporters/otlp/otlpmetric/otlpmetrichttp/client.go index b335e4ba2fc..e4e5c67e6f9 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/client.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/client.go @@ -28,15 +28,13 @@ import ( "strings" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" - metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" - - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - "google.golang.org/protobuf/proto" "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" colmetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" + metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) const contentTypeProto = "application/x-protobuf" diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go b/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go index fa5c2a79e31..4fb116972e9 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/client_test.go @@ -22,14 +22,13 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" - "go.opentelemetry.io/otel/sdk/resource" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" + "go.opentelemetry.io/otel/sdk/resource" ) const ( diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index 986a33043be..495187a1fa8 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -61,8 +61,6 @@ replace go.opentelemetry.io/otel/exporters/trace/zipkin => ../../../trace/zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric - replace go.opentelemetry.io/otel/internal/metric => ../../../../internal/metric replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/mock_collector_test.go b/exporters/otlp/otlpmetric/otlpmetrichttp/mock_collector_test.go index 4cc2a340f14..042866c2eef 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/mock_collector_test.go +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/mock_collector_test.go @@ -28,13 +28,12 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" - "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpconfig" + "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal/otlpmetrictest" collectormetricpb "go.opentelemetry.io/proto/otlp/collector/metrics/v1" metricpb "go.opentelemetry.io/proto/otlp/metrics/v1" ) diff --git a/exporters/otlp/otlptrace/exporter.go b/exporters/otlp/otlptrace/exporter.go index d795db9127d..7e9bb6c47ae 100644 --- a/exporters/otlp/otlptrace/exporter.go +++ b/exporters/otlp/otlptrace/exporter.go @@ -20,7 +20,6 @@ import ( "sync" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" - tracesdk "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index df6f4098b3c..da9c45770da 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -53,8 +53,6 @@ replace go.opentelemetry.io/otel/exporters/zipkin => ../../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough diff --git a/exporters/otlp/otlptrace/internal/connection/connection.go b/exporters/otlp/otlptrace/internal/connection/connection.go index 6747803945f..0e2da32ce1c 100644 --- a/exporters/otlp/otlptrace/internal/connection/connection.go +++ b/exporters/otlp/otlptrace/internal/connection/connection.go @@ -23,16 +23,14 @@ import ( "unsafe" "google.golang.org/genproto/googleapis/rpc/errdetails" + "google.golang.org/grpc" "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "google.golang.org/grpc/encoding/gzip" + "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/retry" - - "google.golang.org/grpc" - "google.golang.org/grpc/metadata" ) type Connection struct { diff --git a/exporters/otlp/otlptrace/internal/connection/connection_test.go b/exporters/otlp/otlptrace/internal/connection/connection_test.go index 3c2a18eb02b..8c0c86ed261 100644 --- a/exporters/otlp/otlptrace/internal/connection/connection_test.go +++ b/exporters/otlp/otlptrace/internal/connection/connection_test.go @@ -21,13 +21,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/retry" - "google.golang.org/genproto/googleapis/rpc/errdetails" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/durationpb" + + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/retry" ) func TestThrottleDuration(t *testing.T) { diff --git a/exporters/otlp/otlptrace/internal/otlpconfig/options_test.go b/exporters/otlp/otlptrace/internal/otlpconfig/options_test.go index 54131cd4b15..ad25efdac04 100644 --- a/exporters/otlp/otlptrace/internal/otlpconfig/options_test.go +++ b/exporters/otlp/otlptrace/internal/otlpconfig/options_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" - "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" ) const ( diff --git a/exporters/otlp/otlptrace/internal/otlptracetest/otlptest.go b/exporters/otlp/otlptrace/internal/otlptracetest/otlptest.go index e524219e94e..9a2ac74598c 100644 --- a/exporters/otlp/otlptrace/internal/otlptracetest/otlptest.go +++ b/exporters/otlp/otlptrace/internal/otlptracetest/otlptest.go @@ -19,9 +19,8 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace" - "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" commonpb "go.opentelemetry.io/proto/otlp/common/v1" diff --git a/exporters/otlp/otlptrace/internal/tracetransform/attribute.go b/exporters/otlp/otlptrace/internal/tracetransform/attribute.go index 517411b2403..d9086a390de 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/attribute.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/attribute.go @@ -16,9 +16,8 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptr import ( "go.opentelemetry.io/otel/attribute" - commonpb "go.opentelemetry.io/proto/otlp/common/v1" - "go.opentelemetry.io/otel/sdk/resource" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) // KeyValues transforms a slice of attribute KeyValues into OTLP key-values. diff --git a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go index 25d3c1ba4b7..6246b17f578 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go @@ -15,9 +15,8 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" import ( - commonpb "go.opentelemetry.io/proto/otlp/common/v1" - "go.opentelemetry.io/otel/sdk/instrumentation" + commonpb "go.opentelemetry.io/proto/otlp/common/v1" ) func InstrumentationLibrary(il instrumentation.Library) *commonpb.InstrumentationLibrary { diff --git a/exporters/otlp/otlptrace/internal/tracetransform/resource.go b/exporters/otlp/otlptrace/internal/tracetransform/resource.go index c2b17a6b288..05a1f78adbc 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/resource.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/resource.go @@ -15,9 +15,8 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/tracetransform" import ( - resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" - "go.opentelemetry.io/otel/sdk/resource" + resourcepb "go.opentelemetry.io/proto/otlp/resource/v1" ) // Resource transforms a Resource into an OTLP Resource. diff --git a/exporters/otlp/otlptrace/internal/tracetransform/span.go b/exporters/otlp/otlptrace/internal/tracetransform/span.go index 09dd7081843..2f0f5eacb77 100644 --- a/exporters/otlp/otlptrace/internal/tracetransform/span.go +++ b/exporters/otlp/otlptrace/internal/tracetransform/span.go @@ -17,11 +17,10 @@ package tracetransform // import "go.opentelemetry.io/otel/exporters/otlp/otlptr import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" - "go.opentelemetry.io/otel/sdk/instrumentation" tracesdk "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) const ( diff --git a/exporters/otlp/otlptrace/otlptracegrpc/client.go b/exporters/otlp/otlptrace/otlptracegrpc/client.go index b17b9291c2c..89a3bbea8d8 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/client.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/client.go @@ -20,13 +20,11 @@ import ( "fmt" "sync" + "google.golang.org/grpc" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/connection" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" - - "google.golang.org/grpc" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) diff --git a/exporters/otlp/otlptrace/otlptracegrpc/client_test.go b/exporters/otlp/otlptrace/otlptracegrpc/client_test.go index 1694d219a21..7a819c87ffb 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/client_test.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/client_test.go @@ -21,20 +21,17 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" - - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "google.golang.org/grpc" + "google.golang.org/grpc/codes" "google.golang.org/grpc/encoding/gzip" + "google.golang.org/grpc/status" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" commonpb "go.opentelemetry.io/proto/otlp/common/v1" diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 81c3d5ffa6e..aa9296e4fe4 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -49,8 +49,6 @@ replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../../sdk/metric replace go.opentelemetry.io/otel/example/passthrough => ../../../../example/passthrough diff --git a/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go b/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go index e33e65115c9..fb224d07080 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/mock_collector_test.go @@ -24,11 +24,10 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" - "google.golang.org/grpc" "google.golang.org/grpc/metadata" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) diff --git a/exporters/otlp/otlptrace/otlptracegrpc/options.go b/exporters/otlp/otlptrace/otlptracegrpc/options.go index 86bfc1dc8a5..da82e622c65 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/options.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/options.go @@ -18,12 +18,12 @@ import ( "fmt" "time" + "google.golang.org/grpc" + "google.golang.org/grpc/credentials" + "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/retry" - - "google.golang.org/grpc" - "google.golang.org/grpc/credentials" ) // Option applies an option to the gRPC driver. diff --git a/exporters/otlp/otlptrace/otlptracehttp/client.go b/exporters/otlp/otlptrace/otlptracehttp/client.go index c3aa3c9ab39..749b3f39b02 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/client.go +++ b/exporters/otlp/otlptrace/otlptracehttp/client.go @@ -29,15 +29,13 @@ import ( "sync" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace" - tracepb "go.opentelemetry.io/proto/otlp/trace/v1" + "google.golang.org/protobuf/proto" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/retry" - - "google.golang.org/protobuf/proto" - coltracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" + tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) const contentTypeProto = "application/x-protobuf" diff --git a/exporters/otlp/otlptrace/otlptracehttp/client_test.go b/exporters/otlp/otlptrace/otlptracehttp/client_test.go index e3f7850e2f9..445717e08d5 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/client_test.go +++ b/exporters/otlp/otlptrace/otlptracehttp/client_test.go @@ -22,13 +22,12 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/exporters/otlp/otlptrace" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" ) const ( diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index 1abc32fba8e..9a5f0d71905 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -52,8 +52,6 @@ replace go.opentelemetry.io/otel/metric => ../../../../metric replace go.opentelemetry.io/otel/sdk => ../../../../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../../trace diff --git a/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go b/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go index af6481f946a..01d79daf8c4 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go +++ b/exporters/otlp/otlptrace/otlptracehttp/mock_collector_test.go @@ -28,13 +28,12 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlptracetest" collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" tracepb "go.opentelemetry.io/proto/otlp/trace/v1" ) diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index 7e88e55a220..9dffd062456 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -8,7 +8,6 @@ require ( go.opentelemetry.io/otel v1.2.0 go.opentelemetry.io/otel/metric v0.25.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 go.opentelemetry.io/otel/sdk/metric v0.25.0 ) @@ -56,8 +55,6 @@ replace go.opentelemetry.io/otel/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/exporters/prometheus/prometheus.go b/exporters/prometheus/prometheus.go index 9fc276caafc..1a626ba84a3 100644 --- a/exporters/prometheus/prometheus.go +++ b/exporters/prometheus/prometheus.go @@ -31,10 +31,10 @@ import ( "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/exporters/prometheus/prometheus_test.go b/exporters/prometheus/prometheus_test.go index 5efdba33469..907db0db4b7 100644 --- a/exporters/prometheus/prometheus_test.go +++ b/exporters/prometheus/prometheus_test.go @@ -27,9 +27,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/prometheus" "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" selector "go.opentelemetry.io/otel/sdk/metric/selector/simple" "go.opentelemetry.io/otel/sdk/resource" diff --git a/exporters/stdout/stdoutmetric/example_test.go b/exporters/stdout/stdoutmetric/example_test.go index 522877e73eb..c367b767040 100644 --- a/exporters/stdout/stdoutmetric/example_test.go +++ b/exporters/stdout/stdoutmetric/example_test.go @@ -18,9 +18,8 @@ import ( "context" "log" - "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" - "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" diff --git a/exporters/stdout/stdoutmetric/exporter.go b/exporters/stdout/stdoutmetric/exporter.go index 25b129dcdfd..e1ea02339c0 100644 --- a/exporters/stdout/stdoutmetric/exporter.go +++ b/exporters/stdout/stdoutmetric/exporter.go @@ -14,16 +14,14 @@ package stdoutmetric // import "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" -import ( - "go.opentelemetry.io/otel/sdk/export/metric" -) +import "go.opentelemetry.io/otel/sdk/metric/export" type Exporter struct { metricExporter } var ( - _ metric.Exporter = &Exporter{} + _ export.Exporter = &Exporter{} ) // New creates an Exporter with the passed options. diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index d4bb9d5b855..a5f282ec2d9 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -12,7 +12,6 @@ require ( go.opentelemetry.io/otel v1.2.0 go.opentelemetry.io/otel/metric v0.25.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 go.opentelemetry.io/otel/sdk/metric v0.25.0 ) @@ -46,8 +45,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools replace go.opentelemetry.io/otel/metric => ../../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../trace diff --git a/exporters/stdout/stdoutmetric/metric.go b/exporters/stdout/stdoutmetric/metric.go index 07333c64fb7..10dfef7c8a9 100644 --- a/exporters/stdout/stdoutmetric/metric.go +++ b/exporters/stdout/stdoutmetric/metric.go @@ -23,9 +23,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric/sdkapi" - exportmetric "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) @@ -33,7 +33,7 @@ type metricExporter struct { config config } -var _ exportmetric.Exporter = &metricExporter{} +var _ export.Exporter = &metricExporter{} type line struct { Name string `json:"Name"` @@ -51,10 +51,10 @@ func (e *metricExporter) TemporalityFor(desc *sdkapi.Descriptor, kind aggregatio return aggregation.StatelessTemporalitySelector().TemporalityFor(desc, kind) } -func (e *metricExporter) Export(_ context.Context, res *resource.Resource, reader exportmetric.InstrumentationLibraryReader) error { +func (e *metricExporter) Export(_ context.Context, res *resource.Resource, reader export.InstrumentationLibraryReader) error { var aggError error var batch []line - aggError = reader.ForEach(func(lib instrumentation.Library, mr exportmetric.Reader) error { + aggError = reader.ForEach(func(lib instrumentation.Library, mr export.Reader) error { var instLabels []attribute.KeyValue if name := lib.Name; name != "" { @@ -69,7 +69,7 @@ func (e *metricExporter) Export(_ context.Context, res *resource.Resource, reade instSet := attribute.NewSet(instLabels...) encodedInstLabels := instSet.Encoded(e.config.LabelEncoder) - return mr.ForEach(e, func(record exportmetric.Record) error { + return mr.ForEach(e, func(record export.Record) error { desc := record.Descriptor() agg := record.Aggregation() kind := desc.NumberKind() diff --git a/exporters/stdout/stdoutmetric/metric_test.go b/exporters/stdout/stdoutmetric/metric_test.go index 395df09c02f..62e89424119 100644 --- a/exporters/stdout/stdoutmetric/metric_test.go +++ b/exporters/stdout/stdoutmetric/metric_test.go @@ -23,15 +23,14 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" diff --git a/exporters/stdout/stdouttrace/go.mod b/exporters/stdout/stdouttrace/go.mod index f697e6832dd..593673f607d 100644 --- a/exporters/stdout/stdouttrace/go.mod +++ b/exporters/stdout/stdouttrace/go.mod @@ -44,8 +44,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools replace go.opentelemetry.io/otel/metric => ../../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../trace diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod index 870f4417723..6958f4f98e5 100644 --- a/exporters/zipkin/go.mod +++ b/exporters/zipkin/go.mod @@ -41,8 +41,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/exporters/zipkin/model.go b/exporters/zipkin/model.go index 65eea062958..ba9b0f00987 100644 --- a/exporters/zipkin/model.go +++ b/exporters/zipkin/model.go @@ -21,16 +21,15 @@ import ( "net" "strconv" + zkmodel "github.com/openzipkin/zipkin-go/model" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" - "go.opentelemetry.io/otel/trace" - - zkmodel "github.com/openzipkin/zipkin-go/model" - sdktrace "go.opentelemetry.io/otel/sdk/trace" tracesdk "go.opentelemetry.io/otel/sdk/trace" + semconv "go.opentelemetry.io/otel/semconv/v1.7.0" + "go.opentelemetry.io/otel/trace" ) const ( diff --git a/go.mod b/go.mod index ca30e57cd73..410c4e9f31b 100644 --- a/go.mod +++ b/go.mod @@ -42,8 +42,6 @@ replace go.opentelemetry.io/otel/internal/metric => ./internal/metric replace go.opentelemetry.io/otel/metric => ./metric -replace go.opentelemetry.io/otel/sdk/export/metric => ./sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ./sdk/metric replace go.opentelemetry.io/otel/trace => ./trace diff --git a/internal/metric/go.mod b/internal/metric/go.mod index 59b4b82fbd7..dbdcfa87d75 100644 --- a/internal/metric/go.mod +++ b/internal/metric/go.mod @@ -50,8 +50,6 @@ replace go.opentelemetry.io/otel/internal/tools => ../tools replace go.opentelemetry.io/otel/sdk => ../../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 4b3200b9502..4d558a6ba97 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -47,8 +47,6 @@ replace go.opentelemetry.io/otel/sdk => ../../sdk replace go.opentelemetry.io/otel/metric => ../../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace diff --git a/metric/go.mod b/metric/go.mod index f8f9ce76eff..839bc5b8db7 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -34,8 +34,6 @@ replace go.opentelemetry.io/otel/metric => ./ replace go.opentelemetry.io/otel/sdk => ../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../sdk/metric replace go.opentelemetry.io/otel/trace => ../trace diff --git a/metric/metric_test.go b/metric/metric_test.go index 9118cb18774..d94b99eedb6 100644 --- a/metric/metric_test.go +++ b/metric/metric_test.go @@ -19,16 +19,16 @@ import ( "errors" "testing" + "github.com/google/go-cmp/cmp" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" "go.opentelemetry.io/otel/metric/unit" - - "github.com/google/go-cmp/cmp" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var Must = metric.Must diff --git a/schema/go.mod b/schema/go.mod index 1797a666710..6390306c830 100644 --- a/schema/go.mod +++ b/schema/go.mod @@ -64,8 +64,6 @@ replace go.opentelemetry.io/otel/schema => ./ replace go.opentelemetry.io/otel/sdk => ../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../sdk/metric replace go.opentelemetry.io/otel/trace => ../trace diff --git a/sdk/export/metric/go.mod b/sdk/export/metric/go.mod deleted file mode 100644 index c4f47cf650c..00000000000 --- a/sdk/export/metric/go.mod +++ /dev/null @@ -1,74 +0,0 @@ -module go.opentelemetry.io/otel/sdk/export/metric - -go 1.15 - -replace go.opentelemetry.io/otel => ../../.. - -replace go.opentelemetry.io/otel/bridge/opencensus => ../../../bridge/opencensus - -replace go.opentelemetry.io/otel/bridge/opentracing => ../../../bridge/opentracing - -replace go.opentelemetry.io/otel/example/jaeger => ../../../example/jaeger - -replace go.opentelemetry.io/otel/example/namedtracer => ../../../example/namedtracer - -replace go.opentelemetry.io/otel/example/opencensus => ../../../example/opencensus - -replace go.opentelemetry.io/otel/example/otel-collector => ../../../example/otel-collector - -replace go.opentelemetry.io/otel/example/prom-collector => ../../../example/prom-collector - -replace go.opentelemetry.io/otel/example/prometheus => ../../../example/prometheus - -replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin - -replace go.opentelemetry.io/otel/exporters/prometheus => ../../../exporters/prometheus - -replace go.opentelemetry.io/otel/exporters/jaeger => ../../../exporters/jaeger - -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../exporters/zipkin - -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools - -replace go.opentelemetry.io/otel/metric => ../../../metric - -replace go.opentelemetry.io/otel/sdk => ../.. - -replace go.opentelemetry.io/otel/sdk/export/metric => ./ - -replace go.opentelemetry.io/otel/sdk/metric => ../../metric - -replace go.opentelemetry.io/otel/trace => ../../../trace - -require ( - github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/otel v1.2.0 - go.opentelemetry.io/otel/metric v0.25.0 - go.opentelemetry.io/otel/sdk v1.2.0 -) - -replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../../exporters/otlp/otlptrace - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../../exporters/otlp/otlptrace/otlptracegrpc - -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../../exporters/otlp/otlptrace/otlptracehttp - -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric - -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../../exporters/otlp/otlpmetric - -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../../exporters/otlp/otlpmetric/otlpmetricgrpc - -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../exporters/stdout/stdoutmetric - -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../exporters/stdout/stdouttrace - -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../../exporters/otlp/otlpmetric/otlpmetrichttp - -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../bridge/opencensus/test - -replace go.opentelemetry.io/otel/example/fib => ../../../example/fib - -replace go.opentelemetry.io/otel/schema => ../../../schema diff --git a/sdk/export/metric/go.sum b/sdk/export/metric/go.sum deleted file mode 100644 index 2ae2b35b289..00000000000 --- a/sdk/export/metric/go.sum +++ /dev/null @@ -1,17 +0,0 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 h1:iGu644GcxtEcrInvDsQRCwJjtCIOlT2V7IRt6ah2Whw= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/sdk/go.mod b/sdk/go.mod index 3e53688cd54..d751792e11d 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -42,8 +42,6 @@ replace go.opentelemetry.io/otel/sdk => ./ replace go.opentelemetry.io/otel/metric => ../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ./export/metric - replace go.opentelemetry.io/otel/sdk/metric => ./metric replace go.opentelemetry.io/otel/trace => ../trace diff --git a/sdk/metric/aggregator/aggregator.go b/sdk/metric/aggregator/aggregator.go index 13a315e2d4a..103c08cfa0b 100644 --- a/sdk/metric/aggregator/aggregator.go +++ b/sdk/metric/aggregator/aggregator.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) // NewInconsistentAggregatorError formats an error describing an attempt to diff --git a/sdk/metric/aggregator/aggregator_test.go b/sdk/metric/aggregator/aggregator_test.go index fd85297ed1d..bf405b5c3f8 100644 --- a/sdk/metric/aggregator/aggregator_test.go +++ b/sdk/metric/aggregator/aggregator_test.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) func TestInconsistentAggregatorErr(t *testing.T) { diff --git a/sdk/metric/aggregator/aggregatortest/test.go b/sdk/metric/aggregator/aggregatortest/test.go index 2fbfca5eed9..48b92ec9c7e 100644 --- a/sdk/metric/aggregator/aggregatortest/test.go +++ b/sdk/metric/aggregator/aggregatortest/test.go @@ -29,9 +29,9 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) const Magnitude = 1000 diff --git a/sdk/metric/aggregator/exact/exact.go b/sdk/metric/aggregator/exact/exact.go index 336cd878fd0..98c642e7290 100644 --- a/sdk/metric/aggregator/exact/exact.go +++ b/sdk/metric/aggregator/exact/exact.go @@ -21,9 +21,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type ( diff --git a/sdk/metric/aggregator/exact/exact_test.go b/sdk/metric/aggregator/exact/exact_test.go index 0ef1fdf9379..d55942bab9f 100644 --- a/sdk/metric/aggregator/exact/exact_test.go +++ b/sdk/metric/aggregator/exact/exact_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type updateTest struct { diff --git a/sdk/metric/aggregator/histogram/histogram.go b/sdk/metric/aggregator/histogram/histogram.go index 899c71cacd1..888c985ce3e 100644 --- a/sdk/metric/aggregator/histogram/histogram.go +++ b/sdk/metric/aggregator/histogram/histogram.go @@ -21,9 +21,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) // Note: This code uses a Mutex to govern access to the exclusive diff --git a/sdk/metric/aggregator/histogram/histogram_test.go b/sdk/metric/aggregator/histogram/histogram_test.go index a4c5c6da687..2d09edbfdc9 100644 --- a/sdk/metric/aggregator/histogram/histogram_test.go +++ b/sdk/metric/aggregator/histogram/histogram_test.go @@ -25,9 +25,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" + "go.opentelemetry.io/otel/sdk/metric/export" ) const count = 100 diff --git a/sdk/metric/aggregator/lastvalue/lastvalue.go b/sdk/metric/aggregator/lastvalue/lastvalue.go index 71b117890cb..4a1da706062 100644 --- a/sdk/metric/aggregator/lastvalue/lastvalue.go +++ b/sdk/metric/aggregator/lastvalue/lastvalue.go @@ -22,9 +22,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type ( diff --git a/sdk/metric/aggregator/lastvalue/lastvalue_test.go b/sdk/metric/aggregator/lastvalue/lastvalue_test.go index 8f1a771009c..bdfe6a65bd4 100644 --- a/sdk/metric/aggregator/lastvalue/lastvalue_test.go +++ b/sdk/metric/aggregator/lastvalue/lastvalue_test.go @@ -27,9 +27,9 @@ import ( ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) const count = 100 diff --git a/sdk/metric/aggregator/minmaxsumcount/mmsc.go b/sdk/metric/aggregator/minmaxsumcount/mmsc.go index 663cb4e0d3d..467de0ebb96 100644 --- a/sdk/metric/aggregator/minmaxsumcount/mmsc.go +++ b/sdk/metric/aggregator/minmaxsumcount/mmsc.go @@ -20,9 +20,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type ( diff --git a/sdk/metric/aggregator/minmaxsumcount/mmsc_test.go b/sdk/metric/aggregator/minmaxsumcount/mmsc_test.go index b0dc7f8fb19..dd4f81c160c 100644 --- a/sdk/metric/aggregator/minmaxsumcount/mmsc_test.go +++ b/sdk/metric/aggregator/minmaxsumcount/mmsc_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) const count = 100 diff --git a/sdk/metric/aggregator/sum/sum.go b/sdk/metric/aggregator/sum/sum.go index 26390a61015..47af665029f 100644 --- a/sdk/metric/aggregator/sum/sum.go +++ b/sdk/metric/aggregator/sum/sum.go @@ -19,9 +19,9 @@ import ( "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) // Aggregator aggregates counter events. diff --git a/sdk/metric/aggregator/sum/sum_test.go b/sdk/metric/aggregator/sum/sum_test.go index 3387c83cc8d..da614d83f49 100644 --- a/sdk/metric/aggregator/sum/sum_test.go +++ b/sdk/metric/aggregator/sum/sum_test.go @@ -24,8 +24,8 @@ import ( ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" + "go.opentelemetry.io/otel/sdk/metric/export" ) const count = 100 diff --git a/sdk/metric/benchmark_test.go b/sdk/metric/benchmark_test.go index f7eacae962c..063bc099ddc 100644 --- a/sdk/metric/benchmark_test.go +++ b/sdk/metric/benchmark_test.go @@ -24,8 +24,8 @@ import ( "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/export" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" ) diff --git a/sdk/metric/controller/basic/config.go b/sdk/metric/controller/basic/config.go index cbc91a8f59d..01691ecadd1 100644 --- a/sdk/metric/controller/basic/config.go +++ b/sdk/metric/controller/basic/config.go @@ -18,7 +18,7 @@ import ( "time" "go.opentelemetry.io/otel" - export "go.opentelemetry.io/otel/sdk/export/metric" + "go.opentelemetry.io/otel/sdk/metric/export" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/sdk/metric/controller/basic/controller.go b/sdk/metric/controller/basic/controller.go index 97ba8945f06..8c6f136d020 100644 --- a/sdk/metric/controller/basic/controller.go +++ b/sdk/metric/controller/basic/controller.go @@ -23,10 +23,10 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/internal/metric/registry" "go.opentelemetry.io/otel/metric" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/instrumentation" sdk "go.opentelemetry.io/otel/sdk/metric" controllerTime "go.opentelemetry.io/otel/sdk/metric/controller/time" + "go.opentelemetry.io/otel/sdk/metric/export" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/sdk/metric/controller/basic/controller_test.go b/sdk/metric/controller/basic/controller_test.go index 870e65f2c0c..503a278148c 100644 --- a/sdk/metric/controller/basic/controller_test.go +++ b/sdk/metric/controller/basic/controller_test.go @@ -27,11 +27,11 @@ import ( ottest "go.opentelemetry.io/otel/internal/internaltest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" "go.opentelemetry.io/otel/sdk/metric/controller/controllertest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/metric/controller/basic/pull_test.go b/sdk/metric/controller/basic/pull_test.go index 6e87c6f6a97..96d1e1adad1 100644 --- a/sdk/metric/controller/basic/pull_test.go +++ b/sdk/metric/controller/basic/pull_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" "go.opentelemetry.io/otel/sdk/metric/controller/controllertest" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/metric/controller/basic/push_test.go b/sdk/metric/controller/basic/push_test.go index 775754774bf..0a6679b29de 100644 --- a/sdk/metric/controller/basic/push_test.go +++ b/sdk/metric/controller/basic/push_test.go @@ -28,10 +28,10 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" controller "go.opentelemetry.io/otel/sdk/metric/controller/basic" "go.opentelemetry.io/otel/sdk/metric/controller/controllertest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" processor "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/metric/controller/controllertest/test.go b/sdk/metric/controller/controllertest/test.go index 8676129ebe5..ed0bb88f1a3 100644 --- a/sdk/metric/controller/controllertest/test.go +++ b/sdk/metric/controller/controllertest/test.go @@ -19,10 +19,10 @@ import ( "github.com/benbjohnson/clock" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" controllerTime "go.opentelemetry.io/otel/sdk/metric/controller/time" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type MockClock struct { diff --git a/sdk/metric/correct_test.go b/sdk/metric/correct_test.go index 773a99de0a5..b1fd848b048 100644 --- a/sdk/metric/correct_test.go +++ b/sdk/metric/correct_test.go @@ -27,9 +27,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" metricsdk "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" ) diff --git a/sdk/metric/doc.go b/sdk/metric/doc.go index 35d0fa55447..cda06cd6123 100644 --- a/sdk/metric/doc.go +++ b/sdk/metric/doc.go @@ -67,7 +67,7 @@ Export Pipeline While the SDK serves to maintain a current set of records and coordinate collection, the behavior of a metrics export pipeline is configured through the export types in -go.opentelemetry.io/otel/sdk/export/metric. It is important to keep +go.opentelemetry.io/otel/sdk/metric/export. It is important to keep in mind the context these interfaces are called from. There are two contexts, instrumentation context, where a user-level goroutine that enters the SDK resulting in a new record, and collection context, diff --git a/sdk/export/metric/aggregation/aggregation.go b/sdk/metric/export/aggregation/aggregation.go similarity index 98% rename from sdk/export/metric/aggregation/aggregation.go rename to sdk/metric/export/aggregation/aggregation.go index 80060a99e84..fd0a37def2e 100644 --- a/sdk/export/metric/aggregation/aggregation.go +++ b/sdk/metric/export/aggregation/aggregation.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package aggregation // import "go.opentelemetry.io/otel/sdk/export/metric/aggregation" +package aggregation // import "go.opentelemetry.io/otel/sdk/metric/export/aggregation" import ( "fmt" diff --git a/sdk/export/metric/aggregation/temporality.go b/sdk/metric/export/aggregation/temporality.go similarity index 97% rename from sdk/export/metric/aggregation/temporality.go rename to sdk/metric/export/aggregation/temporality.go index 4a4a733aa28..ca71b79d03f 100644 --- a/sdk/export/metric/aggregation/temporality.go +++ b/sdk/metric/export/aggregation/temporality.go @@ -14,7 +14,7 @@ //go:generate stringer -type=Temporality -package aggregation // import "go.opentelemetry.io/otel/sdk/export/metric/aggregation" +package aggregation // import "go.opentelemetry.io/otel/sdk/metric/export/aggregation" import ( "go.opentelemetry.io/otel/metric/sdkapi" diff --git a/sdk/export/metric/aggregation/temporality_string.go b/sdk/metric/export/aggregation/temporality_string.go similarity index 100% rename from sdk/export/metric/aggregation/temporality_string.go rename to sdk/metric/export/aggregation/temporality_string.go diff --git a/sdk/export/metric/aggregation/temporality_test.go b/sdk/metric/export/aggregation/temporality_test.go similarity index 100% rename from sdk/export/metric/aggregation/temporality_test.go rename to sdk/metric/export/aggregation/temporality_test.go diff --git a/sdk/export/metric/metric.go b/sdk/metric/export/metric.go similarity index 99% rename from sdk/export/metric/metric.go rename to sdk/metric/export/metric.go index f077f74013f..d536b9d4b2c 100644 --- a/sdk/export/metric/metric.go +++ b/sdk/metric/export/metric.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package metric // import "go.opentelemetry.io/otel/sdk/export/metric" +package export // import "go.opentelemetry.io/otel/sdk/metric/export" import ( "context" @@ -22,8 +22,8 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/sdk/export/metric/metric_test.go b/sdk/metric/export/metric_test.go similarity index 99% rename from sdk/export/metric/metric_test.go rename to sdk/metric/export/metric_test.go index 706e3b83a51..5337d11c9e8 100644 --- a/sdk/export/metric/metric_test.go +++ b/sdk/metric/export/metric_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package metric +package export import ( "testing" diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index b9c53984ebc..96a27f11734 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -34,8 +34,6 @@ replace go.opentelemetry.io/otel/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../ -replace go.opentelemetry.io/otel/sdk/export/metric => ../export/metric - replace go.opentelemetry.io/otel/sdk/metric => ./ replace go.opentelemetry.io/otel/trace => ../../trace @@ -47,7 +45,6 @@ require ( go.opentelemetry.io/otel/internal/metric v0.25.0 go.opentelemetry.io/otel/metric v0.25.0 go.opentelemetry.io/otel/sdk v1.2.0 - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 ) replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough diff --git a/sdk/metric/processor/basic/basic.go b/sdk/metric/processor/basic/basic.go index 7e2fd26320a..ce7d5ca3b93 100644 --- a/sdk/metric/processor/basic/basic.go +++ b/sdk/metric/processor/basic/basic.go @@ -22,8 +22,8 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" ) type ( diff --git a/sdk/metric/processor/basic/basic_test.go b/sdk/metric/processor/basic/basic_test.go index d4d90e95050..d26c68f4876 100644 --- a/sdk/metric/processor/basic/basic_test.go +++ b/sdk/metric/processor/basic/basic_test.go @@ -29,11 +29,11 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" sdk "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" processorTest "go.opentelemetry.io/otel/sdk/metric/processor/processortest" diff --git a/sdk/metric/processor/processortest/test.go b/sdk/metric/processor/processortest/test.go index bb6f18f7e67..7258c59ab40 100644 --- a/sdk/metric/processor/processortest/test.go +++ b/sdk/metric/processor/processortest/test.go @@ -24,14 +24,14 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/metric/aggregator/exact" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/resource" ) diff --git a/sdk/metric/processor/processortest/test_test.go b/sdk/metric/processor/processortest/test_test.go index 2ddbafc0ec8..4cc990c344a 100644 --- a/sdk/metric/processor/processortest/test_test.go +++ b/sdk/metric/processor/processortest/test_test.go @@ -22,10 +22,10 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" metricsdk "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" processorTest "go.opentelemetry.io/otel/sdk/metric/processor/processortest" "go.opentelemetry.io/otel/sdk/resource" diff --git a/sdk/metric/processor/reducer/reducer.go b/sdk/metric/processor/reducer/reducer.go index deb9edd34f1..b7fb4894036 100644 --- a/sdk/metric/processor/reducer/reducer.go +++ b/sdk/metric/processor/reducer/reducer.go @@ -17,7 +17,7 @@ package reducer // import "go.opentelemetry.io/otel/sdk/metric/processor/reducer import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" + "go.opentelemetry.io/otel/sdk/metric/export" ) type ( diff --git a/sdk/metric/processor/reducer/reducer_test.go b/sdk/metric/processor/reducer/reducer_test.go index bac96ae2b6c..3da65d313ef 100644 --- a/sdk/metric/processor/reducer/reducer_test.go +++ b/sdk/metric/processor/reducer/reducer_test.go @@ -23,9 +23,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/sdkapi" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" "go.opentelemetry.io/otel/sdk/instrumentation" metricsdk "go.opentelemetry.io/otel/sdk/metric" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/basic" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" processorTest "go.opentelemetry.io/otel/sdk/metric/processor/processortest" diff --git a/sdk/metric/sdk.go b/sdk/metric/sdk.go index 60f0f798944..8c0438db298 100644 --- a/sdk/metric/sdk.go +++ b/sdk/metric/sdk.go @@ -26,8 +26,8 @@ import ( internal "go.opentelemetry.io/otel/internal/metric" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator" + "go.opentelemetry.io/otel/sdk/metric/export" ) type ( diff --git a/sdk/metric/selector/simple/simple.go b/sdk/metric/selector/simple/simple.go index 0f06827f05f..3e667c4b5c0 100644 --- a/sdk/metric/selector/simple/simple.go +++ b/sdk/metric/selector/simple/simple.go @@ -16,12 +16,12 @@ package simple // import "go.opentelemetry.io/otel/sdk/metric/selector/simple" import ( "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/exact" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" ) type ( diff --git a/sdk/metric/selector/simple/simple_test.go b/sdk/metric/selector/simple/simple_test.go index 12e629d0403..b6d3ce930f2 100644 --- a/sdk/metric/selector/simple/simple_test.go +++ b/sdk/metric/selector/simple/simple_test.go @@ -22,12 +22,12 @@ import ( "go.opentelemetry.io/otel/metric/metrictest" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/exact" "go.opentelemetry.io/otel/sdk/metric/aggregator/histogram" "go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue" "go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount" "go.opentelemetry.io/otel/sdk/metric/aggregator/sum" + "go.opentelemetry.io/otel/sdk/metric/export" "go.opentelemetry.io/otel/sdk/metric/selector/simple" ) diff --git a/sdk/metric/stress_test.go b/sdk/metric/stress_test.go index 229b9fe7c20..f6b9eb4ba02 100644 --- a/sdk/metric/stress_test.go +++ b/sdk/metric/stress_test.go @@ -36,8 +36,8 @@ import ( "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/number" "go.opentelemetry.io/otel/metric/sdkapi" - export "go.opentelemetry.io/otel/sdk/export/metric" - "go.opentelemetry.io/otel/sdk/export/metric/aggregation" + "go.opentelemetry.io/otel/sdk/metric/export" + "go.opentelemetry.io/otel/sdk/metric/export/aggregation" "go.opentelemetry.io/otel/sdk/metric/processor/processortest" ) diff --git a/sdk/resource/os_unix_test.go b/sdk/resource/os_unix_test.go index bf15463a931..2f03980c4a8 100644 --- a/sdk/resource/os_unix_test.go +++ b/sdk/resource/os_unix_test.go @@ -23,10 +23,9 @@ import ( "testing" "github.com/stretchr/testify/require" + "golang.org/x/sys/unix" "go.opentelemetry.io/otel/sdk/resource" - - "golang.org/x/sys/unix" ) func fakeUnameProvider(buf *unix.Utsname) error { diff --git a/sdk/trace/batch_span_processor_test.go b/sdk/trace/batch_span_processor_test.go index d40ea27df77..acc2d906426 100644 --- a/sdk/trace/batch_span_processor_test.go +++ b/sdk/trace/batch_span_processor_test.go @@ -26,11 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" - "go.opentelemetry.io/otel/trace" - - sdktrace "go.opentelemetry.io/otel/sdk/trace" ) type testBatchExporter struct { diff --git a/sdk/trace/benchmark_test.go b/sdk/trace/benchmark_test.go index b5322e95f74..bad9c2430b3 100644 --- a/sdk/trace/benchmark_test.go +++ b/sdk/trace/benchmark_test.go @@ -19,9 +19,8 @@ import ( "testing" "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/trace" - sdktrace "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/trace" ) func BenchmarkStartEndSpan(b *testing.B) { diff --git a/sdk/trace/provider.go b/sdk/trace/provider.go index 3a32445bc75..47ff5fad1e2 100644 --- a/sdk/trace/provider.go +++ b/sdk/trace/provider.go @@ -21,10 +21,9 @@ import ( "sync/atomic" "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/resource" + "go.opentelemetry.io/otel/trace" ) const ( diff --git a/sdk/trace/simple_span_processor_test.go b/sdk/trace/simple_span_processor_test.go index 4ac7124c5fc..ea0f8de49de 100644 --- a/sdk/trace/simple_span_processor_test.go +++ b/sdk/trace/simple_span_processor_test.go @@ -20,9 +20,8 @@ import ( "testing" "time" - "go.opentelemetry.io/otel/trace" - sdktrace "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/trace" ) var ( diff --git a/sdk/trace/span.go b/sdk/trace/span.go index a12c68b40a9..41a68b58551 100644 --- a/sdk/trace/span.go +++ b/sdk/trace/span.go @@ -25,12 +25,11 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/internal" "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.7.0" + "go.opentelemetry.io/otel/trace" ) // ReadOnlySpan allows reading information from the data structure underlying a diff --git a/sdk/trace/trace_test.go b/sdk/trace/trace_test.go index 308d5ce18ab..be27ed62041 100644 --- a/sdk/trace/trace_test.go +++ b/sdk/trace/trace_test.go @@ -26,20 +26,18 @@ import ( "testing" "time" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/attribute" - "go.opentelemetry.io/otel/codes" - semconv "go.opentelemetry.io/otel/semconv/v1.7.0" - "go.opentelemetry.io/otel/trace" - "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/codes" ottest "go.opentelemetry.io/otel/internal/internaltest" - "go.opentelemetry.io/otel/sdk/instrumentation" "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.7.0" + "go.opentelemetry.io/otel/trace" ) const envVar = "OTEL_RESOURCE_ATTRIBUTES" diff --git a/sdk/trace/tracer.go b/sdk/trace/tracer.go index afd4b5b5d5b..1177c729a8f 100644 --- a/sdk/trace/tracer.go +++ b/sdk/trace/tracer.go @@ -18,9 +18,8 @@ import ( "context" "time" - "go.opentelemetry.io/otel/trace" - "go.opentelemetry.io/otel/sdk/instrumentation" + "go.opentelemetry.io/otel/trace" ) type tracer struct { diff --git a/trace/go.mod b/trace/go.mod index 8c001007502..50159925634 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -34,8 +34,6 @@ replace go.opentelemetry.io/otel/metric => ../metric replace go.opentelemetry.io/otel/sdk => ../sdk -replace go.opentelemetry.io/otel/sdk/export/metric => ../sdk/export/metric - replace go.opentelemetry.io/otel/sdk/metric => ../sdk/metric replace go.opentelemetry.io/otel/trace => ./ diff --git a/trace/trace_test.go b/trace/trace_test.go index 758c58185db..c9ffbf69572 100644 --- a/trace/trace_test.go +++ b/trace/trace_test.go @@ -19,11 +19,10 @@ import ( "context" "testing" + "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/attribute" - - "github.com/google/go-cmp/cmp" ) func TestSpanContextIsValid(t *testing.T) {