Skip to content

Commit

Permalink
Add the toplevel module (make make working again) (#16)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
krnowak authored Apr 17, 2020
1 parent da45c10 commit e4eb804
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 12 deletions.
6 changes: 6 additions & 0 deletions doc.go
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions exporters/metric/dogstatsd/dogstatsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/dogstatsd/dogstatsd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/dogstatsd/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/dogstatsd/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/dogstatsd/internal/statsd/conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion exporters/metric/dogstatsd/labels_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module go.opentelemetry.io/contrib

go 1.14
2 changes: 1 addition & 1 deletion plugins/sample/trace/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion plugins/sample/trace/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion plugins/sample/trace/go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 2 additions & 1 deletion plugins/sample/trace/sample_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module go.opentelemetry.io/otel/tools
module go.opentelemetry.io/contrib/tools

go 1.13

Expand Down

0 comments on commit e4eb804

Please sign in to comment.