fix metrics tests

cottand · Jan 8, 2024 · d596c52 · d596c52
1 parent 32f7bbc
commit d596c52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/grimd_test.go b/grimd_test.go
@@ -62,6 +62,9 @@ func integrationTest(changeConfig func(c *Config), test func(client *dns.Client,
 	// QuestionCache contains all queries to the dns server
 	questionCache := makeQuestionCache(config.QuestionCacheCap)
 
+	reloadChan := make(chan bool)
+	_, _ = StartAPIServer(&config, reloadChan, blockCache, questionCache)
+	defer close(reloadChan)
 	server.Run(&config, blockCache, questionCache)
 
 	time.Sleep(200 * time.Millisecond)

diff --git a/internal/metric/metric.go b/internal/metric/metric.go
@@ -73,15 +73,18 @@ var (
 	configHighCardinality = false
 )
 
-func Start(resetPeriodMinutes int64, highCardinality bool) (closeChan context.CancelFunc) {
-	configHighCardinality = highCardinality
+func init() {
 	prometheus.MustRegister(
 		responseCounter,
 		RequestUpstreamResolveCounter,
 		RequestUpstreamDohRequest,
 		CustomDNSConfigReload,
 		DohResponseCount,
 	)
+}
+
+func Start(resetPeriodMinutes int64, highCardinality bool) (closeChan context.CancelFunc) {
+	configHighCardinality = highCardinality
 	ctx, cancel := context.WithCancel(context.Background())
 	mark := time.Now()