consolidate internal/aws and internal/awsxray folders (#3098)

consolidate `internal/aws` and `internal/awsxray` modules into one folder. ├── aws │ ├── metrics │ └── xray **Testing:** `make all`
open-telemetry · Apr 14, 2021 · 81dc441 · 81dc441
1 parent 020dc8c
commit 81dc441
Show file tree

Hide file tree

Showing 75 changed files with 75 additions and 107 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -45,7 +45,7 @@ exporter/uptraceexporter/                            @open-telemetry/collector-c
 extension/httpforwarder/                             @open-telemetry/collector-contrib-approvers @asuresh4
 extension/observer/                                  @open-telemetry/collector-contrib-approvers @asuresh4 @jrcamp
 
-internal/awsxray/                                    @open-telemetry/collector-contrib-approvers @anuraaga @mxiamxia
+internal/aws/                                        @open-telemetry/collector-contrib-approvers @anuraaga @mxiamxia
 internal/k8sconfig/                                  @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
 internal/splunk/                                     @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
 internal/stanza/                                     @open-telemetry/collector-contrib-approvers @djaglowski

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -134,19 +134,19 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"
-    directory: "/internal/aws"
+    directory: "/internal/aws/metrics"
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"
-    directory: "/internal/awsxray"
+    directory: "/internal/aws/xray"
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"
-    directory: "/internal/awsxray/testdata/sampleapp"
+    directory: "/internal/aws/xray/testdata/sampleapp"
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"
-    directory: "/internal/awsxray/testdata/sampleserver"
+    directory: "/internal/aws/xray/testdata/sampleserver"
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"

diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go
@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.uber.org/zap"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws"
+	aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 var deltaMetricCalculator = aws.NewFloat64DeltaCalculator()

diff --git a/exporter/awsemfexporter/datapoint_test.go b/exporter/awsemfexporter/datapoint_test.go
@@ -29,7 +29,7 @@ import (
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest/observer"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws"
+	aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 func generateTestIntGauge(name string) *metricspb.Metric {

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -3,24 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemf
 go 1.14
 
 require (
-	github.com/armon/go-metrics v0.3.3 // indirect
 	github.com/aws/aws-sdk-go v1.38.18
 	github.com/census-instrumentation/opencensus-proto v0.3.0
-	github.com/gogo/googleapis v1.3.0 // indirect
 	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.2.0
-	github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
-	github.com/hashicorp/go-msgpack v0.5.5 // indirect
-	github.com/mattn/go-colorable v0.1.7 // indirect
-	github.com/onsi/ginkgo v1.14.1 // indirect
-	github.com/onsi/gomega v1.10.2 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000
-	github.com/pelletier/go-toml v1.8.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
 	go.uber.org/zap v1.16.0
 	google.golang.org/protobuf v1.26.0
-	gopkg.in/ini.v1 v1.57.0 // indirect
 )
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws => ../../internal/aws
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ./../../internal/aws/metrics
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
diff --git a/exporter/awsemfexporter/grouped_metric.go b/exporter/awsemfexporter/grouped_metric.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.uber.org/zap"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws"
+	aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
 )
 
 // GroupedMetric defines set of metrics with same namespace, timestamp and labels

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/onsi/ginkgo v1.14.1 // indirect
 	github.com/onsi/gomega v1.10.2 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-00010101000000-000000000000
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
@@ -20,4 +20,4 @@ require (
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => ./../../internal/awsxray
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => ./../../internal/aws/xray
diff --git a/exporter/awsxrayexporter/translator/aws.go b/exporter/awsxrayexporter/translator/aws.go
@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 const (

diff --git a/exporter/awsxrayexporter/translator/aws_test.go b/exporter/awsxrayexporter/translator/aws_test.go
@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func TestAwsFromEc2Resource(t *testing.T) {

diff --git a/exporter/awsxrayexporter/translator/cause.go b/exporter/awsxrayexporter/translator/cause.go
@@ -24,7 +24,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func makeCause(span pdata.Span, attributes map[string]string, resource pdata.Resource) (isError, isFault bool,

diff --git a/exporter/awsxrayexporter/translator/http.go b/exporter/awsxrayexporter/translator/http.go
@@ -21,7 +21,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func makeHTTP(span pdata.Span) (map[string]string, *awsxray.HTTPData) {

diff --git a/exporter/awsxrayexporter/translator/segment.go b/exporter/awsxrayexporter/translator/segment.go
@@ -28,7 +28,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 // AWS X-Ray acceptable values for origin field.

diff --git a/exporter/awsxrayexporter/translator/segment_test.go b/exporter/awsxrayexporter/translator/segment_test.go
@@ -26,7 +26,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 const (

diff --git a/exporter/awsxrayexporter/translator/service.go b/exporter/awsxrayexporter/translator/service.go
@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func makeService(resource pdata.Resource) *awsxray.ServiceData {

diff --git a/exporter/awsxrayexporter/translator/sql.go b/exporter/awsxrayexporter/translator/sql.go
@@ -17,7 +17,7 @@ package translator
 import (
 	semconventions "go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func makeSQL(attributes map[string]string) (map[string]string, *awsxray.SQLData) {

diff --git a/go.mod b/go.mod
@@ -77,9 +77,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splun
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => ./internal/k8sconfig
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws => ./internal/aws
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ./internal/aws/metrics
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => ./internal/awsxray
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => ./internal/aws/xray
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => ./internal/stanza
 

diff --git a/internal/aws/Makefile b/internal/aws/Makefile
diff --git a/internal/aws/metrics/Makefile b/internal/aws/metrics/Makefile
@@ -0,0 +1 @@
+include ../../../Makefile.Common
diff --git a/internal/aws/go.mod → internal/aws/metrics/go.mod b/internal/aws/go.mod → internal/aws/metrics/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws
+module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics
 
 go 1.14
 

diff --git a/internal/aws/go.sum → internal/aws/metrics/go.sum b/internal/aws/go.sum → internal/aws/metrics/go.sum
diff --git a/internal/aws/metric_calculator.go → internal/aws/metrics/metric_calculator.go b/internal/aws/metric_calculator.go → internal/aws/metrics/metric_calculator.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package aws
+package metrics
 
 import (
 	"sync"

diff --git a/internal/aws/metric_calculator_test.go → ...nal/aws/metrics/metric_calculator_test.go b/internal/aws/metric_calculator_test.go → ...nal/aws/metrics/metric_calculator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package aws
+package metrics
 
 import (
 	"math/rand"

diff --git a/internal/aws/xray/Makefile b/internal/aws/xray/Makefile
@@ -0,0 +1 @@
+include ../../../Makefile.Common
diff --git a/internal/awsxray/aws.go → internal/aws/xray/awsxray.go b/internal/awsxray/aws.go → internal/aws/xray/awsxray.go
diff --git a/internal/awsxray/go.mod → internal/aws/xray/go.mod b/internal/awsxray/go.mod → internal/aws/xray/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray
+module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray
 
 go 1.14
 

diff --git a/internal/awsxray/go.sum → internal/aws/xray/go.sum b/internal/awsxray/go.sum → internal/aws/xray/go.sum
diff --git a/internal/awsxray/testdata/README.md → internal/aws/xray/testdata/README.md b/internal/awsxray/testdata/README.md → internal/aws/xray/testdata/README.md
diff --git a/...l/awsxray/testdata/awsMissingAwsField.txt → .../aws/xray/testdata/awsMissingAwsField.txt b/...l/awsxray/testdata/awsMissingAwsField.txt → .../aws/xray/testdata/awsMissingAwsField.txt
diff --git a/...al/awsxray/testdata/awsValidAwsFields.txt → ...l/aws/xray/testdata/awsValidAwsFields.txt b/...al/awsxray/testdata/awsValidAwsFields.txt → ...l/aws/xray/testdata/awsValidAwsFields.txt
@@ -37,7 +37,7 @@
             "deployment_id": 32,
             "version_label": "app-5a56-170119_190650-stage-170119_190650"
         },
-        "account_id": "620297135128"
+        "account_id": "000000000000"
     },
     "service": {
         "compiler_version": "go1.14.6",

diff --git a/internal/awsxray/testdata/ddbSample.txt → internal/aws/xray/testdata/ddbSample.txt b/internal/awsxray/testdata/ddbSample.txt → internal/aws/xray/testdata/ddbSample.txt
diff --git a/...rnal/awsxray/testdata/indepSubsegment.txt → ...nal/aws/xray/testdata/indepSubsegment.txt b/...rnal/awsxray/testdata/indepSubsegment.txt → ...nal/aws/xray/testdata/indepSubsegment.txt
diff --git a/...ndepSubsegmentWithContentLengthString.txt → ...ndepSubsegmentWithContentLengthString.txt b/...ndepSubsegmentWithContentLengthString.txt → ...ndepSubsegmentWithContentLengthString.txt
diff --git a/...data/indepSubsegmentWithInvalidSqlUrl.txt → ...data/indepSubsegmentWithInvalidSqlUrl.txt b/...data/indepSubsegmentWithInvalidSqlUrl.txt → ...data/indepSubsegmentWithInvalidSqlUrl.txt
diff --git a/...sxray/testdata/indepSubsegmentWithSql.txt → .../xray/testdata/indepSubsegmentWithSql.txt b/...sxray/testdata/indepSubsegmentWithSql.txt → .../xray/testdata/indepSubsegmentWithSql.txt
diff --git a/...nal/awsxray/testdata/invalidNamespace.txt → ...al/aws/xray/testdata/invalidNamespace.txt b/...nal/awsxray/testdata/invalidNamespace.txt → ...al/aws/xray/testdata/invalidNamespace.txt
diff --git a/...wsxray/testdata/minCauseIsExceptionId.txt → ...s/xray/testdata/minCauseIsExceptionId.txt b/...wsxray/testdata/minCauseIsExceptionId.txt → ...s/xray/testdata/minCauseIsExceptionId.txt
diff --git a/...al/awsxray/testdata/minCauseIsInvalid.txt → ...l/aws/xray/testdata/minCauseIsInvalid.txt b/...al/awsxray/testdata/minCauseIsInvalid.txt → ...l/aws/xray/testdata/minCauseIsInvalid.txt
diff --git a/internal/awsxray/testdata/minInProgress.txt → internal/aws/xray/testdata/minInProgress.txt b/internal/awsxray/testdata/minInProgress.txt → internal/aws/xray/testdata/minInProgress.txt
diff --git a/internal/awsxray/testdata/minOtherFields.txt → ...rnal/aws/xray/testdata/minOtherFields.txt b/internal/awsxray/testdata/minOtherFields.txt → ...rnal/aws/xray/testdata/minOtherFields.txt
diff --git a/internal/aws/xray/testdata/sampleapp/Makefile b/internal/aws/xray/testdata/sampleapp/Makefile
@@ -0,0 +1 @@
+include ../../../../../Makefile.Common
diff --git a/internal/awsxray/testdata/sampleapp/go.mod → internal/aws/xray/testdata/sampleapp/go.mod b/internal/awsxray/testdata/sampleapp/go.mod → internal/aws/xray/testdata/sampleapp/go.mod
diff --git a/internal/awsxray/testdata/sampleapp/go.sum → internal/aws/xray/testdata/sampleapp/go.sum b/internal/awsxray/testdata/sampleapp/go.sum → internal/aws/xray/testdata/sampleapp/go.sum
diff --git a/...rnal/awsxray/testdata/sampleapp/sample.go → ...nal/aws/xray/testdata/sampleapp/sample.go b/...rnal/awsxray/testdata/sampleapp/sample.go → ...nal/aws/xray/testdata/sampleapp/sample.go
diff --git a/internal/aws/xray/testdata/sampleserver/Makefile b/internal/aws/xray/testdata/sampleserver/Makefile
@@ -0,0 +1 @@
+include ../../../../../Makefile.Common
diff --git a/...rnal/awsxray/testdata/sampleserver/go.mod → ...nal/aws/xray/testdata/sampleserver/go.mod b/...rnal/awsxray/testdata/sampleserver/go.mod → ...nal/aws/xray/testdata/sampleserver/go.mod
diff --git a/...rnal/awsxray/testdata/sampleserver/go.sum → ...nal/aws/xray/testdata/sampleserver/go.sum b/...rnal/awsxray/testdata/sampleserver/go.sum → ...nal/aws/xray/testdata/sampleserver/go.sum
diff --git a/...l/awsxray/testdata/sampleserver/sample.go → .../aws/xray/testdata/sampleserver/sample.go b/...l/awsxray/testdata/sampleserver/sample.go → .../aws/xray/testdata/sampleserver/sample.go
diff --git a/...xray/testdata/segmentValidationFailed.txt → ...xray/testdata/segmentValidationFailed.txt b/...xray/testdata/segmentValidationFailed.txt → ...xray/testdata/segmentValidationFailed.txt
diff --git a/internal/awsxray/testdata/serverSample.txt → internal/aws/xray/testdata/serverSample.txt b/internal/awsxray/testdata/serverSample.txt → internal/aws/xray/testdata/serverSample.txt
diff --git a/internal/awsxray/tracesegment.go → internal/aws/xray/tracesegment.go b/internal/awsxray/tracesegment.go → internal/aws/xray/tracesegment.go
diff --git a/internal/awsxray/tracesegment_test.go → internal/aws/xray/tracesegment_test.go b/internal/awsxray/tracesegment_test.go → internal/aws/xray/tracesegment_test.go
diff --git a/internal/awsxray/util.go → internal/aws/xray/util.go b/internal/awsxray/util.go → internal/aws/xray/util.go
diff --git a/internal/awsxray/util_test.go → internal/aws/xray/util_test.go b/internal/awsxray/util_test.go → internal/aws/xray/util_test.go
diff --git a/internal/awsxray/Makefile b/internal/awsxray/Makefile
diff --git a/internal/awsxray/testdata/sampleapp/Makefile b/internal/awsxray/testdata/sampleapp/Makefile
diff --git a/internal/awsxray/testdata/sampleserver/Makefile b/internal/awsxray/testdata/sampleserver/Makefile
diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go
@@ -26,7 +26,7 @@ import (
 	"go.opentelemetry.io/collector/config/configtest"
 	"go.opentelemetry.io/collector/config/configtls"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/proxy"
 )
 

diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go
@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/receiver/receiverhelper"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/proxy"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/udppoller"
 )

diff --git a/receiver/awsxrayreceiver/factory_test.go b/receiver/awsxrayreceiver/factory_test.go
@@ -31,7 +31,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.uber.org/zap"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 type mockMetricsConsumer struct {

diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod
@@ -12,12 +12,12 @@ require (
 	github.com/mattn/go-colorable v0.1.7 // indirect
 	github.com/onsi/ginkgo v1.14.1 // indirect
 	github.com/onsi/gomega v1.10.2 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-00010101000000-000000000000
 	github.com/pelletier/go-toml v1.8.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.24.1-0.20210414213607-0f75efa9f327
 	go.uber.org/zap v1.16.0
 	gopkg.in/ini.v1 v1.57.0 // indirect
 )
 
-replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => ./../../internal/awsxray
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => ./../../internal/aws/xray
diff --git a/receiver/awsxrayreceiver/internal/translator/aws.go b/receiver/awsxrayreceiver/internal/translator/aws.go
@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addAWSToResource(aws *awsxray.AWSData, attrs *pdata.AttributeMap) {

diff --git a/receiver/awsxrayreceiver/internal/translator/cause.go b/receiver/awsxrayreceiver/internal/translator/cause.go
@@ -21,7 +21,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addCause(seg *awsxray.Segment, span *pdata.Span) {

diff --git a/receiver/awsxrayreceiver/internal/translator/cause_test.go b/receiver/awsxrayreceiver/internal/translator/cause_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func TestConvertStackFramesToStackTraceStr(t *testing.T) {

diff --git a/receiver/awsxrayreceiver/internal/translator/http.go b/receiver/awsxrayreceiver/internal/translator/http.go
@@ -19,7 +19,7 @@ import (
 	"go.opentelemetry.io/collector/translator/conventions"
 	tracetranslator "go.opentelemetry.io/collector/translator/trace"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addHTTP(seg *awsxray.Segment, span *pdata.Span) {

diff --git a/receiver/awsxrayreceiver/internal/translator/metadata.go b/receiver/awsxrayreceiver/internal/translator/metadata.go
@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addMetadata(meta map[string]map[string]interface{}, attrs *pdata.AttributeMap) error {

diff --git a/receiver/awsxrayreceiver/internal/translator/name.go b/receiver/awsxrayreceiver/internal/translator/name.go
@@ -19,7 +19,7 @@ import (
 
 	"go.opentelemetry.io/collector/consumer/pdata"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 const (

diff --git a/receiver/awsxrayreceiver/internal/translator/sdk.go b/receiver/awsxrayreceiver/internal/translator/sdk.go
@@ -20,7 +20,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addSdkToResource(seg *awsxray.Segment, attrs *pdata.AttributeMap) {

diff --git a/receiver/awsxrayreceiver/internal/translator/sql.go b/receiver/awsxrayreceiver/internal/translator/sql.go
@@ -21,7 +21,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 func addSQLToSpan(sql *awsxray.SQLData, attrs *pdata.AttributeMap) error {

diff --git a/receiver/awsxrayreceiver/internal/translator/translator.go b/receiver/awsxrayreceiver/internal/translator/translator.go
@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/conventions"
 
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ import ( @@
     	"go.opentelemetry.io/collector/consumer/pdata"
-    	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray"
+    	awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray"
     )
     const (
@@ Expand Down @@