Skip to content

Commit

Permalink
Update OTel fork components to 505e232 (#940)
Browse files Browse the repository at this point in the history
Co-authored-by: Github Action <[email protected]>
  • Loading branch information
github-actions[bot] and actions-user authored Nov 2, 2023
1 parent d92f8fc commit 1f5ae35
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
28 changes: 14 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,34 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2022

// Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters
// to be all replaced since there are some changes that will always be from upstream
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231102130031-505e23230a50

// Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230928170322-0df38c533713

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231102130031-505e23230a50

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231027153828-85560f40a33d
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231102130031-505e23230a50

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231027153828-85560f40a33d
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231102130031-505e23230a50

// Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957
replace github.com/shirou/gopsutil/v3 => github.com/aws/telegraf/patches/gopsutil/v3 v3.0.0-20230915153624-7629361f8380 // indirect
Expand Down Expand Up @@ -422,4 +422,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20231027153828-85560f40a33d
replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20231102130031-505e23230a50
52 changes: 26 additions & 26 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -140,36 +140,36 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231027153828-85560f40a33d h1:4aT8Ex9/LsNvp/J3FuElEzsWShjFW2GS6NT90z09WmU=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231027153828-85560f40a33d/go.mod h1:/8w8sPrpOeADRJgMsu8o4jOiFX29zCC899+ao7S1GXI=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231027153828-85560f40a33d h1:jCUfoiuYdDIh2rL3AXqnQIzuBfXGbIab0jCaUOsLOHM=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231027153828-85560f40a33d/go.mod h1:UAXcRSojI8I0Kb9iS9a2v7J/iPrQ1loJIsBprSaVdFo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231027153828-85560f40a33d h1:DsayVZkW2sJSk8gOmdAz4uNtutHVbH1vTERMyaSBxZA=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231027153828-85560f40a33d/go.mod h1:cr4dmBlfnMVYT+gyKUAKh39zQu5u/UAukxQj15MdZ18=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231102130031-505e23230a50 h1:MFm/DA3NTQQ3LjON7cj3a53VBwCjRFzBy6UCjfkJxKc=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231102130031-505e23230a50/go.mod h1:/8w8sPrpOeADRJgMsu8o4jOiFX29zCC899+ao7S1GXI=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231102130031-505e23230a50 h1:Qzmqql2XCdgK3m65CK41hMAopfFNEbJpDUjs9xX5aSk=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231102130031-505e23230a50/go.mod h1:UAXcRSojI8I0Kb9iS9a2v7J/iPrQ1loJIsBprSaVdFo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231102130031-505e23230a50 h1:TTRentWNAvzfYCKHclu08pPWgTiBTuxLHXmBjeN1w/M=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231102130031-505e23230a50/go.mod h1:cr4dmBlfnMVYT+gyKUAKh39zQu5u/UAukxQj15MdZ18=
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20231023230448-f645697bf350 h1:+75XAqf0Og8cshAdekRcqWf3v38Uw34XJRFbul6jbv0=
github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20231023230448-f645697bf350/go.mod h1:uOQa5/9Jle9VADEdWCXL4AbJr35NJQil30tapcTHQlw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231027153828-85560f40a33d h1:mD+Yowd83cgOi5JvLLlkqdtM1OjVrh5h1tazO8UUM/Y=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231027153828-85560f40a33d/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231027153828-85560f40a33d h1:xyceDNef/z4LrNT00wGnCUdaymVqdnDBXUAv46M2ahs=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231027153828-85560f40a33d/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231027153828-85560f40a33d h1:FtIbMifCcVpuehF3eWDN8SSScDe5uSezQJNJPctpEWw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231027153828-85560f40a33d/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231027153828-85560f40a33d h1:Qwha5VgT7YqcA4bqiT2iUNoOu/eIiU/UFf8QBCnvYY4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231027153828-85560f40a33d/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231027153828-85560f40a33d h1:cIlfirT7KzeUdRNOGrtd6MGHH6LxHSErJEfygsQr5+A=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231027153828-85560f40a33d/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231027153828-85560f40a33d h1:oIfODk8cssFqd7OcQdzGnBiOCmJQ3HwlNXhgF0sVY7E=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231027153828-85560f40a33d/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231102130031-505e23230a50 h1:qpH231iNaHowAP+sLku3pF9Rnw6lNC+8lKDQl6UpS0k=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231102130031-505e23230a50/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231102130031-505e23230a50 h1:POrjHtvpsWELsdWNq3HBZfvN2Z9pvFMVV0L4T5TJiVM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231102130031-505e23230a50/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231102130031-505e23230a50 h1:OojhFhavWdxvWUn2VwQriIBVXCmAU5R+n5S1dD3/AaY=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231102130031-505e23230a50/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231102130031-505e23230a50 h1:UL1ouNkUmHyTCFWkL9nV2pp7J9DFzJMqqJfDWJ8diPY=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231102130031-505e23230a50/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231102130031-505e23230a50 h1:9pjFfcacizieSw26H7S5bCBlnRBRorFWtAW/ESJ4H5I=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231102130031-505e23230a50/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231102130031-505e23230a50 h1:RnTZCZljG89RQkX3qHp8QnYW0dN3fvzS5/Ma234xLp8=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231102130031-505e23230a50/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230928170322-0df38c533713 h1:2daWNVtWNvRDoCTN5GG5N+LEM9OuY3RjJ0cboU3+xmM=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230928170322-0df38c533713/go.mod h1:lJLumMdUeKqurOskauSjhH4J2hz8r0iNyQWDl3i5NSM=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231027153828-85560f40a33d h1:9ggrXW27XY06+kColIRozGPdbjHlqWmWkT3S596E4BE=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231027153828-85560f40a33d/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231027153828-85560f40a33d h1:uIDzHA/33UjBxk2WPC0Lo2UUiyahVnsraFz9cXithKI=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231027153828-85560f40a33d/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231027153828-85560f40a33d h1:rYgchItoanCKq7d6461905u3uASnmoKdezAnvvCJMgc=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231027153828-85560f40a33d/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231027153828-85560f40a33d h1:8g+GKEcezZDgnieQFnD5D+tUcC2N2Bc6uuXQaUG9OlI=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231027153828-85560f40a33d/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231102130031-505e23230a50 h1:vLAUJwQUtH2OQ9QkkehyxXI//WalYbNgKU2nqb48LR8=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231102130031-505e23230a50/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231102130031-505e23230a50 h1:09XDd1Ta4n7nLlDUBASj6PoO5j/VwkRWQfvrvFNcoW0=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231102130031-505e23230a50/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231102130031-505e23230a50 h1:3oWzbiA0uwws3DPS6pg5pye/0PDkmWR+qUihyvDYVkA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231102130031-505e23230a50/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231102130031-505e23230a50 h1:XRMxGoIsq7FySiJff33EcxnSJgOTaWrJtyzhB1Uw5XE=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231102130031-505e23230a50/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko=
github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ=
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE=
Expand Down

0 comments on commit 1f5ae35

Please sign in to comment.