Fix metrics data race in the Engine test run finalization

This should close grafana/k6#1887
APITeamLimited · Mar 8, 2021 · e73a013 · e73a013
1 parent d1c7a08
commit e73a013
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/core/engine.go b/core/engine.go
@@ -328,6 +328,15 @@ func (e *Engine) processMetrics(globalCtx context.Context, processMetricsAfterRu
 		case <-ticker.C:
 			processSamples()
 		case <-processMetricsAfterRun:
+		getCachedMetrics:
+			for ***REMOVED***
+				select ***REMOVED***
+				case sc := <-e.Samples:
+					sampleContainers = append(sampleContainers, sc)
+				default:
+					break getCachedMetrics
+				***REMOVED***
+			***REMOVED***
 			e.logger.Debug("Processing metrics and thresholds after the test run has ended...")
 			processSamples()
 			if !e.runtimeOptions.NoThresholds.Bool ***REMOVED***