Skip to content

Commit

Permalink
Update OTel fork components to 082d76a (#339)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jul 18, 2023
1 parent 3bd13c5 commit 3493d71
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 @@ -5,33 +5,33 @@ go 1.19
replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.20220502160831-c20ebe67c5ef

// 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 will always from upstream
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230717184741-0f1881d4473a
// 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-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230718001704-082d76a23ef3

// 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-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230718001704-082d76a23ef3

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230717184741-0f1881d4473a
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230718001704-082d76a23ef3

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230717184741-0f1881d4473a
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230718001704-082d76a23ef3

// 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
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-20230717184741-0f1881d4473a h1:sIgp4c5HTeOd9oIp4eJ7LcqIY8FXXlhQ8aRorGxcZgU=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230717184741-0f1881d4473a/go.mod h1:IHSUwIqD07m3DG+5D65tQcICkFEdspEKGBmQLcQgNpI=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230717184741-0f1881d4473a h1:e11WbBYjunaANujpXTs2j5eAY6u+GGPiprtJYj85tkQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230717184741-0f1881d4473a/go.mod h1:WvkRymAOh4wqSd6bBo5fHY6EjtvxIfWRmEs+cR+yUjM=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230717184741-0f1881d4473a h1:X9X58kN3IWItAPmy3GzHgKm8dX3p8hm6GQwPjTf/0VU=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230717184741-0f1881d4473a/go.mod h1:fUd/E+pt+yulpry4B/wNwDmi++aBM4cNt7LGqwFR/7c=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230717184741-0f1881d4473a h1:+7k/6YWK2ng7wScG/5NK1QBzhKF0APjh9c3uml+z3GY=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230717184741-0f1881d4473a/go.mod h1:hCblP0UsxFEckXJCAjuHzd+sGf4vlncOSnYr/IiDBgs=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230717184741-0f1881d4473a h1:QkCw9pFzcF+zBaIOsW7Jb2fx3yadDaqz7OnnvC+EEiI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230717184741-0f1881d4473a/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230717184741-0f1881d4473a h1:qe5Zg7kAFv7umv95otOJb17VIBPI2mOrKH0HSPmwmTw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230717184741-0f1881d4473a/go.mod h1:aC35JomgqpFoK4IjwSO/ZmY9HA1NecPyya+55pfpsvM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230717184741-0f1881d4473a h1:OR2XGNXw3EQG9v8DlCKgd+qAXyCT5N7OFBAiDO9wsa0=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230717184741-0f1881d4473a/go.mod h1:0iZGDRrS6loyQEp4QeGL3Bs29/3PX8WYWBbqii3kXo4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230717184741-0f1881d4473a h1:l1XUoq3y36ytHOa0wjg0dBZcg6Ws6HcA+RKt5jnFdXQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230717184741-0f1881d4473a/go.mod h1:agePwwPsGafM9w30Xl7EJud7RlgLmtfpDzmq0F2MD4c=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230717184741-0f1881d4473a h1:OHPeAAN8pDFOOEtG3Uerc9AVCLAz8UzOwJyWMdNhnDU=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230717184741-0f1881d4473a/go.mod h1:b5uvbp31ZtSPEHt6fwnpycZpuk/vWB5sCPEQV+PITCI=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230717184741-0f1881d4473a h1:QToGFhKb/oE6X5G6f00h3IH595Wpkpn3m8pg9EA9wDA=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230717184741-0f1881d4473a/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230717184741-0f1881d4473a h1:5cP3oIcbzrpQbAaxIx7KgVTIKYDJh1TMm1u9V8hs5Sk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230717184741-0f1881d4473a/go.mod h1:bc3n+E9/TUaJ5XhyXoojlZHAu/V1oyWd38JyVzM8/WM=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230717184741-0f1881d4473a h1:NWzKQnR6WCf6z+hw+FOxIRY9BclLZMKoFzCpyhneyAE=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230717184741-0f1881d4473a/go.mod h1:RLs4bvSSdYstbU4+6JhhT+3utpgaeQceMIIZ2lyWjsk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230717184741-0f1881d4473a h1:yMOI/0mEoP7dQG58mRT7NnLpWdhjXtmaF4v4pXu5Yfk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230717184741-0f1881d4473a/go.mod h1:4kwffrS4Pe8OzrZ0DgcG0AFIds5+SXeTnaUEv9AvjbA=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230718001704-082d76a23ef3 h1:4CxaqRZ1OM+K/3G1jTTzHpTtImnbvuee+oSB7vNJEOw=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230718001704-082d76a23ef3/go.mod h1:duLx2+YwViAlRWXZfGp0jhzHCTCHoBomEK+sMN8Buqo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230718001704-082d76a23ef3 h1:Xx6LyGmFiWK0MK4WWUgQzaLDVP3Ry0E3PbvuxkI4b2k=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230718001704-082d76a23ef3/go.mod h1:oK+IzBQBaw+rk6IpAZF/hv1Kf4C+FpG0EU65+kB4WQg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230718001704-082d76a23ef3 h1:eOhuKsoWmmw1kR3/kb7AojXPsFgQqbGuEGANda+YdEc=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230718001704-082d76a23ef3/go.mod h1:Nrijt/LpTujytIcNo6aHtfjsa0pKB4tRbDfkm/OPlvs=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230718001704-082d76a23ef3 h1:8ZPnlL/rKEIkU1LTctmbVGgXlHaexv5JCD0k0Qvc6vA=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230718001704-082d76a23ef3/go.mod h1:hsfLfFcbX/bQmxOaRTjkBRSCEDsQrMhcdAjOrGd1+68=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230718001704-082d76a23ef3 h1:6HbYY3oHc/1G7rKYiP+LvHDKrKR6qUQV/7L3+l5OcBY=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230718001704-082d76a23ef3/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230718001704-082d76a23ef3 h1:I7P2lyqwrO77SKieXK6xuDC/zrMLioeljkQqWXecd98=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230718001704-082d76a23ef3/go.mod h1:aC35JomgqpFoK4IjwSO/ZmY9HA1NecPyya+55pfpsvM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230718001704-082d76a23ef3 h1:oNMQ65IMGA9VQ7Cc8LPzCrtOnfRCympciUppyFUkjcw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230718001704-082d76a23ef3/go.mod h1:0iZGDRrS6loyQEp4QeGL3Bs29/3PX8WYWBbqii3kXo4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230718001704-082d76a23ef3 h1:BrYQ/MlPqCYJ6l/i+YA3gxA1knL7NwEWqrrsIpjaQFE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230718001704-082d76a23ef3/go.mod h1:cZPM0+cwMlwz+seyIDTQ5vHRuCK37G6MAgrB1DQDB8U=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230718001704-082d76a23ef3 h1:KNWevzAtJL5X5RhZz/css0fUcCU8r8ePyUkh9VPkJZ8=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230718001704-082d76a23ef3/go.mod h1:UonwG0d6MVsqbZiEb+1hlr5oIeDEbVJ3uUlcC05fFIU=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230718001704-082d76a23ef3 h1:dRddUeYmHNvCgZwacKPwiABCzBawbfHLSQT6EDDB7tM=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230718001704-082d76a23ef3/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230718001704-082d76a23ef3 h1:VcDT6iv7F9PSv6VMCJll6SoercwD9KxGv/Qi4Y+Ufcw=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230718001704-082d76a23ef3/go.mod h1:x/8XmPCuU5xM9O4xrQsKWJ8qYgT3tNlui/MXyR3bZ/M=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230718001704-082d76a23ef3 h1:qA26s8Yfn/kHSXyZE/CEE642aXxELqnB2t9OBOcCYso=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230718001704-082d76a23ef3/go.mod h1:L6WoMPJOLw/3VsB4jO4exRwWaSNUvkirhyqv2ssY/qg=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230718001704-082d76a23ef3 h1:LyjEbZuuMDdQmC1nVF2OfLhACj5tw12MeezAbYGiYRo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230718001704-082d76a23ef3/go.mod h1:4kwffrS4Pe8OzrZ0DgcG0AFIds5+SXeTnaUEv9AvjbA=
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 3493d71

Please sign in to comment.