Reduce Retry Time

Add A Zap Logger To Imds Retryer And Reduce Retry Time

Add Fallback Imds Client

cmd/configschema/go.mod

@@ -277,7 +277,7 @@ 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-20230719154634-7dfcb28377c2 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // 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
@@ -286,7 +286,7 @@ 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.309 // 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.22 // indirect

cmd/otelcontribcol/go.mod

@@ -5,7 +5,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
 go 1.19
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83
  github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.77.0
@@ -278,7 +278,7 @@ 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.309 // 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.22 // indirect

cmd/oteltestbedcol/go.mod

@@ -65,7 +65,7 @@ require (
  github.com/antonmedv/expr v1.12.5 // indirect
  github.com/apache/thrift v0.18.1 // indirect
  github.com/armon/go-metrics v0.4.1 // indirect
- github.com/aws/aws-sdk-go v1.44.255 // indirect
+ github.com/aws/aws-sdk-go v1.44.309 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // 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.309
  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,7 +19,7 @@ require (
 )
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // 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

exporter/awsemfexporter/go.mod

@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemf
 go 1.19
 
 require (
- github.com/aws/aws-sdk-go v1.44.293
+ github.com/aws/aws-sdk-go v1.44.309
  github.com/census-instrumentation/opencensus-proto v0.4.1
  github.com/golang/protobuf v1.5.3
  github.com/google/uuid v1.3.0
@@ -24,7 +24,7 @@ require (
 )
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect

exporter/awss3exporter/go.mod

@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3e
 go 1.19
 
 require (
- github.com/aws/aws-sdk-go v1.44.255
+ github.com/aws/aws-sdk-go v1.44.309
  github.com/stretchr/testify v1.8.2
  go.opentelemetry.io/collector v0.77.0
  go.opentelemetry.io/collector/component v0.77.0

exporter/awsxrayexporter/go.mod

@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra
 go 1.19
 
 require (
- github.com/aws/aws-sdk-go v1.44.293
+ github.com/aws/aws-sdk-go v1.44.309
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.77.0
@@ -18,7 +18,7 @@ require (
 )
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect

exporter/datadogexporter/go.mod

@@ -14,8 +14,8 @@ require (
  github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.2.0
  github.com/DataDog/sketches-go v1.4.2
  github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.13.1
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2
- github.com/aws/aws-sdk-go v1.44.293
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83
+ github.com/aws/aws-sdk-go v1.44.309
  github.com/cenkalti/backoff/v4 v4.2.1
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.77.0

exporter/datadogexporter/internal/hostmetadata/internal/ec2/ec2.go

@@ -68,19 +68,37 @@ func GetHostInfo(logger *zap.Logger) (hostInfo *HostInfo) {
  defer cancel()
 
  meta := ec2metadata.New(sess, &aws.Config{
- Retryer: override.IMDSRetryer,
+ Retryer: override.IMDSRetryer,
+ EC2MetadataEnableFallback: aws.Bool(false),
+ })
+
+ metaFallbackEnable := ec2metadata.New(sess, &aws.Config{
+ Retryer: override.IMDSRetryer,
+ EC2MetadataEnableFallback: aws.Bool(false),
  })
 
  if idDoc, err := meta.GetInstanceIdentityDocumentWithContext(ctx); err == nil {
  hostInfo.InstanceID = idDoc.InstanceID
  } else {
- logger.Warn("Failed to get EC2 instance id document", zap.Error(err))
+ childCtxFallbackEnable, cancelRetryEnable := context.WithTimeout(ctx, override.TimePerCall)
+ defer cancelRetryEnable()
+ if idDocInner, errInner := meta.GetInstanceIdentityDocumentWithContext(childCtxFallbackEnable); errInner == nil {
+ hostInfo.InstanceID = idDocInner.InstanceID
+ } else {
+ logger.Warn("Failed to get EC2 instance id document", zap.Error(err))
+ }
  }
 
  if ec2Hostname, err := meta.GetMetadataWithContext(ctx, "hostname"); err == nil {
  hostInfo.EC2Hostname = ec2Hostname
  } else {
- logger.Warn("Failed to get EC2 hostname", zap.Error(err))
+ childCtxFallbackEnable, cancelRetryEnable := context.WithTimeout(ctx, override.TimePerCall)
+ defer cancelRetryEnable()
+ if ec2HostnameInner, errInner := metaFallbackEnable.GetMetadataWithContext(childCtxFallbackEnable, "hostname"); errInner == nil {
+ hostInfo.EC2Hostname = ec2HostnameInner
+ } else {
+ logger.Warn("Failed to get EC2 hostname", zap.Error(err))
+ }
  }
 
  return

exporter/kafkaexporter/go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
  github.com/Shopify/sarama v1.38.1
- github.com/aws/aws-sdk-go v1.44.255
+ github.com/aws/aws-sdk-go v1.44.309
  github.com/cenkalti/backoff/v4 v4.2.1
  github.com/gogo/protobuf v1.3.2
  github.com/jaegertracing/jaeger v1.41.0

exporter/prometheusexporter/go.mod

@@ -38,7 +38,7 @@ require (
  github.com/Microsoft/go-winio v0.6.0 // indirect
  github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
  github.com/armon/go-metrics v0.4.1 // indirect
- github.com/aws/aws-sdk-go v1.44.255 // indirect
+ github.com/aws/aws-sdk-go v1.44.309 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/cenkalti/backoff/v4 v4.2.1 // indirect
  github.com/cespare/xxhash/v2 v2.2.0 // indirect

extension/awsproxy/go.mod

@@ -13,8 +13,8 @@ require (
 )
 
 require (
- github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230719154634-7dfcb28377c2 // indirect
- github.com/aws/aws-sdk-go v1.44.293 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
+ github.com/aws/aws-sdk-go v1.44.309 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/fsnotify/fsnotify v1.6.0 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect