Skip to content

fix(evaluation): return per-request error responses in Batch #6262

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

Open
AruneshDwivedi wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

fix(evaluation): return per-request error responses in Batch #6262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f33ad
fix(evaluation): return per-request error responses instead of aborti…
AruneshDwivedi Jul 24, 2026
2b7094e
fix(evaluation): use require.NoError for linter compliance
AruneshDwivedi Jul 24, 2026
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
67 changes: 48 additions & 19 deletions internal/server/evaluation/evaluation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package evaluation

import (
"context"
"errors"
"fmt"
"hash/crc32"
"sort"
Expand Down Expand Up @@ -500,9 +499,28 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ

f, err := store.GetFlag(ctx, storage.NewResource(req.NamespaceKey, req.FlagKey, storage.WithReference(b.Reference)))
if err != nil {
var errnf errs.ErrNotFound
if errors.As(err, &errnf) {
eresp := &rpcevaluation.EvaluationResponse{
eresp := &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_ERROR_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_ErrorResponse{
ErrorResponse: &rpcevaluation.ErrorEvaluationResponse{
FlagKey: req.FlagKey,
NamespaceKey: req.NamespaceKey,
Reason: rpcevaluation.ErrorEvaluationReason_NOT_FOUND_ERROR_EVALUATION_REASON,
},
},
}

resp.Responses = append(resp.Responses, eresp)
continue
}

var eresp *rpcevaluation.EvaluationResponse

switch f.Type {
case core.FlagType_BOOLEAN_FLAG_TYPE:
res, err := s.boolean(ctx, store, env, f, req)
if err != nil {
eresp = &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_ERROR_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_ErrorResponse{
ErrorResponse: &rpcevaluation.ErrorEvaluationResponse{
Expand All @@ -512,21 +530,10 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ
},
},
}

resp.Responses = append(resp.Responses, eresp)
continue
}

return nil, err
}

switch f.Type {
case core.FlagType_BOOLEAN_FLAG_TYPE:
res, err := s.boolean(ctx, store, env, f, req)
if err != nil {
return nil, err
}

if s.tracingEnabled {
s.addEvaluationEvent(
ctx, env, req.NamespaceKey, req.FlagKey, req.EntityId, req.RequestId,
Expand All @@ -537,7 +544,7 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ
)
}

eresp := &rpcevaluation.EvaluationResponse{
eresp = &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_BOOLEAN_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_BooleanResponse{
BooleanResponse: res,
Expand All @@ -548,7 +555,18 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ
case core.FlagType_VARIANT_FLAG_TYPE:
res, err := s.variant(ctx, store, env, f, req)
if err != nil {
return nil, err
eresp = &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_ERROR_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_ErrorResponse{
ErrorResponse: &rpcevaluation.ErrorEvaluationResponse{
FlagKey: req.FlagKey,
NamespaceKey: req.NamespaceKey,
Reason: rpcevaluation.ErrorEvaluationReason_NOT_FOUND_ERROR_EVALUATION_REASON,
},
},
}
resp.Responses = append(resp.Responses, eresp)
continue
}

if s.tracingEnabled {
Expand All @@ -561,7 +579,7 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ
tracing.AttributeFlagTypeVariant,
)
}
eresp := &rpcevaluation.EvaluationResponse{
eresp = &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_VARIANT_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_VariantResponse{
VariantResponse: res,
Expand All @@ -570,7 +588,18 @@ func (s *Server) Batch(ctx context.Context, b *rpcevaluation.BatchEvaluationRequ

resp.Responses = append(resp.Responses, eresp)
default:
return nil, errs.ErrInvalidf("unknown flag type: %s", f.Type)
eresp = &rpcevaluation.EvaluationResponse{
Type: rpcevaluation.EvaluationResponseType_ERROR_EVALUATION_RESPONSE_TYPE,
Response: &rpcevaluation.EvaluationResponse_ErrorResponse{
ErrorResponse: &rpcevaluation.ErrorEvaluationResponse{
FlagKey: req.FlagKey,
NamespaceKey: req.NamespaceKey,
Reason: rpcevaluation.ErrorEvaluationReason_NOT_FOUND_ERROR_EVALUATION_REASON,
},
},
}
resp.Responses = append(resp.Responses, eresp)
continue
}
}

Expand Down
18 changes: 12 additions & 6 deletions internal/server/evaluation/evaluation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ func TestBatch_UnknownFlagType(t *testing.T) {
Type: 3,
}, nil)

_, err := s.Batch(t.Context(), &rpcevaluation.BatchEvaluationRequest{
resp, err := s.Batch(t.Context(), &rpcevaluation.BatchEvaluationRequest{
Requests: []*rpcevaluation.EvaluationRequest{
{
FlagKey: flagKey,
Expand All @@ -1084,8 +1084,11 @@ func TestBatch_UnknownFlagType(t *testing.T) {
},
})

require.Error(t, err)
assert.EqualError(t, err, "unknown flag type: 3")
require.NoError(t, err)
require.Len(t, resp.GetResponses(), 1)
er := resp.GetResponses()[0].GetErrorResponse()
assert.NotNil(t, er)
assert.Equal(t, rpcevaluation.ErrorEvaluationReason_NOT_FOUND_ERROR_EVALUATION_REASON, er.GetReason())
}

func TestBatch_InternalError_GetFlag(t *testing.T) {
Expand All @@ -1104,7 +1107,7 @@ func TestBatch_InternalError_GetFlag(t *testing.T) {

store.On("GetFlag", mock.Anything, storage.NewResource(namespaceKey, flagKey)).Return(&core.Flag{}, errors.New("internal error"))

_, err := s.Batch(t.Context(), &rpcevaluation.BatchEvaluationRequest{
resp, err := s.Batch(t.Context(), &rpcevaluation.BatchEvaluationRequest{
Requests: []*rpcevaluation.EvaluationRequest{
{
FlagKey: flagKey,
Expand All @@ -1117,8 +1120,11 @@ func TestBatch_InternalError_GetFlag(t *testing.T) {
},
})

require.Error(t, err)
assert.EqualError(t, err, "internal error")
require.NoError(t, err)
require.Len(t, resp.GetResponses(), 1)
er := resp.GetResponses()[0].GetErrorResponse()
assert.NotNil(t, er)
assert.Equal(t, rpcevaluation.ErrorEvaluationReason_NOT_FOUND_ERROR_EVALUATION_REASON, er.GetReason())
}

func TestBatch_Success(t *testing.T) {
Expand Down
Loading