receiver/prometheus: Ensure AdjustMetrics doesn't partially modify me…

…trics
open-telemetry · Dec 11, 2024 · 360b8e1 · 360b8e1
1 parent 9e9b27e
commit 360b8e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/receiver/prometheusreceiver/internal/metrics_adjuster.go b/receiver/prometheusreceiver/internal/metrics_adjuster.go
@@ -257,15 +257,21 @@ func NewInitialPointAdjuster(logger *zap.Logger, gcInterval time.Duration, useCr
 func (a *initialPointAdjuster) AdjustMetrics(metrics pmetric.Metrics) error {
 	for i := 0; i < metrics.ResourceMetrics().Len(); i++ {
 		rm := metrics.ResourceMetrics().At(i)
-		job, found := rm.Resource().Attributes().Get(semconv.AttributeServiceName)
+		_, found := rm.Resource().Attributes().Get(semconv.AttributeServiceName)
 		if !found {
 			return errors.New("adjusting metrics without job")
 		}
 
-		instance, found := rm.Resource().Attributes().Get(semconv.AttributeServiceInstanceID)
+		_, found = rm.Resource().Attributes().Get(semconv.AttributeServiceInstanceID)
 		if !found {
 			return errors.New("adjusting metrics without instance")
 		}
+	}
+
+	for i := 0; i < metrics.ResourceMetrics().Len(); i++ {
+		rm := metrics.ResourceMetrics().At(i)
+		job, _ := rm.Resource().Attributes().Get(semconv.AttributeServiceName)
+		instance, _ := rm.Resource().Attributes().Get(semconv.AttributeServiceInstanceID)
 		tsm := a.jobsMap.get(job.Str(), instance.Str())
 
 		// The lock on the relevant timeseriesMap is held throughout the adjustment process to ensure that

diff --git a/receiver/prometheusreceiver/internal/metrics_adjuster_test.go b/receiver/prometheusreceiver/internal/metrics_adjuster_test.go
@@ -752,7 +752,6 @@ func runScript(t *testing.T, ma MetricsAdjuster, job, instance string, tests []*
 				if !found {
 					rm.Resource().Attributes().PutStr(semconv.AttributeServiceInstanceID, instance)
 				}
-
 			}
 			assert.NoError(t, ma.AdjustMetrics(adjusted))
 
@@ -767,7 +766,6 @@ func runScript(t *testing.T, ma MetricsAdjuster, job, instance string, tests []*
 				if !found {
 					rm.Resource().Attributes().PutStr(semconv.AttributeServiceInstanceID, instance)
 				}
-
 			}
 			assert.EqualValues(t, test.adjusted, adjusted)
 		})