Refactor the relabel loop

swiatekm · swiatekm · commit 221cc8e868ae · 2024-11-06T17:27:29.000+01:00
diff --git a/cmd/otel-allocator/prehook/relabel.go b/cmd/otel-allocator/prehook/relabel.go
@@ -43,18 +43,15 @@ func (tf *RelabelConfigTargetFilter) Apply(targets map[string]*target.Item) map[
 
 	// Note: jobNameKey != tItem.JobName (jobNameKey is hashed)
 	for jobNameKey, tItem := range targets {
-		keepTarget := true
+		var keepTarget bool
 		lset := tItem.Labels
 		for _, cfg := range tf.relabelCfg[tItem.JobName] {
 			lset, keepTarget = relabel.Process(lset, cfg)
 			if !keepTarget {
+				delete(targets, jobNameKey)
 				break // inner loop
 			}
 		}
-
-		if !keepTarget {
-			delete(targets, jobNameKey)
-		}
 	}
 
 	tf.log.V(2).Info("Filtering complete", "seen", numTargets, "kept", len(targets))

Original file line number	Diff line number	Diff line change
`@@ -43,18 +43,15 @@ func (tf RelabelConfigTargetFilter) Apply(targets map[string]target.Item) map[`
`43`	`43`
`44`	`44`	`// Note: jobNameKey != tItem.JobName (jobNameKey is hashed)`
`45`	`45`	`for jobNameKey, tItem := range targets {`
`46`		`- keepTarget := true`
	`46`	`+ var keepTarget bool`
`47`	`47`	`lset := tItem.Labels`
`48`	`48`	`for _, cfg := range tf.relabelCfg[tItem.JobName] {`
`49`	`49`	`lset, keepTarget = relabel.Process(lset, cfg)`
`50`	`50`	`if !keepTarget {`
	`51`	`+ delete(targets, jobNameKey)`
`51`	`52`	`break // inner loop`
`52`	`53`	`}`
`53`	`54`	`}`
`54`		`-`
`55`		`- if !keepTarget {`
`56`		`- delete(targets, jobNameKey)`
`57`		`- }`
`58`	`55`	`}`
`59`	`56`
`60`	`57`	`tf.log.V(2).Info("Filtering complete", "seen", numTargets, "kept", len(targets))`