Merge pull request open-telemetry#89 from amazon-contributing/sky3339…

…99/merge-aws-cwa-dev

Merge aws-cwa-dev into aws-cwa-apm

cmd/configschema/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/open-telemetry/opentelemetry-collector-contrib v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.77.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector v0.77.0
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0
@@ -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-20230727225902-317222bcea83 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // 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

cmd/otelcontribcol/exporters_test.go

@@ -25,7 +25,6 @@ import (
 	"runtime"
 	"testing"
 
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
@@ -497,7 +496,6 @@ func TestDefaultExporters(t *testing.T) {
 		expectedExporters[k] = struct{}{}
 	}
 	for _, tt := range tests {
-		override.IMDSRetryer = nil
 		_, ok := expFactories[tt.exporter]
 		if !ok {
 			// not part of the distro, skipping.

cmd/otelcontribcol/go.mod

@@ -5,7 +5,6 @@ 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-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
@@ -174,7 +173,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.77.0
 	github.com/prometheus/prometheus v0.43.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector v0.77.0
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/connector/forwardconnector v0.77.0
@@ -270,6 +269,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-20230818193829-04a761abd409 // 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

exporter/awscloudwatchlogsexporter/exporter.go

@@ -72,7 +72,7 @@ func newCwLogsPusher(expConfig *Config, params exp.CreateSettings) (*exporter, e
 	}
 
 	// create CWLogs client with aws session config
-	svcStructuredLog := cwlogs.NewClient(params.Logger, awsConfig, params.BuildInfo, expConfig.LogGroupName, expConfig.LogRetention, session)
+	svcStructuredLog := cwlogs.NewClient(params.Logger, awsConfig, params.BuildInfo, expConfig.LogGroupName, expConfig.LogRetention, session, false)
 	collectorIdentifier, err := uuid.NewRandom()
 
 	if err != nil {

exporter/awscloudwatchlogsexporter/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.77.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/confmap v0.77.0
 	go.opentelemetry.io/collector/consumer v0.77.0
@@ -19,7 +19,7 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // 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/config.go

@@ -75,11 +75,14 @@ type Config struct {
 	// TODO: we can support directing output to a file (in the future) while customer specifies a file path here.
 	OutputDestination string `mapstructure:"output_destination"`
 
-	// EKSFargateContainerInsightsEnabled is an option to reformat certin metric labels so that they take the form of a high level object
+	// EKSFargateContainerInsightsEnabled is an option to reformat certain metric labels so that they take the form of a high level object
 	// The end result will make the labels look like those coming out of ECS and be more easily injected into cloudwatch
 	// Note that at the moment in order to use this feature the value "kubernetes" must also be added to the ParseJSONEncodedAttributeValues array in order to be used
 	EKSFargateContainerInsightsEnabled bool `mapstructure:"eks_fargate_container_insights_enabled"`
 
+	// EnhancedContainerInsights indicates payloads will include enhanced container insights metrics
+	EnhancedContainerInsights bool `mapstructure:"enhanced_container_insights"`
+
 	// DisableMetricExtraction is an option to disable the extraction of metrics from the EMF logs.
 	// Setting this to true essentially skips generating and setting the _aws / CloudWatchMetrics section of the EMF log, thus effectively
 	// retaining all the fields / labels in the EMF log except for the section responsible for extraction of metrics.

exporter/awsemfexporter/config_test.go

@@ -133,6 +133,28 @@ func TestLoadConfig(t *testing.T) {
 				logger:                  zap.NewNop(),
 			},
 		},
+		{
+			id: component.NewIDWithName(typeStr, "enhanced_container_insights"),
+			expected: &Config{
+				AWSSessionSettings: awsutil.AWSSessionSettings{
+					NumberOfWorkers:       8,
+					Endpoint:              "",
+					RequestTimeoutSeconds: 30,
+					MaxRetries:            2,
+					NoVerifySSL:           false,
+					ProxyAddress:          "",
+					Region:                "",
+					RoleARN:               "",
+				},
+				LogGroupName:              "",
+				LogStreamName:             "",
+				DimensionRollupOption:     "ZeroAndSingleDimensionRollup",
+				OutputDestination:         "cloudwatch",
+				Version:                   "1",
+				EnhancedContainerInsights: true,
+				logger:                    zap.NewNop(),
+			},
+		},
 	}
 
 	for _, tt := range tests {

exporter/awsemfexporter/emf_exporter.go

@@ -66,7 +66,7 @@ func newEmfExporter(config *Config, set exporter.CreateSettings) (*emfExporter,
 	}
 
 	// create CWLogs client with aws session config
-	svcStructuredLog := cwlogs.NewClient(set.Logger, awsConfig, set.BuildInfo, config.LogGroupName, config.LogRetention, session)
+	svcStructuredLog := cwlogs.NewClient(set.Logger, awsConfig, set.BuildInfo, config.LogGroupName, config.LogRetention, session, isEnhancedContainerInsights(config))
 	collectorIdentifier, err := uuid.NewRandom()
 
 	if err != nil {
@@ -198,3 +198,7 @@ func wrapErrorIfBadRequest(err error) error {
 	}
 	return err
 }
+
+func isEnhancedContainerInsights(config *Config) bool {
+	return config.EnhancedContainerInsights && !config.DisableMetricExtraction
+}

exporter/awsemfexporter/emf_exporter_test.go

@@ -641,3 +641,16 @@ func TestNewEmfExporterWithoutConfig(t *testing.T) {
 	assert.Nil(t, exp)
 	assert.Equal(t, settings.Logger, expCfg.logger)
 }
+
+func TestIsEnhancedContainerInsights(t *testing.T) {
+	factory := NewFactory()
+	cfg := factory.CreateDefaultConfig().(*Config)
+	cfg.EnhancedContainerInsights = true
+	cfg.DisableMetricExtraction = false
+	assert.True(t, isEnhancedContainerInsights(cfg))
+	cfg.EnhancedContainerInsights = false
+	assert.False(t, isEnhancedContainerInsights(cfg))
+	cfg.EnhancedContainerInsights = true
+	cfg.DisableMetricExtraction = true
+	assert.False(t, isEnhancedContainerInsights(cfg))
+}

exporter/awsemfexporter/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.77.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/confmap v0.77.0
 	go.opentelemetry.io/collector/consumer v0.77.0
@@ -24,7 +24,7 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // 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/awsemfexporter/testdata/config.yaml

@@ -15,3 +15,5 @@ awsemf/metric_descriptors:
       overwrite: true
 awsemf/disable_metric_extraction:
   disable_metric_extraction: true
+awsemf/enhanced_container_insights:
+  enhanced_container_insights: true

exporter/awsxrayexporter/go.mod

@@ -7,7 +7,7 @@ require (
 	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
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/confmap v0.77.0
 	go.opentelemetry.io/collector/consumer v0.77.0
@@ -18,7 +18,7 @@ require (
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // 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/config_test.go

@@ -17,13 +17,11 @@ package datadogexporter
 import (
 	"testing"
 
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/confmap"
 )
 
 func TestValidate(t *testing.T) {
-	override.IMDSRetryer = nil
 	tests := []struct {
 		name string
 		cfg  *Config

exporter/datadogexporter/go.mod

@@ -14,7 +14,6 @@ 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-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
@@ -26,7 +25,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.77.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector v0.77.0
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/confmap v0.77.0
@@ -62,6 +61,7 @@ require (
 	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/Showmax/go-fqdn v1.0.0 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // indirect
 	github.com/antonmedv/expr v1.12.5 // indirect
 	github.com/armon/go-metrics v0.3.10 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect

exporter/datadogexporter/internal/hostmetadata/metadata_test.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes"
 	"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/azure"
-	override "github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/component"
@@ -65,7 +64,6 @@ var (
 )
 
 func TestFillHostMetadata(t *testing.T) {
-	override.IMDSRetryer = nil
 	params := exportertest.NewNopCreateSettings()
 	params.BuildInfo = mockBuildInfo
 

extension/awsproxy/go.mod

@@ -5,15 +5,15 @@ go 1.19
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.77.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.77.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector v0.77.0
 	go.opentelemetry.io/collector/component v0.77.0
 	go.opentelemetry.io/collector/confmap v0.77.0
 	go.uber.org/zap v1.24.0
 )
 
 require (
-	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230727225902-317222bcea83 // indirect
+	github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230818193829-04a761abd409 // 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