Skip to content

fix: treat context.Canceled error as connect.CodeCanceled in the log interceptor #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pirosiki197 merged 1 commit into from
Feb 5, 2026
Merged

fix: treat context.Canceled error as connect.CodeCanceled in the log interceptor #1160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/infrastructure/grpc/log_interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"connectrpc.com/connect"
"github.com/friendsofgo/errors"
"github.com/traPtitech/neoshowcase/pkg/domain"
"github.com/traPtitech/neoshowcase/pkg/domain/web"
"github.com/traPtitech/neoshowcase/pkg/util/slogutil"
Expand Down Expand Up @@ -37,12 +38,17 @@ func (l *LogInterceptor) WrapUnary(next connect.UnaryFunc) connect.UnaryFunc {
start := time.Now()
response, err := next(ctx, request)
elapsed := fmt.Sprintf("%.3fs", time.Since(start).Seconds())

if err == nil || connect.IsNotModifiedError(err) {
slog.InfoContext(ctx, "unary request succeeded",
"procedure", request.Spec().Procedure,
"duration_sec", elapsed,
)
} else {
// treat context.Canceled error as connect.CodeCanceled
if errors.Is(err, context.Canceled) {
err = connect.NewError(connect.CodeCanceled, err)
}
switch connect.CodeOf(err) {
case connect.CodeUnknown, connect.CodeInternal, connect.CodeUnavailable, connect.CodeDeadlineExceeded, connect.CodeUnimplemented, connect.CodeDataLoss:
slog.ErrorContext(ctx, "unary request failed with server error",
Expand Down
Loading