chore(nimbus): Update External Configs (#15638)

SUMMARY:

SUCCESS:

fenix at main (6e32b4962597e60549f9fc289aa627cae508887c) version None
fenix at main (6e32b4962597e60549f9fc289aa627cae508887c) version 152.0.0
firefox_ios at main (17dfdbb56f39d99c4214d49dd3566dbeb167d606) version
None
firefox_ios at release/v151.0 (86de6b1abdcd59e48dfa236ee323496583b24168)
version 151.0.1
firefox_ios at release/v151.1 (e5dd824f75bff304dbe19b8a08bb0777d9393f95)
version 151.1.0
firefox_ios at firefox-v151.0 (c5f54f750bc1c32c555647aee66f17820eaac86b)
version 151.0.0
firefox_ios at main (17dfdbb56f39d99c4214d49dd3566dbeb167d606) version
151.2.0
monitor_cirrus at main (1abaee080a291ffbe55962f75cf415cd07a3c319)
version None
firefox_accounts_cirrus at main
(781fda24f9a3d92740aeedb0fb6cd86424e49030) version None
firefox_desktop at main (6e32b4962597e60549f9fc289aa627cae508887c)
version None
firefox_desktop at main (6e32b4962597e60549f9fc289aa627cae508887c)
version 152.0.0
subplat_cirrus at main (781fda24f9a3d92740aeedb0fb6cd86424e49030)
version None

CACHED:

fenix at release (91d93ddd290c6fc70df44dbdc363fc5a0a6306c5) version
151.0.0 (cached)
firefox_ios at release/v147.0 (b4245fd8bf7e102c01055a1c4b418afa48093429)
version 147.0.1 (cached)
firefox_ios at release/v147.1 (a220c06a8c6c3bb57c19049d903d6a37396df085)
version 147.1.1 (cached)
firefox_ios at release/v147.2 (306eb1b46e5c1672ef7c8901cca054ff46b4ae82)
version 147.2.2 (cached)
firefox_ios at release/v147.3 (9c2728a4bba87405151a16d0a63eccf3c1f29163)
version 147.3.1 (cached)
firefox_ios at release/v147.4 (95fef469924d431d1a00ce04647eecccbf213812)
version 147.4.1 (cached)
firefox_ios at release/v147.5 (bf74916de8790bdc7c88531e15ab17d6ec56b04f)
version 147.5.1 (cached)
firefox_ios at release/v148.0 (090b4555b4c20a97bbfc85fbf02440bcfd406610)
version 148.0.1 (cached)
firefox_ios at release/v148.1 (96b1d7dd87685b82b8e2a0c165fc60c3b4d9cc8f)
version 148.1.1 (cached)
firefox_ios at release/v148.2 (71f2e2c632ea875b85dcaec25b0aa4fa3519ba97)
version 148.2.1 (cached)
firefox_ios at release/v148.3 (0edc073a6f3b69d0883f64c4310be2a6aa30ecc5)
version 148.3.1 (cached)
firefox_ios at release/v149.0 (a679ff252ca3a82c36c1ef5291a4d1d936034c31)
version 149.0.1 (cached)
firefox_ios at release/v149.1 (93f6fc2bcd799f74753248ea94938f2a0e1f7cf7)
version 149.1.1 (cached)
firefox_ios at release/v149.2 (b368baf2e257abe8d624710052c6fe788e0b1aee)
version 149.2.1 (cached)
firefox_ios at release/v149.3 (a087b05d51d14859bc6b217067c104acecdbe5b2)
version 149.3.1 (cached)
firefox_ios at release/v150.0 (251a757be907f072173c4173dae2804c79e0170d)
version 150.0.1 (cached)
firefox_ios at release/v150.1 (9998525d32525e507ad894bf734cc89d19f6ba62)
version 150.1.1 (cached)
firefox_ios at release/v150.2 (3105b1d8b15ad82a4794b15ba3e09ed0bd7801d6)
version 150.2.1 (cached)
firefox_ios at release/v150.3 (a88b27cb23568f0b7e8f7e782e393a882e74fd6e)
version 150.3.1 (cached)
firefox_ios at firefox-v150.3 (f8f596bfd2b5ca83a77d8bf54eb3d2cbec395671)
version 150.3.0 (cached)
firefox_ios at firefox-v150.2 (e50ecad2a9ff5721f95e66419b3c025aaa4b951c)
version 150.2.0 (cached)
firefox_ios at firefox-v150.1 (341e96bda4dd657970d3c0db7f71b08f9eadb395)
version 150.1.0 (cached)
firefox_ios at firefox-v150.0 (a931ff36e4b0152c6a0e9d98a5106fa849a5c1d3)
version 150.0.0 (cached)
firefox_ios at firefox-v149.3 (60411c8b13399ab88ab5063076e867c85e42f4a7)
version 149.3.0 (cached)
firefox_ios at firefox-v149.2 (bbf01266055948c34e58ab25d6c77d73d8592acc)
version 149.2.0 (cached)
firefox_ios at firefox-v149.1 (56fa93d90f435d10977e675aac4d679f1d256e3a)
version 149.1.0 (cached)
firefox_ios at firefox-v149.0 (9db4bd51a49cfef1593cd30d07d314b21cc639a1)
version 149.0.0 (cached)
firefox_ios at firefox-v148.3 (1b5be10df86c50e67cea5cc55d6e9dbe66921da9)
version 148.3.0 (cached)
firefox_ios at firefox-v148.2 (f1efef1c856662666006ed563686ed39c4e0cade)
version 148.2.0 (cached)
firefox_ios at firefox-v148.1 (981a01118303b8707b432e1d73040e8fd1c9cf8a)
version 148.1.0 (cached)
firefox_ios at firefox-v148.0 (beacfdda9beb2af76455521594ebfe2fb5b53824)
version 148.0.0 (cached)
firefox_ios at firefox-v147.5 (419dce5232746280706aeb1a777f95b3d76f84ff)
version 147.5.0 (cached)
firefox_ios at firefox-v147.4 (1fe8bc1836b4326ec15207c61b1363fe83f53a92)
version 147.4.0 (cached)
firefox_ios at firefox-v147.3 (33730a472dd94e2638307078cf2ffd124d12db21)
version 147.3.0 (cached)
firefox_ios at firefox-v147.2 (1931e0204698064de1e292ea873b617cf44b1244)
version 147.2.0 (cached)
firefox_ios at firefox-v147.1 (9e21c0bc53bb598ded45b478077a3b2bd17266db)
version 147.1.0 (cached)
firefox_ios at firefox-v147.0 (f46e2b4822278910a63f8aaf0ad753ce6504f9b4)
version 147.0.0 (cached)
firefox_desktop at release (91d93ddd290c6fc70df44dbdc363fc5a0a6306c5)
version 151.0.0 (cached)
firefox_desktop at esr115 (84341e2725284f1e82f53127f28289454daee783)
version 115.36.0 (cached)
firefox_desktop at esr128 (ed38f9209e39bd7ad247c81a7c20c99c874e0a62)
version 128.14.1 (cached)
firefox_desktop at esr140 (ef9fef7a9928dfbea50e89a256d44492c2d28ca1)
version 140.11.0 (cached)

Co-authored-by: Experimenter Bot <experimenter-ci-bot@mozilla.com>

Author: experimenter-github-app[bot]

experimenter/experimenter/features/manifests/fenix/.ref-cache.yaml

@@ -1,3 +1,3 @@
 beta: 83e871927810f621bb3067b265649aa9505ad84f
-main: e374045fac6f19383a04d087d2930ced5c1551fe
+main: 6e32b4962597e60549f9fc289aa627cae508887c
 release: 91d93ddd290c6fc70df44dbdc363fc5a0a6306c5

experimenter/experimenter/features/manifests/firefox-desktop/.ref-cache.yaml

@@ -2,5 +2,5 @@ beta: 83e871927810f621bb3067b265649aa9505ad84f
 esr115: 84341e2725284f1e82f53127f28289454daee783
 esr128: ed38f9209e39bd7ad247c81a7c20c99c874e0a62
 esr140: ef9fef7a9928dfbea50e89a256d44492c2d28ca1
-main: e374045fac6f19383a04d087d2930ced5c1551fe
+main: 6e32b4962597e60549f9fc289aa627cae508887c
 release: 91d93ddd290c6fc70df44dbdc363fc5a0a6306c5

experimenter/experimenter/features/manifests/ios/.ref-cache.yaml

@@ -90,7 +90,8 @@ firefox-v150.0: a931ff36e4b0152c6a0e9d98a5106fa849a5c1d3
 firefox-v150.1: 341e96bda4dd657970d3c0db7f71b08f9eadb395
 firefox-v150.2: e50ecad2a9ff5721f95e66419b3c025aaa4b951c
 firefox-v150.3: f8f596bfd2b5ca83a77d8bf54eb3d2cbec395671
-main: a1f774839a3023e070a74b13f1773af661872e77
+firefox-v151.0: c5f54f750bc1c32c555647aee66f17820eaac86b
+main: 17dfdbb56f39d99c4214d49dd3566dbeb167d606
 release/v117: 43b690c450066d4dde1b2ccb93ed3714d244d502
 release/v118: 89a7ea3c3372e5a4ef5b3c5b85499d26198d0524
 release/v119: 7dc381f991c6d2a983c3ba7f0cffd880e8c29e7b
@@ -150,7 +151,8 @@ release/v150.0: 251a757be907f072173c4173dae2804c79e0170d
 release/v150.1: 9998525d32525e507ad894bf734cc89d19f6ba62
 release/v150.2: 3105b1d8b15ad82a4794b15ba3e09ed0bd7801d6
 release/v150.3: a88b27cb23568f0b7e8f7e782e393a882e74fd6e
-release/v151.0: c5f54f750bc1c32c555647aee66f17820eaac86b
+release/v151.0: 86de6b1abdcd59e48dfa236ee323496583b24168
+release/v151.1: e5dd824f75bff304dbe19b8a08bb0777d9393f95
 v117.0: 3b275ab1e4ccef769d84437033c0c68acfd2df8a
 v117.1: 55ddcf473a65d106d43f6d2ae5af4076d6d03688
 v117.2: 5cc367aa8857199cd8a54d53e8faf6696c5614c3

experimenter/experimenter/features/manifests/ios/v151.0.1/RecordedNimbusContext.swift

@@ -0,0 +1,226 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+import Common
+import Foundation
+import Glean
+import Shared
+
+import class MozillaAppServices.NimbusGleanPings
+import func MozillaAppServices.getCalculatedAttributes
+import func MozillaAppServices.getLocaleTag
+import struct MozillaAppServices.JsonObject
+import protocol MozillaAppServices.RecordedContext
+import MozillaRustComponents
+
+private extension Double? {
+    func toInt64() -> Int64? {
+        guard let self = self else { return nil }
+        return Int64(self)
+    }
+}
+
+extension Int32? {
+    func toInt64() -> Int64? {
+        guard let self = self else { return nil }
+        return Int64(self)
+    }
+}
+
+/// TODO(FXIOS-12942): Implement proper thread-safety
+final class RecordedNimbusContext: RecordedContext, @unchecked Sendable {
+    /**
+     * The following constants are string constants of the keys that appear in the [EVENT_QUERIES] map.
+     */
+    static let DAYS_OPENED_IN_LAST_28 = "days_opened_in_last_28"
+
+    /**
+     * [EVENT_QUERIES] is a map of keys to Nimbus SDK EventStore queries.
+     */
+    static let EVENT_QUERIES = [
+        DAYS_OPENED_IN_LAST_28: "'events.app_opened'|eventCountNonZero('Days', 28, 0)",
+    ]
+
+    var isFirstRun: Bool
+    var isPhone: Bool
+    var isDefaultBrowser: Bool
+    var isBottomToolbarUser: Bool
+    var hasEnabledTipsNotifications: Bool
+    var hasAcceptedTermsOfUse: Bool
+    var userDisabledAi: Bool
+    var isAppleIntelligenceAvailable: Bool
+    var cannotUseAppleIntelligence: Bool
+    var appVersion: String?
+    var region: String?
+    var language: String?
+    var locale: String
+    var daysSinceInstall: Int32?
+    var daysSinceUpdate: Int32?
+    var touExperiencePoints: Int32?
+
+    private var eventQueries: [String: String]
+    private var eventQueryValues: [String: Double] = [:]
+
+    private var logger: Logger
+
+    init(isFirstRun: Bool,
+         isDefaultBrowser: Bool,
+         isBottomToolbarUser: Bool,
+         hasEnabledTipsNotifications: Bool,
+         hasAcceptedTermsOfUse: Bool,
+         userDisabledAi: Bool,
+         isAppleIntelligenceAvailable: Bool,
+         cannotUseAppleIntelligence: Bool,
+         eventQueries: [String: String] = RecordedNimbusContext.EVENT_QUERIES,
+         isPhone: Bool = UIDeviceDetails.userInterfaceIdiom == .phone,
+         bundle: Bundle = Bundle.main,
+         logger: Logger = DefaultLogger.shared) {
+        self.logger = logger
+        logger.log("init start", level: .debug, category: .experiments)
+        self.eventQueries = eventQueries
+
+        self.isFirstRun = isFirstRun
+        self.isPhone = isPhone
+        self.isDefaultBrowser = isDefaultBrowser
+        self.isBottomToolbarUser = isBottomToolbarUser
+        self.hasEnabledTipsNotifications = hasEnabledTipsNotifications
+        self.hasAcceptedTermsOfUse = hasAcceptedTermsOfUse
+        self.userDisabledAi  = userDisabledAi
+        self.isAppleIntelligenceAvailable = isAppleIntelligenceAvailable
+        self.cannotUseAppleIntelligence = cannotUseAppleIntelligence
+
+        let info = bundle.infoDictionary ?? [:]
+        appVersion = info["CFBundleShortVersionString"] as? String
+
+        locale = getLocaleTag()
+        var inferredDateInstalledOn: Date? {
+            guard
+                let documentsURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last,
+                let attributes = try? FileManager.default.attributesOfItem(atPath: documentsURL.path)
+            else { return nil }
+            return attributes[.creationDate] as? Date
+        }
+        let installationDateSinceEpoch = inferredDateInstalledOn.map {
+            Int64(($0.timeIntervalSince1970 * 1000).rounded())
+        }
+        guard let dbPath = Experiments.dbPath else {
+            self.logger.log("Unable to obtain dbPath, skipping calculating attributes",
+                            level: .warning,
+                            category: .experiments)
+            return
+        }
+        guard let calculatedAttributes = try? getCalculatedAttributes(installationDate: installationDateSinceEpoch,
+                                                                      dbPath: dbPath,
+                                                                      locale: locale)
+        else { return }
+
+        daysSinceInstall = calculatedAttributes.daysSinceInstall
+        daysSinceUpdate = calculatedAttributes.daysSinceUpdate
+        language = calculatedAttributes.language
+        region = calculatedAttributes.region
+        touExperiencePoints = Experiments.touExperiencePoints(region: region)
+        self.logger.log("init end", level: .debug, category: .experiments)
+    }
+
+    /**
+     * [getEventQueries] is called by the Nimbus SDK Rust code to retrieve the map of event
+     * queries. The are then executed against the Nimbus SDK's EventStore to retrieve their values.
+     *
+     * @return Map<String, String>
+     */
+    func getEventQueries() -> [String: String] {
+        logger.log("getEventQueries", level: .debug, category: .experiments)
+        return eventQueries
+    }
+
+    /**
+     * [record] is called when experiment enrollments are evolved. It should apply the
+     * [RecordedNimbusContext]'s values to a [NimbusSystem.RecordedNimbusContextObject] instance,
+     * and use that instance to record the values to Glean.
+     */
+    func record() {
+        logger.log("record start", level: .debug, category: .experiments)
+
+        // Bring the ping into scope so that Glean knows it exists and includes NimbusSystem.recordedNimbusContext
+        _ = NimbusGleanPings.nimbusTargetingContext
+
+        let eventQueryValuesObject = GleanMetrics.NimbusSystem.RecordedNimbusContextObjectItemEventQueryValuesObject(
+            daysOpenedInLast28: eventQueryValues[RecordedNimbusContext.DAYS_OPENED_IN_LAST_28].toInt64()
+        )
+
+        GleanMetrics.NimbusSystem.recordedNimbusContext.set(
+            GleanMetrics.NimbusSystem.RecordedNimbusContextObject(
+                isFirstRun: isFirstRun,
+                eventQueryValues: eventQueryValuesObject,
+                isPhone: isPhone,
+                appVersion: appVersion,
+                locale: locale,
+                daysSinceInstall: daysSinceInstall.toInt64(),
+                daysSinceUpdate: daysSinceUpdate.toInt64(),
+                language: language,
+                region: region,
+                isDefaultBrowser: isDefaultBrowser,
+                isBottomToolbarUser: isBottomToolbarUser,
+                hasEnabledTipsNotifications: hasEnabledTipsNotifications,
+                hasAcceptedTermsOfUse: hasAcceptedTermsOfUse,
+                userDisabledAi: userDisabledAi,
+                isAppleIntelligenceAvailable: isAppleIntelligenceAvailable,
+                cannotUseAppleIntelligence: cannotUseAppleIntelligence,
+                touExperiencePoints: touExperiencePoints.toInt64()
+            )
+        )
+        logger.log("record end", level: .debug, category: .experiments)
+    }
+
+    /**
+     * [setEventQueryValues] is called by the Nimbus SDK Rust code after the event queries have been
+     * executed. The [eventQueryValues] should be written back to the Kotlin object.
+     *
+     * @param [eventQueryValues] The values for each query after they have been executed in the
+     * Nimbus SDK Rust environment.
+     */
+    func setEventQueryValues(eventQueryValues: [String: Double]) {
+        logger.log("setEventQueryValues", level: .debug, category: .experiments)
+        self.eventQueryValues = eventQueryValues
+    }
+
+    /**
+     * [toJson] is called by the Nimbus SDK Rust code after the event queries have been executed,
+     * and before experiment enrollments have been evolved. The value returned from this method
+     * will be applied directly to the Nimbus targeting context, and its keys/values take
+     * precedence over those in the main Nimbus targeting context.
+     *
+     * @return JsonObject
+     */
+    func toJson() -> JsonObject {
+        logger.log("toJson start", level: .debug, category: .experiments)
+        guard let data = try? JSONSerialization.data(withJSONObject: [
+            "is_first_run": isFirstRun,
+            "isFirstRun": "\(isFirstRun)",
+            "is_phone": isPhone,
+            "events": eventQueryValues,
+            "app_version": appVersion as Any,
+            "region": region as Any,
+            "language": language as Any,
+            "locale": locale as Any,
+            "days_since_install": daysSinceInstall as Any,
+            "days_since_update": daysSinceUpdate as Any,
+            "is_default_browser": isDefaultBrowser,
+            "is_bottom_toolbar_user": isBottomToolbarUser,
+            "has_enabled_tips_notifications": hasEnabledTipsNotifications,
+            "has_accepted_terms_of_use": hasAcceptedTermsOfUse,
+            "user_disabled_ai": userDisabledAi,
+            "is_apple_intelligence_available": isAppleIntelligenceAvailable,
+            "cannot_use_apple_intelligence": cannotUseAppleIntelligence,
+            "tou_experience_points": touExperiencePoints as Any
+        ]),
+            let jsonString = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as? String
+        else {
+            logger.log("toJson error thrown while creating JSON string", level: .warning, category: .experiments)
+            return "{}"
+        }
+        logger.log("toJson end", level: .debug, category: .experiments, extra: ["json": jsonString])
+        return jsonString
+    }
+}