update tests

dunglas · Feb 24, 2025 · 347727e · 347727e
1 parent 4baeaab
commit 347727e
Show file tree

Hide file tree

Showing 3 changed files with 220 additions and 2 deletions.
diff --git a/caddy/caddy_test.go b/caddy/caddy_test.go
@@ -796,3 +796,221 @@ func testSingleIniConfiguration(tester *caddytest.Tester, key string, value stri
 		)
 	}
 }
+
+func TestMultiWorkersMetrics(t *testing.T) {
+	var wg sync.WaitGroup
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+	{
+		skip_install_trust
+		admin localhost:2999
+		http_port `+testPort+`
+		https_port 9443
+
+		frankenphp {
+			worker {
+				name service1
+				file ../testdata/index.php
+				num 2
+			}
+			worker {
+				name service2
+				file ../testdata/ini.php
+				num 3
+			}
+		}
+	}
+
+	localhost:`+testPort+` {
+		route {
+			php {
+				root ../testdata
+			}
+		}
+	}
+
+	example.com:`+testPort+` {
+		route {
+			php {
+				root ../testdata
+			}
+		}
+	}
+	`, "caddyfile")
+
+	// Make some requests
+	for i := 0; i < 10; i++ {
+		wg.Add(1)
+		go func(i int) {
+			tester.AssertGetResponse(fmt.Sprintf("http://localhost:"+testPort+"/index.php?i=%d", i), http.StatusOK, fmt.Sprintf("I am by birth a Genevese (%d)", i))
+			wg.Done()
+		}(i)
+	}
+	wg.Wait()
+
+	// Fetch metrics
+	resp, err := http.Get("http://localhost:2999/metrics")
+	if err != nil {
+		t.Fatalf("failed to fetch metrics: %v", err)
+	}
+	defer resp.Body.Close()
+
+	// Read and parse metrics
+	metrics := new(bytes.Buffer)
+	_, err = metrics.ReadFrom(resp.Body)
+	if err != nil {
+		t.Fatalf("failed to read metrics: %v", err)
+	}
+
+	cpus := fmt.Sprintf("%d", frankenphp.MaxThreads)
+
+	// Check metrics
+	expectedMetrics := `
+	# HELP frankenphp_total_threads Total number of PHP threads
+	# TYPE frankenphp_total_threads counter
+	frankenphp_total_threads ` + cpus + `
+
+	# HELP frankenphp_busy_threads Number of busy PHP threads
+	# TYPE frankenphp_busy_threads gauge
+	frankenphp_busy_threads 5
+
+	# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
+	# TYPE frankenphp_busy_workers gauge
+	frankenphp_busy_workers{worker="service1"} 0
+
+	# HELP frankenphp_total_workers Total number of PHP workers for this worker
+	# TYPE frankenphp_total_workers gauge
+	frankenphp_total_workers{worker="service1"} 2
+	frankenphp_total_workers{worker="service2"} 3
+
+	# HELP frankenphp_worker_request_count
+	# TYPE frankenphp_worker_request_count counter
+	frankenphp_worker_request_count{worker="service1"} 10
+
+	# HELP frankenphp_ready_workers Running workers that have successfully called frankenphp_handle_request at least once
+	# TYPE frankenphp_ready_workers gauge
+	frankenphp_ready_workers{worker="service1"} 2
+	frankenphp_ready_workers{worker="service2"} 3
+	`
+
+	ctx := caddy.ActiveContext()
+	require.NoError(t,
+		testutil.GatherAndCompare(
+			ctx.GetMetricsRegistry(),
+			strings.NewReader(expectedMetrics),
+			"frankenphp_total_threads",
+			"frankenphp_busy_threads",
+			"frankenphp_busy_workers",
+			"frankenphp_total_workers",
+			"frankenphp_worker_request_count",
+			"frankenphp_ready_workers",
+		))
+}
+
+func TestMultiWorkersMetricsWithDuplicateName(t *testing.T) {
+	var wg sync.WaitGroup
+	tester := caddytest.NewTester(t)
+	tester.InitServer(`
+	{
+		skip_install_trust
+		admin localhost:2999
+		http_port `+testPort+`
+		https_port 9443
+
+		frankenphp {
+			worker {
+				name service1
+				file ../testdata/index.php
+				num 2
+			}
+			worker {
+				name service1
+				file ../testdata/ini.php
+				num 3
+			}
+		}
+	}
+
+	localhost:`+testPort+` {
+		route {
+			php {
+				root ../testdata
+			}
+		}
+	}
+
+	example.com:`+testPort+` {
+		route {
+			php {
+				root ../testdata
+			}
+		}
+	}
+	`, "caddyfile")
+
+	// Make some requests
+	for i := 0; i < 10; i++ {
+		wg.Add(1)
+		go func(i int) {
+			tester.AssertGetResponse(fmt.Sprintf("http://localhost:"+testPort+"/index.php?i=%d", i), http.StatusOK, fmt.Sprintf("I am by birth a Genevese (%d)", i))
+			wg.Done()
+		}(i)
+	}
+	wg.Wait()
+
+	// Fetch metrics
+	resp, err := http.Get("http://localhost:2999/metrics")
+	if err != nil {
+		t.Fatalf("failed to fetch metrics: %v", err)
+	}
+	defer resp.Body.Close()
+
+	// Read and parse metrics
+	metrics := new(bytes.Buffer)
+	_, err = metrics.ReadFrom(resp.Body)
+	if err != nil {
+		t.Fatalf("failed to read metrics: %v", err)
+	}
+
+	cpus := fmt.Sprintf("%d", frankenphp.MaxThreads)
+
+	// Check metrics
+	expectedMetrics := `
+	# HELP frankenphp_total_threads Total number of PHP threads
+	# TYPE frankenphp_total_threads counter
+	frankenphp_total_threads ` + cpus + `
+
+	# HELP frankenphp_busy_threads Number of busy PHP threads
+	# TYPE frankenphp_busy_threads gauge
+	frankenphp_busy_threads 5
+
+	# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
+	# TYPE frankenphp_busy_workers gauge
+	frankenphp_busy_workers{worker="service1"} 0
+
+	# HELP frankenphp_total_workers Total number of PHP workers for this worker
+	# TYPE frankenphp_total_workers gauge
+	frankenphp_total_workers{worker="service1"} 5
+
+	# HELP frankenphp_worker_request_count
+	# TYPE frankenphp_worker_request_count counter
+	frankenphp_worker_request_count{worker="service1"} 10
+
+	# HELP frankenphp_ready_workers Running workers that have successfully called frankenphp_handle_request at least once
+	# TYPE frankenphp_ready_workers gauge
+	frankenphp_ready_workers{worker="service1"} 5
+	`
+
+	ctx := caddy.ActiveContext()
+	require.NoError(t,
+		testutil.GatherAndCompare(
+			ctx.GetMetricsRegistry(),
+			strings.NewReader(expectedMetrics),
+			"frankenphp_total_threads",
+			"frankenphp_busy_threads",
+			"frankenphp_busy_workers",
+			"frankenphp_total_workers",
+			"frankenphp_worker_request_count",
+			"frankenphp_ready_workers",
+		))
+}
diff --git a/metrics.go b/metrics.go
@@ -236,7 +236,7 @@ func (m *PrometheusMetrics) TotalWorkers(string, int) {
 		m.workerQueueDepth = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: "frankenphp",
 			Subsystem: sub,
-			Name:      "worker_queue_depth",
+			Name:      "queue_depth",
 		}, basicLabels)
 		if err := m.registry.Register(m.workerQueueDepth); err != nil &&
 			!errors.As(err, &prometheus.AlreadyRegisteredError{}) {

diff --git a/worker_test.go b/worker_test.go
@@ -119,7 +119,7 @@ func TestWorkerGetOpt(t *testing.T) {
 func ExampleServeHTTP_workers() {
 	if err := frankenphp.Init(
 		frankenphp.WithWorkers("worker1", "worker1.php", 4, map[string]string{"ENV1": "foo"}, []string{}),
-		frankenphp.WithWorkers("worker2", "worker2.php", 2, map[string]string{"ENV2": "bar"}, []string{}),
+		frankenphp.WithWorkers("worker1", "worker2.php", 2, map[string]string{"ENV2": "bar"}, []string{}),
 	); err != nil {
 		panic(err)
 	}