From 510fa7a62d94a574b1f7a9907584d0cab67e2d4e Mon Sep 17 00:00:00 2001 From: RAM PRASAD ATLURI <116977270+ATLURI0001@users.noreply.github.com> Date: Sat, 14 Nov 2026 11:29:27 +0530 Subject: [PATCH] feat(proxy): add upstream failover retry, read timeout, and trace ID propagation --- apps/demo/app.py | 15 +++++++++++++-- nginx/snippets/proxy.conf | 4 ++++ tests/test_project.py | 11 +++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/apps/demo/app.py b/apps/demo/app.py index cd26e8e..b8bf4ca 100644 --- a/apps/demo/app.py +++ b/apps/demo/app.py @@ -6,9 +6,16 @@ INSTANCE = os.getenv("INSTANCE", ROLE) async def health(request): - return web.json_response({"status": "ok", "service": INSTANCE}) + req_id = request.headers.get("X-Request-ID") + data = {"status": "ok", "service": INSTANCE} + if req_id: + data["requestId"] = req_id + headers = {"X-Request-ID": req_id} if req_id else {} + return web.json_response(data, headers=headers) async def index(request): + req_id = request.headers.get("X-Request-ID") + headers = {"X-Request-ID": req_id} if req_id else {} if ROLE == "web": return web.Response( text=("
" @@ -17,8 +24,12 @@ async def index(request): "Try /api/ and WebSocket /ws/.
" ""), content_type="text/html", + headers=headers, ) - return web.json_response({"service": ROLE, "instance": INSTANCE, "path": request.path}) + data = {"service": ROLE, "instance": INSTANCE, "path": request.path} + if req_id: + data["requestId"] = req_id + return web.json_response(data, headers=headers) async def ws_handler(request): if ROLE != "realtime": diff --git a/nginx/snippets/proxy.conf b/nginx/snippets/proxy.conf index 127706d..7d9899c 100644 --- a/nginx/snippets/proxy.conf +++ b/nginx/snippets/proxy.conf @@ -6,4 +6,8 @@ proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Request-ID $request_id; proxy_connect_timeout 3s; proxy_send_timeout 30s; +proxy_read_timeout 30s; proxy_set_header Connection ""; +proxy_hide_header X-Powered-By; +proxy_next_upstream error timeout http_502 http_503 http_504; +proxy_next_upstream_tries 2; diff --git a/tests/test_project.py b/tests/test_project.py index e4e3753..b448bc1 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -70,7 +70,12 @@ def test_proxy_forwarding_invariants(self): self.assertIn('proxy_set_header X-Forwarded-Proto $scheme;', proxy) self.assertIn('proxy_set_header X-Request-ID $request_id;', proxy) self.assertIn('proxy_connect_timeout 3s;', proxy) + self.assertIn('proxy_read_timeout 30s;', proxy) + self.assertIn('proxy_send_timeout 30s;', proxy) self.assertIn('proxy_set_header Connection "";', proxy) + self.assertIn('proxy_hide_header X-Powered-By;', proxy) + self.assertIn('proxy_next_upstream error timeout http_502 http_503 http_504;', proxy) + self.assertIn('proxy_next_upstream_tries 2;', proxy) def test_rate_limiting_and_http_status(self): nginx_cfg = load('nginx/nginx.conf') @@ -124,5 +129,11 @@ def test_gzip_compression_and_buffer_tuning(self): self.assertIn('client_body_buffer_size 128k;', cfg) self.assertIn('large_client_header_buffers 4 8k;', cfg) + def test_trace_id_propagation_in_demo_app(self): + source = load('apps/demo/app.py') + self.assertIn('request.headers.get("X-Request-ID")', source) + self.assertIn('data["requestId"] = req_id', source) + self.assertIn('"X-Request-ID": req_id', source) + if __name__ == '__main__': unittest.main()