update tests

dunglas · Feb 10, 2025 · bcc320c · bcc320c
1 parent 4b66348
commit bcc320c
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/caddy/caddy_test.go b/caddy/caddy_test.go
@@ -2,6 +2,7 @@ package caddy_test
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"net/http"
 	"os"
@@ -11,10 +12,10 @@ import (
 	"testing"
 
 	"github.com/dunglas/frankenphp"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/require"
 
+	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddytest"
 )
 
@@ -317,6 +318,7 @@ func TestPHPServerDirectiveDisableFileServer(t *testing.T) {
 
 func TestMetrics(t *testing.T) {
 	var wg sync.WaitGroup
+	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`
 	{
@@ -374,11 +376,12 @@ func TestMetrics(t *testing.T) {
 	frankenphp_busy_threads 0
 	`
 
-	require.NoError(t, testutil.GatherAndCompare(prometheus.DefaultGatherer, strings.NewReader(expectedMetrics), "frankenphp_total_threads", "frankenphp_busy_threads"))
+	require.NoError(t, testutil.GatherAndCompare(ctx.GetMetricsRegistry(), strings.NewReader(expectedMetrics), "frankenphp_total_threads", "frankenphp_busy_threads"))
 }
 
 func TestWorkerMetrics(t *testing.T) {
 	var wg sync.WaitGroup
+	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`
 	{
@@ -464,7 +467,7 @@ func TestWorkerMetrics(t *testing.T) {
 
 	require.NoError(t,
 		testutil.GatherAndCompare(
-			prometheus.DefaultGatherer,
+			ctx.GetMetricsRegistry(),
 			strings.NewReader(expectedMetrics),
 			"frankenphp_total_threads",
 			"frankenphp_busy_threads",
@@ -479,6 +482,7 @@ func TestWorkerMetrics(t *testing.T) {
 
 func TestAutoWorkerConfig(t *testing.T) {
 	var wg sync.WaitGroup
+	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`
 	{
@@ -565,7 +569,7 @@ func TestAutoWorkerConfig(t *testing.T) {
 
 	require.NoError(t,
 		testutil.GatherAndCompare(
-			prometheus.DefaultGatherer,
+			ctx.GetMetricsRegistry(),
 			strings.NewReader(expectedMetrics),
 			"frankenphp_total_threads",
 			"frankenphp_busy_threads",