Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change entire repo to use the new vanityurl go.opentelemetry.io/collector #977

Merged
merged 1 commit into from
May 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ linters-settings:
goimports:
# put imports beginning with prefix after 3rd-party packages;
# it's a comma-separated list of prefixes
local-prefixes: github.com/open-telemetry/opentelemetry-collector
local-prefixes: go.opentelemetry.io/collector
misspell:
# Correct spellings using locale preferences for US or UK.
# Default is to use a neutral variety of English.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ Working with the project sources requires the following tools:
Fork the repo, checkout the upstream repo to your GOPATH by:

```
$ GO111MODULE="" go get -d github.com/open-telemetry/opentelemetry-collector
$ GO111MODULE="" go get -d go.opentelemetry.io/collector
```

Add your fork as an origin:

```shell
$ cd $(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-collector
$ cd $(go env GOPATH)/src/go.opentelemetry.io/collector
$ git remote add fork git@github.com:YOUR_GITHUB_USERNAME/opentelemetry-service.git
```

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ STATIC_CHECK=staticcheck
BUILD_TYPE?=release

GIT_SHA=$(shell git rev-parse --short HEAD)
BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector/internal/version
BUILD_INFO_IMPORT_PATH=go.opentelemetry.io/collector/internal/version
BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA)
ifdef VERSION
BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)
Expand Down Expand Up @@ -78,7 +78,7 @@ benchmark:
.PHONY: test-with-cover
test-with-cover:
@echo Verifying that all packages have test files to count in coverage
@internal/buildscripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemetry-collector/,./,$(ALL_PKGS_NO_TESTBED))
@internal/buildscripts/check-test-files.sh $(subst go.opentelemetry.io/collector/,./,$(ALL_PKGS_NO_TESTBED))
@echo pre-compiling tests
@time go test -i $(ALL_PKGS_NO_TESTBED)
$(GO_ACC) $(ALL_PKGS_NO_TESTBED)
Expand Down Expand Up @@ -130,12 +130,12 @@ lint: lint-static-check

.PHONY: impi
impi:
@$(IMPI) --local github.com/open-telemetry/opentelemetry-collector --scheme stdThirdPartyLocal ./...
@$(IMPI) --local go.opentelemetry.io/collector --scheme stdThirdPartyLocal ./...

.PHONY: fmt
fmt:
gofmt -w -s ./
goimports -w -local github.com/open-telemetry/opentelemetry-collector ./
goimports -w -local go.opentelemetry.io/collector ./

.PHONY: install-tools
install-tools:
Expand Down
6 changes: 3 additions & 3 deletions cmd/otelcol/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package main
import (
"log"

"github.com/open-telemetry/opentelemetry-collector/internal/version"
"github.com/open-telemetry/opentelemetry-collector/service"
"github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
"go.opentelemetry.io/collector/internal/version"
"go.opentelemetry.io/collector/service"
"go.opentelemetry.io/collector/service/defaultcomponents"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pdatagen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"os"

"github.com/open-telemetry/opentelemetry-collector/cmd/pdatagen/internal"
"go.opentelemetry.io/collector/cmd/pdatagen/internal"
)

func check(e error) {
Expand Down
2 changes: 1 addition & 1 deletion component/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package component
import (
"context"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

// Component is either a receiver, exporter, processor or extension.
Expand Down
2 changes: 1 addition & 1 deletion component/componenterror/errors_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"testing"

"github.com/open-telemetry/opentelemetry-collector/component/componenterror"
"go.opentelemetry.io/collector/component/componenterror"
)

func TestCombineErrors(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions component/componenttest/error_waiting_host.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package componenttest
import (
"time"

"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configmodels"
)

// ErrorWaitingHost mocks an component.Host for test purposes.
Expand Down
4 changes: 2 additions & 2 deletions component/componenttest/nop_host.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package componenttest

import (
"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configmodels"
)

// NopHost mocks a receiver.ReceiverHost for test purposes.
Expand Down
4 changes: 2 additions & 2 deletions component/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
)

// Exporter defines functions that all exporters must implement.
Expand Down
2 changes: 1 addition & 1 deletion component/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/stretchr/testify/assert"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

type TestExporterFactory struct {
Expand Down
2 changes: 1 addition & 1 deletion component/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

// ServiceExtension is the interface for objects hosted by the OpenTelemetry Collector that
Expand Down
2 changes: 1 addition & 1 deletion component/factory_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package component
import (
"fmt"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

// MakeReceiverFactoryMap takes a list of receiver factories and returns a map
Expand Down
4 changes: 2 additions & 2 deletions component/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
)

// Processor defines the common functions that must be implemented by TraceProcessor
Expand Down
6 changes: 3 additions & 3 deletions component/processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/stretchr/testify/assert"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configerror"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"go.opentelemetry.io/collector/config/configerror"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
)

type TestProcessorFactory struct {
Expand Down
4 changes: 2 additions & 2 deletions component/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
)

// Receiver defines functions that trace and metric receivers must implement.
Expand Down
4 changes: 2 additions & 2 deletions component/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/stretchr/testify/assert"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
)

