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/").
83 lines
2.5 KiB
Go
83 lines
2.5 KiB
Go
package service
|
|
|
|
import (
|
|
"database/sql"
|
|
"encoding/json"
|
|
"testing"
|
|
|
|
"github.com/seifghazi/claude-code-monitor/internal/model"
|
|
)
|
|
|
|
func TestApplyStoredResponseToSummary(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
summary := &model.RequestSummary{}
|
|
applyStoredResponseToSummary(summary, sql.NullString{
|
|
Valid: true,
|
|
String: `{"statusCode":201,"responseTime":42,"body":{"usage":{"input_tokens":10,"output_tokens":5},"stop_reason":"end_turn"}}`,
|
|
})
|
|
|
|
if summary.StatusCode != 201 {
|
|
t.Fatalf("expected status code 201, got %d", summary.StatusCode)
|
|
}
|
|
if summary.ResponseTime != 42 {
|
|
t.Fatalf("expected response time 42, got %d", summary.ResponseTime)
|
|
}
|
|
if summary.Usage == nil || summary.Usage.InputTokens != 10 || summary.Usage.OutputTokens != 5 {
|
|
t.Fatalf("expected usage decoded, got %#v", summary.Usage)
|
|
}
|
|
if summary.StopReason != "end_turn" {
|
|
t.Fatalf("expected stop reason end_turn, got %q", summary.StopReason)
|
|
}
|
|
}
|
|
|
|
func TestApplyStoredResponseToSummaryIgnoresInvalidPayload(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
summary := &model.RequestSummary{}
|
|
applyStoredResponseToSummary(summary, sql.NullString{Valid: true, String: `{not-json`})
|
|
|
|
if summary.StatusCode != 0 || summary.ResponseTime != 0 || summary.Usage != nil || summary.StopReason != "" {
|
|
t.Fatalf("expected invalid payload ignored, got %#v", summary)
|
|
}
|
|
}
|
|
|
|
func TestDecodeResponseBodySummary(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
body, _ := json.Marshal(map[string]interface{}{
|
|
"usage": map[string]interface{}{
|
|
"input_tokens": 7,
|
|
"output_tokens": 3,
|
|
"cache_read_input_tokens": 2,
|
|
"cache_creation_input_tokens": 1,
|
|
},
|
|
"stop_reason": "tool_use",
|
|
})
|
|
|
|
summary, ok := decodeResponseBodySummary(body)
|
|
if !ok {
|
|
t.Fatal("expected response body summary to decode")
|
|
}
|
|
if total := totalTokensFromUsage(summary.Usage); total != 13 {
|
|
t.Fatalf("expected total tokens 13, got %d", total)
|
|
}
|
|
if summary.StopReason != "tool_use" {
|
|
t.Fatalf("expected stop reason tool_use, got %q", summary.StopReason)
|
|
}
|
|
}
|
|
|
|
func TestUsageCountsFromStoredResponse(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
input, output, cache, ok := usageCountsFromStoredResponse(sql.NullString{
|
|
Valid: true,
|
|
String: `{"body":{"usage":{"input_tokens":7,"output_tokens":3,"cache_read_input_tokens":2,"cache_creation_input_tokens":1}}}`,
|
|
})
|
|
if !ok {
|
|
t.Fatal("expected usage counts to decode")
|
|
}
|
|
if input != 7 || output != 3 || cache != 3 {
|
|
t.Fatalf("unexpected usage counts: input=%d output=%d cache=%d", input, output, cache)
|
|
}
|
|
}
|