Skip to content

Commit

Permalink
Update OTel fork components to b8f0f42 (#385)
Browse files Browse the repository at this point in the history 
Co-authored-by: Github Action <[email protected]>
(cherry picked from commit 9a108b3)
  • Loading branch information
@github-actions @sky333999
github-actions[bot] authored and sky333999 committed Aug 10, 2023
1 parent db03fb6 commit ab161e6
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 39 deletions.
26 changes: 13 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ 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-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230807181813-b8f0f4201baf

// 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-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230807181813-b8f0f4201baf

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230803201702-2ab86474ff55
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230807181813-b8f0f4201baf

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230803201702-2ab86474ff55
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230807181813-b8f0f4201baf

// 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-20220502160831-c20ebe67c5ef // indirect
Expand Down
52 changes: 26 additions & 26 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,32 +143,32 @@ 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-20230803201702-2ab86474ff55 h1:S7NoV8C9zbBCbbYFkISYiM47uxU4+W08stWmgKcFkhg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230803201702-2ab86474ff55/go.mod h1:HRf2sceR2g7776hNmRb25at9Z2BRbU822oFLk7RvsWo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230803201702-2ab86474ff55 h1:l8CjZ8dxYhwwOG2dHmJHpO4tPrpIlETKtCliaQM182w=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230803201702-2ab86474ff55/go.mod h1:IYoanLjlF21D1IwcfOSihSOujnPrS3BuS1gsFm4NWqA=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230803201702-2ab86474ff55 h1:MmCZc5NI7WqN5zsuf/XTM+hTxEx6N5hw/nB41xrirmc=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230803201702-2ab86474ff55/go.mod h1:2jse1hY+I0ebMKuSTeKqaSyLbubRnW2yt//HhmYwXFE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230803201702-2ab86474ff55 h1:cRn/4CIjGyVIrBr/ikOUqR1Ah8jpiBpD/A9m6/WPQFI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230803201702-2ab86474ff55/go.mod h1:SQwoElvhs3XjgU1+uo8TgS3UP/xoVK+Ge1lLPviYWEE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230803201702-2ab86474ff55 h1:lMjE7/nPEAEjrd6boF1VjyyGfBCJ3c7dPOqiCEU06NE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230803201702-2ab86474ff55/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230803201702-2ab86474ff55 h1:Tc+MvPz1M24bgRBS0m/ULqDzhedKo3u3hZJgwPdVcig=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230803201702-2ab86474ff55/go.mod h1:leu6SU6eqJeveXxY+wFdxnLvQua0hORuqTGrRjUHoVI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230803201702-2ab86474ff55 h1:D73A9LmA/rBf8xXOVH5VB5SBLVEfCXyVK+kZUsyh5zw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230803201702-2ab86474ff55/go.mod h1:Oy2KtD3Rbby6z1OVPY8qyQIDqnQASytn3QpdhvgAPJ8=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230803201702-2ab86474ff55 h1:Rj8ryT/1I2F4MiYPuBSgT9VOdOq1lfGbJ8u3IK2PXzM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230803201702-2ab86474ff55/go.mod h1:IALoNQANfbEwCx09yx14thn6R2cVfBoitENfMF58Vis=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230803201702-2ab86474ff55 h1:HaAoar65Ch7XNmc+qZ2frUhMrijtodJoE1Wi3YLnC9M=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230803201702-2ab86474ff55/go.mod h1:RDXDH3dfw/s7w9iqdZhBglBIKJ+ZUSP+G+bFjphmFA8=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230803201702-2ab86474ff55 h1:u+4GaEOlzEf1SuOUYQs04S6Dxdvl+D9Gz21w/Lteo2w=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230803201702-2ab86474ff55/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230803201702-2ab86474ff55 h1:lJTnqkSEvxtiMjcKdg34MiAPcGFmW0lNR/yOPWFD9/A=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230803201702-2ab86474ff55/go.mod h1:KhbOQJZJ6bKD1fM2k5/kx7SIrVHbnSmk0c/sUI7JFjk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230803201702-2ab86474ff55 h1:lrho3w5pTdAZpnfGOVcEWnTwQemYYhSjQJij8KxQOMQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230803201702-2ab86474ff55/go.mod h1:SqiFiXuXls4qdMe4sKldrDQp06AtNmt+3yQwd1FIjeo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230803201702-2ab86474ff55 h1:y74Jwxt8IGWI1p4c715JHzk3Wd2cc9iHiItJZlzQNG8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230803201702-2ab86474ff55/go.mod h1:Hle+DN7pi6FnsogIVsp+9n0k0EHrhYLszIDSWvRn1EY=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230807181813-b8f0f4201baf h1:weWB5SFL1MjmepotbDI+9Aqp+StEWJO4E+GY/uYtixY=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:HRf2sceR2g7776hNmRb25at9Z2BRbU822oFLk7RvsWo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230807181813-b8f0f4201baf h1:b+U9dV4iNI8IbeXgqo3AWYuVosvxh9bPsm9CfCTaBsE=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:IYoanLjlF21D1IwcfOSihSOujnPrS3BuS1gsFm4NWqA=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230807181813-b8f0f4201baf h1:dCJ08rcjZlrUfC6t7HmKHcW27BzgQFGusSEYXsnMz5g=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:2jse1hY+I0ebMKuSTeKqaSyLbubRnW2yt//HhmYwXFE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230807181813-b8f0f4201baf h1:PTkykPK4nlH4iyrQw92O3t5Bj5I9CuKQeGGpGUhMu5s=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:SQwoElvhs3XjgU1+uo8TgS3UP/xoVK+Ge1lLPviYWEE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230807181813-b8f0f4201baf h1:B7Huur7aR7JtmKJxjQbV36c4B3MkDxMGXwGuBbRzG24=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230807181813-b8f0f4201baf h1:8N4OlS5pvbrc6mBOCHaJgGqkfjOn5CtQsNdfRGi2exI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:leu6SU6eqJeveXxY+wFdxnLvQua0hORuqTGrRjUHoVI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230807181813-b8f0f4201baf h1:E2qOAZAWzJzs/hAOExdyZ7yglUsajImXAU7UWncXd2I=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:Oy2KtD3Rbby6z1OVPY8qyQIDqnQASytn3QpdhvgAPJ8=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230807181813-b8f0f4201baf h1:BdgkoKGlFQfIV2ZWbu4G3nEa0t26/kMeMHtzV9qtVfs=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:IALoNQANfbEwCx09yx14thn6R2cVfBoitENfMF58Vis=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230807181813-b8f0f4201baf h1:zA8RiBPnZ3tZakX/8cUqCTHVPaBfKcxEHU2Dvsar2r8=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:RDXDH3dfw/s7w9iqdZhBglBIKJ+ZUSP+G+bFjphmFA8=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230807181813-b8f0f4201baf h1:kSIQh105mawDde1HJHK9YVhi8IWQOHgIN2huuRptUPA=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230807181813-b8f0f4201baf h1:BZVtRbpEsgnPz6EFyr/B7uGQWiyh+5FffcK0sC6Wa24=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:KhbOQJZJ6bKD1fM2k5/kx7SIrVHbnSmk0c/sUI7JFjk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230807181813-b8f0f4201baf h1:Wk0tO9M/BgWqBvfYNr4Qo8T0Rc6EXGs40Bs4XggqXrA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:SqiFiXuXls4qdMe4sKldrDQp06AtNmt+3yQwd1FIjeo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230807181813-b8f0f4201baf h1:QOeIvEoBlWjZHqUA9Nf22XxptP66qryhugWmsgPhcDo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230807181813-b8f0f4201baf/go.mod h1:Hle+DN7pi6FnsogIVsp+9n0k0EHrhYLszIDSWvRn1EY=
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 ab161e6

Please sign in to comment.