Merge pull request #1240 from jw-s/bugfix/fix-filter-label-function-c…

…losure Reference closure scoped family generator
kubernetes · Sep 29, 2020 · 8772ad3 · 8772ad3
2 parents a18b988 + a112553
commit 8772ad3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/main_test.go b/main_test.go
@@ -138,7 +138,12 @@ func TestFullScrapeCycle(t *testing.T) {
 		t.Fatal(err)
 	}
 	builder.WithAllowDenyList(l)
-	builder.WithAllowLabels(map[string][]string{})
+	builder.WithAllowLabels(map[string][]string{
+		"kube_pod_labels": {
+			"namespace",
+			"pod",
+		},
+	})
 
 	handler := metricshandler.New(&options.Options{}, kubeClient, builder, false)
 	handler.ConfigureSharding(ctx, 0, 1)

diff --git a/pkg/metric_generator/generator.go b/pkg/metric_generator/generator.go
@@ -135,7 +135,7 @@ func FilterMetricFamiliesLabels(allowLabels allowLabels, families []FamilyGenera
 				metricFamily := familyGenerator.GenerateFunc(obj)
 
 				for _, m := range metricFamily.Metrics {
-					m.LabelKeys, m.LabelValues = allowLabels.Allowed(f.Name, m.LabelKeys, m.LabelValues)
+					m.LabelKeys, m.LabelValues = allowLabels.Allowed(familyGenerator.Name, m.LabelKeys, m.LabelValues)
 				}
 				return metricFamily
 			}