Fix concurrency issues in emf exporter (#2571)

pmatyjasek-sumo · Apr 28, 2021 · 9352e0d · 9352e0d
1 parent f5fd956
commit 9352e0d
Show file tree

Hide file tree

Showing 4 changed files with 272 additions and 207 deletions.
diff --git a/exporter/awsemfexporter/cwlog_client_test.go b/exporter/awsemfexporter/cwlog_client_test.go
@@ -32,14 +32,14 @@ import (
 	"go.uber.org/zap"
 )
 
-func NewAlwaysPassMockLogClient() LogClient {
+func NewAlwaysPassMockLogClient(putLogEventsFunc func(args mock.Arguments)) LogClient {
 	logger := zap.NewNop()
 	svc := new(mockCloudWatchLogsClient)
 
 	svc.On("PutLogEvents", mock.Anything).Return(
 		&cloudwatchlogs.PutLogEventsOutput{
 			NextSequenceToken: &expectedNextSequenceToken},
-		nil)
+		nil).Run(putLogEventsFunc)
 
 	svc.On("CreateLogGroup", mock.Anything).Return(new(cloudwatchlogs.CreateLogGroupOutput), nil)
 

diff --git a/exporter/awsemfexporter/metric_translator.go b/exporter/awsemfexporter/metric_translator.go
@@ -315,7 +315,7 @@ func translateCWMetricToEMF(cWMetric *CWMetrics) *LogEvent {
 	}
 
 	metricCreationTime := cWMetric.TimestampMs
-	logEvent := NewLogEvent(
+	logEvent := newLogEvent(
 		metricCreationTime,
 		string(pleMsg),
 	)