From e4eb804471ca1d0d3997250a1c281b10542e46c0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 17 Apr 2020 17:40:17 +0200 Subject: [PATCH] Add the toplevel module (make `make` working again) (#16) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add the toplevel module So the go tooling stops throwing weird errors. Without that, running make fails with the following message: ``` PATH="/…/.tools:${PATH}" go generate ./... can't load package: package ./exporters/metric/dogstatsd: code in directory /…/exporters/metric/dogstatsd expects import "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd" can't load package: package ./plugins/sample/trace: code in directory /…/plugins/sample/trace expects import "github.com/open-telemetry/opentelemetry-go-contrib/plugins/sample/trace" make: *** [Makefile:113: generate] Error 1 ``` * Rename the module to use the vanity URL The `go.opentelemetry.io/contrib` vanity URL is working now, so let's officially switch to it. --- doc.go | 6 ++++++ exporters/metric/dogstatsd/dogstatsd.go | 4 ++-- exporters/metric/dogstatsd/dogstatsd_test.go | 2 +- exporters/metric/dogstatsd/example_test.go | 2 +- exporters/metric/dogstatsd/go.mod | 2 +- exporters/metric/dogstatsd/internal/statsd/conn_test.go | 2 +- exporters/metric/dogstatsd/labels_test.go | 2 +- go.mod | 3 +++ plugins/sample/trace/doc.go | 2 +- plugins/sample/trace/example_test.go | 2 +- plugins/sample/trace/go.mod | 2 +- plugins/sample/trace/sample_test.go | 3 ++- tools/go.mod | 2 +- 13 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 doc.go create mode 100644 go.mod diff --git a/doc.go b/doc.go new file mode 100644 index 00000000000..1f4a3dcee6d --- /dev/null +++ b/doc.go @@ -0,0 +1,6 @@ +// This package provides all of its functionality through its +// submodules. The submodules in the exporters directory provide +// implementations for trace and metric exporters for third-party +// collectors, and submodules in the plugins directory provide the +// instrumentation for the popular go libraries. +package contrib diff --git a/exporters/metric/dogstatsd/dogstatsd.go b/exporters/metric/dogstatsd/dogstatsd.go index 84286f748bb..9c69d95409c 100644 --- a/exporters/metric/dogstatsd/dogstatsd.go +++ b/exporters/metric/dogstatsd/dogstatsd.go @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package dogstatsd // import "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd" +package dogstatsd // import "go.opentelemetry.io/contrib/exporters/metric/dogstatsd" import ( "bytes" "time" - "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd/internal/statsd" + "go.opentelemetry.io/contrib/exporters/metric/dogstatsd/internal/statsd" "go.opentelemetry.io/otel/api/global" "go.opentelemetry.io/otel/api/metric" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/exporters/metric/dogstatsd/dogstatsd_test.go b/exporters/metric/dogstatsd/dogstatsd_test.go index f4e5f5716a2..5ec9e49cb9c 100644 --- a/exporters/metric/dogstatsd/dogstatsd_test.go +++ b/exporters/metric/dogstatsd/dogstatsd_test.go @@ -19,9 +19,9 @@ import ( "context" "testing" - "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd" "github.com/stretchr/testify/require" + "go.opentelemetry.io/contrib/exporters/metric/dogstatsd" "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" diff --git a/exporters/metric/dogstatsd/example_test.go b/exporters/metric/dogstatsd/example_test.go index fd4f763f2b3..5f3630fe4c8 100644 --- a/exporters/metric/dogstatsd/example_test.go +++ b/exporters/metric/dogstatsd/example_test.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd" + "go.opentelemetry.io/contrib/exporters/metric/dogstatsd" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" ) diff --git a/exporters/metric/dogstatsd/go.mod b/exporters/metric/dogstatsd/go.mod index 85135039b2b..17cdab6bad5 100644 --- a/exporters/metric/dogstatsd/go.mod +++ b/exporters/metric/dogstatsd/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd +module go.opentelemetry.io/contrib/exporters/metric/dogstatsd go 1.14 diff --git a/exporters/metric/dogstatsd/internal/statsd/conn_test.go b/exporters/metric/dogstatsd/internal/statsd/conn_test.go index f6b0139af91..99ef236724d 100644 --- a/exporters/metric/dogstatsd/internal/statsd/conn_test.go +++ b/exporters/metric/dogstatsd/internal/statsd/conn_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd/internal/statsd" "github.com/stretchr/testify/require" + "go.opentelemetry.io/contrib/exporters/metric/dogstatsd/internal/statsd" "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" "go.opentelemetry.io/otel/api/metric" diff --git a/exporters/metric/dogstatsd/labels_test.go b/exporters/metric/dogstatsd/labels_test.go index 07ba467c9c1..1d2c7a113d5 100644 --- a/exporters/metric/dogstatsd/labels_test.go +++ b/exporters/metric/dogstatsd/labels_test.go @@ -17,9 +17,9 @@ package dogstatsd_test import ( "testing" - "github.com/open-telemetry/opentelemetry-go-contrib/exporters/metric/dogstatsd" "github.com/stretchr/testify/require" + "go.opentelemetry.io/contrib/exporters/metric/dogstatsd" "go.opentelemetry.io/otel/api/core" "go.opentelemetry.io/otel/api/key" export "go.opentelemetry.io/otel/sdk/export/metric" diff --git a/go.mod b/go.mod new file mode 100644 index 00000000000..3a96b217dec --- /dev/null +++ b/go.mod @@ -0,0 +1,3 @@ +module go.opentelemetry.io/contrib + +go 1.14 diff --git a/plugins/sample/trace/doc.go b/plugins/sample/trace/doc.go index 74d69c14fb9..844aff30dd1 100644 --- a/plugins/sample/trace/doc.go +++ b/plugins/sample/trace/doc.go @@ -13,4 +13,4 @@ // limitations under the License. // Package sample contains a sample plugin for OpenTelemetry distributed tracing. -package trace // import "github.com/open-telemetry/opentelemetry-go-contrib/plugins/sample/trace" +package trace // import "go.opentelemetry.io/contrib/plugins/sample/trace" diff --git a/plugins/sample/trace/example_test.go b/plugins/sample/trace/example_test.go index 1536f72bcb2..bbd58d28153 100644 --- a/plugins/sample/trace/example_test.go +++ b/plugins/sample/trace/example_test.go @@ -15,7 +15,7 @@ package trace_test import ( - "github.com/open-telemetry/opentelemetry-go-contrib/plugins/sample/trace" + "go.opentelemetry.io/contrib/plugins/sample/trace" ) func ExampleRegister() { diff --git a/plugins/sample/trace/go.mod b/plugins/sample/trace/go.mod index ad03cb25a4c..a0f605376a9 100644 --- a/plugins/sample/trace/go.mod +++ b/plugins/sample/trace/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-go-contrib/plugins/sample/trace +module go.opentelemetry.io/contrib/plugins/sample/trace go 1.13 diff --git a/plugins/sample/trace/sample_test.go b/plugins/sample/trace/sample_test.go index 346ca7d0d5c..030a8c07b28 100644 --- a/plugins/sample/trace/sample_test.go +++ b/plugins/sample/trace/sample_test.go @@ -17,8 +17,9 @@ package trace_test import ( "testing" - "github.com/open-telemetry/opentelemetry-go-contrib/plugins/sample/trace" "github.com/stretchr/testify/assert" + + "go.opentelemetry.io/contrib/plugins/sample/trace" ) // Register registers sample plugin to instrument a Sample appliction. diff --git a/tools/go.mod b/tools/go.mod index 9203448e4ad..c2bd2407c80 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module go.opentelemetry.io/otel/tools +module go.opentelemetry.io/contrib/tools go 1.13