From 328b261e69579913ce5dddcdf92cb2a27f8d91d8 Mon Sep 17 00:00:00 2001 From: reoring Date: Thu, 19 Nov 2026 07:38:14 +0900 Subject: [PATCH 1/2] Log one structured line per HTTP request Wrap the server handler with appserver-go requestlog and record the failures that only wrote a response. (appserver-go pinned to the PR commit until v0.7.0 is tagged.) --- cmd/server/main.go | 12 +++++++++++- cmd/server/server_test.go | 23 +++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 410b0e7..c685e2c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -4,6 +4,7 @@ import ( "context" "errors" "flag" + "io" "log" "net/http" "os" @@ -13,6 +14,7 @@ import ( "github.com/appthrust/agent-guide/content" "github.com/appthrust/appserver-go/appserver/platformenv" + "github.com/appthrust/appserver-go/appserver/requestlog" ) func main() { @@ -38,7 +40,7 @@ func main() { if err != nil { log.Fatal(err) } - server := &http.Server{Addr: *listen, Handler: handler, ReadHeaderTimeout: 10 * time.Second} + server := newServer(*listen, handler, os.Stderr) ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) defer stop() go func() { @@ -54,3 +56,11 @@ func main() { log.Fatal(err) } } + +func newServer(addr string, handler http.Handler, logOutput io.Writer) *http.Server { + return &http.Server{ + Addr: addr, + Handler: requestlog.Wrap(handler, requestlog.Options{Service: "agent-guide", Output: logOutput}), + ReadHeaderTimeout: 10 * time.Second, + } +} diff --git a/cmd/server/server_test.go b/cmd/server/server_test.go index 95eec25..dd6f9bf 100644 --- a/cmd/server/server_test.go +++ b/cmd/server/server_test.go @@ -1,6 +1,7 @@ package main import ( + "bytes" "crypto/ecdsa" "crypto/elliptic" "crypto/rand" @@ -53,6 +54,28 @@ func userBearer(subject, email string) string { return "Bearer eyJhbGciOiJub25lIn0." + base64.RawURLEncoding.EncodeToString(claims) + "." } +func TestServerLogsFailedReadiness(t *testing.T) { + environment(t) + handler := fixtureHandler(t, "invalid-yaml", "https://api.example.test") + var logs bytes.Buffer + server := newServer(":0", handler, &logs) + response := call(server.Handler, "/readyz", "") + require.Equal(t, http.StatusServiceUnavailable, response.Code) + + require.Equal(t, 1, bytes.Count(logs.Bytes(), []byte{'\n'})) + var entry struct { + Service string `json:"service"` + Path string `json:"path"` + Status int `json:"status"` + ErrorCode string `json:"error_code"` + } + require.NoError(t, json.Unmarshal(logs.Bytes(), &entry)) + require.Equal(t, "agent-guide", entry.Service) + require.Equal(t, "/readyz", entry.Path) + require.Equal(t, response.Code, entry.Status) + require.Equal(t, "content_unavailable", entry.ErrorCode) +} + func TestPublicRoutesAndBearerBoundaries(t *testing.T) { environment(t) handler := fixtureHandler(t, "valid", "https://api.example.test") diff --git a/go.mod b/go.mod index 56fa67e..3ec0570 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/appthrust/agent-guide go 1.26.0 require ( - github.com/appthrust/appserver-go v0.5.1 + github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56 github.com/stretchr/testify v1.11.1 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 6caaff3..1eb1cec 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/appthrust/appserver-go v0.5.1 h1:L9IfLUZjR2GxQmEK+d7rjo8P1bItbbb+kqKotRRoey4= -github.com/appthrust/appserver-go v0.5.1/go.mod h1:0KSf9RQZ6OxBcE0lxYzzjKF37nfwbKps3wXUGlE0oFo= +github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56 h1:JKydZpovuh/gTTwMH63iDRKtPa2gjnDEUAbCF7VMa54= +github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56/go.mod h1:0KSf9RQZ6OxBcE0lxYzzjKF37nfwbKps3wXUGlE0oFo= github.com/coreos/go-oidc/v3 v3.20.0 h1:EtE0WIBHk03N+DqGkY4+UONzzZHk7amKt6IyNd7OsZE= github.com/coreos/go-oidc/v3 v3.20.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= From 58dc53039dda3bac2680720d8bbd499c46e1275e Mon Sep 17 00:00:00 2001 From: reoring Date: Thu, 19 Nov 2026 07:51:19 +0900 Subject: [PATCH 2/2] Pin appserver-go v0.7.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3ec0570..f2be9bb 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/appthrust/agent-guide go 1.26.0 require ( - github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56 + github.com/appthrust/appserver-go v0.7.0 github.com/stretchr/testify v1.11.1 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 1eb1cec..0ee7be7 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56 h1:JKydZpovuh/gTTwMH63iDRKtPa2gjnDEUAbCF7VMa54= -github.com/appthrust/appserver-go v0.6.1-0.20261118223418-5f8bf82f7a56/go.mod h1:0KSf9RQZ6OxBcE0lxYzzjKF37nfwbKps3wXUGlE0oFo= +github.com/appthrust/appserver-go v0.7.0 h1:Fd1G+l/Ys0aAAiI2ZmMKqAz4qY6Dv7WwsF/rZtUgPUA= +github.com/appthrust/appserver-go v0.7.0/go.mod h1:0KSf9RQZ6OxBcE0lxYzzjKF37nfwbKps3wXUGlE0oFo= github.com/coreos/go-oidc/v3 v3.20.0 h1:EtE0WIBHk03N+DqGkY4+UONzzZHk7amKt6IyNd7OsZE= github.com/coreos/go-oidc/v3 v3.20.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=