updating based on comments

amazon-contributing · Oct 11, 2023 · ff86286 · ff86286
1 parent 0c50f1d
commit ff86286
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go
@@ -107,15 +107,14 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pmetric.Metrics) e
 	for _, groupedMetric := range groupedMetrics {
 		cWMetric := translateGroupedMetricToCWMetric(groupedMetric, emf.config)
 		putLogEvent, err := translateCWMetricToEMF(cWMetric, emf.config)
-		if emf.config.EnhancedContainerInsights && (putLogEvent != nil &&
-			putLogEvent.InputLogEvent != nil &&
-			putLogEvent.InputLogEvent.Message != nil) && *putLogEvent.InputLogEvent.Message == "" {
-			emf.config.logger.Debug("Dropping empty putLogEvents for EnhancedContainerInsights")
-			continue
-		}
 		if err != nil {
 			return err
 		}
+		// Drop a nil putLogEvent for EnhancedContainerInsights
+		if emf.config.EnhancedContainerInsights && putLogEvent == nil {
+			emf.config.logger.Debug("Dropping empty putLogEvents for EnhancedContainerInsights")
+			continue
+		}
 		// Currently we only support two options for "OutputDestination".
 		if strings.EqualFold(outputDestination, outputDestinationStdout) {
 			if putLogEvent != nil &&

diff --git a/exporter/awsemfexporter/metric_translator.go b/exporter/awsemfexporter/metric_translator.go
@@ -432,12 +432,8 @@ func translateCWMetricToEMF(cWMetric *cWMetrics, config *Config) (*cwlogs.Event,
 			fieldMap["CloudWatchMetrics"] = cWMetric.measurements
 		}
 	} else if len(cWMetric.measurements) < 1 && config.EnhancedContainerInsights {
-		// Return empty logEvent if requests does not contain metrics when EnhancedContainerInsights is enabled
-		logEvent := cwlogs.NewEvent(
-			int64(0),
-			"",
-		)
-		return logEvent, nil
+		// Return nil if requests does not contain metrics when EnhancedContainerInsights is enabled
+		return nil, nil
 	}
 
 	pleMsg, err := json.Marshal(fieldMap)

diff --git a/exporter/awsemfexporter/metric_translator_test.go b/exporter/awsemfexporter/metric_translator_test.go
@@ -486,7 +486,7 @@ func TestTranslateCWMetricToEMFForEnhancedContainerInsights(t *testing.T) {
 		EnhancedContainerInsights bool
 		fields                    map[string]interface{}
 		measurements              []cWMeasurement
-		expectedEMFLogEvent       string
+		expectedEMFLogEvent       interface{}
 	}{
 		"EnhancedContainerInsightsEnabled": {
 			EnhancedContainerInsights: true,
@@ -499,7 +499,7 @@ func TestTranslateCWMetricToEMFForEnhancedContainerInsights(t *testing.T) {
 				"Sources":                               "[\"apiserver\"]",
 			},
 			measurements:        nil,
-			expectedEMFLogEvent: "",
+			expectedEMFLogEvent: nil,
 		},
 		"EnhancedContainerInsightsDisabled": {
 			EnhancedContainerInsights: false,
@@ -534,7 +534,9 @@ func TestTranslateCWMetricToEMFForEnhancedContainerInsights(t *testing.T) {
 			emfLogEvent, err := translateCWMetricToEMF(cloudwatchMetric, config)
 			require.NoError(t, err)
 
-			assert.Equal(t, tc.expectedEMFLogEvent, *emfLogEvent.InputLogEvent.Message)
+			if tc.expectedEMFLogEvent != nil {
+				assert.Equal(t, tc.expectedEMFLogEvent, *emfLogEvent.InputLogEvent.Message)
+			}
 		})
 	}
 
@@ -1454,22 +1456,22 @@ func TestGroupedMetricToCWMeasurementsWithFilters(t *testing.T) {
 					MetricNameSelectors: []string{"metric(1|3)"},
 				},
 			}, []cWMeasurement{
-				{
-					Namespace:  namespace,
-					Dimensions: [][]string{{}},
-					Metrics: []map[string]string{
-						{
-							"Name": "metric1",
-							"Unit": "Count",
-						},
-						{
-							"Name": "metric3",
-							"Unit": "Seconds",
-						},
+			{
+				Namespace:  namespace,
+				Dimensions: [][]string{{}},
+				Metrics: []map[string]string{
+					{
+						"Name": "metric1",
+						"Unit": "Count",
+					},
+					{
+						"Name": "metric3",
+						"Unit": "Seconds",
 					},
 				},
 			},
 		},
+		},
 		{
 			"label matchers",
 			[]*MetricDeclaration{