Fix: panic when max-length metrics are excluded

j-gourdon · j-gourdon · commit 3aec9c2cf17b · 2022-04-11T14:36:27.000+02:00
diff --git a/exporter_queue.go b/exporter_queue.go
@@ -215,11 +215,16 @@ func (e exporterQueue) Collect(ctx context.Context, ch chan<- prometheus.Metric)
 		}
 		e.stateMetric.WithLabelValues(append(labelValues, state)...).Set(1)
 
-		if f := collectLowerMetric("arguments.x-max-length", "effective_policy_definition.max-length", queue); f >= 0 {
-			limitsGaugeVec["max-length"].WithLabelValues(labelValues...).Set(f)
+		if _, ok := limitsGaugeVec["max-length"]; ok {
+			if f := collectLowerMetric("arguments.x-max-length", "effective_policy_definition.max-length", queue); f >= 0 {
+				limitsGaugeVec["max-length"].WithLabelValues(labelValues...).Set(f)
+			}
 		}
-		if f := collectLowerMetric("arguments.x-max-length-bytes", "effective_policy_definition.max-length-bytes", queue); f >= 0 {
-			limitsGaugeVec["max-length-bytes"].WithLabelValues(labelValues...).Set(f)
+
+		if _, ok := limitsGaugeVec["max-length-bytes"]; ok {
+			if f := collectLowerMetric("arguments.x-max-length-bytes", "effective_policy_definition.max-length-bytes", queue); f >= 0 {
+				limitsGaugeVec["max-length-bytes"].WithLabelValues(labelValues...).Set(f)
+			}
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -215,11 +215,16 @@ func (e exporterQueue) Collect(ctx context.Context, ch chan<- prometheus.Metric)`
`215`	`215`	`}`
`216`	`216`	`e.stateMetric.WithLabelValues(append(labelValues, state)...).Set(1)`
`217`	`217`
`218`		`- if f := collectLowerMetric("arguments.x-max-length", "effective_policy_definition.max-length", queue); f >= 0 {`
`219`		`- limitsGaugeVec["max-length"].WithLabelValues(labelValues...).Set(f)`
	`218`	`+ if _, ok := limitsGaugeVec["max-length"]; ok {`
	`219`	`+ if f := collectLowerMetric("arguments.x-max-length", "effective_policy_definition.max-length", queue); f >= 0 {`
	`220`	`+ limitsGaugeVec["max-length"].WithLabelValues(labelValues...).Set(f)`
	`221`	`+ }`
`220`	`222`	`}`
`221`		`- if f := collectLowerMetric("arguments.x-max-length-bytes", "effective_policy_definition.max-length-bytes", queue); f >= 0 {`
`222`		`- limitsGaugeVec["max-length-bytes"].WithLabelValues(labelValues...).Set(f)`
	`223`	`+`
	`224`	`+ if _, ok := limitsGaugeVec["max-length-bytes"]; ok {`
	`225`	`+ if f := collectLowerMetric("arguments.x-max-length-bytes", "effective_policy_definition.max-length-bytes", queue); f >= 0 {`
	`226`	`+ limitsGaugeVec["max-length-bytes"].WithLabelValues(labelValues...).Set(f)`
	`227`	`+ }`
`223`	`228`	`}`
`224`	`229`
`225`	`230`	`}`