From 195ec9e57ddd0977918fb39da744cef6f4260972 Mon Sep 17 00:00:00 2001
From: Mark Phelps <209477+markphelps@users.noreply.github.com>
Date: Fri, 29 Sep 2023 15:39:06 -0400
Subject: [PATCH] feat: add requestID to batch response (#2177)

---
 internal/server/evaluation/evaluation.go      | 5 ++++-
 internal/server/evaluation/evaluation_test.go | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/internal/server/evaluation/evaluation.go b/internal/server/evaluation/evaluation.go
index f7760e605e..967ce6a413 100644
--- a/internal/server/evaluation/evaluation.go
+++ b/internal/server/evaluation/evaluation.go
@@ -76,6 +76,7 @@ func (s *Server) variant(ctx context.Context, flag *flipt.Flag, r *rpcevaluation
 	}
 
 	ver := &rpcevaluation.VariantEvaluationResponse{
+		RequestId:         r.RequestId,
 		Match:             resp.Match,
 		Reason:            reason,
 		VariantKey:        resp.Value,
@@ -131,7 +132,9 @@ func (s *Server) boolean(ctx context.Context, flag *flipt.Flag, r *rpcevaluation
 	}
 
 	var (
-		resp     = &rpcevaluation.BooleanEvaluationResponse{}
+		resp = &rpcevaluation.BooleanEvaluationResponse{
+			RequestId: r.RequestId,
+		}
 		lastRank int32
 	)
 
diff --git a/internal/server/evaluation/evaluation_test.go b/internal/server/evaluation/evaluation_test.go
index ba82e574d1..572bf00fc9 100644
--- a/internal/server/evaluation/evaluation_test.go
+++ b/internal/server/evaluation/evaluation_test.go
@@ -768,6 +768,7 @@ func TestBatch_Success(t *testing.T) {
 	res, err := s.Batch(context.TODO(), &rpcevaluation.BatchEvaluationRequest{
 		Requests: []*rpcevaluation.EvaluationRequest{
 			{
+				RequestId:    "1",
 				FlagKey:      flagKey,
 				EntityId:     "test-entity",
 				NamespaceKey: namespaceKey,
@@ -776,6 +777,7 @@ func TestBatch_Success(t *testing.T) {
 				},
 			},
 			{
+				RequestId:    "2",
 				FlagKey:      anotherFlagKey,
 				EntityId:     "test-entity",
 				NamespaceKey: namespaceKey,
@@ -784,6 +786,7 @@ func TestBatch_Success(t *testing.T) {
 				},
 			},
 			{
+				RequestId:    "3",
 				FlagKey:      variantFlagKey,
 				EntityId:     "test-entity",
 				NamespaceKey: namespaceKey,
@@ -803,6 +806,7 @@ func TestBatch_Success(t *testing.T) {
 	assert.True(t, b.BooleanResponse.Enabled, "value should be true from match")
 	assert.Equal(t, rpcevaluation.EvaluationReason_MATCH_EVALUATION_REASON, b.BooleanResponse.Reason)
 	assert.Equal(t, rpcevaluation.EvaluationResponseType_BOOLEAN_EVALUATION_RESPONSE_TYPE, res.Responses[0].Type)
+	assert.Equal(t, "1", b.BooleanResponse.RequestId)
 
 	e, ok := res.Responses[1].Response.(*rpcevaluation.EvaluationResponse_ErrorResponse)
 	assert.True(t, ok, "response should be a error evaluation response")
@@ -817,4 +821,5 @@ func TestBatch_Success(t *testing.T) {
 	assert.Contains(t, v.VariantResponse.SegmentKeys, "bar")
 	assert.Equal(t, rpcevaluation.EvaluationReason_MATCH_EVALUATION_REASON, v.VariantResponse.Reason)
 	assert.Equal(t, rpcevaluation.EvaluationResponseType_VARIANT_EVALUATION_RESPONSE_TYPE, res.Responses[2].Type)
+	assert.Equal(t, "3", v.VariantResponse.RequestId)
 }