zishuo/frankenphp
1
0
Fork 0
mirror of https://github.com/dunglas/frankenphp.git synced 2025-12-24 13:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

use 🌍 for global workers :)

Browse Source
This commit is contained in:
DubbleClick
2025-04-24 18:31:50 +07:00
parent 4cc8893ced
commit 1c414cebbc
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
caddy/caddy.go
View File

@@ -318,8 +318,8 @@ func (f *FrankenPHPApp) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
}
wc.Name = name
}
if strings.HasPrefix(wc.Name, "🧩 ") {
return fmt.Errorf("global worker names must not start with '🧩 ': %q", wc.Name)
if !strings.HasPrefix(wc.Name, "🌍 ") {
wc.Name = "🌍 " + wc.Name
}
// check for duplicate workers
for _, existingWorker := range f.Workers {

44
caddy/caddy_test.go
View File

@@ -574,19 +574,19 @@ func TestWorkerMetrics(t *testing.T) {
# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
# TYPE frankenphp_busy_workers gauge
frankenphp_busy_workers{worker="` + workerName + `"} 0
frankenphp_busy_workers{worker="🌍 ` + workerName + `"} 0
# HELP frankenphp_total_workers Total number of PHP workers for this worker
# TYPE frankenphp_total_workers gauge
frankenphp_total_workers{worker="` + workerName + `"} 2
frankenphp_total_workers{worker="🌍 ` + workerName + `"} 2
# HELP frankenphp_worker_request_count
# TYPE frankenphp_worker_request_count counter
frankenphp_worker_request_count{worker="` + workerName + `"} 10
frankenphp_worker_request_count{worker="🌍 ` + workerName + `"} 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="` + workerName + `"} 2
frankenphp_ready_workers{worker="🌍 ` + workerName + `"} 2
`
ctx := caddy.ActiveContext()
@@ -666,19 +666,19 @@ func TestNamedWorkerMetrics(t *testing.T) {
# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
# TYPE frankenphp_busy_workers gauge
frankenphp_busy_workers{worker="my_app"} 0
frankenphp_busy_workers{worker="🌍 my_app"} 0
# HELP frankenphp_total_workers Total number of PHP workers for this worker
# TYPE frankenphp_total_workers gauge
frankenphp_total_workers{worker="my_app"} 2
frankenphp_total_workers{worker="🌍 my_app"} 2
# HELP frankenphp_worker_request_count
# TYPE frankenphp_worker_request_count counter
frankenphp_worker_request_count{worker="my_app"} 10
frankenphp_worker_request_count{worker="🌍 my_app"} 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="my_app"} 2
frankenphp_ready_workers{worker="🌍 my_app"} 2
`
ctx := caddy.ActiveContext()
@@ -758,19 +758,19 @@ func TestAutoWorkerConfig(t *testing.T) {
# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
# TYPE frankenphp_busy_workers gauge
frankenphp_busy_workers{worker="` + workerName + `"} 0
frankenphp_busy_workers{worker="🌍 ` + workerName + `"} 0
# HELP frankenphp_total_workers Total number of PHP workers for this worker
# TYPE frankenphp_total_workers gauge
frankenphp_total_workers{worker="` + workerName + `"} ` + workers + `
frankenphp_total_workers{worker="🌍 ` + workerName + `"} ` + workers + `
# HELP frankenphp_worker_request_count
# TYPE frankenphp_worker_request_count counter
frankenphp_worker_request_count{worker="` + workerName + `"} 10
frankenphp_worker_request_count{worker="🌍 ` + workerName + `"} 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="` + workerName + `"} ` + workers + `
frankenphp_ready_workers{worker="🌍 ` + workerName + `"} ` + workers + `
`
ctx := caddy.ActiveContext()
@@ -1052,21 +1052,21 @@ func TestMultiWorkersMetrics(t *testing.T) {
# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
# TYPE frankenphp_busy_workers gauge
frankenphp_busy_workers{worker="service1"} 0
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
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
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
frankenphp_ready_workers{worker="🌍 service1"} 2
frankenphp_ready_workers{worker="🌍 service2"} 3
`
ctx := caddy.ActiveContext()
@@ -1159,19 +1159,19 @@ func TestMultiWorkersMetricsWithDuplicateName(t *testing.T) {
# HELP frankenphp_busy_workers Number of busy PHP workers for this worker
# TYPE frankenphp_busy_workers gauge
frankenphp_busy_workers{worker="service1"} 0
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
frankenphp_total_workers{worker="🌍 service1"} 5
# HELP frankenphp_worker_request_count
# TYPE frankenphp_worker_request_count counter
frankenphp_worker_request_count{worker="service1"} 10
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
frankenphp_ready_workers{worker="🌍 service1"} 5
`
ctx := caddy.ActiveContext()

2
caddy/config_test.go
View File

@@ -267,7 +267,7 @@ func TestModuleWorkerWithCustomName(t *testing.T) {
require.Len(t, module.Workers, 1, "Expected one worker to be added to the module")
require.Equal(t, "../testdata/worker-with-env.php", module.Workers[0].FileName, "Worker should have the correct filename")
// Verify that the worker was added to moduleWorkerConfigs with the 🧩 prefix
// Verify that the worker was added to moduleWorkerConfigs with the 🧩 prefix
require.Equal(t, "🧩 custom-worker-name", module.Workers[0].Name, "Worker should have the custom name")
resetModuleWorkers()

28
metrics_test.go
View File

@@ -32,7 +32,7 @@ func TestPrometheusMetrics_TotalWorkers(t *testing.T) {
require.Nil(t, m.workerRequestTime)
require.Nil(t, m.workerRequestCount)
m.TotalWorkers("test_worker", 2)
m.TotalWorkers("🌍 test_worker", 2)
require.NotNil(t, m.totalWorkers)
require.NotNil(t, m.busyWorkers)
@@ -45,8 +45,8 @@ func TestPrometheusMetrics_TotalWorkers(t *testing.T) {
func TestPrometheusMetrics_StopWorkerRequest(t *testing.T) {
m := createPrometheusMetrics()
m.TotalWorkers("test_worker", 2)
m.StopWorkerRequest("test_worker", 2*time.Second)
m.TotalWorkers("🌍 test_worker", 2)
m.StopWorkerRequest("🌍 test_worker", 2*time.Second)
inputs := []struct {
name string
@@ -62,7 +62,7 @@ func TestPrometheusMetrics_StopWorkerRequest(t *testing.T) {
# TYPE frankenphp_worker_request_count counter
`,
expect: `
frankenphp_worker_request_count{worker="test_worker"} 1
frankenphp_worker_request_count{worker="🌍 test_worker"} 1
`,
},
{
@@ -73,7 +73,7 @@ func TestPrometheusMetrics_StopWorkerRequest(t *testing.T) {
# TYPE frankenphp_busy_workers gauge
`,
expect: `
frankenphp_busy_workers{worker="test_worker"} -1
frankenphp_busy_workers{worker="🌍 test_worker"} -1
`,
},
{
@@ -84,7 +84,7 @@ func TestPrometheusMetrics_StopWorkerRequest(t *testing.T) {
# TYPE frankenphp_worker_request_time counter
`,
expect: `
frankenphp_worker_request_time{worker="test_worker"} 2
frankenphp_worker_request_time{worker="🌍 test_worker"} 2
`,
},
}
@@ -99,8 +99,8 @@ func TestPrometheusMetrics_StopWorkerRequest(t *testing.T) {
func TestPrometheusMetrics_StartWorkerRequest(t *testing.T) {
m := createPrometheusMetrics()
m.TotalWorkers("test_worker", 2)
m.StartWorkerRequest("test_worker")
m.TotalWorkers("🌍 test_worker", 2)
m.StartWorkerRequest("🌍 test_worker")
inputs := []struct {
name string
@@ -116,7 +116,7 @@ func TestPrometheusMetrics_StartWorkerRequest(t *testing.T) {
# TYPE frankenphp_busy_workers gauge
`,
expect: `
frankenphp_busy_workers{worker="test_worker"} 1
frankenphp_busy_workers{worker="🌍 test_worker"} 1
`,
},
}
@@ -131,8 +131,8 @@ func TestPrometheusMetrics_StartWorkerRequest(t *testing.T) {
func TestPrometheusMetrics_TestStopReasonCrash(t *testing.T) {
m := createPrometheusMetrics()
m.TotalWorkers("test_worker", 2)
m.StopWorker("test_worker", StopReasonCrash)
m.TotalWorkers("🌍 test_worker", 2)
m.StopWorker("🌍 test_worker", StopReasonCrash)
inputs := []struct {
name string
@@ -159,7 +159,7 @@ func TestPrometheusMetrics_TestStopReasonCrash(t *testing.T) {
# TYPE frankenphp_total_workers gauge
`,
expect: `
frankenphp_total_workers{worker="test_worker"} -1
frankenphp_total_workers{worker="🌍 test_worker"} -1
`,
},
{
@@ -170,7 +170,7 @@ func TestPrometheusMetrics_TestStopReasonCrash(t *testing.T) {
# TYPE frankenphp_ready_workers gauge
`,
expect: `
frankenphp_ready_workers{worker="test_worker"} -1
frankenphp_ready_workers{worker="🌍 test_worker"} -1
`,
},
{
@@ -181,7 +181,7 @@ func TestPrometheusMetrics_TestStopReasonCrash(t *testing.T) {
# TYPE frankenphp_worker_crashes counter
`,
expect: `
frankenphp_worker_crashes{worker="test_worker"} 1
frankenphp_worker_crashes{worker="🌍 test_worker"} 1
`,
},
}