Merge pull request #49 from sethAmazon/revert-imds-aws-sk-v2

Revert "Retry IMDSV2 Before Falling Back To IMDSV1"

cmd/configschema/go.mod

@@ -83,7 +83,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.77.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.79.0 // indirect
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.77.0 // indirect
@@ -277,7 +277,6 @@ require (
  github.com/alecthomas/participle/v2 v2.0.0 // indirect
  github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
  github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
  github.com/andybalholm/brotli v1.0.5 // indirect
  github.com/antonmedv/expr v1.12.5 // indirect
  github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
@@ -289,8 +288,8 @@ require (
  github.com/aws/aws-sdk-go v1.44.293 // indirect
  github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
  github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
  github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect
  github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
@@ -303,9 +302,9 @@ require (
  github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
  github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.11 // indirect
  github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
  github.com/aws/smithy-go v1.13.5 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver v3.5.1+incompatible // indirect

cmd/otelcontribcol/go.mod

@@ -269,7 +269,6 @@ require (
  github.com/alecthomas/participle/v2 v2.0.0 // indirect
  github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
  github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
  github.com/andybalholm/brotli v1.0.5 // indirect
  github.com/antonmedv/expr v1.12.5 // indirect
  github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
@@ -278,11 +277,11 @@ require (
  github.com/apache/thrift v0.18.1 // indirect
  github.com/ardielle/ardielle-go v1.5.2 // indirect
  github.com/armon/go-metrics v0.4.1 // indirect
- github.com/aws/aws-sdk-go v1.44.293 // indirect
+ github.com/aws/aws-sdk-go v1.44.255 // indirect
  github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
  github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.18.22 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.21 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
  github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.33 // indirect
  github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
@@ -295,9 +294,9 @@ require (
  github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
  github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.11 // indirect
  github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.9 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.10 // indirect
  github.com/aws/smithy-go v1.13.5 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver v3.5.1+incompatible // indirect
@@ -497,7 +496,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.77.0 // indirect
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.79.0 // indirect
+ github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.77.0 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.77.0 // indirect

exporter/awscloudwatchlogsexporter/go.mod

@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsclo
 go 1.19
 
 require (
- github.com/aws/aws-sdk-go v1.44.293
+ github.com/aws/aws-sdk-go v1.44.255
  github.com/cenkalti/backoff/v4 v4.2.1
  github.com/google/uuid v1.3.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
@@ -19,19 +19,6 @@ require (
 )
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
- github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
- github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
- github.com/aws/smithy-go v1.13.5 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/protobuf v1.5.3 // indirect
@@ -66,8 +53,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/a
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => ../../internal/aws/cwlogs
 
-replace github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws => ../../override/aws
-
 retract (
  v0.76.2
  v0.76.1