diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e195bea41646..33f9819ac6b6 100644 --- 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 index 71e195e65e36..98f79598bb04 100644 --- 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 index 6e0969574e3a..644e8ceb9212 100644 --- 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 index 65c7159f182d..5ae244650430 100644 --- 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 index 01bd302e2bef..73c1c93668cc 100644 --- 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 index d3bfbf94cb7a..8328b2623664 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -72,7 +72,6 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/HdrHistogram/hdrhistogram-go v0.9.0/go.mod h1:nxrse8/Tzg2tg3DZcZjm6qEclQKK70g0KxO61gFFZD4= @@ -116,9 +115,8 @@ github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.3 h1:a9F4rlj7EWWrbj7BYw8J8+x+ZZkJeqzNyRk8hdPF+ro= -github.com/armon/go-metrics v0.3.3/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= @@ -162,8 +160,6 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -399,13 +395,11 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v1.1.0 h1:kFkMAZBNAn4j7K0GiZr8cRYzejq68VbheufiV3YuyFI= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= -github.com/gogo/googleapis v1.3.0 h1:M695OaDJ5ipWvDPcoAg/YL9c3uORAegkEfBqTQF/fTQ= -github.com/gogo/googleapis v1.3.0/go.mod h1:d+q1s/xVJxZGKWwC/6UfPIF33J+G1Tq4GYv9Y+Tg/EU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -535,24 +529,20 @@ github.com/hashicorp/consul/sdk v0.7.0 h1:H6R9d008jDcHPQPAqPNuydAshJ4v5/8URdFnUv github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.15.0 h1:qMuK0wxsoW4D0ddCCYwPSTm4KQv1X1ke3WmPWZ0Mvsk= github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.2.0 h1:l6UW37iCXwZkZoAbEYnptSHVE/cQ5bOTPYG5W3vf9+8= -github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-plugin v1.4.0/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -585,6 +575,7 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hetznercloud/hcloud-go v1.23.1 h1:SkYdCa6x458cMSDz5GI18iPz5j2hicACiDP6J/s/bTs= github.com/hetznercloud/hcloud-go v1.23.1/go.mod h1:xng8lbDUg+xM1dgc0yGHX5EeqbwIq7UYlMWMTx3SQVg= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -695,9 +686,8 @@ github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsI github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -764,8 +754,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= @@ -777,18 +765,14 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4= -github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +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/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs= -github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -811,17 +795,15 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= +github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= -github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= @@ -852,7 +834,6 @@ github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -997,7 +978,6 @@ github.com/tklauser/numcpus v0.2.1 h1:ct88eFm+Q7m2ZfXJdan1xYoXKlmwsfP+k88q05KvlZ github.com/tklauser/numcpus v0.2.1/go.mod h1:9aU+wOc6WjUIZEwWMP62PL/41d65P+iks1gBkr4QyP8= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/uber/jaeger-client-go v2.25.0+incompatible h1:IxcNZ7WRY1Y3G4poYlx24szfsn/3LvK9QHCq9oQw8+U= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= @@ -1175,7 +1155,6 @@ golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1239,7 +1218,6 @@ golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1268,7 +1246,6 @@ golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1510,6 +1487,7 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/fsnotify/fsnotify.v1 v1.4.7 h1:XNNYLJHt73EyYiCZi6+xjupS9CpvmiDgjPTAjrBlQbo= gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= @@ -1517,9 +1495,8 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.52.0 h1:j+Lt/M1oPPejkniCg1TkWE2J3Eh1oZTsHSXzMTzUXn4= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= -gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= diff --git a/exporter/awsemfexporter/grouped_metric.go b/exporter/awsemfexporter/grouped_metric.go index 4cb5767deeaa..af4f0606afae 100644 --- 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 index 282f3cd5002a..36afe8c60fcb 100644 --- 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 index 2f8f2c084863..2a63de48e567 100644 --- 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 index eb6c0f871e66..a8d87a3c8bd4 100644 --- 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 index 00d48a2d84db..dea848b5912a 100644 --- 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 index e96e704e7171..ab3ff9ee6565 100644 --- 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 index bd47ad47f2fa..00dc3e3c1337 100644 --- 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 index be6bcc72bf59..d6cc0753f705 100644 --- 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 index 166b4e1e14f0..644cfa3b8a8a 100644 --- 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 index acdfec97ea7d..74c458d31328 100644 --- 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 index b3915d3f2473..4569207773cd 100644 --- 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 deleted file mode 100644 index ded7a36092dc..000000000000 --- a/internal/aws/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common diff --git a/internal/aws/metrics/Makefile b/internal/aws/metrics/Makefile new file mode 100644 index 000000000000..bdd863a203be --- /dev/null +++ b/internal/aws/metrics/Makefile @@ -0,0 +1 @@ +include ../../../Makefile.Common diff --git a/internal/aws/go.mod b/internal/aws/metrics/go.mod similarity index 93% rename from internal/aws/go.mod rename to internal/aws/metrics/go.mod index 3a102748cd82..e5f79bd36573 100644 --- a/internal/aws/go.mod +++ b/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 b/internal/aws/metrics/go.sum similarity index 100% rename from internal/aws/go.sum rename to internal/aws/metrics/go.sum diff --git a/internal/aws/metric_calculator.go b/internal/aws/metrics/metric_calculator.go similarity index 99% rename from internal/aws/metric_calculator.go rename to internal/aws/metrics/metric_calculator.go index 1875d6577f31..6a2a5cdb6a0c 100644 --- a/internal/aws/metric_calculator.go +++ b/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 b/internal/aws/metrics/metric_calculator_test.go similarity index 99% rename from internal/aws/metric_calculator_test.go rename to internal/aws/metrics/metric_calculator_test.go index 3c6828c4660c..f668e34df805 100644 --- a/internal/aws/metric_calculator_test.go +++ b/internal/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 new file mode 100644 index 000000000000..bdd863a203be --- /dev/null +++ b/internal/aws/xray/Makefile @@ -0,0 +1 @@ +include ../../../Makefile.Common diff --git a/internal/awsxray/aws.go b/internal/aws/xray/awsxray.go similarity index 100% rename from internal/awsxray/aws.go rename to internal/aws/xray/awsxray.go diff --git a/internal/awsxray/go.mod b/internal/aws/xray/go.mod similarity index 89% rename from internal/awsxray/go.mod rename to internal/aws/xray/go.mod index 3c38efec2036..7f2eb1531ce5 100644 --- a/internal/awsxray/go.mod +++ b/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 b/internal/aws/xray/go.sum similarity index 100% rename from internal/awsxray/go.sum rename to internal/aws/xray/go.sum diff --git a/internal/awsxray/testdata/README.md b/internal/aws/xray/testdata/README.md similarity index 100% rename from internal/awsxray/testdata/README.md rename to internal/aws/xray/testdata/README.md diff --git a/internal/awsxray/testdata/awsMissingAwsField.txt b/internal/aws/xray/testdata/awsMissingAwsField.txt similarity index 100% rename from internal/awsxray/testdata/awsMissingAwsField.txt rename to internal/aws/xray/testdata/awsMissingAwsField.txt diff --git a/internal/awsxray/testdata/awsValidAwsFields.txt b/internal/aws/xray/testdata/awsValidAwsFields.txt similarity index 97% rename from internal/awsxray/testdata/awsValidAwsFields.txt rename to internal/aws/xray/testdata/awsValidAwsFields.txt index 00f3194a8453..693a9624cfd6 100644 --- a/internal/awsxray/testdata/awsValidAwsFields.txt +++ b/internal/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 b/internal/aws/xray/testdata/ddbSample.txt similarity index 100% rename from internal/awsxray/testdata/ddbSample.txt rename to internal/aws/xray/testdata/ddbSample.txt diff --git a/internal/awsxray/testdata/indepSubsegment.txt b/internal/aws/xray/testdata/indepSubsegment.txt similarity index 100% rename from internal/awsxray/testdata/indepSubsegment.txt rename to internal/aws/xray/testdata/indepSubsegment.txt diff --git a/internal/awsxray/testdata/indepSubsegmentWithContentLengthString.txt b/internal/aws/xray/testdata/indepSubsegmentWithContentLengthString.txt similarity index 100% rename from internal/awsxray/testdata/indepSubsegmentWithContentLengthString.txt rename to internal/aws/xray/testdata/indepSubsegmentWithContentLengthString.txt diff --git a/internal/awsxray/testdata/indepSubsegmentWithInvalidSqlUrl.txt b/internal/aws/xray/testdata/indepSubsegmentWithInvalidSqlUrl.txt similarity index 100% rename from internal/awsxray/testdata/indepSubsegmentWithInvalidSqlUrl.txt rename to internal/aws/xray/testdata/indepSubsegmentWithInvalidSqlUrl.txt diff --git a/internal/awsxray/testdata/indepSubsegmentWithSql.txt b/internal/aws/xray/testdata/indepSubsegmentWithSql.txt similarity index 100% rename from internal/awsxray/testdata/indepSubsegmentWithSql.txt rename to internal/aws/xray/testdata/indepSubsegmentWithSql.txt diff --git a/internal/awsxray/testdata/invalidNamespace.txt b/internal/aws/xray/testdata/invalidNamespace.txt similarity index 100% rename from internal/awsxray/testdata/invalidNamespace.txt rename to internal/aws/xray/testdata/invalidNamespace.txt diff --git a/internal/awsxray/testdata/minCauseIsExceptionId.txt b/internal/aws/xray/testdata/minCauseIsExceptionId.txt similarity index 100% rename from internal/awsxray/testdata/minCauseIsExceptionId.txt rename to internal/aws/xray/testdata/minCauseIsExceptionId.txt diff --git a/internal/awsxray/testdata/minCauseIsInvalid.txt b/internal/aws/xray/testdata/minCauseIsInvalid.txt similarity index 100% rename from internal/awsxray/testdata/minCauseIsInvalid.txt rename to internal/aws/xray/testdata/minCauseIsInvalid.txt diff --git a/internal/awsxray/testdata/minInProgress.txt b/internal/aws/xray/testdata/minInProgress.txt similarity index 100% rename from internal/awsxray/testdata/minInProgress.txt rename to internal/aws/xray/testdata/minInProgress.txt diff --git a/internal/awsxray/testdata/minOtherFields.txt b/internal/aws/xray/testdata/minOtherFields.txt similarity index 100% rename from internal/awsxray/testdata/minOtherFields.txt rename to internal/aws/xray/testdata/minOtherFields.txt diff --git a/internal/aws/xray/testdata/sampleapp/Makefile b/internal/aws/xray/testdata/sampleapp/Makefile new file mode 100644 index 000000000000..5b5a76ada341 --- /dev/null +++ b/internal/aws/xray/testdata/sampleapp/Makefile @@ -0,0 +1 @@ +include ../../../../../Makefile.Common diff --git a/internal/awsxray/testdata/sampleapp/go.mod b/internal/aws/xray/testdata/sampleapp/go.mod similarity index 100% rename from internal/awsxray/testdata/sampleapp/go.mod rename to internal/aws/xray/testdata/sampleapp/go.mod diff --git a/internal/awsxray/testdata/sampleapp/go.sum b/internal/aws/xray/testdata/sampleapp/go.sum similarity index 100% rename from internal/awsxray/testdata/sampleapp/go.sum rename to internal/aws/xray/testdata/sampleapp/go.sum diff --git a/internal/awsxray/testdata/sampleapp/sample.go b/internal/aws/xray/testdata/sampleapp/sample.go similarity index 100% rename from internal/awsxray/testdata/sampleapp/sample.go rename to internal/aws/xray/testdata/sampleapp/sample.go diff --git a/internal/aws/xray/testdata/sampleserver/Makefile b/internal/aws/xray/testdata/sampleserver/Makefile new file mode 100644 index 000000000000..5b5a76ada341 --- /dev/null +++ b/internal/aws/xray/testdata/sampleserver/Makefile @@ -0,0 +1 @@ +include ../../../../../Makefile.Common diff --git a/internal/awsxray/testdata/sampleserver/go.mod b/internal/aws/xray/testdata/sampleserver/go.mod similarity index 100% rename from internal/awsxray/testdata/sampleserver/go.mod rename to internal/aws/xray/testdata/sampleserver/go.mod diff --git a/internal/awsxray/testdata/sampleserver/go.sum b/internal/aws/xray/testdata/sampleserver/go.sum similarity index 100% rename from internal/awsxray/testdata/sampleserver/go.sum rename to internal/aws/xray/testdata/sampleserver/go.sum diff --git a/internal/awsxray/testdata/sampleserver/sample.go b/internal/aws/xray/testdata/sampleserver/sample.go similarity index 100% rename from internal/awsxray/testdata/sampleserver/sample.go rename to internal/aws/xray/testdata/sampleserver/sample.go diff --git a/internal/awsxray/testdata/segmentValidationFailed.txt b/internal/aws/xray/testdata/segmentValidationFailed.txt similarity index 100% rename from internal/awsxray/testdata/segmentValidationFailed.txt rename to internal/aws/xray/testdata/segmentValidationFailed.txt diff --git a/internal/awsxray/testdata/serverSample.txt b/internal/aws/xray/testdata/serverSample.txt similarity index 100% rename from internal/awsxray/testdata/serverSample.txt rename to internal/aws/xray/testdata/serverSample.txt diff --git a/internal/awsxray/tracesegment.go b/internal/aws/xray/tracesegment.go similarity index 100% rename from internal/awsxray/tracesegment.go rename to internal/aws/xray/tracesegment.go diff --git a/internal/awsxray/tracesegment_test.go b/internal/aws/xray/tracesegment_test.go similarity index 100% rename from internal/awsxray/tracesegment_test.go rename to internal/aws/xray/tracesegment_test.go diff --git a/internal/awsxray/util.go b/internal/aws/xray/util.go similarity index 100% rename from internal/awsxray/util.go rename to internal/aws/xray/util.go diff --git a/internal/awsxray/util_test.go b/internal/aws/xray/util_test.go similarity index 100% rename from internal/awsxray/util_test.go rename to internal/aws/xray/util_test.go diff --git a/internal/awsxray/Makefile b/internal/awsxray/Makefile deleted file mode 100644 index ded7a36092dc..000000000000 --- a/internal/awsxray/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common diff --git a/internal/awsxray/testdata/sampleapp/Makefile b/internal/awsxray/testdata/sampleapp/Makefile deleted file mode 100644 index a51dd235cf47..000000000000 --- a/internal/awsxray/testdata/sampleapp/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../Makefile.Common \ No newline at end of file diff --git a/internal/awsxray/testdata/sampleserver/Makefile b/internal/awsxray/testdata/sampleserver/Makefile deleted file mode 100644 index a51dd235cf47..000000000000 --- a/internal/awsxray/testdata/sampleserver/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../Makefile.Common \ No newline at end of file diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index c88e2e10323f..e40b1b9a8368 100644 --- 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 index 887ad090a6ca..3526b054cca9 100644 --- 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 index 928974a98d49..f03886f2e3c0 100644 --- 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 index a921276ef5fa..acfdc461b576 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -12,7 +12,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/receiver/awsxrayreceiver/internal/translator/aws.go b/receiver/awsxrayreceiver/internal/translator/aws.go index 1ede8a31ecf3..4a1aa9928e0f 100644 --- 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 index bb0a10695ba4..420aa04ddbc0 100644 --- 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 index c460e1ae92c1..69aa2fa7d9cd 100644 --- 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 index 96b42f6dd3c6..9e8ba3f444de 100644 --- 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 index af90c54ee611..85aa0f3c230b 100644 --- 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 index fdfe96e7cbfc..507ff8d73c08 100644 --- 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 index b6bf3f558d21..3b8b8d72968a 100644 --- 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 index 9218ebd77e28..af34e01246be 100644 --- 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 index 541933eb1cc1..3cf9acf0e042 100644 --- 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 ( diff --git a/receiver/awsxrayreceiver/internal/translator/translator_test.go b/receiver/awsxrayreceiver/internal/translator/translator_test.go index 257eae58fd14..3847bb81969f 100644 --- a/receiver/awsxrayreceiver/internal/translator/translator_test.go +++ b/receiver/awsxrayreceiver/internal/translator/translator_test.go @@ -26,7 +26,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" ) type perSpanProperties struct { @@ -85,7 +85,7 @@ func TestTranslation(t *testing.T) { }{ { testCase: "TranslateInstrumentedServerSegment", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "serverSample.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "serverSample.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString(conventions.AttributeCloudProviderAWS) @@ -131,7 +131,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateInstrumentedClientSegment", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "ddbSample.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "ddbSample.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString(conventions.AttributeCloudProviderAWS) @@ -553,7 +553,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "[aws] TranslateMissingAWSFieldSegment", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "awsMissingAwsField.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "awsMissingAwsField.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString("unknown") @@ -588,7 +588,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "[aws] TranslateEC2AWSFieldsSegment", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "awsValidAwsFields.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "awsValidAwsFields.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString(conventions.AttributeCloudProviderAWS) @@ -652,7 +652,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateCauseIsExceptionId", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "minCauseIsExceptionId.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "minCauseIsExceptionId.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString("unknown") @@ -687,7 +687,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateInvalidNamespace", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "invalidNamespace.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "invalidNamespace.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { return nil }, @@ -705,7 +705,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateIndepSubsegment", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "indepSubsegment.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "indepSubsegment.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString("unknown") @@ -750,7 +750,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateIndepSubsegmentForContentLengthString", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "indepSubsegmentWithContentLengthString.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithContentLengthString.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString("unknown") @@ -797,7 +797,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateSql", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "indepSubsegmentWithSql.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithSql.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { attrs := make(map[string]pdata.AttributeValue) attrs[conventions.AttributeCloudProvider] = pdata.NewAttributeValueString("unknown") @@ -842,7 +842,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateInvalidSqlUrl", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "indepSubsegmentWithInvalidSqlUrl.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "indepSubsegmentWithInvalidSqlUrl.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { return nil }, @@ -863,7 +863,7 @@ func TestTranslation(t *testing.T) { { testCase: "TranslateJsonUnmarshallFailed", expectedUnmarshallFailure: true, - samplePath: path.Join("../../../../internal/awsxray", "testdata", "minCauseIsInvalid.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "minCauseIsInvalid.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { return nil }, @@ -883,7 +883,7 @@ func TestTranslation(t *testing.T) { }, { testCase: "TranslateRootSegValidationFailed", - samplePath: path.Join("../../../../internal/awsxray", "testdata", "segmentValidationFailed.txt"), + samplePath: path.Join("../../../../internal/aws/xray", "testdata", "segmentValidationFailed.txt"), expectedResourceAttrs: func(seg *awsxray.Segment) map[string]pdata.AttributeValue { return nil }, diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller.go b/receiver/awsxrayreceiver/internal/udppoller/poller.go index 13f33bb26ada..4186ba33d02e 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray" + awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" recvErr "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/errors" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/socketconn" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/tracesegment" diff --git a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go index d692ca0d7996..137d920b65a9 100644 --- a/receiver/awsxrayreceiver/internal/udppoller/poller_test.go +++ b/receiver/awsxrayreceiver/internal/udppoller/poller_test.go @@ -32,7 +32,7 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray" + awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" internalErr "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/errors" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/tracesegment" ) diff --git a/receiver/awsxrayreceiver/receiver.go b/receiver/awsxrayreceiver/receiver.go index d0068b2f8c1d..3ee731bd4461 100644 --- a/receiver/awsxrayreceiver/receiver.go +++ b/receiver/awsxrayreceiver/receiver.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/obsreport" "go.uber.org/zap" - "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/translator" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/udppoller" diff --git a/receiver/awsxrayreceiver/receiver_test.go b/receiver/awsxrayreceiver/receiver_test.go index 3f3f1ef8467b..1bc53fc7ad76 100644 --- a/receiver/awsxrayreceiver/receiver_test.go +++ b/receiver/awsxrayreceiver/receiver_test.go @@ -219,7 +219,7 @@ func TestSegmentsPassedToConsumer(t *testing.T) { addr, rcvr, _ := createAndOptionallyStartReceiver(t, receiverName, nil, true) defer rcvr.Shutdown(context.Background()) - content, err := ioutil.ReadFile(path.Join("../../internal/awsxray", "testdata", "ddbSample.txt")) + content, err := ioutil.ReadFile(path.Join("../../internal/aws/xray", "testdata", "ddbSample.txt")) assert.NoError(t, err, "can not read raw segment") err = writePacket(t, addr, segmentHeader+string(content)) @@ -278,7 +278,7 @@ func TestSegmentsConsumerErrorsOut(t *testing.T) { true) defer rcvr.Shutdown(context.Background()) - content, err := ioutil.ReadFile(path.Join("../../internal/awsxray", "testdata", "serverSample.txt")) + content, err := ioutil.ReadFile(path.Join("../../internal/aws/xray", "testdata", "serverSample.txt")) assert.NoError(t, err, "can not read raw segment") err = writePacket(t, addr, segmentHeader+string(content))