Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Update OTel fork components to 4b74f352a68968c240642dfb54049e9e9dd7ce1d #892

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Update OTel fork components to 4b74f352a68968c240642dfb54049e9e9dd7ce1d #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions go.mod
View file
Open in desktop
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-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231005180140-4b74f352a689

// 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-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231005180140-4b74f352a689

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-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231005180140-4b74f352a689

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231002160453-1957d95a68c7
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231005180140-4b74f352a689

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231002160453-1957d95a68c7
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231005180140-4b74f352a689

// 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 @@ -423,4 +423,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-20231002160453-1957d95a68c7
replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20231005180140-4b74f352a689
52 changes: 26 additions & 26 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,34 +139,34 @@ 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-20231002160453-1957d95a68c7 h1:tPUjPzCJPfB8PKoU/dOybBWNqXE5F2fDOYmXJ2Aw8O4=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231002160453-1957d95a68c7/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231002160453-1957d95a68c7 h1:eF2wBE5Tf25H2KzOfKMphrp2ypt8Bpf6LNyBBF4vVVE=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231002160453-1957d95a68c7/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231002160453-1957d95a68c7 h1:OFtCEHStmq+IhXpCAmZYuJiei4buGrXz7mAdu+YVJCs=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231002160453-1957d95a68c7/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231002160453-1957d95a68c7 h1:NsqMEC9MrJDyMbbFaTB/PSz9ZueNLvB6yg37bRBKQmA=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231002160453-1957d95a68c7/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231002160453-1957d95a68c7 h1:xg/s45OU1LhcmSCxz+7qgXKHljtW7hgu4nQX8muRozw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231002160453-1957d95a68c7/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231002160453-1957d95a68c7 h1:032FuhRi/l68/Tpx6h4DkUDwVpSIVyYhtxHzxf3JZ+I=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231002160453-1957d95a68c7/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231002160453-1957d95a68c7 h1:Vgsx20V4lcBGLYD4ayubPJ4sCnVlRGC7fn7G+zOEiXo=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231002160453-1957d95a68c7/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231002160453-1957d95a68c7 h1:riMIsVT4iVRbdlZ2oor9nTMPRGAHU+13ttT5d+21UA4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231002160453-1957d95a68c7/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231002160453-1957d95a68c7 h1:oSlkqgBdFuhGLZv5dEDlzWhW+/WUcw5UagtsG+uEvCI=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231002160453-1957d95a68c7/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231005180140-4b74f352a689 h1:C41hepLgo3qoZ/raJJXwg5+61r1T0wKGe7ouq2GTDCQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231005180140-4b74f352a689/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231005180140-4b74f352a689 h1:PB5QDEQZeC7Wuvmuwd6mlJbjAbU7d1jNe91Ro1sieBY=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231005180140-4b74f352a689/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231005180140-4b74f352a689 h1:Hs0LHi+VUmWUlTBrc3dp8moDSsIElpbUfWWezE4yPdg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231005180140-4b74f352a689/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231005180140-4b74f352a689 h1:PE+2GVB1EVsRaqShTpyunefheg82SklTOeLsYIXveus=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231005180140-4b74f352a689/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231005180140-4b74f352a689 h1:H7WeHG6ERGOgPCS01RjwMo3Faja60PbozpPXDhx3OGI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231005180140-4b74f352a689/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231005180140-4b74f352a689 h1:hpv83ENe81wZmLC93U90hT5WzbOzLCY8EhxAmvUjMuo=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231005180140-4b74f352a689/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231005180140-4b74f352a689 h1:MVjE0TuGzjWvWbphb/UQhhKz2+XtRjnhEJF20ht/D30=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231005180140-4b74f352a689/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231005180140-4b74f352a689 h1:XYgIXvOXzjDUvkw0KQ8HjGmqW2+3fLFOhwtWRZcn5YU=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231005180140-4b74f352a689/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231005180140-4b74f352a689 h1:UMqzAQZicKnFjs4M7QXXfMq1Tf/RopSD0g1kfZkgRvo=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231005180140-4b74f352a689/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-20231002160453-1957d95a68c7 h1:gQ29vEeVTF7wr5YP83+82uHBRkRGOhV3NeTwWDjc3dQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231002160453-1957d95a68c7/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231002160453-1957d95a68c7 h1:9hkohcGsQUL0Y80T2iMI88JsR4yFF4rq9LpXuLAATCA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231002160453-1957d95a68c7/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231002160453-1957d95a68c7 h1:KxLOn4ISFoCZOK+ViryxmqG2eN49ZJCGmwfuvT370Aw=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231002160453-1957d95a68c7/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231002160453-1957d95a68c7 h1:yXCJd4oKpTvFVc4rAij8nfPRNxzo7yrVNDgRp6BOqFE=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231002160453-1957d95a68c7/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231005180140-4b74f352a689 h1:mSioY+8Y75youwy5RUzKmlR5K0SXKcsTsIPReetXyIs=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231005180140-4b74f352a689/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231005180140-4b74f352a689 h1:vMz2KlUPl8FvCit6GN+K2mYGPjN5DbgU5u9q9o0YL0s=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231005180140-4b74f352a689/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231005180140-4b74f352a689 h1:8lwu1RO1grkes/ZD4zQuNLF5FQ9jKlOQQ7vQUss4Buo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231005180140-4b74f352a689/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231005180140-4b74f352a689 h1:PkIHZwFh7YGCEHK6Hb81VMb9J8UugN1KI3wMRoLfb2Q=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231005180140-4b74f352a689/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