Skip to content

Commit a67ac45

Browse files
github-actions[bot]actions-user
github-actions[bot]
and
actions-user
authored
Update OTel fork components to d1a2dc4 (#906)
Co-authored-by: Github Action <[email protected]>
1 parent fc6b1c5 commit a67ac45

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎go.mod‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,34 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2022
66

77
// Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters
88
// to be all replaced since there are some changes that will always be from upstream
9-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231010194048-ca00a4d96086
9+
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231012205229-d1a2dc44f2f3
1010

11-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231010194048-ca00a4d96086
11+
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231012205229-d1a2dc44f2f3
1212

13-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231010194048-ca00a4d96086
13+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231012205229-d1a2dc44f2f3
1414

15-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231010194048-ca00a4d96086
15+
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231012205229-d1a2dc44f2f3
1616

17-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231010194048-ca00a4d96086
17+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231012205229-d1a2dc44f2f3
1818

19-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231010194048-ca00a4d96086
19+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231012205229-d1a2dc44f2f3
2020

2121
// Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519
22-
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231010194048-ca00a4d96086
22+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231012205229-d1a2dc44f2f3
2323

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

26-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231010194048-ca00a4d96086
26+
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231012205229-d1a2dc44f2f3
2727

28-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231010194048-ca00a4d96086
28+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231012205229-d1a2dc44f2f3
2929

30-
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231010194048-ca00a4d96086
30+
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231012205229-d1a2dc44f2f3
3131

32-
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231010194048-ca00a4d96086
32+
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231012205229-d1a2dc44f2f3
3333

34-
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231010194048-ca00a4d96086
34+
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231012205229-d1a2dc44f2f3
3535

36-
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231010194048-ca00a4d96086
36+
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231012205229-d1a2dc44f2f3
3737

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

426-
replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20231010194048-ca00a4d96086
426+
replace github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20231012205229-d1a2dc44f2f3

‎go.sum‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -139,34 +139,34 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
139139
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
140140
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
141141
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I=
142-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231010194048-ca00a4d96086 h1:TRJjygBgnh9fJryfwmW4mlTY5x+3YLzdbLvRH7fRKKE=
143-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231010194048-ca00a4d96086/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg=
144-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231010194048-ca00a4d96086 h1:K6U7gjV7K3dphSHM58+syX2AJEDl0/L5JV+vLoMNteg=
145-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231010194048-ca00a4d96086/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk=
146-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231010194048-ca00a4d96086 h1:U5DkSgPvYr3JPveOKaC2KZYYZLBMQQsU7dBOJOunbco=
147-
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231010194048-ca00a4d96086/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo=
148-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231010194048-ca00a4d96086 h1:DgFsom+0FLOGRmifUum7Ak5agaUkmoowMsaJV9RBuLw=
149-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231010194048-ca00a4d96086/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
150-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231010194048-ca00a4d96086 h1:XqNAMwWdeRK3yBSNQ7qtz2m4h7V14u/uDBqFOzcIGGY=
151-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231010194048-ca00a4d96086/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
152-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231010194048-ca00a4d96086 h1:wacwVdx2g+cgG9rwfnkRpo2livzkh/zNIlJHgS+0eCg=
153-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231010194048-ca00a4d96086/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
154-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231010194048-ca00a4d96086 h1:YX51130ub3HUmjT/yQ9LE3jLLPPJo684DBECE4j614w=
155-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231010194048-ca00a4d96086/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
156-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231010194048-ca00a4d96086 h1:bOmg1o07RevtPz7r6DTYA30m9BFvgk0TBqa0R+g9AAs=
157-
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231010194048-ca00a4d96086/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
158-
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231010194048-ca00a4d96086 h1:o2kPeydL+WfCJs8jM6NBmvfT2hEhXjTmrodckD4ZxNA=
159-
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231010194048-ca00a4d96086/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ=
142+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231012205229-d1a2dc44f2f3 h1:2tLCZtdFZ4B7yfqhtPEWOtVoCpFE0s3zB2IHqkVAVqM=
143+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:WgmC0gq7urueR/VbZ0EHZhe3MXV6oWbaMmEWhHvagfg=
144+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231012205229-d1a2dc44f2f3 h1:J2tk9Eo7FBT+GbQIOd7tq0XQyxtA+O75gHKoGYH5uuE=
145+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:b8pL6t9Xqk/zv0nLZsMiniuugDWiWQZRu9kh9t5SBLk=
146+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231012205229-d1a2dc44f2f3 h1:S1LKmk4Eczr+Ur6ReKMOkvfaYLBcJaTbRbtVmE9s9rY=
147+
github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:K9h+mkX+BsA1UTuuheGJjo44KAahxaNu9jJ8/xVF6jo=
148+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231012205229-d1a2dc44f2f3 h1:axMuDAP4C3gfDb0Ox5NGbIyoTKPOZ4Pt268hfH4jNKk=
149+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:9iAsO2SC8NIsa8/xCmC2Pj4MZPmYdvm+1/n89M74JS4=
150+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231012205229-d1a2dc44f2f3 h1:uCQjg1aL9DjKu8BB+9VhBdEQ6PDxz3PACctDYQU0i0I=
151+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:ZwAqtlNaHJX0IUU5O40j96TDbsPA0K7o+m49AZgei7g=
152+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231012205229-d1a2dc44f2f3 h1:uswozvbfuT2WbsLDd9Pk9hRrm9fsMHPTLzzbbhFEOi8=
153+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:U0J/v82xC95JvG5QhXlrHH9OpgV8scQSGS6N7XW2y/4=
154+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231012205229-d1a2dc44f2f3 h1:brhehmtgpokhtJUaX/Roo/Fg+wp2JootZzj9PyJXc7I=
155+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:58ZN2DUrqxJLqoXu+GZfL0RwMYiRZAAI+COKp0OmA0k=
156+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231012205229-d1a2dc44f2f3 h1:xlCHzoTSd8DOC0aAs1cWsGXlAtUaH0Hzh9yJYzdljgQ=
157+
github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:8edNN/XfefbHuGLiDhFdBN1QfJfgH7wmq5ms2Gme1EA=
158+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231012205229-d1a2dc44f2f3 h1:Igs/mTssnX3WYVpGcj72b9n1GqQdcmWBZmCgAQam8Cg=
159+
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:F5l/VuHtB8418NLJEsHeYz/pni6sWtOMR/SM6mgarhQ=
160160
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230928170322-0df38c533713 h1:2daWNVtWNvRDoCTN5GG5N+LEM9OuY3RjJ0cboU3+xmM=
161161
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20230928170322-0df38c533713/go.mod h1:lJLumMdUeKqurOskauSjhH4J2hz8r0iNyQWDl3i5NSM=
162-
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231010194048-ca00a4d96086 h1:xdNB2JVC9WnOdhoLJVSAfa7q2T8qjDTQyJ3+Rnpr87U=
163-
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231010194048-ca00a4d96086/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
164-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231010194048-ca00a4d96086 h1:eYAppnv9Aib7y27njtMLOQeA02dgOwt/diIo4LNgIgI=
165-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231010194048-ca00a4d96086/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
166-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231010194048-ca00a4d96086 h1:3FiCcGI5UjOzvdtM+AByUsaanTl7x+oXEwxiC70Hl0I=
167-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231010194048-ca00a4d96086/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
168-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231010194048-ca00a4d96086 h1:nLe+YkTSldClMKWWN14TU+Ix1YBo4aAhezedGTbzjeU=
169-
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231010194048-ca00a4d96086/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko=
162+
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231012205229-d1a2dc44f2f3 h1:2veJzdr7Ulzh0PVhIzk8qFlYZ2UOKlh+Th8awDT8fsw=
163+
github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:9qsT0AsMflbQKz0ojK3aRU/PbyGQCDPKut3XMfAkW8k=
164+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231012205229-d1a2dc44f2f3 h1:4Xsr3S/XBYXDOo3AihM9YUww6YxzZUJYRUpiP8LeWe0=
165+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:t/v7BcGrHUQ0/Lb/4egp0Xe8PrTceEkZVArTuRjQGBo=
166+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231012205229-d1a2dc44f2f3 h1:cvtX0kTQO/wY+33wWVv3PJS3tLCQ39x+lCfhZgbMiOY=
167+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:akbVXOWuMWKSgqA1QKoXkm3hFt0qIvDeUr7m3ODAiS8=
168+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231012205229-d1a2dc44f2f3 h1:aNJxUF5OA5SeBosU9OxJr+L6JY8JEx2APAz+xPbb1GM=
169+
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20231012205229-d1a2dc44f2f3/go.mod h1:fw4J+Pn19ZgfR5ZVxWVtlvKq7+zEfXXlZV/7G9IWkko=
170170
github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ=
171171
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
172172
github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE=

0 commit comments

Comments
 (0)