Update to use vanityurl for collector (#239)

Signed-off-by: Bogdan Drutu <[email protected]>

Makefile

@@ -43,6 +43,9 @@ test-with-cover:
 gotidy:
  $(MAKE) for-all CMD="go mod tidy"
 
+.PHONY: gofmt
+gofmt:
+ $(MAKE) for-all CMD="make fmt"
 
 .PHONY: for-all
 for-all:
@@ -115,4 +118,4 @@ update-dep:
 
 .PHONY: update-otel
 update-otel:
- $(MAKE) update-dep MODULE=github.com/open-telemetry/opentelemetry-collector VERSION=master
+ $(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=master

Makefile.Common

@@ -81,6 +81,12 @@ lint-static-check:
  echo "Static check finished successfully"; \
  fi
 
+
+.PHONY: fmt
+fmt:
+ gofmt -w -s ./
+ goimports -w -local github.com/open-telemetry/opentelemetry-collector-contrib ./
+
 .PHONY: lint
 lint: lint-static-check
  $(LINT) run

cmd/otelcontribcol/components.go

@@ -15,10 +15,10 @@
 package main
 
 import (
- "github.com/open-telemetry/opentelemetry-collector/component"
- "github.com/open-telemetry/opentelemetry-collector/component/componenterror"
- "github.com/open-telemetry/opentelemetry-collector/config"
- "github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
+ "go.opentelemetry.io/collector/component"
+ "go.opentelemetry.io/collector/component/componenterror"
+ "go.opentelemetry.io/collector/config"
+ "go.opentelemetry.io/collector/service/defaultcomponents"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter"

cmd/otelcontribcol/main.go

@@ -19,7 +19,7 @@ package main
 import (
  "log"
 
- "github.com/open-telemetry/opentelemetry-collector/service"
+ "go.opentelemetry.io/collector/service"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/internal/version"
 )

exporter/awsxrayexporter/awsxray.go

@@ -20,11 +20,11 @@ import (
  "github.com/aws/aws-sdk-go/aws/awserr"
  "github.com/aws/aws-sdk-go/service/xray"
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
- "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/consumererror"
- "github.com/open-telemetry/opentelemetry-collector/exporter/exporterhelper"
+ "go.opentelemetry.io/collector/component"
+ "go.opentelemetry.io/collector/config/configmodels"
+ "go.opentelemetry.io/collector/consumer/consumerdata"
+ "go.opentelemetry.io/collector/consumer/consumererror"
+ "go.opentelemetry.io/collector/exporter/exporterhelper"
  "go.uber.org/zap"
 
  "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/translator"

exporter/awsxrayexporter/awsxray_test.go

@@ -28,10 +28,10 @@ import (
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
  "github.com/golang/protobuf/ptypes/timestamp"
  "github.com/golang/protobuf/ptypes/wrappers"
- "github.com/open-telemetry/opentelemetry-collector/component"
- "github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ "go.opentelemetry.io/collector/component"
+ "go.opentelemetry.io/collector/consumer/consumerdata"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
  "go.uber.org/zap"
 )
 

exporter/awsxrayexporter/config.go

@@ -14,7 +14,7 @@
 
 package awsxrayexporter
 
-import "github.com/open-telemetry/opentelemetry-collector/config/configmodels"
+import "go.opentelemetry.io/collector/config/configmodels"
 
 // Config defines configuration for AWS X-Ray exporter.
 type Config struct {

exporter/awsxrayexporter/config_test.go

@@ -18,10 +18,10 @@ import (
  "path"
  "testing"
 
- "github.com/open-telemetry/opentelemetry-collector/config"
- "github.com/open-telemetry/opentelemetry-collector/config/configmodels"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "go.opentelemetry.io/collector/config"
+ "go.opentelemetry.io/collector/config/configmodels"
 )
 
 func TestLoadConfig(t *testing.T) {

exporter/awsxrayexporter/conn_test.go

@@ -22,9 +22,9 @@ import (
  "testing"
 
  "github.com/aws/aws-sdk-go/aws/session"
- "github.com/open-telemetry/opentelemetry-collector/config"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/mock"
+ "go.opentelemetry.io/collector/config"
  "go.uber.org/zap"
 )
 

exporter/awsxrayexporter/factory.go

@@ -15,9 +15,9 @@
 package awsxrayexporter
 
 import (
- "github.com/open-telemetry/opentelemetry-collector/component"
- "github.com/open-telemetry/opentelemetry-collector/config/configerror"
- "github.com/open-telemetry/opentelemetry-collector/config/configmodels"
+ "go.opentelemetry.io/collector/component"
+ "go.opentelemetry.io/collector/config/configerror"
+ "go.opentelemetry.io/collector/config/configmodels"
  "go.uber.org/zap"
 )
 

exporter/awsxrayexporter/factory_test.go

@@ -18,11 +18,11 @@ import (
  "path"
  "testing"
 
- "github.com/open-telemetry/opentelemetry-collector/config"
- "github.com/open-telemetry/opentelemetry-collector/config/configcheck"
- "github.com/open-telemetry/opentelemetry-collector/config/configmodels"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
+ "go.opentelemetry.io/collector/config"
+ "go.opentelemetry.io/collector/config/configcheck"
+ "go.opentelemetry.io/collector/config/configmodels"
  "go.uber.org/zap"
 )
 

exporter/awsxrayexporter/go.mod

@@ -7,8 +7,8 @@ require (
  github.com/census-instrumentation/opencensus-proto v0.2.1
  github.com/golang/protobuf v1.3.5
  github.com/mattn/go-isatty v0.0.10 // indirect
- github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200511154150-871119061598
  github.com/stretchr/testify v1.5.1
+ go.opentelemetry.io/collector v0.3.1-0.20200515190405-a637b41c22e3
  go.uber.org/zap v1.10.0
  golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 )

exporter/awsxrayexporter/go.sum

@@ -68,6 +68,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 h1:Fv9bK1Q+ly/ROk4aJsVMeuIwPel4bEnD8EPiI91nZMg=
 github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
@@ -617,8 +618,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.11.1 h1:/dBYI+n4xIL+Y9SKXQrjlKTmJJDwCSlNLRwZ5nBhIek=
-github.com/grpc-ecosystem/grpc-gateway v1.11.1/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.14.5 h1:aiLxiiVzAXb7wb3lAmubA69IokWOoUNe+E7TdGKh8yw=
+github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.2.0 h1:oPsuzLp2uk7I7rojPKuncWbZ+m5TMoD4Ivs+2Rkeh4Y=
 github.com/hashicorp/consul/api v1.2.0/go.mod h1:1SIkFYi2ZTXUE5Kgt179+4hH33djo11+0Eo2XgTAtkw=
@@ -916,8 +917,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200511154150-871119061598 h1:vA2X8qi+PGuF7nVc4iSs1oUJRH+zsspwbI35atVNis0=
-github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200511154150-871119061598/go.mod h1:ht/uOm+HLoXWjhq6seX/BoTwlR0dtCKFe2Y23YRk2a4=
 github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30=
 github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -931,8 +930,8 @@ github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsq
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/openzipkin/zipkin-go v0.2.1 h1:noL5/5Uf1HpVl3wNsfkZhIKbSWCVi5jgqkONNx8PXcA=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/orijtech/prometheus-go-metrics-exporter v0.0.4 h1:AAHKuTu2lX4eMPKV+CRcTug9KdMZ/Ckez7KK+ddEQfM=
-github.com/orijtech/prometheus-go-metrics-exporter v0.0.4/go.mod h1:BiTx/ugZex8LheBk3j53tktWaRdFjV5FCfT2o0P7msE=
+github.com/orijtech/prometheus-go-metrics-exporter v0.0.5 h1:76JFgRIgNDA3pW1fUhmqinU2u5ndHv1gvapDfGG+7/c=
+github.com/orijtech/prometheus-go-metrics-exporter v0.0.5/go.mod h1:BiTx/ugZex8LheBk3j53tktWaRdFjV5FCfT2o0P7msE=
 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
 github.com/ory/dockertest/v3 v3.5.4/go.mod h1:J8ZUbNB2FOhm1cFZW9xBpDsODqsSWcyYgtJYVPcnF70=
 github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
@@ -1029,6 +1028,7 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -1232,6 +1232,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
 go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
 go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opentelemetry.io/collector v0.3.1-0.20200515190405-a637b41c22e3 h1:Gh4QpeUT/nKIHP5CanwvUBPUuN4TOUdVdONy5efaNDI=
+go.opentelemetry.io/collector v0.3.1-0.20200515190405-a637b41c22e3/go.mod h1:aG66d9YK0UIQEjuQxr1vLaBwNnP4QgFpjNEqXDO/b1c=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1340,6 +1342,7 @@ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -1533,6 +1536,7 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 h1:iKtrH9Y8mcbADOP
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20200408120641-fbb3ad325eb7 h1:AMRSRXQjlgdwNhezZB0hscb7mJ4AK/UCM6uNIlEknCc=
 google.golang.org/genproto v0.0.0-20200408120641-fbb3ad325eb7/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -1544,10 +1548,11 @@ google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
@@ -1583,6 +1588,7 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

exporter/awsxrayexporter/translator/aws.go

@@ -18,7 +18,7 @@ import (
  "strconv"
 
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 // AWS-specific OpenTelemetry attribute names

exporter/awsxrayexporter/translator/aws_test.go

@@ -19,8 +19,8 @@ import (
  "testing"
 
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 func TestAwsFromEc2Resource(t *testing.T) {

exporter/awsxrayexporter/translator/cause.go

@@ -18,8 +18,8 @@ import (
  "encoding/hex"
 
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
- tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
+ tracetranslator "go.opentelemetry.io/collector/translator/trace"
 )
 
 // CauseData provides the shape for unmarshalling data that records exception.

exporter/awsxrayexporter/translator/cause_test.go

@@ -21,8 +21,8 @@ import (
 
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 func TestCauseWithStatusMessage(t *testing.T) {

exporter/awsxrayexporter/translator/http.go

@@ -18,8 +18,8 @@ import (
  "strconv"
 
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
- tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
+ tracetranslator "go.opentelemetry.io/collector/translator/trace"
 )
 
 // HTTPData provides the shape for unmarshalling request and response data.

exporter/awsxrayexporter/translator/http_test.go

@@ -22,8 +22,8 @@ import (
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
  "github.com/golang/protobuf/ptypes/wrappers"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 func TestClientSpanWithURLAttribute(t *testing.T) {

exporter/awsxrayexporter/translator/segment.go

@@ -26,8 +26,8 @@ import (
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
  "github.com/golang/protobuf/ptypes"
  "github.com/golang/protobuf/ptypes/timestamp"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
- tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
+ tracetranslator "go.opentelemetry.io/collector/translator/trace"
 )
 
 // AWS X-Ray acceptable values for origin field.

exporter/awsxrayexporter/translator/segment_test.go

@@ -24,9 +24,9 @@ import (
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
  tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
  "github.com/golang/protobuf/ptypes/timestamp"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
- tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
+ tracetranslator "go.opentelemetry.io/collector/translator/trace"
 )
 
 var (

exporter/awsxrayexporter/translator/service.go

@@ -16,7 +16,7 @@ package translator
 
 import (
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 // ServiceData provides the shape for unmarshalling service version.

exporter/awsxrayexporter/translator/service_test.go

@@ -19,8 +19,8 @@ import (
  "testing"
 
  resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 func TestServiceFromResource(t *testing.T) {

exporter/awsxrayexporter/translator/sql.go

@@ -15,7 +15,7 @@
 package translator
 
 import (
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 // SQLData provides the shape for unmarshalling sql data.

exporter/awsxrayexporter/translator/sql_test.go

@@ -18,8 +18,8 @@ import (
  "strings"
  "testing"
 
- semconventions "github.com/open-telemetry/opentelemetry-collector/translator/conventions"
  "github.com/stretchr/testify/assert"
+ semconventions "go.opentelemetry.io/collector/translator/conventions"
 )
 
 func TestClientSpanWithStatementAttribute(t *testing.T) {