diff --git a/README.md b/README.md index 04347231d..af7d1a2aa 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ import ( "log" "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/api/global/internal/meter_test.go b/api/global/internal/meter_test.go index 0156d40a1..1d8edc41a 100644 --- a/api/global/internal/meter_test.go +++ b/api/global/internal/meter_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/global/internal" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/metric/stdout" + "go.opentelemetry.io/otel/exporters/metric/stdout" metrictest "go.opentelemetry.io/otel/internal/metric" ) diff --git a/example/basic/main.go b/example/basic/main.go index 88e854dfd..36c87f6c1 100644 --- a/example/basic/main.go +++ b/example/basic/main.go @@ -23,8 +23,8 @@ import ( "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" "go.opentelemetry.io/otel/api/trace" - metricstdout "go.opentelemetry.io/otel/exporter/metric/stdout" - tracestdout "go.opentelemetry.io/otel/exporter/trace/stdout" + metricstdout "go.opentelemetry.io/otel/exporters/metric/stdout" + tracestdout "go.opentelemetry.io/otel/exporters/trace/stdout" "go.opentelemetry.io/otel/sdk/metric/controller/push" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/grpc/config/config.go b/example/grpc/config/config.go index 0a493dc40..6ebef485b 100644 --- a/example/grpc/config/config.go +++ b/example/grpc/config/config.go @@ -18,7 +18,7 @@ import ( "log" "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/http-stackdriver/client/client.go b/example/http-stackdriver/client/client.go index 0e27658fe..0595c9e04 100644 --- a/example/http-stackdriver/client/client.go +++ b/example/http-stackdriver/client/client.go @@ -30,7 +30,7 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporter/trace/stackdriver" + "go.opentelemetry.io/otel/exporters/trace/stackdriver" "go.opentelemetry.io/otel/plugin/httptrace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/http-stackdriver/go.mod b/example/http-stackdriver/go.mod index b90810701..3cb9719b9 100644 --- a/example/http-stackdriver/go.mod +++ b/example/http-stackdriver/go.mod @@ -4,11 +4,11 @@ go 1.13 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporter/trace/stackdriver => ../../exporter/trace/stackdriver + go.opentelemetry.io/otel/exporters/trace/stackdriver => ../../exporters/trace/stackdriver ) require ( go.opentelemetry.io/otel v0.2.1 - go.opentelemetry.io/otel/exporter/trace/stackdriver v0.2.1 + go.opentelemetry.io/otel/exporters/trace/stackdriver v0.2.1 google.golang.org/grpc v1.24.0 ) diff --git a/example/http-stackdriver/server/server.go b/example/http-stackdriver/server/server.go index 233a1b266..476750ca7 100644 --- a/example/http-stackdriver/server/server.go +++ b/example/http-stackdriver/server/server.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/api/correlation" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporter/trace/stackdriver" + "go.opentelemetry.io/otel/exporters/trace/stackdriver" "go.opentelemetry.io/otel/plugin/httptrace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/http/client/client.go b/example/http/client/client.go index 202502b8f..769e3ce4f 100644 --- a/example/http/client/client.go +++ b/example/http/client/client.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" "go.opentelemetry.io/otel/plugin/httptrace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/http/server/server.go b/example/http/server/server.go index 07a092207..f1d111647 100644 --- a/example/http/server/server.go +++ b/example/http/server/server.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/otel/api/correlation" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" "go.opentelemetry.io/otel/plugin/httptrace" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index 9e2920e68..1108a69ee 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -4,10 +4,10 @@ go 1.13 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporter/trace/jaeger => ../../exporter/trace/jaeger + go.opentelemetry.io/otel/exporters/trace/jaeger => ../../exporters/trace/jaeger ) require ( go.opentelemetry.io/otel v0.2.1 - go.opentelemetry.io/otel/exporter/trace/jaeger v0.2.1 + go.opentelemetry.io/otel/exporters/trace/jaeger v0.2.1 ) diff --git a/example/jaeger/main.go b/example/jaeger/main.go index b64c4e591..35bfc17c3 100644 --- a/example/jaeger/main.go +++ b/example/jaeger/main.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/trace/jaeger" + "go.opentelemetry.io/otel/exporters/trace/jaeger" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/namedtracer/main.go b/example/namedtracer/main.go index 18f3429f8..8d1d11861 100644 --- a/example/namedtracer/main.go +++ b/example/namedtracer/main.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/trace" "go.opentelemetry.io/otel/example/namedtracer/foo" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index b805d0bd8..73776aea5 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -4,10 +4,10 @@ go 1.13 replace ( go.opentelemetry.io/otel => ../.. - go.opentelemetry.io/otel/exporter/metric/prometheus => ../../exporter/metric/prometheus + go.opentelemetry.io/otel/exporters/metric/prometheus => ../../exporters/metric/prometheus ) require ( go.opentelemetry.io/otel v0.2.1 - go.opentelemetry.io/otel/exporter/metric/prometheus v0.2.1 + go.opentelemetry.io/otel/exporters/metric/prometheus v0.2.1 ) diff --git a/example/prometheus/main.go b/example/prometheus/main.go index db60cc98c..61286709e 100644 --- a/example/prometheus/main.go +++ b/example/prometheus/main.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporter/metric/prometheus" + "go.opentelemetry.io/otel/exporters/metric/prometheus" "go.opentelemetry.io/otel/sdk/metric/controller/push" ) diff --git a/exporter/metric/dogstatsd/dogstatsd.go b/exporters/metric/dogstatsd/dogstatsd.go similarity index 96% rename from exporter/metric/dogstatsd/dogstatsd.go rename to exporters/metric/dogstatsd/dogstatsd.go index 449559031..40c2ed2ca 100644 --- a/exporter/metric/dogstatsd/dogstatsd.go +++ b/exporters/metric/dogstatsd/dogstatsd.go @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -package dogstatsd // import "go.opentelemetry.io/otel/exporter/metric/dogstatsd" +package dogstatsd // import "go.opentelemetry.io/otel/exporters/metric/dogstatsd" import ( "bytes" "time" "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/exporter/metric/internal/statsd" + "go.opentelemetry.io/otel/exporters/metric/internal/statsd" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric/batcher/ungrouped" diff --git a/exporter/metric/dogstatsd/dogstatsd_test.go b/exporters/metric/dogstatsd/dogstatsd_test.go similarity index 92% rename from exporter/metric/dogstatsd/dogstatsd_test.go rename to exporters/metric/dogstatsd/dogstatsd_test.go index 0ace98d9c..01d230df8 100644 --- a/exporter/metric/dogstatsd/dogstatsd_test.go +++ b/exporters/metric/dogstatsd/dogstatsd_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/metric/dogstatsd" - "go.opentelemetry.io/otel/exporter/metric/internal/statsd" - "go.opentelemetry.io/otel/exporter/metric/test" + "go.opentelemetry.io/otel/exporters/metric/dogstatsd" + "go.opentelemetry.io/otel/exporters/metric/internal/statsd" + "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/aggregator/counter" diff --git a/exporter/metric/dogstatsd/example_test.go b/exporters/metric/dogstatsd/example_test.go similarity index 96% rename from exporter/metric/dogstatsd/example_test.go rename to exporters/metric/dogstatsd/example_test.go index 86c7cf6fc..fcbfbc349 100644 --- a/exporter/metric/dogstatsd/example_test.go +++ b/exporters/metric/dogstatsd/example_test.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporter/metric/dogstatsd" + "go.opentelemetry.io/otel/exporters/metric/dogstatsd" ) func ExampleNew() { diff --git a/exporter/metric/internal/statsd/conn.go b/exporters/metric/internal/statsd/conn.go similarity index 100% rename from exporter/metric/internal/statsd/conn.go rename to exporters/metric/internal/statsd/conn.go diff --git a/exporter/metric/internal/statsd/conn_test.go b/exporters/metric/internal/statsd/conn_test.go similarity index 98% rename from exporter/metric/internal/statsd/conn_test.go rename to exporters/metric/internal/statsd/conn_test.go index eb0cd525a..50d53d1a6 100644 --- a/exporter/metric/internal/statsd/conn_test.go +++ b/exporters/metric/internal/statsd/conn_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/unit" - "go.opentelemetry.io/otel/exporter/metric/internal/statsd" - "go.opentelemetry.io/otel/exporter/metric/test" + "go.opentelemetry.io/otel/exporters/metric/internal/statsd" + "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" ) diff --git a/exporter/metric/internal/statsd/labels.go b/exporters/metric/internal/statsd/labels.go similarity index 100% rename from exporter/metric/internal/statsd/labels.go rename to exporters/metric/internal/statsd/labels.go diff --git a/exporter/metric/internal/statsd/labels_test.go b/exporters/metric/internal/statsd/labels_test.go similarity index 97% rename from exporter/metric/internal/statsd/labels_test.go rename to exporters/metric/internal/statsd/labels_test.go index d3070de66..df1e3dfd9 100644 --- a/exporter/metric/internal/statsd/labels_test.go +++ b/exporters/metric/internal/statsd/labels_test.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/metric/internal/statsd" + "go.opentelemetry.io/otel/exporters/metric/internal/statsd" export "go.opentelemetry.io/otel/sdk/export/metric" sdk "go.opentelemetry.io/otel/sdk/metric" ) diff --git a/exporter/metric/prometheus/README.md b/exporters/metric/prometheus/README.md similarity index 61% rename from exporter/metric/prometheus/README.md rename to exporters/metric/prometheus/README.md index a6e37b878..85e79fa99 100644 --- a/exporter/metric/prometheus/README.md +++ b/exporters/metric/prometheus/README.md @@ -4,5 +4,5 @@ OpenTelemetry Prometheus exporter ## Installation ``` -go get -u go.opentelemetry.io/otel/exporter/metric/prometheus +go get -u go.opentelemetry.io/otel/exporters/metric/prometheus ``` diff --git a/exporter/metric/prometheus/go.mod b/exporters/metric/prometheus/go.mod similarity index 75% rename from exporter/metric/prometheus/go.mod rename to exporters/metric/prometheus/go.mod index 8316365af..ade3adcca 100644 --- a/exporter/metric/prometheus/go.mod +++ b/exporters/metric/prometheus/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/otel/exporter/metric/prometheus +module go.opentelemetry.io/otel/exporters/metric/prometheus go 1.13 diff --git a/exporter/metric/prometheus/go.sum b/exporters/metric/prometheus/go.sum similarity index 100% rename from exporter/metric/prometheus/go.sum rename to exporters/metric/prometheus/go.sum diff --git a/exporter/metric/prometheus/prometheus.go b/exporters/metric/prometheus/prometheus.go similarity index 100% rename from exporter/metric/prometheus/prometheus.go rename to exporters/metric/prometheus/prometheus.go diff --git a/exporter/metric/prometheus/prometheus_test.go b/exporters/metric/prometheus/prometheus_test.go similarity index 96% rename from exporter/metric/prometheus/prometheus_test.go rename to exporters/metric/prometheus/prometheus_test.go index 999b93242..6aee38383 100644 --- a/exporter/metric/prometheus/prometheus_test.go +++ b/exporters/metric/prometheus/prometheus_test.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/metric/prometheus" - "go.opentelemetry.io/otel/exporter/metric/test" + "go.opentelemetry.io/otel/exporters/metric/prometheus" + "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/metric" ) diff --git a/exporter/metric/prometheus/sanitize.go b/exporters/metric/prometheus/sanitize.go similarity index 100% rename from exporter/metric/prometheus/sanitize.go rename to exporters/metric/prometheus/sanitize.go diff --git a/exporter/metric/prometheus/sanitize_test.go b/exporters/metric/prometheus/sanitize_test.go similarity index 100% rename from exporter/metric/prometheus/sanitize_test.go rename to exporters/metric/prometheus/sanitize_test.go diff --git a/exporter/metric/stdout/example_test.go b/exporters/metric/stdout/example_test.go similarity index 93% rename from exporter/metric/stdout/example_test.go rename to exporters/metric/stdout/example_test.go index 5034146c8..74a61cb5f 100644 --- a/exporter/metric/stdout/example_test.go +++ b/exporters/metric/stdout/example_test.go @@ -7,7 +7,7 @@ import ( "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporter/metric/stdout" + "go.opentelemetry.io/otel/exporters/metric/stdout" ) func ExampleNewExportPipeline() { diff --git a/exporter/metric/stdout/stdout.go b/exporters/metric/stdout/stdout.go similarity index 98% rename from exporter/metric/stdout/stdout.go rename to exporters/metric/stdout/stdout.go index bc42ea54b..465afdf75 100644 --- a/exporter/metric/stdout/stdout.go +++ b/exporters/metric/stdout/stdout.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package stdout // import "go.opentelemetry.io/otel/exporter/metric/stdout" +package stdout // import "go.opentelemetry.io/otel/exporters/metric/stdout" import ( "context" diff --git a/exporter/metric/stdout/stdout_test.go b/exporters/metric/stdout/stdout_test.go similarity index 98% rename from exporter/metric/stdout/stdout_test.go rename to exporters/metric/stdout/stdout_test.go index 40bfd7d5c..dd3cd47ba 100644 --- a/exporter/metric/stdout/stdout_test.go +++ b/exporters/metric/stdout/stdout_test.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" - "go.opentelemetry.io/otel/exporter/metric/stdout" - "go.opentelemetry.io/otel/exporter/metric/test" + "go.opentelemetry.io/otel/exporters/metric/stdout" + "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregator" sdk "go.opentelemetry.io/otel/sdk/metric" diff --git a/exporter/metric/test/test.go b/exporters/metric/test/test.go similarity index 100% rename from exporter/metric/test/test.go rename to exporters/metric/test/test.go diff --git a/exporter/trace/jaeger/README.md b/exporters/trace/jaeger/README.md similarity index 61% rename from exporter/trace/jaeger/README.md rename to exporters/trace/jaeger/README.md index fec8185d8..f0c58564a 100644 --- a/exporter/trace/jaeger/README.md +++ b/exporters/trace/jaeger/README.md @@ -4,5 +4,5 @@ OpenTelemetry Jaeger exporter ## Installation ``` -go get -u go.opentelemetry.io/otel/exporter/trace/jaeger +go get -u go.opentelemetry.io/otel/exporters/trace/jaeger ``` diff --git a/exporter/trace/jaeger/agent.go b/exporters/trace/jaeger/agent.go similarity index 97% rename from exporter/trace/jaeger/agent.go rename to exporters/trace/jaeger/agent.go index 6f211b69b..3d957187b 100644 --- a/exporter/trace/jaeger/agent.go +++ b/exporters/trace/jaeger/agent.go @@ -21,7 +21,7 @@ import ( "github.com/apache/thrift/lib/go/thrift" - gen "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" ) // udpPacketMaxLength is the max size of UDP packet we want to send, synced with jaeger-agent diff --git a/exporter/trace/jaeger/doc.go b/exporters/trace/jaeger/doc.go similarity index 89% rename from exporter/trace/jaeger/doc.go rename to exporters/trace/jaeger/doc.go index b65dab0c4..19e9029d1 100644 --- a/exporter/trace/jaeger/doc.go +++ b/exporters/trace/jaeger/doc.go @@ -13,4 +13,4 @@ // limitations under the License. // Package jaeger contains an OpenTelemetry tracing exporter for Jaeger. -package jaeger // import "go.opentelemetry.io/otel/exporter/trace/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger" diff --git a/exporter/trace/jaeger/go.mod b/exporters/trace/jaeger/go.mod similarity index 82% rename from exporter/trace/jaeger/go.mod rename to exporters/trace/jaeger/go.mod index 675ff04db..4ea0641ab 100644 --- a/exporter/trace/jaeger/go.mod +++ b/exporters/trace/jaeger/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/otel/exporter/trace/jaeger +module go.opentelemetry.io/otel/exporters/trace/jaeger go 1.13 diff --git a/exporter/trace/jaeger/go.sum b/exporters/trace/jaeger/go.sum similarity index 100% rename from exporter/trace/jaeger/go.sum rename to exporters/trace/jaeger/go.sum diff --git a/exporter/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go b/exporters/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go similarity index 100% rename from exporter/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go rename to exporters/trace/jaeger/internal/gen-go/jaeger/GoUnusedProtection__.go diff --git a/exporter/trace/jaeger/internal/gen-go/jaeger/agent.go b/exporters/trace/jaeger/internal/gen-go/jaeger/agent.go similarity index 100% rename from exporter/trace/jaeger/internal/gen-go/jaeger/agent.go rename to exporters/trace/jaeger/internal/gen-go/jaeger/agent.go diff --git a/exporter/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go b/exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go similarity index 98% rename from exporter/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go rename to exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go index ecfac3972..9f462d86c 100755 --- a/exporter/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go +++ b/exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go @@ -16,7 +16,7 @@ import ( "github.com/apache/thrift/lib/go/thrift" - "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" + "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" ) func Usage() { diff --git a/exporter/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go b/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go similarity index 100% rename from exporter/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go rename to exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go diff --git a/exporter/trace/jaeger/internal/gen-go/jaeger/jaeger.go b/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go similarity index 99% rename from exporter/trace/jaeger/internal/gen-go/jaeger/jaeger.go rename to exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go index 97f292bb9..3dc6f6cbf 100644 --- a/exporter/trace/jaeger/internal/gen-go/jaeger/jaeger.go +++ b/exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go @@ -1,7 +1,7 @@ // Autogenerated by Thrift Compiler (0.11.0) // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING -package jaeger // import "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" +package jaeger // import "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" import ( "bytes" diff --git a/exporter/trace/jaeger/jaeger.go b/exporters/trace/jaeger/jaeger.go similarity index 99% rename from exporter/trace/jaeger/jaeger.go rename to exporters/trace/jaeger/jaeger.go index 5cc83e362..597659beb 100644 --- a/exporter/trace/jaeger/jaeger.go +++ b/exporters/trace/jaeger/jaeger.go @@ -23,7 +23,7 @@ import ( "google.golang.org/grpc/codes" "go.opentelemetry.io/otel/api/core" - gen "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" export "go.opentelemetry.io/otel/sdk/export/trace" ) diff --git a/exporter/trace/jaeger/jaeger_test.go b/exporters/trace/jaeger/jaeger_test.go similarity index 98% rename from exporter/trace/jaeger/jaeger_test.go rename to exporters/trace/jaeger/jaeger_test.go index 17b2d37ab..8ac905384 100644 --- a/exporter/trace/jaeger/jaeger_test.go +++ b/exporters/trace/jaeger/jaeger_test.go @@ -33,7 +33,7 @@ import ( sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/api/core" - gen "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" export "go.opentelemetry.io/otel/sdk/export/trace" ) diff --git a/exporter/trace/jaeger/uploader.go b/exporters/trace/jaeger/uploader.go similarity index 97% rename from exporter/trace/jaeger/uploader.go rename to exporters/trace/jaeger/uploader.go index 98bd78466..8252190a8 100644 --- a/exporter/trace/jaeger/uploader.go +++ b/exporters/trace/jaeger/uploader.go @@ -10,7 +10,7 @@ import ( "github.com/apache/thrift/lib/go/thrift" - gen "go.opentelemetry.io/otel/exporter/trace/jaeger/internal/gen-go/jaeger" + gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger" ) // batchUploader send a batch of spans to Jaeger diff --git a/exporter/trace/stackdriver/go.mod b/exporters/trace/stackdriver/go.mod similarity index 86% rename from exporter/trace/stackdriver/go.mod rename to exporters/trace/stackdriver/go.mod index 564ed8359..01b6b5d5a 100644 --- a/exporter/trace/stackdriver/go.mod +++ b/exporters/trace/stackdriver/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/otel/exporter/trace/stackdriver +module go.opentelemetry.io/otel/exporters/trace/stackdriver go 1.13 diff --git a/exporter/trace/stackdriver/go.sum b/exporters/trace/stackdriver/go.sum similarity index 100% rename from exporter/trace/stackdriver/go.sum rename to exporters/trace/stackdriver/go.sum diff --git a/exporter/trace/stackdriver/stackdriver.go b/exporters/trace/stackdriver/stackdriver.go similarity index 100% rename from exporter/trace/stackdriver/stackdriver.go rename to exporters/trace/stackdriver/stackdriver.go diff --git a/exporter/trace/stackdriver/stackdriver_test.go b/exporters/trace/stackdriver/stackdriver_test.go similarity index 98% rename from exporter/trace/stackdriver/stackdriver_test.go rename to exporters/trace/stackdriver/stackdriver_test.go index 7f4c9f219..e529ab263 100644 --- a/exporter/trace/stackdriver/stackdriver_test.go +++ b/exporters/trace/stackdriver/stackdriver_test.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc" "go.opentelemetry.io/otel/api/global" - "go.opentelemetry.io/otel/exporter/trace/stackdriver" + "go.opentelemetry.io/otel/exporters/trace/stackdriver" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/exporter/trace/stackdriver/trace.go b/exporters/trace/stackdriver/trace.go similarity index 97% rename from exporter/trace/stackdriver/trace.go rename to exporters/trace/stackdriver/trace.go index fd1714e90..3e6f46aec 100644 --- a/exporter/trace/stackdriver/trace.go +++ b/exporters/trace/stackdriver/trace.go @@ -80,7 +80,7 @@ func (e *traceExporter) uploadSpans(ctx context.Context, spans []*tracepb.Span) // tracer := apitrace.Register() // ctx, span := tracer.Start( // ctx, - // "go.opentelemetry.io/otel/exporter/stackdriver.uploadSpans", + // "go.opentelemetry.io/otel/exporters/stackdriver.uploadSpans", // ) // defer span.End() // span.SetAttributes(key.New("num_spans").Int64(int64(len(spans)))) diff --git a/exporter/trace/stackdriver/trace_proto.go b/exporters/trace/stackdriver/trace_proto.go similarity index 100% rename from exporter/trace/stackdriver/trace_proto.go rename to exporters/trace/stackdriver/trace_proto.go diff --git a/exporter/trace/stdout/doc.go b/exporters/trace/stdout/doc.go similarity index 90% rename from exporter/trace/stdout/doc.go rename to exporters/trace/stdout/doc.go index df336e912..0bce749b5 100644 --- a/exporter/trace/stdout/doc.go +++ b/exporters/trace/stdout/doc.go @@ -13,4 +13,4 @@ // limitations under the License. // Package stdout contains an OpenTelemetry tracing exporter for writing to stdout. -package stdout // import "go.opentelemetry.io/otel/exporter/trace/stdout" +package stdout // import "go.opentelemetry.io/otel/exporters/trace/stdout" diff --git a/exporter/trace/stdout/stdout.go b/exporters/trace/stdout/stdout.go similarity index 100% rename from exporter/trace/stdout/stdout.go rename to exporters/trace/stdout/stdout.go diff --git a/exporter/trace/stdout/stdout_test.go b/exporters/trace/stdout/stdout_test.go similarity index 100% rename from exporter/trace/stdout/stdout_test.go rename to exporters/trace/stdout/stdout_test.go diff --git a/plugin/othttp/handler_example_test.go b/plugin/othttp/handler_example_test.go index 2e4ffc0ff..85ee28db2 100644 --- a/plugin/othttp/handler_example_test.go +++ b/plugin/othttp/handler_example_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporter/trace/stdout" + "go.opentelemetry.io/otel/exporters/trace/stdout" "go.opentelemetry.io/otel/plugin/othttp" sdktrace "go.opentelemetry.io/otel/sdk/trace" ) diff --git a/sdk/metric/controller/push/push_test.go b/sdk/metric/controller/push/push_test.go index 570f12f18..77e7599fa 100644 --- a/sdk/metric/controller/push/push_test.go +++ b/sdk/metric/controller/push/push_test.go @@ -25,7 +25,7 @@ import ( "github.com/benbjohnson/clock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/otel/exporter/metric/test" + "go.opentelemetry.io/otel/exporters/metric/test" export "go.opentelemetry.io/otel/sdk/export/metric" "go.opentelemetry.io/otel/sdk/export/metric/aggregator" sdk "go.opentelemetry.io/otel/sdk/metric" diff --git a/sdk/metric/example_test.go b/sdk/metric/example_test.go index f1b30ee99..5bb04d870 100644 --- a/sdk/metric/example_test.go +++ b/sdk/metric/example_test.go @@ -21,7 +21,7 @@ import ( "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporter/metric/stdout" + "go.opentelemetry.io/otel/exporters/metric/stdout" ) func ExampleNew() {