type TestReceiverFactory struct {
Expand Down
4 changes: 2 additions & 2 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configmodels"
)

// These are errors that can be returned by Load(). Note that error codes are not part
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

func TestDecodeConfig(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions config/configcheck/configcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"regexp"
"strings"

"github.com/open-telemetry/opentelemetry-collector/component/componenterror"
"github.com/open-telemetry/opentelemetry-collector/config"
"go.opentelemetry.io/collector/component/componenterror"
"go.opentelemetry.io/collector/config"
)

// The regular expression for valid config field tag.
Expand Down
6 changes: 3 additions & 3 deletions config/configcheck/configcheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/service/defaultcomponents"
)

func TestValidateConfigFromFactories_Success(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion config/configtest/configtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/spf13/viper"
"github.com/stretchr/testify/require"

"github.com/open-telemetry/opentelemetry-collector/config"
"go.opentelemetry.io/collector/config"
)

// NewViperFromYamlFile creates a viper instance that reads the given fileName as yaml config
Expand Down
12 changes: 6 additions & 6 deletions config/example_factories.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configerror"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/internal/data"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configerror"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/internal/data"
)

// ExampleReceiver is for testing purposes. We are defining an example config and factory
Expand Down
4 changes: 2 additions & 2 deletions config/example_factories_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (

"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-collector/component/componenttest"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer/consumerdata"
)

func TestExampleExporterConsumer(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion config/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"go.opentelemetry.io/collector/config/configmodels"
)

// LoadConfigFile loads a config from file.
Expand Down
6 changes: 3 additions & 3 deletions consumer/consumer.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package consumer
import (
"context"

"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdata"
"github.com/open-telemetry/opentelemetry-collector/internal/data"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/internal/data"
)

// MetricsConsumerBase defines a common interface for MetricsConsumerOld and MetricsConsumer.
Expand Down
10 changes: 5 additions & 5 deletions consumer/converter/converter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ package converter
import (
"context"

"github.com/open-telemetry/opentelemetry-collector/consumer"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdatautil"
"github.com/open-telemetry/opentelemetry-collector/translator/internaldata"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/consumer/pdatautil"
"go.opentelemetry.io/collector/translator/internaldata"
)

// NewInternalToOCTraceConverter creates new internalToOCTraceConverter that takes TraceConsumer and
Expand Down
8 changes: 4 additions & 4 deletions consumer/converter/converter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (

"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-collector/consumer/pdatautil"
"github.com/open-telemetry/opentelemetry-collector/exporter/exportertest"
"github.com/open-telemetry/opentelemetry-collector/internal/data/testdata"
"github.com/open-telemetry/opentelemetry-collector/translator/internaldata"
"go.opentelemetry.io/collector/consumer/pdatautil"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/internal/data/testdata"
"go.opentelemetry.io/collector/translator/internaldata"
)

func TestNewInternalToOCTraceConverter(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions consumer/pdatautil/pdatautil.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/golang/protobuf/proto"

"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdata"
"github.com/open-telemetry/opentelemetry-collector/internal/data"
"github.com/open-telemetry/opentelemetry-collector/translator/internaldata"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/internal/data"
"go.opentelemetry.io/collector/translator/internaldata"
)

// MetricsToMetricsData returns the `[]consumerdata.MetricsData` representation of the `pdata.Metrics`.
Expand Down
6 changes: 3 additions & 3 deletions consumer/pdatautil/pdatautil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
ocmetrics "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdata"
"github.com/open-telemetry/opentelemetry-collector/internal/data/testdata"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/internal/data/testdata"
)

func TestMetricCount(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions exporter/exporterhelper/metricshelper.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ package exporterhelper
import (
"context"

"github.com/open-telemetry/opentelemetry-collector/component"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/pdatautil"
"github.com/open-telemetry/opentelemetry-collector/obsreport"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configmodels"
"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
"go.opentelemetry.io/collector/consumer/pdatautil"
"go.opentelemetry.io/collector/obsreport"
)

// PushMetricsDataOld is a helper function that is similar to ConsumeMetricsData but also returns
Expand Down