diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index 69931ec4825e..b565ba8d8cfd 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -199,6 +199,7 @@ func wrapErrorIfBadRequest(err error) error { return err } -func isEnhancedContainerInsights(config *Config) bool { - return config.EnhancedContainerInsights && !config.DisableMetricExtraction +func isEnhancedContainerInsights(_ *Config) bool { + return false // temporarily disable, also need to rename _config to config + // return config.EnhancedContainerInsights && !config.DisableMetricExtraction } diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go index 2329120d4a69..91c9d3fce714 100644 --- a/exporter/awsemfexporter/emf_exporter_test.go +++ b/exporter/awsemfexporter/emf_exporter_test.go @@ -354,7 +354,7 @@ func TestIsEnhancedContainerInsights(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.EnhancedContainerInsights = true cfg.DisableMetricExtraction = false - assert.True(t, isEnhancedContainerInsights(cfg)) + assert.False(t, isEnhancedContainerInsights(cfg)) cfg.EnhancedContainerInsights = false assert.False(t, isEnhancedContainerInsights(cfg)) cfg.EnhancedContainerInsights = true diff --git a/internal/aws/cwlogs/cwlog_client.go b/internal/aws/cwlogs/cwlog_client.go index e82a9a562a15..70635b8de9ff 100644 --- a/internal/aws/cwlogs/cwlog_client.go +++ b/internal/aws/cwlogs/cwlog_client.go @@ -54,6 +54,7 @@ func NewClient(logger *zap.Logger, awsConfig *aws.Config, buildInfo component.Bu client := cloudwatchlogs.New(sess, awsConfig) client.Handlers.Build.PushBackNamed(handler.NewRequestCompressionHandler([]string{"PutLogEvents"}, logger)) client.Handlers.Build.PushBackNamed(handler.RequestStructuredLogHandler) + // temporarily disable the flag client.Handlers.Build.PushFrontNamed(newCollectorUserAgentHandler(buildInfo, logGroupName, enhancedContainerInsights)) return newCloudWatchLogClient(client, logRetention, tags, logger) }