Merge branch 'main' into put-context-spec

spotify · Nov 12, 2024 · 4553324 · 4553324
2 parents 90f06f1 + 558c811
commit 4553324
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/ConfidenceDemoApp/ConfidenceDemoApp/ConfidenceDemoApp.swift b/ConfidenceDemoApp/ConfidenceDemoApp/ConfidenceDemoApp.swift
@@ -20,7 +20,10 @@ struct ConfidenceDemoApp: App {
         WindowGroup {
             let secret = ProcessInfo.processInfo.environment["CLIENT_SECRET"] ?? ""
             let confidence = Confidence.Builder(clientSecret: secret, loggerLevel: .TRACE)
-                .withContext(initialContext: ["targeting_key": ConfidenceValue(string: UUID.init().uuidString)])
+                .withContext(initialContext: [
+                    "targeting_key": ConfidenceValue(string: UUID.init().uuidString),
+                    "user_id": .init(string: "user2")
+                ])
                 .build()
 
             let status = Status()

diff --git a/Sources/Confidence/Confidence.swift b/Sources/Confidence/Confidence.swift
@@ -154,7 +154,8 @@ public class Confidence: ConfidenceEventSender {
                 flagName: key,
                 defaultValue: defaultValue,
                 context: getContext(),
-                flagApplier: flagApplier
+                flagApplier: flagApplier,
+                debugLogger: debugLogger
             )
         }
     }

diff --git a/Sources/Confidence/DebugLogger.swift b/Sources/Confidence/DebugLogger.swift
@@ -6,6 +6,7 @@ internal protocol DebugLogger {
     func logMessage(message: String, isWarning: Bool)
     func logFlags(action: String, flag: String)
     func logContext(action: String, context: ConfidenceStruct)
+    func logResolveDebugURL(flagName: String, context: ConfidenceStruct)
 }
 
 private extension Logger {
@@ -15,6 +16,16 @@ private extension Logger {
 }
 
 internal class DebugLoggerImpl: DebugLogger {
+    private let encoder = JSONEncoder()
+
+    func logResolveDebugURL(flagName: String, context: ConfidenceStruct) {
+        let ctxNetworkValue = TypeMapper.convert(structure: context)
+        if let ctxNetworkData = try? encoder.encode(ctxNetworkValue),
+        let ctxNetworkString = String(data: ctxNetworkData, encoding: .utf8) {
+            log(messageLevel: .DEBUG, message: "[Resolve Debug] https://app.confidence.spotify.com/flags/resolver-test?flag=flags/\(flagName)&context=\(ctxNetworkString)")
+        }
+    }
+
     private let loggerLevel: LoggerLevel
 
     init(loggerLevel: LoggerLevel) {

diff --git a/Sources/Confidence/FlagEvaluation.swift b/Sources/Confidence/FlagEvaluation.swift
@@ -29,7 +29,8 @@ extension FlagResolution {
         flagName: String,
         defaultValue: T,
         context: ConfidenceStruct,
-        flagApplier: FlagApplier? = nil
+        flagApplier: FlagApplier? = nil,
+        debugLogger: DebugLogger? = nil
     ) -> Evaluation<T> {
         do {
             let parsedKey = try FlagPath.getPath(for: flagName)
@@ -44,6 +45,10 @@ extension FlagResolution {
                 )
             }
 
+            if let debugLogger = debugLogger {
+                debugLogger.logResolveDebugURL(flagName: parsedKey.flag, context: context)
+            }
+
             if let evaluation = checkBackendErrors(resolvedFlag: resolvedFlag, defaultValue: defaultValue) {
                 return evaluation
             }

diff --git a/Tests/ConfidenceTests/Helpers/DebugLoggerFake.swift b/Tests/ConfidenceTests/Helpers/DebugLoggerFake.swift
@@ -25,6 +25,10 @@ internal class DebugLoggerFake: DebugLogger {
         // no-op
     }
 
+    func logResolveDebugURL(flagName: String, context: ConfidenceStruct) {
+        // no-op
+    }
+
     func getUploadBatchSuccessCount() -> Int {
         return uploadBatchSuccessCounter.get()
     }