Skip to content

Commit 2237878

Browse files
sethAmazonsethAmazon
authored
Merge pull request open-telemetry#49 from sethAmazon/revert-imds-aws-sk-v2
Revert "Retry IMDSV2 Before Falling Back To IMDSV1"
2 parents 99d6179 + 351efeb commit 2237878

File tree

46 files changed

+239
-991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+239
-991
lines changed

‎cmd/configschema/go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ require (
8383
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.77.0 // indirect
8484
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.77.0 // indirect
8585
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.77.0 // indirect
86-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.79.0 // indirect
86+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.77.0 // indirect
8787
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.77.0 // indirect
8888
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.77.0 // indirect
8989
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.77.0 // indirect
@@ -277,7 +277,6 @@ require (
277277
github.com/alecthomas/participle/v2 v2.0.0 // indirect
278278
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
279279
github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
280-
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
281280
github.com/andybalholm/brotli v1.0.5 // indirect
282281
github.com/antonmedv/expr v1.12.5 // indirect
283282
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
@@ -289,8 +288,8 @@ require (
289288
github.com/aws/aws-sdk-go v1.44.293 // indirect
290289
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
291290
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
292-
github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
293-
github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
291+
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
292+
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
294293
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
295294
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect
296295
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
@@ -303,9 +302,9 @@ require (
303302
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
304303
github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.11 // indirect
305304
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
306-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
307-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
308-
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
305+
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
306+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
307+
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
309308
github.com/aws/smithy-go v1.13.5 // indirect
310309
github.com/beorn7/perks v1.0.1 // indirect
311310
github.com/blang/semver v3.5.1+incompatible // indirect

‎cmd/configschema/go.sum

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/go.mod

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ require (
269269
github.com/alecthomas/participle/v2 v2.0.0 // indirect
270270
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
271271
github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
272-
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
273272
github.com/andybalholm/brotli v1.0.5 // indirect
274273
github.com/antonmedv/expr v1.12.5 // indirect
275274
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
@@ -278,11 +277,11 @@ require (
278277
github.com/apache/thrift v0.18.1 // indirect
279278
github.com/ardielle/ardielle-go v1.5.2 // indirect
280279
github.com/armon/go-metrics v0.4.1 // indirect
281-
github.com/aws/aws-sdk-go v1.44.293 // indirect
280+
github.com/aws/aws-sdk-go v1.44.255 // indirect
282281
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
283282
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
284-
github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
285-
github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
283+
github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
284+
github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
286285
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
287286
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect
288287
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
@@ -295,9 +294,9 @@ require (
295294
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
296295
github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.11 // indirect
297296
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
298-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
299-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
300-
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
297+
github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
298+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
299+
github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
301300
github.com/aws/smithy-go v1.13.5 // indirect
302301
github.com/beorn7/perks v1.0.1 // indirect
303302
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -497,7 +496,7 @@ require (
497496
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.77.0 // indirect
498497
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.77.0 // indirect
499498
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.77.0 // indirect
500-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.79.0 // indirect
499+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.77.0 // indirect
501500
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.77.0 // indirect
502501
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.77.0 // indirect
503502
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.77.0 // indirect

‎cmd/otelcontribcol/go.sum

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎exporter/awscloudwatchlogsexporter/go.mod

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.293
6+
github.com/aws/aws-sdk-go v1.44.255
77
github.com/cenkalti/backoff/v4 v4.2.1
88
github.com/google/uuid v1.3.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
@@ -19,19 +19,6 @@ require (
1919
)
2020

2121
require (
22-
github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
23-
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
24-
github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
25-
github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
26-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
27-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
28-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
29-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
30-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
31-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
32-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
34-
github.com/aws/smithy-go v1.13.5 // indirect
3522
github.com/davecgh/go-spew v1.1.1 // indirect
3623
github.com/gogo/protobuf v1.3.2 // indirect
3724
github.com/golang/protobuf v1.5.3 // indirect
@@ -66,8 +53,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
6653

6754
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs
6855

69-
replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
70-
7156
retract (
7257
v0.76.2
7358
v0.76.1

0 commit comments

Comments
 (0)