fix(evaluation): add segments to the boolean evaluation response (#4766)

Author: erka

internal/server/evaluation/evaluation.go

@@ -319,6 +319,7 @@ func (s *Server) Boolean(ctx context.Context, r *rpcevaluation.EvaluationRequest
 			tracing.AttributeRequestID.String(r.RequestId),
 			tracing.AttributeValue.Bool(resp.Enabled),
 			tracing.AttributeReason.String(resp.Reason.String()),
+			tracing.AttributeSegments.StringSlice(resp.SegmentKeys),
 			tracing.AttributeFlagTypeBoolean,
 		))
 	}
@@ -359,6 +360,7 @@ func (s *Server) boolean(ctx context.Context, store storage.ReadOnlyStore, env e
 						metrics.AttributeValue.Bool(resp.Enabled),
 						metrics.AttributeReason.String(resp.Reason.String()),
 						metrics.AttributeFlagType.String("boolean"),
+						metrics.AttributeSegments.StringSlice(resp.SegmentKeys),
 					),
 				),
 			)
@@ -408,7 +410,6 @@ func (s *Server) boolean(ctx context.Context, store storage.ReadOnlyStore, env e
 			)
 
 			for k, v := range rollout.Segment.Segments {
-				segmentKeys = append(segmentKeys, k)
 				matched, reason, err := s.matchConstraints(r.Context, v.Constraints, v.MatchType, r.EntityId)
 				if err != nil {
 					return nil, err
@@ -417,6 +418,7 @@ func (s *Server) boolean(ctx context.Context, store storage.ReadOnlyStore, env e
 				// if we don't match the segment, fall through to the next rollout.
 				if matched {
 					s.logger.Debug(reason)
+					segmentKeys = append(segmentKeys, k)
 					segmentMatches++
 				}
 			}
@@ -437,6 +439,7 @@ func (s *Server) boolean(ctx context.Context, store storage.ReadOnlyStore, env e
 			resp.Enabled = rollout.Segment.Value
 			resp.Reason = rpcevaluation.EvaluationReason_MATCH_EVALUATION_REASON
 			resp.FlagKey = flag.Key
+			resp.SegmentKeys = segmentKeys
 
 			s.logger.Debug("segment based matched", zap.Int("rank", int(rollout.Rank)), zap.Strings("segments", segmentKeys))
 			return resp, nil

internal/server/evaluation/evaluation_test.go

@@ -505,6 +505,7 @@ func TestBoolean_PercentageRuleFallthrough_SegmentMatch(t *testing.T) {
 	assert.True(t, res.Enabled)
 	assert.Equal(t, rpcevaluation.EvaluationReason_MATCH_EVALUATION_REASON, res.Reason)
 	assert.Equal(t, flagKey, res.FlagKey)
+	assert.Equal(t, []string{"test-segment"}, res.SegmentKeys)
 }
 
 func TestBoolean_SegmentMatch_MultipleConstraints(t *testing.T) {
@@ -1172,7 +1173,6 @@ func Test_matchesString(t *testing.T) {
 			wantMatch: true,
 		},
 		{
-
 			name: "contains",
 			constraint: storage.EvaluationConstraint{
 				Property: "foo",
@@ -1183,7 +1183,6 @@ func Test_matchesString(t *testing.T) {
 			wantMatch: true,
 		},
 		{
-
 			name: "negative contains",
 			constraint: storage.EvaluationConstraint{
 				Property: "foo",

internal/server/evaluation/ofrep_bridge.go

@@ -129,6 +129,7 @@ func (s *Server) OFREPFlagEvaluation(ctx context.Context, r *ofrep.EvaluateFlagR
 				tracing.AttributeFlag.String(r.Key),
 				tracing.AttributeValue.Bool(resp.Enabled),
 				tracing.AttributeReason.String(resp.Reason.String()),
+				tracing.AttributeSegments.StringSlice(resp.SegmentKeys),
 				tracing.AttributeFlagTypeBoolean,
 			))
 		}

rpc/flipt/audit/event.pb.go

@@ -65,6 +65,7 @@ message BooleanEvaluationResponse {
   double request_duration_millis = 4;
   google.protobuf.Timestamp timestamp = 5;
   string flag_key = 6;
+  repeated string segment_keys = 7;
 }
 
 message VariantEvaluationResponse {