8e550b9785
This commit captures both the prior accumulated work-in-progress
(framework migration web/→svelte/, postgres storage, conversation
viewer, dashboard auth, OpenAPI spec, integration tests) AND today's
operational improvements layered on top. History wasn't checkpointed
incrementally; happy to split it via interactive rebase if a reviewer
wants smaller commits.
Today's changes (in addition to the older WIP):
1. Configurable upstream response-header timeout
- ANTHROPIC_RESPONSE_HEADER_TIMEOUT env (default 300s)
- Replaces hardcoded 300s in provider/anthropic.go that was firing
on opus + 1M-context + extended thinking non-streaming requests
- Files: internal/config/config.go, internal/provider/anthropic.go
2. Structured forward-error diagnostic logging
- When a forward to Anthropic fails, log a single key=value line
with request_id, model, stream, body_bytes, has_thinking,
anthropic_beta, query, elapsed, ctx_err — alongside the existing
human-readable error line for back-compat
- Files: internal/handler/handlers.go (logForwardFailure)
3. Full SSE protocol passthrough + Flusher fix
- handler/handlers.go: forward all SSE lines verbatim (event:, id:,
retry:, : comments, blank-line terminators), not only data:.
Previous code produced malformed SSE for strict parsers.
- middleware/logging.go: explicit Flush() method on responseWriter.
Embedding http.ResponseWriter (interface) does not auto-promote
Flush(), so every w.(http.Flusher) check in the streaming
handler was returning ok=false and SSE writes buffered in net/http
until the body closed.
4. Non-streaming → streaming demotion (feature-flagged)
- ANTHROPIC_DEMOTE_NONSTREAMING env (default false)
- When enabled and the routed provider is anthropic, force stream=true
upstream for clients that asked for stream=false. Receive SSE,
accumulate via accumulateSSEToMessage (handles text, tool_use with
partial_json reassembly, thinking, signature, citations_delta,
usage merge), and synthesize a single non-streaming JSON response.
- Eliminates the ResponseHeaderTimeout class of failure entirely.
- Body rewrite uses json.Decoder + UseNumber() to preserve integer
precision in unknown nested fields (tool inputs from prior turns).
- Files: internal/config/config.go, internal/handler/handlers.go,
cmd/proxy/main.go, cmd/proxy/main_test.go
5. Live operational state: /livez gauge + graceful drain
- New internal/runtime package: atomic in-flight counter + draining flag
- New middleware/inflight.go: increments runtime gauge, applied to
/v1/* subrouter so Messages, ChatCompletions, and ProxyPassthrough
are all counted
- /v1/* moved to a gorilla/mux subrouter so the InFlight middleware
applies surgically; /health, /livez, /openapi.* remain on parent
router (unauthenticated, uncounted)
- Health handler returns 503 draining when runtime.IsDraining() is
true, so Traefik stops routing to a slot before drain begins
- New /livez handler returns {status, in_flight, draining, timestamp}
- SIGTERM handler in main.go: SetDraining(true), poll for in_flight==0
with 32-min ceiling and 1s tick (logs every 10s), then srv.Shutdown
- Auth bypass list extended with /livez
- Files: internal/runtime/runtime.go (new),
internal/middleware/inflight.go (new),
internal/middleware/auth.go,
internal/handler/handlers.go (Health, Livez, runtime import),
cmd/proxy/main.go (subrouter, drain loop)
6. OpenAPI spec updates
- Document Health 503 response and new DrainingResponse schema
- Add /livez path with LivezResponse schema
- Files: internal/handler/openapi.go
Verified: go build ./... clean, go test ./... all pass, go vet clean.
Three rounds of codex peer review across changes 1-5; all feedback
addressed (citations_delta, json.Number precision, drain-loop logging
via lastLog timestamp, PathPrefix tightened to "/v1/").
104 lines
2.6 KiB
Go
104 lines
2.6 KiB
Go
package service
|
|
|
|
import (
|
|
"database/sql"
|
|
"io"
|
|
"log"
|
|
"testing"
|
|
|
|
"github.com/seifghazi/claude-code-monitor/internal/model"
|
|
)
|
|
|
|
func TestUnmarshalStoredRequestFields(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
logger := log.New(io.Discard, "", 0)
|
|
|
|
t.Run("decodes all stored fields", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req := &model.RequestLog{}
|
|
err := unmarshalStoredRequestFields(
|
|
logger,
|
|
req,
|
|
`{"content-type":["application/json"]}`,
|
|
`{"messages":[{"role":"user","content":"hi"}]}`,
|
|
sql.NullString{String: `{"score":8,"maxScore":10}`, Valid: true},
|
|
sql.NullString{String: `{"statusCode":200,"body":{"ok":true}}`, Valid: true},
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("unmarshalStoredRequestFields() error = %v", err)
|
|
}
|
|
if got := req.Headers["content-type"][0]; got != "application/json" {
|
|
t.Fatalf("expected header decoded, got %q", got)
|
|
}
|
|
body := req.Body.(map[string]interface{})
|
|
messages := body["messages"].([]interface{})
|
|
if len(messages) != 1 {
|
|
t.Fatalf("expected one message, got %#v", body)
|
|
}
|
|
if req.PromptGrade == nil || req.PromptGrade.Score != 8 {
|
|
t.Fatalf("expected prompt grade decoded, got %#v", req.PromptGrade)
|
|
}
|
|
if req.Response == nil || req.Response.StatusCode != 200 {
|
|
t.Fatalf("expected response decoded, got %#v", req.Response)
|
|
}
|
|
})
|
|
|
|
t.Run("returns error for invalid headers json", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req := &model.RequestLog{}
|
|
err := unmarshalStoredRequestFields(
|
|
logger,
|
|
req,
|
|
`{not-json`,
|
|
`{"ok":true}`,
|
|
sql.NullString{},
|
|
sql.NullString{},
|
|
)
|
|
if err == nil {
|
|
t.Fatal("expected invalid headers json error")
|
|
}
|
|
})
|
|
|
|
t.Run("returns error for invalid body json", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req := &model.RequestLog{}
|
|
err := unmarshalStoredRequestFields(
|
|
logger,
|
|
req,
|
|
`{"accept":["application/json"]}`,
|
|
`{not-json`,
|
|
sql.NullString{},
|
|
sql.NullString{},
|
|
)
|
|
if err == nil {
|
|
t.Fatal("expected invalid body json error")
|
|
}
|
|
})
|
|
|
|
t.Run("ignores corrupt optional grade and response", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req := &model.RequestLog{}
|
|
err := unmarshalStoredRequestFields(
|
|
logger,
|
|
req,
|
|
`{"accept":["application/json"]}`,
|
|
`{"ok":true}`,
|
|
sql.NullString{String: `{"score":`, Valid: true},
|
|
sql.NullString{String: `{"statusCode":`, Valid: true},
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("unmarshalStoredRequestFields() unexpected error = %v", err)
|
|
}
|
|
if req.PromptGrade != nil {
|
|
t.Fatalf("expected corrupt prompt grade ignored, got %#v", req.PromptGrade)
|
|
}
|
|
if req.Response != nil {
|
|
t.Fatalf("expected corrupt response ignored, got %#v", req.Response)
|
|
}
|
|
})
|
|
}
|