tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-06 15:46:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 添加可观察性监听地址支持，优化配置和测试用例

Browse Source
This commit is contained in:
ryan
2026-03-14 17:42:06 +08:00
parent 4be44733e8
commit 7628397785
8 changed files with 111 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atsf_server/service/config_version.go
+6 -5
View File
@@ -115,11 +115,12 @@ type configBundle struct {
}
const (
nginxSupportDirPlaceholder = "__ATSF_SUPPORT_DIR__"
nginxRouteConfigPlaceholder = "__ATSF_ROUTE_CONFIG__"
nginxAccessLogPlaceholder = "__ATSF_ACCESS_LOG__"
nginxLuaDirPlaceholder = "__ATSF_LUA_DIR__"
nginxObservabilityPortPlaceholder = "__ATSF_OBSERVABILITY_PORT__"
nginxSupportDirPlaceholder = "__ATSF_SUPPORT_DIR__"
nginxRouteConfigPlaceholder = "__ATSF_ROUTE_CONFIG__"
nginxAccessLogPlaceholder = "__ATSF_ACCESS_LOG__"
nginxLuaDirPlaceholder = "__ATSF_LUA_DIR__"
nginxObservabilityListenPlaceholder = "__ATSF_OBSERVABILITY_LISTEN__"
nginxObservabilityPortPlaceholder = "__ATSF_OBSERVABILITY_PORT__"
)
var requiredMainConfigTemplatePlaceholders = []string{
atsf_server/service/https_phase1_test.go
+11 -2
View File
@@ -60,8 +60,11 @@ func TestCreateTLSCertificateAndRenderHTTPSConfig(t *testing.T) {
if !strings.Contains(result.Version.MainConfig, "log_by_lua_file __ATSF_LUA_DIR__/observability/log.lua;") {
t.Fatal("expected main config to include managed openresty lua log hook")
}
if !strings.Contains(result.Version.MainConfig, "listen 127.0.0.1:__ATSF_OBSERVABILITY_PORT__;") {
t.Fatal("expected main config to include managed openresty observability port placeholder")
if !strings.Contains(result.Version.MainConfig, "listen __ATSF_OBSERVABILITY_LISTEN__;") {
t.Fatal("expected main config to include managed openresty observability listen placeholder")
}
if strings.Contains(result.Version.MainConfig, "allow 127.0.0.1;") {
t.Fatal("expected main config to avoid hard-coded allow rules on observability server")
}
if !strings.Contains(result.Version.RenderedConfig, "listen 443 ssl;") {
t.Fatal("expected rendered config to include https server block")
@@ -78,6 +81,12 @@ func TestCreateTLSCertificateAndRenderHTTPSConfig(t *testing.T) {
if !strings.Contains(result.Version.SupportFilesJSON, "observability/log.lua") || !strings.Contains(result.Version.SupportFilesJSON, "observability/read.lua") {
t.Fatal("expected support files to contain managed openresty observability lua scripts")
}
if !strings.Contains(result.Version.SupportFilesJSON, "/atsflare/observability") || !strings.Contains(result.Version.SupportFilesJSON, "/atsflare/stub_status") {
t.Fatal("expected observability log lua to skip self-observability requests")
}
if !strings.Contains(result.Version.SupportFilesJSON, "window_start = now - (now % window_size)") || !strings.Contains(result.Version.SupportFilesJSON, "local window_size = 60") {
t.Fatal("expected support files to use fixed 60-second observability windows")
}
}
func TestCreateProxyRouteRejectsHTTPSWithoutCertificate(t *testing.T) {
atsf_server/service/openresty_observability_assets.go
+16 -31
View File
@@ -8,6 +8,7 @@ const (
openRestyObservabilityLogLuaPath = openRestyObservabilitySupportDir + "/log.lua"
openRestyObservabilityReadLuaPath = openRestyObservabilitySupportDir + "/read.lua"
openRestyObservabilityWindowTTL = 7200
openRestyObservabilityWindowSize = 60
)
const openRestyObservabilityInitLua = `local dict = ngx.shared.atsflare_observability
@@ -15,12 +16,7 @@ if not dict then
return
end
local now = ngx.time()
local current_window = dict:get("current_window")
if not current_window then
dict:set("current_window", now)
dict:set("window_started_at:" .. now, now)
end
return
`
const openRestyObservabilityLogLua = `local dict = ngx.shared.atsflare_observability
@@ -28,15 +24,16 @@ if not dict then
return
end
local ttl = ` + "7200" + `
local current_window = dict:get("current_window")
local now = ngx.time()
if not current_window then
current_window = now
dict:set("current_window", current_window)
dict:set("window_started_at:" .. current_window, now)
local request_uri = tostring(ngx.var.uri or "")
if request_uri == "/atsflare/observability" or request_uri == "/atsflare/stub_status" then
return
end
local ttl = ` + "7200" + `
local now = ngx.time()
local window_size = ` + "60" + `
local window_start = now - (now % window_size)
local function ensure_counter(key)
dict:add(key, 0, ttl)
end
@@ -64,7 +61,7 @@ local function remember_value(list_key, marker_key, value)
dict:set(list_key, existing .. "\n" .. value, ttl)
end
local window_prefix = tostring(current_window)
local window_prefix = tostring(window_start)
incr("request_count:" .. window_prefix, 1)
local status = tostring(ngx.status or 0)
@@ -116,12 +113,9 @@ if not dict then
end
local now = ngx.time()
local current_window = dict:get("current_window")
if not current_window then
current_window = now
dict:set("current_window", current_window)
dict:set("window_started_at:" .. current_window, now)
end
local window_size = ` + "60" + `
local window_start = now - (now % window_size)
local current_window = tostring(window_start)
local function read_counter(key)
return tonumber(dict:get(key) or 0) or 0
@@ -140,7 +134,7 @@ local function read_map(window_id, prefix, list_key)
end
local payload = {
window_started_at_unix = read_counter("window_started_at:" .. current_window),
window_started_at_unix = window_start,
window_ended_at_unix = now,
request_count = read_counter("request_count:" .. current_window),
error_count = read_counter("error_count:" .. current_window),
@@ -152,13 +146,6 @@ local payload = {
openresty_tx_bytes = read_counter("openresty_tx_bytes:" .. current_window)
}
local next_window = now
if next_window <= current_window then
next_window = current_window + 1
end
dict:set("current_window", next_window)
dict:set("window_started_at:" .. next_window, now)
ngx.header.content_type = "application/json"
ngx.say(cjson.encode(payload))
`
@@ -178,11 +165,9 @@ func renderOpenRestyObservabilityTemplateBlock() string {
fmt.Sprintf(" log_by_lua_file %s/%s;", nginxLuaDirPlaceholder, openRestyObservabilityLogLuaPath),
"",
fmt.Sprintf(" server {"),
fmt.Sprintf(" listen 127.0.0.1:%s;", nginxObservabilityPortPlaceholder),
fmt.Sprintf(" listen %s;", nginxObservabilityListenPlaceholder),
" server_name atsflare-observability;",
" access_log off;",
" allow 127.0.0.1;",
" deny all;",
"",
" location = /atsflare/observability {",
" default_type application/json;",