use updated schema

Author: typotter

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/internal/aggregation/AggregationStats.kt

@@ -106,10 +106,10 @@ internal class AggregationStats(
 
         return FlagEvaluation(
             timestamp = snapshotFirst,
-            flag = FlagEvaluation.Flag(aggregationKey.flagKey),
-            variant = aggregationKey.variantKey?.let { FlagEvaluation.Flag(it) },
-            allocation = aggregationKey.allocationKey?.let { FlagEvaluation.Flag(it) },
-            targetingRule = null, // Not applicable
+            flag = FlagEvaluation.Identifier(aggregationKey.flagKey),
+            variant = aggregationKey.variantKey?.let { FlagEvaluation.Identifier(it) },
+            allocation = aggregationKey.allocationKey?.let { FlagEvaluation.Identifier(it) },
+            targetingRule = null,
             targetingKey = aggregationKey.targetingKey,
             context = eventContext,
             error = snapshotMessage?.let { FlagEvaluation.Error(message = it) },

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/internal/storage/EvaluationEventRecordWriter.kt

@@ -11,7 +11,7 @@ import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.api.storage.EventType
 import com.datadog.android.api.storage.RawBatchEvent
 import com.datadog.android.flags.internal.EvaluationEventWriter
-import com.datadog.android.flags.model.BatchedFlagEvaluations
+import com.datadog.android.flags.model.FlagEvaluation
 
 /**
  * Persists serialized flag evaluation events to SDK Core storage.
@@ -20,7 +20,7 @@ import com.datadog.android.flags.model.BatchedFlagEvaluations
  * to the EVP intake endpoint by the SDK Core's upload mechanism.
  */
 internal class EvaluationEventRecordWriter(private val sdkCore: FeatureSdkCore) : EvaluationEventWriter {
-    override fun writeAll(events: List<BatchedFlagEvaluations.FlagEvaluation>) {
+    override fun writeAll(events: List<FlagEvaluation>) {
         if (events.isEmpty()) return
 
         sdkCore.getFeature(Feature.FLAGS_EVALUATIONS_FEATURE_NAME)

features/dd-sdk-android-flags/src/test/kotlin/com/datadog/android/flags/internal/storage/EvaluationEventRecordWriterTest.kt

@@ -14,7 +14,7 @@ import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.api.storage.EventBatchWriter
 import com.datadog.android.api.storage.EventType
 import com.datadog.android.api.storage.RawBatchEvent
-import com.datadog.android.flags.model.BatchedFlagEvaluations
+import com.datadog.android.flags.model.FlagEvaluation
 import com.datadog.android.flags.utils.forge.ForgeConfigurator
 import fr.xgouchet.elmyr.annotation.Forgery
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
@@ -59,9 +59,9 @@ internal class EvaluationEventRecordWriterTest {
 
     @Test
     fun `M write all events to storage W writeAll() { multiple events }`(
-        @Forgery event1: BatchedFlagEvaluations.FlagEvaluation,
-        @Forgery event2: BatchedFlagEvaluations.FlagEvaluation,
-        @Forgery event3: BatchedFlagEvaluations.FlagEvaluation
+        @Forgery event1: FlagEvaluation,
+        @Forgery event2: FlagEvaluation,
+        @Forgery event3: FlagEvaluation
     ) {
         // Given
         val events = listOf(event1, event2, event3)
@@ -102,7 +102,7 @@ internal class EvaluationEventRecordWriterTest {
 
     @Test
     fun `M use write context W writeAll() { events provided }`(
-        @Forgery event: BatchedFlagEvaluations.FlagEvaluation
+        @Forgery event: FlagEvaluation
     ) {
         // Given
         whenever(mockSdkCore.getFeature(Feature.FLAGS_EVALUATIONS_FEATURE_NAME)).thenReturn(mockFeature)
@@ -134,8 +134,8 @@ internal class EvaluationEventRecordWriterTest {
 
     @Test
     fun `M do nothing W writeAll() { feature not available }`(
-        @Forgery event1: BatchedFlagEvaluations.FlagEvaluation,
-        @Forgery event2: BatchedFlagEvaluations.FlagEvaluation
+        @Forgery event1: FlagEvaluation,
+        @Forgery event2: FlagEvaluation
     ) {
         // Given
         val events = listOf(event1, event2)
@@ -152,12 +152,12 @@ internal class EvaluationEventRecordWriterTest {
     @Test
     fun `M serialize events correctly W writeAll() { events with all fields }`() {
         // Given - event with all fields populated
-        val event = BatchedFlagEvaluations.FlagEvaluation(
+        val event = FlagEvaluation(
             timestamp = 1234567890L,
-            flag = BatchedFlagEvaluations.Identifier("test-flag"),
-            variant = BatchedFlagEvaluations.Identifier("variant-a"),
-            allocation = BatchedFlagEvaluations.Identifier("allocation-1"),
-            targetingRule = BatchedFlagEvaluations.Identifier("rule-1"),
+            flag = FlagEvaluation.Identifier("test-flag"),
+            variant = FlagEvaluation.Identifier("variant-a"),
+            allocation = FlagEvaluation.Identifier("allocation-1"),
+            targetingRule = FlagEvaluation.Identifier("rule-1"),
             targetingKey = "user-123",
             context = null,
             error = null,
@@ -195,7 +195,7 @@ internal class EvaluationEventRecordWriterTest {
 
     @Test
     fun `M write event with UTF-8 encoding W writeAll() { event provided }`(
-        @Forgery event: BatchedFlagEvaluations.FlagEvaluation
+        @Forgery event: FlagEvaluation
     ) {
         // Given
         whenever(mockSdkCore.getFeature(Feature.FLAGS_EVALUATIONS_FEATURE_NAME)).thenReturn(mockFeature)

features/dd-sdk-android-flags/src/test/kotlin/com/datadog/android/flags/utils/forge/FlagEvaluationForgeryFactory.kt

@@ -21,18 +21,18 @@ internal class FlagEvaluationForgeryFactory : ForgeryFactory<FlagEvaluation> {
 
         return FlagEvaluation(
             timestamp = firstEvalTimestamp,
-            flag = FlagEvaluation.Flag(forge.anAlphabeticalString()),
+            flag = FlagEvaluation.Identifier(forge.anAlphabeticalString()),
             variant = if (!isDefaultOrError) {
-                FlagEvaluation.Flag(forge.anAlphabeticalString())
+                FlagEvaluation.Identifier(forge.anAlphabeticalString())
             } else {
                 null
             },
             allocation = if (!isDefaultOrError) {
-                FlagEvaluation.Flag(forge.anAlphabeticalString())
+                FlagEvaluation.Identifier(forge.anAlphabeticalString())
             } else {
                 null
             },
-            targetingRule = null, // Not currently tracked
+            targetingRule = null,
             targetingKey = forge.aNullable { forge.anAlphabeticalString() },
             context = null,
             error = if (hasError) {