Nightly auto-update (121.0.20231115050443)

Firefox Sync Engineering · Firefox Sync Engineering · commit 183e924a384c · 2023-11-15T08:03:16.000Z
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,13 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "992658f2ae57a8912faf8568bf716e727fda1e4c546b7cc80de1a9678e00eb2a"
-let version = "121.0.20231113221234"
-let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231113221234/artifacts/public/build/MozillaRustComponents.xcframework.zip"
+let checksum = "c47e120669f3ac89d88a19a4e42ac6755370c2ab16d96a430a7d3c6bc304d190"
+let version = "121.0.20231115050443"
+let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231115050443/artifacts/public/build/MozillaRustComponents.xcframework.zip"
 
 // Focus xcframework
-let focusChecksum = "111afd54cd5594e0997114c8bd109f77f4edb74fc8fc334dfb10ba61f2343e21"
-let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231113221234/artifacts/public/build/FocusRustComponents.xcframework.zip"
+let focusChecksum = "b9a36b6ab452437a6e4d16d941056324cd7565d375db897d21cb35b1751cbfd4"
+let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231115050443/artifacts/public/build/FocusRustComponents.xcframework.zip"
 let package = Package(
     name: "MozillaRustComponentsSwift",
     platforms: [.iOS(.v14)],
diff --git a/swift-source/all/FxAClient/FxAccountLogging.swift b/swift-source/all/FxAClient/FxAccountLogging.swift
@@ -5,7 +5,7 @@
 import Foundation
 import os.log
 
-class FxALog {
+enum FxALog {
     private static let log = OSLog(
         subsystem: Bundle.main.bundleIdentifier!,
         category: "FxAccountManager"
diff --git a/swift-source/all/Generated/Metrics/Metrics.swift b/swift-source/all/Generated/Metrics/Metrics.swift
@@ -25,7 +25,7 @@ extension GleanMetrics {
             // Intentionally left private, no external user can instantiate a new global object.
         }
 
-        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 13, hour: 22, minute: 33, second: 22))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 15, hour: 5, minute: 22, second: 6))
     }
 
     enum NimbusEvents {
diff --git a/swift-source/all/Generated/places.swift b/swift-source/all/Generated/places.swift
@@ -559,7 +559,7 @@ public protocol PlacesConnectionProtocol {
     func deleteVisit(url: String, timestamp: PlacesTimestamp) throws
     func getTopFrecentSiteInfos(numItems: Int32, thresholdOption: FrecencyThresholdOption) throws -> [TopFrecentSiteInfo]
     func deleteEverythingHistory() throws
-    func runMaintenancePrune(dbSizeLimit: UInt32) throws -> RunMaintenanceMetrics
+    func runMaintenancePrune(dbSizeLimit: UInt32, pruneLimit: UInt32) throws -> RunMaintenanceMetrics
     func runMaintenanceVacuum() throws
     func runMaintenanceOptimize() throws
     func runMaintenanceCheckpoint() throws
@@ -816,11 +816,12 @@ public class PlacesConnection: PlacesConnectionProtocol {
             }
     }
 
-    public func runMaintenancePrune(dbSizeLimit: UInt32) throws -> RunMaintenanceMetrics {
+    public func runMaintenancePrune(dbSizeLimit: UInt32, pruneLimit: UInt32) throws -> RunMaintenanceMetrics {
         return try FfiConverterTypeRunMaintenanceMetrics.lift(
             rustCallWithError(FfiConverterTypePlacesApiError.lift) {
                 uniffi_places_fn_method_placesconnection_run_maintenance_prune(self.pointer,
-                                                                               FfiConverterUInt32.lower(dbSizeLimit), $0)
+                                                                               FfiConverterUInt32.lower(dbSizeLimit),
+                                                                               FfiConverterUInt32.lower(pruneLimit), $0)
             }
         )
     }
@@ -3720,7 +3721,7 @@ private var initializationResult: InitializationResult {
     if uniffi_places_checksum_method_placesconnection_delete_everything_history() != 64039 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_places_checksum_method_placesconnection_run_maintenance_prune() != 19326 {
+    if uniffi_places_checksum_method_placesconnection_run_maintenance_prune() != 51047 {
         return InitializationResult.apiChecksumMismatch
     }
     if uniffi_places_checksum_method_placesconnection_run_maintenance_vacuum() != 5715 {
diff --git a/swift-source/all/Generated/placesFFI.h b/swift-source/all/Generated/placesFFI.h
@@ -138,7 +138,7 @@ RustBuffer uniffi_places_fn_method_placesconnection_get_top_frecent_site_infos(v
 );
 void uniffi_places_fn_method_placesconnection_delete_everything_history(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_places_fn_method_placesconnection_run_maintenance_prune(void*_Nonnull ptr, uint32_t db_size_limit, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_places_fn_method_placesconnection_run_maintenance_prune(void*_Nonnull ptr, uint32_t db_size_limit, uint32_t prune_limit, RustCallStatus *_Nonnull out_status
 );
 void uniffi_places_fn_method_placesconnection_run_maintenance_vacuum(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
diff --git a/swift-source/all/Places/Places.swift b/swift-source/all/Places/Places.swift
@@ -462,7 +462,10 @@ public class PlacesWriteConnection: PlacesReadConnection {
     open func runMaintenance(dbSizeLimit: UInt32 = 0) throws {
         return try queue.sync {
             try self.checkApi()
-            _ = try self.conn.runMaintenancePrune(dbSizeLimit: dbSizeLimit)
+            // The Kotlin code uses a higher pruneLimit, while Swift is extra conservative.  The
+            // main reason for this is the v119 places incident.  Once we figure that one out more,
+            // let's increase the prune limit here as well.
+            _ = try self.conn.runMaintenancePrune(dbSizeLimit: dbSizeLimit, pruneLimit: 6)
             try self.conn.runMaintenanceVacuum()
             try self.conn.runMaintenanceOptimize()
             try self.conn.runMaintenanceCheckpoint()
diff --git a/swift-source/focus/Generated/Metrics/Metrics.swift b/swift-source/focus/Generated/Metrics/Metrics.swift
@@ -25,7 +25,7 @@ extension GleanMetrics {
             // Intentionally left private, no external user can instantiate a new global object.
         }
 
-        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 13, hour: 22, minute: 33, second: 25))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 15, hour: 5, minute: 22, second: 9))
     }
 
     enum NimbusEvents {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extension GleanMetrics {`
`25`	`25`	`// Intentionally left private, no external user can instantiate a new global object.`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 13, hour: 22, minute: 33, second: 22))`
	`28`	`+ public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 15, hour: 5, minute: 22, second: 6))`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`enum NimbusEvents {`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ public protocol PlacesConnectionProtocol {`
`559`	`559`	`func deleteVisit(url: String, timestamp: PlacesTimestamp) throws`
`560`	`560`	`func getTopFrecentSiteInfos(numItems: Int32, thresholdOption: FrecencyThresholdOption) throws -> [TopFrecentSiteInfo]`
`561`	`561`	`func deleteEverythingHistory() throws`
`562`		`- func runMaintenancePrune(dbSizeLimit: UInt32) throws -> RunMaintenanceMetrics`
	`562`	`+ func runMaintenancePrune(dbSizeLimit: UInt32, pruneLimit: UInt32) throws -> RunMaintenanceMetrics`
`563`	`563`	`func runMaintenanceVacuum() throws`
`564`	`564`	`func runMaintenanceOptimize() throws`
`565`	`565`	`func runMaintenanceCheckpoint() throws`
`@@ -816,11 +816,12 @@ public class PlacesConnection: PlacesConnectionProtocol {`
`816`	`816`	`}`
`817`	`817`	`}`
`818`	`818`
`819`		`- public func runMaintenancePrune(dbSizeLimit: UInt32) throws -> RunMaintenanceMetrics {`
	`819`	`+ public func runMaintenancePrune(dbSizeLimit: UInt32, pruneLimit: UInt32) throws -> RunMaintenanceMetrics {`
`820`	`820`	`return try FfiConverterTypeRunMaintenanceMetrics.lift(`
`821`	`821`	`rustCallWithError(FfiConverterTypePlacesApiError.lift) {`
`822`	`822`	`uniffi_places_fn_method_placesconnection_run_maintenance_prune(self.pointer,`
`823`		`- FfiConverterUInt32.lower(dbSizeLimit), $0)`
	`823`	`+ FfiConverterUInt32.lower(dbSizeLimit),`
	`824`	`+ FfiConverterUInt32.lower(pruneLimit), $0)`
`824`	`825`	`}`
`825`	`826`	`)`
`826`	`827`	`}`
`@@ -3720,7 +3721,7 @@ private var initializationResult: InitializationResult {`
`3720`	`3721`	`if uniffi_places_checksum_method_placesconnection_delete_everything_history() != 64039 {`
`3721`	`3722`	`return InitializationResult.apiChecksumMismatch`
`3722`	`3723`	`}`
`3723`		`- if uniffi_places_checksum_method_placesconnection_run_maintenance_prune() != 19326 {`
	`3724`	`+ if uniffi_places_checksum_method_placesconnection_run_maintenance_prune() != 51047 {`
`3724`	`3725`	`return InitializationResult.apiChecksumMismatch`
`3725`	`3726`	`}`
`3726`	`3727`	`if uniffi_places_checksum_method_placesconnection_run_maintenance_vacuum() != 5715 {`