Fix custom labels disabling (#3076)

gnurizen · web-flow · commit c9783a520bc0 · 2025-07-24T13:17:22.000-04:00
diff --git a/main.go b/main.go
@@ -289,12 +289,17 @@ func mainWithExitCode() flags.ExitCode {
 		includeTracers.Disable(goTracer)
 	}
 
-	// Add golabels tracer when collect-custom-labels is true
-	if f.CollectCustomLabels {
-		if goLabelsTracer := tracertypes.Labels; !includeTracers.Has(goLabelsTracer) {
+	// Enable/disable golabels tracer based on collect-custom-labels flag
+	if goLabelsTracer := tracertypes.Labels; f.CollectCustomLabels {
+		if !includeTracers.Has(goLabelsTracer) {
 			log.Debug("Adding 'golabels' tracer due to collect-custom-labels being enabled")
 			includeTracers.Enable(goLabelsTracer)
 		}
+	} else {
+		if includeTracers.Has(goLabelsTracer) {
+			log.Debug("Removing 'golabels' tracer due to collect-custom-labels being disabled")
+			includeTracers.Disable(goLabelsTracer)
+		}
 	}
 
 	var relabelConfigs []*relabel.Config

Original file line number	Diff line number	Diff line change
`@@ -289,12 +289,17 @@ func mainWithExitCode() flags.ExitCode {`
`289`	`289`	`includeTracers.Disable(goTracer)`
`290`	`290`	`}`
`291`	`291`
`292`		`- // Add golabels tracer when collect-custom-labels is true`
`293`		`- if f.CollectCustomLabels {`
`294`		`- if goLabelsTracer := tracertypes.Labels; !includeTracers.Has(goLabelsTracer) {`
	`292`	`+ // Enable/disable golabels tracer based on collect-custom-labels flag`
	`293`	`+ if goLabelsTracer := tracertypes.Labels; f.CollectCustomLabels {`
	`294`	`+ if !includeTracers.Has(goLabelsTracer) {`
`295`	`295`	`log.Debug("Adding 'golabels' tracer due to collect-custom-labels being enabled")`
`296`	`296`	`includeTracers.Enable(goLabelsTracer)`
`297`	`297`	`}`
	`298`	`+ } else {`
	`299`	`+ if includeTracers.Has(goLabelsTracer) {`
	`300`	`+ log.Debug("Removing 'golabels' tracer due to collect-custom-labels being disabled")`
	`301`	`+ includeTracers.Disable(goLabelsTracer)`
	`302`	`+ }`
`298`	`303`	`}`
`299`	`304`
`300`	`305`	`var relabelConfigs []*relabel.Config`