From 12c47be2e70ae0c0a1159f7ee89da1edf813fa8d 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/internal/api/admin.go | 12 +++++- cmd/server/internal/api/api.go | 18 ++++---- cmd/server/internal/api/api_test.go | 5 ++- cmd/server/internal/api/members.go | 4 ++ cmd/server/internal/api/network.go | 4 ++ cmd/server/internal/api/profile.go | 4 ++ cmd/server/internal/api/recipients.go | 2 + cmd/server/internal/api/slack_admin.go | 14 +++++-- cmd/server/internal/api/slack_admin_test.go | 4 +- cmd/server/internal/slackinbound/commands.go | 8 ++++ cmd/server/internal/slackinbound/events.go | 41 ++++++++++++++----- cmd/server/internal/slackinbound/handler.go | 2 + .../internal/slackinbound/interactions.go | 8 ++++ cmd/server/internal/slackinbound/pending.go | 21 ++++++++-- cmd/server/main.go | 12 +++++- cmd/server/server.go | 4 +- cmd/server/server_test.go | 15 ++++++- go.mod | 2 +- go.sum | 4 +- 19 files changed, 146 insertions(+), 38 deletions(-) diff --git a/cmd/server/internal/api/admin.go b/cmd/server/internal/api/admin.go index 99e2160..8848608 100644 --- a/cmd/server/internal/api/admin.go +++ b/cmd/server/internal/api/admin.go @@ -9,6 +9,7 @@ import ( contract "github.com/appthrust/appserver-go/appserver/contract/directory" "github.com/appthrust/appserver-go/appserver/httpx" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/store" ) @@ -105,6 +106,9 @@ func (a *API) closeStatement(s *request) (any, int, error) { return nil, 0, err } } + if refreshErr != nil { + requestlog.SetOutcome(s.r, "degraded", "directory_refresh_failed") + } statement, err = a.store.CloseStatement(s.r.Context(), month, s.now, s.member.ID, refreshErr == nil && len(requested) == 0) return a.renderStatement(statement), 200, err } @@ -122,7 +126,9 @@ func (a *API) exportCSV(s *request) (any, int, error) { } s.w.Header().Set("Content-Type", "text/csv; charset=utf-8") s.w.Header().Set("Content-Disposition", `attachment; filename="peerbonus-`+month+`.csv"`) - _, _ = s.w.Write([]byte{0xef, 0xbb, 0xbf}) + if _, err := s.w.Write([]byte{0xef, 0xbb, 0xbf}); err != nil { + requestlog.SetOutcome(s.r, "stream_failed", "csv_write_failed") + } writer := csv.NewWriter(s.w) _ = writer.Write([]string{"month", "person_id", "email", "display_name", "pending", "points", "unit_value", "currency", "amount"}) for _, line := range statement.Lines { @@ -132,6 +138,7 @@ func (a *API) exportCSV(s *request) (any, int, error) { } writer.Flush() if err := writer.Error(); err != nil { + requestlog.SetOutcome(s.r, "stream_failed", "csv_write_failed") log.Printf("peerbonus CSV response failed: %v", err) } return nil, 0, nil @@ -146,6 +153,9 @@ func (a *API) adminMembers(s *request) (any, int, error) { return nil, 0, err } people, directoryErr := a.loadDirectoryPeople(s) + if directoryErr != nil { + requestlog.SetOutcome(s.r, "degraded", "directory_unavailable") + } result := mergeParticipation(month, activity, people, directoryErr == nil) return a.renderParticipation(result), 200, nil } diff --git a/cmd/server/internal/api/api.go b/cmd/server/internal/api/api.go index 6e1bb2f..8566f28 100644 --- a/cmd/server/internal/api/api.go +++ b/cmd/server/internal/api/api.go @@ -15,6 +15,7 @@ import ( "github.com/appthrust/appserver-go/appserver/identity" "github.com/appthrust/appserver-go/appserver/link" "github.com/appthrust/appserver-go/appserver/platformclient" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/directory" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" @@ -119,7 +120,7 @@ func (a *API) route(pattern string, mutation, needsRoles bool, fn endpoint) { if needsRoles { s.access, err = a.platform.Access(ctx, s.subject, bearer) if err != nil { - writeError(w, httpx.Fail(502, "upstream_unavailable", "The platform is temporarily unavailable")) + writeError(w, r, httpx.Fail(502, "upstream_unavailable", "The platform is temporarily unavailable")) return } } @@ -128,7 +129,7 @@ func (a *API) route(pattern string, mutation, needsRoles bool, fn endpoint) { if r.ContentLength != 0 { mediaType, _, err := mime.ParseMediaType(r.Header.Get("Content-Type")) if err != nil || mediaType != "application/json" { - writeError(w, httpx.Invalid("Content-Type must be application/json")) + writeError(w, r, httpx.Invalid("Content-Type must be application/json")) return } } @@ -136,12 +137,12 @@ func (a *API) route(pattern string, mutation, needsRoles bool, fn endpoint) { } s.member, err = a.store.MemberBySubject(ctx, s.subject) if err != nil && !errors.Is(err, domain.ErrNotFound) { - writeError(w, err) + writeError(w, r, err) return } body, status, err := fn(s) if err != nil { - writeError(w, err) + writeError(w, r, err) return } // CSV endpoints have already written the successful response. @@ -175,11 +176,11 @@ func (a *API) authenticate(w http.ResponseWriter, r *http.Request) (identity.Ide if err != nil { switch { case errors.Is(err, identity.ErrUnavailable): - writeError(w, httpx.Fail(503, "identity_unavailable", "The identity provider is temporarily unavailable")) + writeError(w, r, httpx.Fail(503, "identity_unavailable", "The identity provider is temporarily unavailable")) case errors.Is(err, identity.ErrRawKeyNotAccepted): - writeError(w, httpx.Fail(401, "raw_key_not_accepted", "Exchange the access key for an assertion before calling this API")) + writeError(w, r, httpx.Fail(401, "raw_key_not_accepted", "Exchange the access key for an assertion before calling this API")) default: - writeError(w, httpx.Fail(401, "unauthenticated", "A valid bearer token is required")) + writeError(w, r, httpx.Fail(401, "unauthenticated", "A valid bearer token is required")) } return identity.Identity{}, "", false } @@ -211,7 +212,7 @@ func decodeBody(s *request, target any, allowEmpty bool) error { return nil } -func writeError(w http.ResponseWriter, err error) { +func writeError(w http.ResponseWriter, r *http.Request, err error) { var insufficient *domain.InsufficientPointsError if errors.As(err, &insufficient) { httpx.WriteJSON(w, 409, struct { @@ -224,6 +225,7 @@ func writeError(w http.ResponseWriter, err error) { } var slackErr *slackAPIError if errors.As(err, &slackErr) { + requestlog.SetError(r, httpx.Fail(slackErr.Status, slackErr.Code, slackErr.Message)) httpx.WriteJSON(w, slackErr.Status, slackErr) return } diff --git a/cmd/server/internal/api/api_test.go b/cmd/server/internal/api/api_test.go index 1c41a2f..8807154 100644 --- a/cmd/server/internal/api/api_test.go +++ b/cmd/server/internal/api/api_test.go @@ -676,10 +676,11 @@ func TestPostSearchAndNewestClappers(t *testing.T) { func TestV2InputAndResponseContractWithoutDatabase(t *testing.T) { a := &API{} for _, query := range []string{strings.Repeat("a", 101), strings.Repeat("あ", 101)} { - _, _, err := a.posts(&request{r: httptest.NewRequest(http.MethodGet, "/posts?q="+url.QueryEscape(query), nil)}) + r := httptest.NewRequest(http.MethodGet, "/posts?q="+url.QueryEscape(query), nil) + _, _, err := a.posts(&request{r: r}) require.Error(t, err) w := httptest.NewRecorder() - writeError(w, err) + writeError(w, r, err) require.Equal(t, 400, w.Code) require.Contains(t, w.Body.String(), `"error":"invalid_request"`) require.Contains(t, w.Body.String(), "Query must contain at most 100 characters") diff --git a/cmd/server/internal/api/members.go b/cmd/server/internal/api/members.go index b373ff1..d1a58e5 100644 --- a/cmd/server/internal/api/members.go +++ b/cmd/server/internal/api/members.go @@ -11,6 +11,7 @@ import ( contract "github.com/appthrust/appserver-go/appserver/contract/directory" "github.com/appthrust/appserver-go/appserver/httpx" "github.com/appthrust/appserver-go/appserver/link" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/store" ) @@ -31,6 +32,7 @@ func (a *API) resolveSelf(s *request) (bool, error) { if s.member.ID == "" { return false, directoryUnavailable() } + requestlog.SetOutcome(s.r, "degraded", "directory_unavailable") in := store.MemberInput{PersonID: s.member.PersonID, Subject: s.member.Subject, DisplayName: s.member.DisplayName, Email: s.member.Email, Pending: s.member.Subject == nil, AvatarVersion: s.member.AvatarVersion} s.member, err = a.store.UpsertMember(s.r.Context(), in, s.now, true) return false, err @@ -79,6 +81,7 @@ func (a *API) me(s *request) (any, int, error) { } if linked { if err := a.refreshMembers(s); err != nil { + requestlog.SetOutcome(s.r, "degraded", "member_refresh_failed") slog.DebugContext(s.r.Context(), "peerbonus member refresh failed", "error", err) } } @@ -171,6 +174,7 @@ func (a *API) recipient(s *request, personID string) (domain.Member, error) { } member, lookupErr := a.store.MemberByPersonID(s.r.Context(), personID) if lookupErr == nil { + requestlog.SetOutcome(s.r, "degraded", "directory_unavailable") return member, nil } if !errors.Is(lookupErr, domain.ErrNotFound) { diff --git a/cmd/server/internal/api/network.go b/cmd/server/internal/api/network.go index 39d38e3..bab4092 100644 --- a/cmd/server/internal/api/network.go +++ b/cmd/server/internal/api/network.go @@ -6,6 +6,7 @@ import ( contract "github.com/appthrust/appserver-go/appserver/contract/directory" "github.com/appthrust/appserver-go/appserver/httpx" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" ) @@ -37,6 +38,9 @@ func (a *API) adminNetwork(s *request) (any, int, error) { people, directoryErr = a.loadDirectoryPeople(s) } } + if directoryErr != nil { + requestlog.SetOutcome(s.r, "degraded", "directory_unavailable") + } result := mergeNetwork(facts, people, groups, group, directoryErr == nil) return renderNetwork(result), 200, nil } diff --git a/cmd/server/internal/api/profile.go b/cmd/server/internal/api/profile.go index 758934d..167a7ca 100644 --- a/cmd/server/internal/api/profile.go +++ b/cmd/server/internal/api/profile.go @@ -1,5 +1,7 @@ package api +import "github.com/appthrust/appserver-go/appserver/requestlog" + func (a *API) member(s *request) (any, int, error) { member, err := a.store.MemberByID(s.r.Context(), s.r.PathValue("id")) if err != nil { @@ -12,6 +14,8 @@ func (a *API) member(s *request) (any, int, error) { groups := []RecipientGroup{} if profile, err := a.loadDirectoryProfile(s, member.PersonID); err == nil { groups = directGroups(profile) + } else { + requestlog.SetOutcome(s.r, "degraded", "directory_profile_unavailable") } return map[string]any{"member": a.renderMember(member), "groups": groups, "stats": a.renderMemberStats(stats)}, 200, nil } diff --git a/cmd/server/internal/api/recipients.go b/cmd/server/internal/api/recipients.go index 8a72e63..a335310 100644 --- a/cmd/server/internal/api/recipients.go +++ b/cmd/server/internal/api/recipients.go @@ -9,6 +9,7 @@ import ( contract "github.com/appthrust/appserver-go/appserver/contract/directory" "github.com/appthrust/appserver-go/appserver/link" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" ) @@ -165,6 +166,7 @@ func (a *API) recipients(s *request) (any, int, error) { if !errors.Is(err, link.ErrUnavailable) && !errors.Is(err, link.ErrAbsent) && !errors.As(err, &denied) { return nil, 0, err } + requestlog.SetOutcome(s.r, "degraded", "directory_unavailable") personID := data.Me.PersonID if personID == "" { personID = s.member.PersonID diff --git a/cmd/server/internal/api/slack_admin.go b/cmd/server/internal/api/slack_admin.go index 1508304..b7a41fe 100644 --- a/cmd/server/internal/api/slack_admin.go +++ b/cmd/server/internal/api/slack_admin.go @@ -11,6 +11,7 @@ import ( "time" "github.com/appthrust/appserver-go/appserver/httpx" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" "github.com/appthrust/peerbonus/cmd/server/internal/store" @@ -56,26 +57,31 @@ func newSlackInboundClient(origin, projectID string, transport http.RoundTripper } } +func unavailableSlackInbound(r *http.Request) *slackInboundResponse { + requestlog.SetOutcome(r, "degraded", "platform_unavailable") + return &slackInboundResponse{Reason: new("platform_unavailable")} +} + func (a *API) discoverSlackInbound(s *request) *slackInboundResponse { if a.slackInbound == nil { return nil } r, err := http.NewRequestWithContext(s.r.Context(), http.MethodGet, a.slackInbound.url, nil) if err != nil { - return &slackInboundResponse{Reason: new("platform_unavailable")} + return unavailableSlackInbound(s.r) } r.Header.Set("Authorization", s.bearer) r.Header.Set("Accept", "application/json") response, err := a.slackInbound.http.Do(r) if err != nil { - return &slackInboundResponse{Reason: new("platform_unavailable")} + return unavailableSlackInbound(s.r) } defer response.Body.Close() if response.StatusCode == http.StatusNotFound { return nil } if response.StatusCode != http.StatusOK { - return &slackInboundResponse{Reason: new("platform_unavailable")} + return unavailableSlackInbound(s.r) } var endpoint struct { URL string `json:"url"` @@ -86,7 +92,7 @@ func (a *API) discoverSlackInbound(s *request) *slackInboundResponse { } `json:"conditions"` } if err := json.NewDecoder(io.LimitReader(response.Body, 8<<20)).Decode(&endpoint); err != nil { - return &slackInboundResponse{Reason: new("platform_unavailable")} + return unavailableSlackInbound(s.r) } result := &slackInboundResponse{Ready: endpoint.Ready} if endpoint.URL != "" { diff --git a/cmd/server/internal/api/slack_admin_test.go b/cmd/server/internal/api/slack_admin_test.go index 8b659cf..398ee3c 100644 --- a/cmd/server/internal/api/slack_admin_test.go +++ b/cmd/server/internal/api/slack_admin_test.go @@ -134,7 +134,7 @@ func slackAdminCall(t *testing.T, a *API, fn endpoint, method, path, body string s := &request{r: r, w: w, bearer: r.Header.Get("Authorization"), now: a.now(), member: domain.Member{ID: "admin"}, access: platformclient.ProjectAccess{Roles: platformclient.Roles{IsConsoleAdmin: true}}} result, code, err := a.admin(fn)(s) if err != nil { - writeError(w, err) + writeError(w, r, err) } else { httpx.WriteJSON(w, code, result) } @@ -239,7 +239,7 @@ func TestSlackAdminVerifyFailures(t *testing.T) { require.NotContains(t, string(body), "secret-token") require.Contains(t, string(body), `"detail":"request_failed"`) w := httptest.NewRecorder() - writeError(w, domain.ErrSlackTeamChanged) + writeError(w, httptest.NewRequest(http.MethodPost, "/admin/slack/verify", nil), domain.ErrSlackTeamChanged) require.Equal(t, 409, w.Code) slackAdminErrorCode(t, w.Body.Bytes(), "slack_team_changed") } diff --git a/cmd/server/internal/slackinbound/commands.go b/cmd/server/internal/slackinbound/commands.go index 7c20b87..6efc3f8 100644 --- a/cmd/server/internal/slackinbound/commands.go +++ b/cmd/server/internal/slackinbound/commands.go @@ -10,6 +10,7 @@ import ( "strconv" "strings" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" ) @@ -24,6 +25,7 @@ func (h *handler) command(w http.ResponseWriter, r *http.Request, locale domain. return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -31,6 +33,7 @@ func (h *handler) command(w http.ResponseWriter, r *http.Request, locale domain. case "balance": remaining, err := h.store.GiveRemaining(r.Context(), member.ID, h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "balance_lookup_failed") http.Error(w, "Balance unavailable", http.StatusServiceUnavailable) return } @@ -43,20 +46,24 @@ func (h *handler) command(w http.ResponseWriter, r *http.Request, locale domain. } program, err := h.store.Program(r.Context()) if err != nil { + requestlog.SetOutcome(r, "failed", "program_lookup_failed") http.Error(w, "Program unavailable", http.StatusServiceUnavailable) return } period, err := h.store.CurrentPeriod(r.Context(), h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "period_lookup_failed") http.Error(w, "Period unavailable", http.StatusServiceUnavailable) return } view, err := json.Marshal(giveModal(member.ID, program, period, locale)) if err != nil { + requestlog.SetError(r, err) http.Error(w, "Modal unavailable", http.StatusInternalServerError) return } if err := h.slack.OpenView(r.Context(), form.Get("trigger_id"), view); err != nil { + requestlog.SetOutcome(r, "failed", "slack_open_view_failed") http.Error(w, "Slack unavailable", http.StatusBadGateway) return } @@ -76,6 +83,7 @@ type ephemeralResponse struct { func (h *handler) commandReply(w http.ResponseWriter, r *http.Request, responseURL, text string) { if err := h.respond(r.Context(), responseURL, ephemeralResponse{ResponseType: "ephemeral", Text: text}); err != nil { + requestlog.SetOutcome(r, "failed", "slack_response_failed") http.Error(w, "Slack response unavailable", http.StatusBadGateway) return } diff --git a/cmd/server/internal/slackinbound/events.go b/cmd/server/internal/slackinbound/events.go index 475aa53..888f5be 100644 --- a/cmd/server/internal/slackinbound/events.go +++ b/cmd/server/internal/slackinbound/events.go @@ -1,7 +1,6 @@ package slackinbound import ( - "context" "encoding/json" "errors" "fmt" @@ -9,6 +8,7 @@ import ( "net/http" "strings" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" "github.com/appthrust/peerbonus/cmd/server/internal/store" @@ -105,8 +105,13 @@ func eventThread(event slackEvent) string { func (h *handler) conversationEphemeral(w http.ResponseWriter, r *http.Request, channel, user, thread string, message slack.Message, committed bool) { message.ThreadTS = thread - if err := h.slack.PostEphemeral(r.Context(), channel, user, message); err != nil && !committed { - http.Error(w, "Slack unavailable", http.StatusBadGateway) + if err := h.slack.PostEphemeral(r.Context(), channel, user, message); err != nil { + if committed { + requestlog.SetOutcome(r, "degraded", "slack_ephemeral_failed") + } else { + requestlog.SetOutcome(r, "failed", "slack_ephemeral_failed") + http.Error(w, "Slack unavailable", http.StatusBadGateway) + } } } @@ -125,6 +130,7 @@ func (h *handler) mention(w http.ResponseWriter, r *http.Request, integration do return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -145,6 +151,7 @@ func (h *handler) mention(w http.ResponseWriter, r *http.Request, integration do return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -160,24 +167,27 @@ func (h *handler) mention(w http.ResponseWriter, r *http.Request, integration do } _, replayed, err := h.store.CreateSlackPosts(r.Context(), store.CreateSlackPostsInput{ SenderID: sender.ID, RecipientIDs: ids, Points: *points, Message: message, Now: h.now(), - Source: h.giveSource(r.Context(), event.Channel, event.TS, ""), + Source: h.giveSource(r, event.Channel, event.TS, ""), }) if err != nil { if _, text := postError(err, locale); text != "" { reply(text) } else { + requestlog.SetOutcome(r, "failed", "give_failed") http.Error(w, "Unable to give points", http.StatusServiceUnavailable) } return } if !replayed { - h.successReply(r.Context(), integration, event.Channel, eventThread(event), giveReplyText(event.User, slackMentions(recipients), *points)) + h.successReply(r, integration, event.Channel, eventThread(event), giveReplyText(event.User, slackMentions(recipients), *points)) } } -func (h *handler) giveSource(ctx context.Context, channel, ts, emoji string) domain.SlackGiveSource { +func (h *handler) giveSource(r *http.Request, channel, ts, emoji string) domain.SlackGiveSource { source := domain.SlackGiveSource{ChannelID: channel, MessageTS: ts, Emoji: emoji} - if link, err := h.slack.Permalink(ctx, channel, ts); err == nil && link != "" { + if link, err := h.slack.Permalink(r.Context(), channel, ts); err != nil { + requestlog.SetOutcome(r, "degraded", "slack_permalink_failed") + } else if link != "" { source.Permalink = &link } return source @@ -195,12 +205,14 @@ func giveReplyText(sender, recipients string, points int) string { return fmt.Sprintf("🎉 <@%s> → %s %d pt", sender, recipients, points) } -func (h *handler) successReply(ctx context.Context, integration domain.SlackIntegration, channel, thread, text string) { +func (h *handler) successReply(r *http.Request, integration domain.SlackIntegration, channel, thread, text string) { if integration.AnnouncePosts && integration.AnnounceChannel != nil && integration.AnnounceChannel.ID == channel { return } // The ledger has committed. A reply failure must not retry the give. - _, _ = h.slack.PostMessage(ctx, channel, slack.Message{Text: text, ThreadTS: thread}) + if _, err := h.slack.PostMessage(r.Context(), channel, slack.Message{Text: text, ThreadTS: thread}); err != nil { + requestlog.SetOutcome(r, "degraded", "slack_reply_failed") + } } func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration domain.SlackIntegration, event slackEvent) { @@ -228,6 +240,7 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d return } if err != nil { + requestlog.SetOutcome(r, "failed", "post_lookup_failed") http.Error(w, "Post unavailable", http.StatusServiceUnavailable) return } @@ -238,6 +251,7 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -250,6 +264,7 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d if text := clapError(err, locale); text != "" { reply(text, false) } else { + requestlog.SetOutcome(r, "failed", "clap_failed") http.Error(w, "Unable to clap", http.StatusServiceUnavailable) } return @@ -257,6 +272,8 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d if !replayed { if remaining, err := h.store.GiveRemaining(r.Context(), sender.ID, h.now()); err == nil { reply(fmt.Sprintf(localized(locale, "拍手しました(残り %d pt)", "Clapped (%d pt remaining)."), remaining), true) + } else { + requestlog.SetOutcome(r, "degraded", "balance_lookup_failed") } } return @@ -267,6 +284,7 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -280,17 +298,18 @@ func (h *handler) reaction(w http.ResponseWriter, r *http.Request, integration d _, replayed, err := h.store.CreateSlackPosts(r.Context(), store.CreateSlackPostsInput{ SenderID: sender.ID, RecipientIDs: []string{recipient.ID}, Points: rule.Points, Values: values, Now: h.now(), Message: fmt.Sprintf(localized(locale, ":%s: Slack のメッセージへのリアクション", ":%s: Reaction to a Slack message"), rule.Emoji), - Source: h.giveSource(r.Context(), channel, thread, rule.Emoji), + Source: h.giveSource(r, channel, thread, rule.Emoji), }) if err != nil { if _, text := postError(err, locale); text != "" { reply(text, false) } else { + requestlog.SetOutcome(r, "failed", "give_failed") http.Error(w, "Unable to give points", http.StatusServiceUnavailable) } return } if !replayed { - h.successReply(r.Context(), integration, channel, thread, giveReplyText(event.User, slackMentions([]string{event.ItemUser}), rule.Points)) + h.successReply(r, integration, channel, thread, giveReplyText(event.User, slackMentions([]string{event.ItemUser}), rule.Points)) } } diff --git a/cmd/server/internal/slackinbound/handler.go b/cmd/server/internal/slackinbound/handler.go index 0e491e8..6364b45 100644 --- a/cmd/server/internal/slackinbound/handler.go +++ b/cmd/server/internal/slackinbound/handler.go @@ -12,6 +12,7 @@ import ( "net/url" "time" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" "github.com/appthrust/peerbonus/cmd/server/internal/store" @@ -100,6 +101,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { r = r.WithContext(ctx) integration, err := h.store.SlackIntegration(ctx) if err != nil { + requestlog.SetOutcome(r, "failed", "slack_integration_lookup_failed") http.Error(w, "Slack integration unavailable", http.StatusServiceUnavailable) return } diff --git a/cmd/server/internal/slackinbound/interactions.go b/cmd/server/internal/slackinbound/interactions.go index 0fae238..80178ef 100644 --- a/cmd/server/internal/slackinbound/interactions.go +++ b/cmd/server/internal/slackinbound/interactions.go @@ -7,6 +7,7 @@ import ( "strconv" "strings" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" "github.com/appthrust/peerbonus/cmd/server/internal/store" @@ -74,6 +75,7 @@ func (h *handler) interact(w http.ResponseWriter, r *http.Request, integration d return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -118,6 +120,7 @@ func (h *handler) submit(w http.ResponseWriter, r *http.Request, locale domain.S if err != nil { block, message := postError(err, locale) if block == "" { + requestlog.SetOutcome(r, "failed", "give_failed") http.Error(w, "Unable to give points", http.StatusServiceUnavailable) return } @@ -190,6 +193,7 @@ func (h *handler) clap(w http.ResponseWriter, r *http.Request, locale domain.Sla if err != nil { text := clapError(err, locale) if text == "" { + requestlog.SetOutcome(r, "failed", "clap_failed") http.Error(w, "Unable to clap", http.StatusServiceUnavailable) return } @@ -198,6 +202,7 @@ func (h *handler) clap(w http.ResponseWriter, r *http.Request, locale domain.Sla } remaining, err := h.store.GiveRemaining(r.Context(), member.ID, h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "balance_lookup_failed") http.Error(w, "Balance unavailable", http.StatusServiceUnavailable) return } @@ -230,6 +235,7 @@ func (h *handler) ephemeral(w http.ResponseWriter, r *http.Request, payload inte return } if err := h.slack.PostEphemeral(r.Context(), payload.Channel.ID, payload.User.ID, slack.Message{Text: text}); err != nil { + requestlog.SetOutcome(r, "failed", "slack_ephemeral_failed") http.Error(w, "Slack unavailable", http.StatusBadGateway) return } @@ -250,6 +256,7 @@ func (h *handler) options(w http.ResponseWriter, r *http.Request, payload intera return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -260,6 +267,7 @@ func (h *handler) options(w http.ResponseWriter, r *http.Request, payload intera } members, err := h.store.SearchMembers(r.Context(), q, member.ID, 20) if err != nil { + requestlog.SetOutcome(r, "failed", "member_search_failed") http.Error(w, "Members unavailable", http.StatusServiceUnavailable) return } diff --git a/cmd/server/internal/slackinbound/pending.go b/cmd/server/internal/slackinbound/pending.go index c064133..5b115f6 100644 --- a/cmd/server/internal/slackinbound/pending.go +++ b/cmd/server/internal/slackinbound/pending.go @@ -8,6 +8,7 @@ import ( "strconv" "strings" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/domain" "github.com/appthrust/peerbonus/cmd/server/internal/slack" "github.com/appthrust/peerbonus/cmd/server/internal/store" @@ -31,11 +32,13 @@ type giveBlock struct { func (h *handler) promptGive(w http.ResponseWriter, r *http.Request, integration domain.SlackIntegration, event slackEvent, senderID string, recipientIDs, recipients []string, message string) { remaining, err := h.store.GiveRemaining(r.Context(), senderID, h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "balance_lookup_failed") http.Error(w, "Balance unavailable", http.StatusServiceUnavailable) return } period, err := h.store.CurrentPeriod(r.Context(), h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "period_lookup_failed") http.Error(w, "Period unavailable", http.StatusServiceUnavailable) return } @@ -45,6 +48,7 @@ func (h *handler) promptGive(w http.ResponseWriter, r *http.Request, integration SenderID: senderID, RecipientIDs: recipientIDs, Message: message, }, h.now()) if err != nil { + requestlog.SetOutcome(r, "failed", "pending_give_create_failed") http.Error(w, "Pending give unavailable", http.StatusServiceUnavailable) return } @@ -85,8 +89,13 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat }() reply := func(text string, committed bool) { err := h.respond(r.Context(), payload.ResponseURL, ephemeralResponse{ResponseType: "ephemeral", Text: text, ReplaceOriginal: true}) - if err != nil && !committed { - http.Error(w, "Slack response unavailable", http.StatusBadGateway) + if err != nil { + if committed { + requestlog.SetOutcome(r, "degraded", "slack_response_failed") + } else { + requestlog.SetOutcome(r, "failed", "slack_response_failed") + http.Error(w, "Slack response unavailable", http.StatusBadGateway) + } } } locale := integration.Locale @@ -96,6 +105,7 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat return } if err != nil { + requestlog.SetOutcome(r, "failed", "member_lookup_failed") http.Error(w, "Member unavailable", http.StatusServiceUnavailable) return } @@ -116,6 +126,7 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat return } if err != nil { + requestlog.SetOutcome(r, "failed", "pending_give_lookup_failed") http.Error(w, "Pending give unavailable", http.StatusServiceUnavailable) return } @@ -128,6 +139,7 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat if errors.Is(err, domain.ErrSlackPendingGiveGone) { reply(pendingGone(locale), false) } else if err != nil { + requestlog.SetOutcome(r, "failed", "pending_give_delete_failed") http.Error(w, "Pending give unavailable", http.StatusServiceUnavailable) } else { reply(localized(locale, "キャンセルしました。", "Cancelled."), true) @@ -136,7 +148,7 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat } posts, replayed, err := h.store.CreateSlackPosts(r.Context(), store.CreateSlackPostsInput{ SenderID: member.ID, RecipientIDs: pending.RecipientIDs, Points: points, Message: pending.Message, - Now: h.now(), PendingID: pending.ID, Source: h.giveSource(r.Context(), pending.ChannelID, pending.MessageTS, ""), + Now: h.now(), PendingID: pending.ID, Source: h.giveSource(r, pending.ChannelID, pending.MessageTS, ""), }) if errors.Is(err, domain.ErrSlackPendingGiveGone) { reply(pendingGone(locale), false) @@ -146,6 +158,7 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat if _, text := postError(err, locale); text != "" { reply(text, false) } else { + requestlog.SetOutcome(r, "failed", "give_failed") http.Error(w, "Unable to give points", http.StatusServiceUnavailable) } return @@ -165,6 +178,6 @@ func (h *handler) pendingAction(w http.ResponseWriter, r *http.Request, integrat recipients[i] = mrkdwnEscaper.Replace(post.Recipient.DisplayName) } } - h.successReply(r.Context(), integration, pending.ChannelID, thread, giveReplyText(payload.User.ID, strings.Join(recipients, " "), points)) + h.successReply(r, integration, pending.ChannelID, thread, giveReplyText(payload.User.ID, strings.Join(recipients, " "), points)) reply(localized(locale, "ポイントを贈りました。", "Points given."), true) } diff --git a/cmd/server/main.go b/cmd/server/main.go index a5b5326..ab0485c 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -4,6 +4,7 @@ import ( "context" "errors" "flag" + "io" "log" "net/http" "os" @@ -12,6 +13,7 @@ import ( "time" "github.com/appthrust/appserver-go/appserver/platformenv" + "github.com/appthrust/appserver-go/appserver/requestlog" ) func main() { @@ -43,7 +45,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() { @@ -59,3 +61,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: "peerbonus", Output: logOutput}), + ReadHeaderTimeout: 10 * time.Second, + } +} diff --git a/cmd/server/server.go b/cmd/server/server.go index b6a4fd8..1153bc9 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -9,6 +9,7 @@ import ( "github.com/appthrust/appserver-go/appserver/platformclient" "github.com/appthrust/appserver-go/appserver/platformenv" "github.com/appthrust/appserver-go/appserver/releaseidentity" + "github.com/appthrust/appserver-go/appserver/requestlog" "github.com/appthrust/peerbonus/cmd/server/internal/api" "net/http" "net/url" @@ -44,7 +45,8 @@ func newHandler(staticDir, upstreamURL, projectID string, peerbonus, inbound htt writeJSON(w, http.StatusOK, map[string]string{"projectId": projectID, "publicUrl": os.Getenv("PEERBONUS_PUBLIC_URL"), "directoryUrl": os.Getenv("PEERBONUS_DIRECTORY_PUBLIC_URL")}) }) mux.Handle("GET /launcher", launcher.NewHandler(catalog, authenticator.Authenticate)) - mux.Handle("GET /releasez", releaseidentity.NewHandler("PEERBONUS", func(w http.ResponseWriter, _ *http.Request) { + mux.Handle("GET /releasez", releaseidentity.NewHandler("PEERBONUS", func(w http.ResponseWriter, r *http.Request) { + requestlog.SetOutcome(r, "unavailable", "release_identity_unavailable") w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.WriteHeader(http.StatusServiceUnavailable) _, _ = w.Write([]byte("UI release status unavailable\n")) diff --git a/cmd/server/server_test.go b/cmd/server/server_test.go index fcff88c..9b9146f 100644 --- a/cmd/server/server_test.go +++ b/cmd/server/server_test.go @@ -1,6 +1,7 @@ package main import ( + "bytes" "encoding/json" "net/http" "net/http/httptest" @@ -161,8 +162,20 @@ func TestReleaseFileAndUnavailable(t *testing.T) { handler, err := newHandler(t.TempDir(), "http://127.0.0.1:1", "pj-test", nil, nil, nil) require.NoError(t, err) w := httptest.NewRecorder() - handler.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/releasez", nil)) + var output bytes.Buffer + newServer(":0", handler, &output).Handler.ServeHTTP(w, httptest.NewRequest(http.MethodGet, "/releasez?private-query", nil)) require.Equal(t, 503, w.Code) + require.Equal(t, 1, bytes.Count(output.Bytes(), []byte{'\n'})) + require.NotContains(t, output.String(), "private-query") + var entry struct { + Service, Outcome, Reason string + Status int + } + require.NoError(t, json.Unmarshal(output.Bytes(), &entry)) + require.Equal(t, "peerbonus", entry.Service) + require.Equal(t, http.StatusServiceUnavailable, entry.Status) + require.Equal(t, "unavailable", entry.Outcome) + require.Equal(t, "release_identity_unavailable", entry.Reason) stamp := filepath.Join(t.TempDir(), "release.json") require.NoError(t, os.WriteFile(stamp, []byte(`{"sourceRevision":"file-revision"}`), 0600)) t.Setenv("PEERBONUS_RELEASE_FILE", stamp) diff --git a/go.mod b/go.mod index c5f1f28..04ef014 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/appthrust/peerbonus 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/lib/pq v1.12.3 github.com/oklog/ulid/v2 v2.1.1 github.com/stretchr/testify v1.11.1 diff --git a/go.sum b/go.sum index 736fd48..e86e9ae 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 6e78191a6aeba1b9ab7fb2771b1d471e3de65c85 Mon Sep 17 00:00:00 2001 From: reoring Date: Thu, 19 Nov 2026 07:51:31 +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 04ef014..2ca8685 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/appthrust/peerbonus 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/lib/pq v1.12.3 github.com/oklog/ulid/v2 v2.1.1 github.com/stretchr/testify v1.11.1 diff --git a/go.sum b/go.sum index e86e9ae..da2a330 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=