Merge pull request #2735 from DataDog/eric.petzel/rum-ff-tracking-variant-key

use variant key instead of value in RUM feature flag tracking

Author: petzel

Datadog/IntegrationUnitTests/Flags/FlagsRUMIntegrationTests.swift

@@ -98,7 +98,7 @@ final class FlagsRUMIntegrationTests: XCTestCase {
         )
 
         XCTAssertEqual(featureFlags.count, 2)
-        XCTAssertEqual(featureFlags["boolean-flag"] as? Bool, boolValue)
-        XCTAssertEqual(featureFlags["string-flag"] as? String, stringValue)
+        XCTAssertEqual(featureFlags["boolean-flag"] as? String, "variation-124")
+        XCTAssertEqual(featureFlags["string-flag"] as? String, "variation-123")
     }
 }

DatadogFlags/Sources/Client/FlagsClient.swift

@@ -251,12 +251,12 @@ extension FlagsClient: FlagsClientProtocol {
             reason: flagAssignment.reason
         )
 
-        trackEvaluation(key: key, assignment: flagAssignment, value: value, context: context)
+        trackEvaluation(key: key, assignment: flagAssignment, context: context)
 
         return details
     }
 
-    internal func trackEvaluation(key: String, assignment: FlagAssignment, value: FlagValue, context: FlagsEvaluationContext) {
+    private func trackEvaluation(key: String, assignment: FlagAssignment, context: FlagsEvaluationContext) {
         exposureLogger.logExposure(
             for: key,
             assignment: assignment,
@@ -272,7 +272,7 @@ extension FlagsClient: FlagsClientProtocol {
 
         rumFlagEvaluationReporter.sendFlagEvaluation(
             flagKey: key,
-            value: value
+            value: assignment.variationKey
         )
     }
 }
@@ -287,16 +287,6 @@ extension FlagsClient: FlagsClientInternal {
 
     @_spi(Internal)
     public func sendFlagEvaluation(key: String, assignment: FlagAssignment, context: FlagsEvaluationContext) {
-        var value: FlagValue
-        switch assignment.variation {
-        case .boolean(let v): value = v
-        case .string(let v): value = v
-        case .integer(let v): value = v
-        case .double(let v): value = v
-        case .object(let v): value = v
-        case .unknown: value = AnyValue.null
-        }
-
-        trackEvaluation(key: key, assignment: assignment, value: value, context: context)
+        trackEvaluation(key: key, assignment: assignment, context: context)
     }
 }

DatadogFlags/Tests/Client/FlagsClientTests.swift

@@ -544,34 +544,31 @@ final class FlagsClientTests: XCTestCase {
         XCTAssertEqual(exposureLogger.logExposureCalls[0].assignment, booleanAssignment)
         XCTAssertEqual(exposureLogger.logExposureCalls[0].context.targetingKey, "user-123")
         XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[0].0, "bool-flag")
-        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[0].1 as? Bool, true)
+        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[0].1 as? String, "var-1")
 
         // Test string tracking
         XCTAssertEqual(exposureLogger.logExposureCalls[1].flagKey, "string-flag")
         XCTAssertEqual(exposureLogger.logExposureCalls[1].assignment, stringAssignment)
         XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[1].0, "string-flag")
-        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[1].1 as? String, "test")
+        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[1].1 as? String, "var-2")
 
         // Test integer tracking
         XCTAssertEqual(exposureLogger.logExposureCalls[2].flagKey, "int-flag")
         XCTAssertEqual(exposureLogger.logExposureCalls[2].assignment, integerAssignment)
         XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[2].0, "int-flag")
-        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[2].1 as? Int, 42)
+        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[2].1 as? String, "var-3")
 
         // Test double tracking
         XCTAssertEqual(exposureLogger.logExposureCalls[3].flagKey, "double-flag")
         XCTAssertEqual(exposureLogger.logExposureCalls[3].assignment, doubleAssignment)
         XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[3].0, "double-flag")
-        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[3].1 as? Double, 3.14)
+        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[3].1 as? String, "var-4")
 
         // Test object tracking
         XCTAssertEqual(exposureLogger.logExposureCalls[4].flagKey, "object-flag")
         XCTAssertEqual(exposureLogger.logExposureCalls[4].assignment, objectAssignment)
         XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[4].0, "object-flag")
-        XCTAssertEqual(
-            rumFlagEvaluationReporter.sendFlagEvaluationCalls[4].1 as? AnyValue,
-            .dictionary(["key": .string("value")])
-        )
+        XCTAssertEqual(rumFlagEvaluationReporter.sendFlagEvaluationCalls[4].1 as? String, "var-5")
 
         // Test evaluation logging
         XCTAssertEqual(evaluationLogger.logEvaluationCalls.count, 5)