Add envId field to Match class to report environment ID

sdk/src/main/java/com/reforge/sdk/config/Match.java

@@ -13,21 +13,24 @@ public class Match {
   private final int rowIndex;
   private final int conditionalValueIndex;
   private final Optional<Integer> weightedValueIndex;
+  private final Optional<Long> envId;
 
   public Match(
     Prefab.ConfigValue configValue,
     ConfigElement configElement,
     List<EvaluatedCriterion> evaluatedCriterion,
     int rowIndex,
     int conditionalValueIndex,
-    Optional<Integer> weightedValueIndex
+    Optional<Integer> weightedValueIndex,
+    Optional<Long> envId
   ) {
     this.configValue = configValue;
     this.configElement = configElement;
     this.evaluatedCriterion = evaluatedCriterion;
     this.rowIndex = rowIndex;
     this.conditionalValueIndex = conditionalValueIndex;
     this.weightedValueIndex = weightedValueIndex;
+    this.envId = envId;
   }
 
   public int getRowIndex() {
@@ -42,6 +45,10 @@ public Optional<Integer> getWeightedValueIndex() {
     return weightedValueIndex;
   }
 
+  public Optional<Long> getEnvId() {
+    return envId;
+  }
+
   public Prefab.ConfigValue getConfigValue() {
     return configValue;
   }
@@ -74,6 +81,7 @@ public String toString() {
       .add("rowIndex", rowIndex)
       .add("conditionalValueIndex", conditionalValueIndex)
       .add("weightedValueIndex", weightedValueIndex)
+      .add("envId", envId)
       .toString();
   }
 }

sdk/src/main/java/com/reforge/sdk/internal/ConfigResolver.java

@@ -89,7 +89,8 @@ private Match reify(Match match, LookupContext lookupContext) {
       match.getEvaluatedCriterion(),
       match.getRowIndex(),
       match.getConditionalValueIndex(),
-      match.getWeightedValueIndex()
+      match.getWeightedValueIndex(),
+      match.getEnvId()
     );
   }
 

sdk/src/main/java/com/reforge/sdk/internal/ConfigRuleEvaluator.java

@@ -113,7 +113,8 @@ private Optional<Match> getMatch(
               conditionalValueIndex,
               lookupContext,
               rowPropertiesStack,
-              configElement
+              configElement,
+              configRow
             );
 
             if (optionalMatch.isPresent()) {
@@ -145,7 +146,8 @@ private Optional<Match> evaluateConditionalValue(
     int conditionalValueIndex,
     LookupContext lookupContext,
     Deque<Map<String, Prefab.ConfigValue>> rowProperties,
-    ConfigElement configElement
+    ConfigElement configElement,
+    Prefab.ConfigRow configRow
   ) {
     List<EvaluatedCriterion> evaluatedCriteria = new ArrayList<>();
     for (Prefab.Criterion criterion : conditionalValue.getCriteriaList()) {
@@ -167,7 +169,8 @@ private Optional<Match> evaluateConditionalValue(
         conditionalValueIndex,
         configElement,
         lookupContext,
-        evaluatedCriteria
+        evaluatedCriteria,
+        configRow
       )
     );
   }
@@ -181,8 +184,13 @@ private Match simplifyToMatch(
     int conditionalValueIndex,
     ConfigElement configElement,
     LookupContext lookupContext,
-    List<EvaluatedCriterion> evaluatedCriteria
+    List<EvaluatedCriterion> evaluatedCriteria,
+    Prefab.ConfigRow configRow
   ) {
+    Optional<Long> envId = configRow.hasProjectEnvId()
+      ? Optional.of(configRow.getProjectEnvId())
+      : Optional.empty();
+
     if (selectedConditionalValue.getValue().hasWeightedValues()) {
       WeightedValueEvaluator.Result result = weightedValueEvaluator.toResult(
         selectedConditionalValue.getValue().getWeightedValues(),
@@ -195,7 +203,8 @@ private Match simplifyToMatch(
         evaluatedCriteria,
         (int) rowIndex,
         conditionalValueIndex,
-        Optional.of(result.getIndex())
+        Optional.of(result.getIndex()),
+        envId
       );
     } else {
       return new Match(
@@ -204,7 +213,8 @@ private Match simplifyToMatch(
         evaluatedCriteria,
         (int) rowIndex,
         conditionalValueIndex,
-        Optional.empty()
+        Optional.empty(),
+        envId
       );
     }
   }

sdk/src/test/java/com/reforge/sdk/internal/ConfigResolverTest.java

@@ -241,6 +241,7 @@ Match match(Prefab.ConfigValue configValue, Prefab.Config config) {
       Collections.emptyList(),
       0,
       0,
+      Optional.empty(),
       Optional.empty()
     );
   }

sdk/src/test/java/com/reforge/sdk/internal/MatchStatsAggregatorTest.java

@@ -69,6 +69,7 @@ void itAggregates() {
         Collections.emptyList(),
         0,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       101
@@ -81,6 +82,7 @@ void itAggregates() {
         Collections.emptyList(),
         0,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       102
@@ -93,6 +95,7 @@ void itAggregates() {
         Collections.emptyList(),
         0,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       102
@@ -108,6 +111,7 @@ void itAggregates() {
         Collections.emptyList(),
         0,
         3,
+        Optional.empty(),
         Optional.empty()
       ),
       107

sdk/src/test/java/com/reforge/sdk/internal/TelemetryManagerTest.java

@@ -358,6 +358,7 @@ private static void reportSomeMatches(TelemetryManager telemetryManager) {
         Collections.emptyList(),
         1,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       new LookupContext(
@@ -379,6 +380,7 @@ private static void reportSomeMatches(TelemetryManager telemetryManager) {
         Collections.emptyList(),
         1,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       new LookupContext(
@@ -400,6 +402,7 @@ private static void reportSomeMatches(TelemetryManager telemetryManager) {
         Collections.emptyList(),
         1,
         2,
+        Optional.empty(),
         Optional.empty()
       ),
       new LookupContext(
@@ -418,6 +421,7 @@ private static void reportSomeMatches(TelemetryManager telemetryManager) {
         Collections.emptyList(),
         0,
         0,
+        Optional.empty(),
         Optional.empty()
       ),
       new LookupContext(
@@ -436,6 +440,7 @@ private static void reportSomeMatches(TelemetryManager telemetryManager) {
         Collections.emptyList(),
         0,
         0,
+        Optional.empty(),
         Optional.empty()
       ),
       new LookupContext(