Skip to content

Commit

Permalink
Update OTel fork to release-262 branch which contains cherry-picked c…
Browse files Browse the repository at this point in the history 
…ommits for v262
  • Loading branch information
@sky333999
sky333999 committed Aug 10, 2023
1 parent 9a259d5 commit 98086fb
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 39 deletions.
27 changes: 14 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-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810034323-023d59318b1b

// 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-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230810034323-023d59318b1b

replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810015819-24607924fd49
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810034323-023d59318b1b

replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810015819-24607924fd49
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810034323-023d59318b1b

// 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 Expand Up @@ -309,6 +309,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.79.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.77.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.77.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.77.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
Expand Down
54 changes: 28 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-20230810015819-24607924fd49 h1:7lpZNH6/hz/ZuKbFaH54EmYSBuyd/gXHdaTyhxXd8JY=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230810015819-24607924fd49/go.mod h1:HRf2sceR2g7776hNmRb25at9Z2BRbU822oFLk7RvsWo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230810015819-24607924fd49 h1:c5NJBTF58S+TWP2aBpHlvyWtXRogPrGJbnJPNl1Kwt0=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230810015819-24607924fd49/go.mod h1:IYoanLjlF21D1IwcfOSihSOujnPrS3BuS1gsFm4NWqA=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810015819-24607924fd49 h1:sCIn6It8bZJdkcef8F/KttMTAkb0tVENci6gmucDBA4=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810015819-24607924fd49/go.mod h1:2jse1hY+I0ebMKuSTeKqaSyLbubRnW2yt//HhmYwXFE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810015819-24607924fd49 h1:UaL/x2RP9JN8sB53Xqk6dWbKQB5eXrvQXH9QbNNOKAI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810015819-24607924fd49/go.mod h1:SQwoElvhs3XjgU1+uo8TgS3UP/xoVK+Ge1lLPviYWEE=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810015819-24607924fd49 h1:RatsNdmnN8YoXRF6Hoz4u/xetzEoKTB7EdhTAEQNp3Y=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810015819-24607924fd49/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810015819-24607924fd49 h1:DKnZeyUpQTUf5VCcFS0Ud/re8s8d9KcuXYBlq3C6lm8=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810015819-24607924fd49/go.mod h1:leu6SU6eqJeveXxY+wFdxnLvQua0hORuqTGrRjUHoVI=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810015819-24607924fd49 h1:NjqjvGD4ckJ0kZFv83iv4zYr+EK7U4gjny6ROGNILw8=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810015819-24607924fd49/go.mod h1:Oy2KtD3Rbby6z1OVPY8qyQIDqnQASytn3QpdhvgAPJ8=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810015819-24607924fd49 h1:Qizp5O3iBPfxbqsUpnlz/BstyCiqOUiRYA/N9DMwpBU=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810015819-24607924fd49/go.mod h1:IALoNQANfbEwCx09yx14thn6R2cVfBoitENfMF58Vis=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810015819-24607924fd49 h1:57q0uHFIBVBwhMDS4ukWo+Y2Sc2Cf4AvE/TMm/tXmUw=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810015819-24607924fd49/go.mod h1:RDXDH3dfw/s7w9iqdZhBglBIKJ+ZUSP+G+bFjphmFA8=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230810015819-24607924fd49 h1:nChl4ArNMXY9T8B0+1nU5XOCR86YFSE8BcQUaiLxbW0=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230810015819-24607924fd49/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810015819-24607924fd49 h1:DfieUwEZVzSb07itpRCdih0fgfS1MxFhJvMhyPlJ/nc=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810015819-24607924fd49/go.mod h1:KhbOQJZJ6bKD1fM2k5/kx7SIrVHbnSmk0c/sUI7JFjk=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810015819-24607924fd49 h1:RtY9lf2uOGzYbs/SawysrRjCw5ygURY32PY8HG4ryOA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810015819-24607924fd49/go.mod h1:SqiFiXuXls4qdMe4sKldrDQp06AtNmt+3yQwd1FIjeo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810015819-24607924fd49 h1:nvodtThYkzq+994WyfUZUFbXokjM56vVl25jesE1Dkw=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810015819-24607924fd49/go.mod h1:Hle+DN7pi6FnsogIVsp+9n0k0EHrhYLszIDSWvRn1EY=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230810034323-023d59318b1b h1:9/7RW6jyQidtdiw29Djovz5J1uNSmQH+daD/fe+rw6A=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20230810034323-023d59318b1b/go.mod h1:duLx2+YwViAlRWXZfGp0jhzHCTCHoBomEK+sMN8Buqo=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230810034323-023d59318b1b h1:3Fy5A5dutHcBnMRDgUP/s3vEpKD7ejpOg3WPEvlgLWw=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20230810034323-023d59318b1b/go.mod h1:oK+IzBQBaw+rk6IpAZF/hv1Kf4C+FpG0EU65+kB4WQg=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810034323-023d59318b1b h1:CucSXQTkoC6F9qqAZtnuJL0+zzWQmx4560DpB3cBEfI=
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20230810034323-023d59318b1b/go.mod h1:Nrijt/LpTujytIcNo6aHtfjsa0pKB4tRbDfkm/OPlvs=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810034323-023d59318b1b h1:KmZDx5oGJPt5i4hoWNchhWAfhAxBBLtk8fR+a8QFs6A=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20230810034323-023d59318b1b/go.mod h1:hsfLfFcbX/bQmxOaRTjkBRSCEDsQrMhcdAjOrGd1+68=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810034323-023d59318b1b h1:c2t5JHWtzx9aLRImX6kO+S8FhwLvC9cn/r+92ifmSr4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20230810034323-023d59318b1b/go.mod h1:b9KA+hw/wH0cO3D2bnUp0oTUzDuoDandrl7p2hzgBtQ=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810034323-023d59318b1b h1:5CLrvXO4tnQLthxAMUJJfgAgjuNyPeqrpIT+zmJC4kw=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20230810034323-023d59318b1b/go.mod h1:aC35JomgqpFoK4IjwSO/ZmY9HA1NecPyya+55pfpsvM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810034323-023d59318b1b h1:W9zEga7X2TTY46VTVSOBXcWXz9w/zOAmUQZtw78S8UM=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20230810034323-023d59318b1b/go.mod h1:0iZGDRrS6loyQEp4QeGL3Bs29/3PX8WYWBbqii3kXo4=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810034323-023d59318b1b h1:ZI/8C2x4qp3HF/VDsO5zGsF8dkxGED8lzkfSwV5i3d0=
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20230810034323-023d59318b1b/go.mod h1:cZPM0+cwMlwz+seyIDTQ5vHRuCK37G6MAgrB1DQDB8U=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810034323-023d59318b1b h1:SQapO3iJim5gaEZ3CRJTykM8GAeZ/xV86Tbv38CfUU8=
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230810034323-023d59318b1b/go.mod h1:ub29hEE1NGExGEF8AS8nkersPkng3mid6FQEXnrSPLg=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230810034323-023d59318b1b h1:nLhufEED3HZoxbUnAQv/0tqDQxlTCvk8bS1jf8kDdEc=
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20230810034323-023d59318b1b/go.mod h1:UHT79wwd4bjA5Z7hQ9Cx6vbr5Pr7HK+PNLeOMt15+m8=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810034323-023d59318b1b h1:k/NU9PJrIlwbh8hnXBUdv0bJ0Uzua4AcKMj6v1EBdIw=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20230810034323-023d59318b1b/go.mod h1:x/8XmPCuU5xM9O4xrQsKWJ8qYgT3tNlui/MXyR3bZ/M=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810034323-023d59318b1b h1:9h21eq0/OCdkRrQ6O3mu/xhCeTUuZDYTw5tQnHF/IAA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20230810034323-023d59318b1b/go.mod h1:L6WoMPJOLw/3VsB4jO4exRwWaSNUvkirhyqv2ssY/qg=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810034323-023d59318b1b h1:H5L15nyk1p7Bpydb9JLvAjyj1ydWdL+x0lg3MS0HoiI=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20230810034323-023d59318b1b/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 Expand Up @@ -973,6 +973,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativeto
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.77.0/go.mod h1:PU+KpXerGtB06q/nSvyVYoO3/EKBs243OIM+BFPVtkg=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.77.0 h1:6qvVVmDbm5hao1WWbKLkQHRMxr9kkkmmAjEMUZK1RkU=
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.77.0/go.mod h1:Z0rIaEGTQpstoOsSNS1aA8wfpwz6iSc1Ljh+tWZTQPc=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.77.0 h1:uohdq86Xau9rAVgSwrtjCqpbTn2TBh29jF5uo/njFJA=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.77.0/go.mod h1:S2ObMWwta6rOBGLoi4D0WW5UunG8SkEMgIAJGjQMa24=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.77.0 h1:0UkaMRzC6LfxqF9WhdKS7UmuXWVuZUiA/hcT99iv4Bc=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.77.0/go.mod h1:MpFwgN5Ya91zETlhpIFDdTOsoqMb4kDhSuguKEimDMU=
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.77.0 h1:8CGEYeDPyhk5f+mJ/QvHBKqhZo7BurLSNEP4cPSg4Ts=
Expand Down

0 comments on commit 98086fb

Please sign in to comment.