Nightly auto-update (131.0.20240808050223)

Firefox Sync Engineering · Firefox Sync Engineering · commit f04ad3ebdca0 · 2024-08-08T08:03:20.000Z
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,13 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "aa161b2789551860669d36124fe7f440e11cb74c2a7b7f8d95ee17f639bd8a8c"
-let version = "131.0.20240806050256"
-let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240806050256/artifacts/public/build/MozillaRustComponents.xcframework.zip"
+let checksum = "45f91e93eb6c301a3bf29f6ffc360d191c54549ad5c26effd5ce194bf7decfe1"
+let version = "131.0.20240808050223"
+let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240808050223/artifacts/public/build/MozillaRustComponents.xcframework.zip"
 
 // Focus xcframework
-let focusChecksum = "7ed06d1a20f387273696419bc9dc653986c6cfe790f330081fe9335102a187b4"
-let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240806050256/artifacts/public/build/FocusRustComponents.xcframework.zip"
+let focusChecksum = "b18bf61488d1810f3ba61d3f6d36f01ca49b61138931a67964e4c659d50e02ae"
+let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.131.20240808050223/artifacts/public/build/FocusRustComponents.xcframework.zip"
 let package = Package(
     name: "MozillaRustComponentsSwift",
     platforms: [.iOS(.v14)],
diff --git a/swift-source/all/Generated/Metrics/Metrics.swift b/swift-source/all/Generated/Metrics/Metrics.swift
@@ -23,7 +23,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: 2024, month: 8, day: 6, hour: 5, minute: 16, second: 48))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 8, hour: 5, minute: 11, second: 19))
     }
 
     enum NimbusEvents {
diff --git a/swift-source/all/Generated/suggest.swift b/swift-source/all/Generated/suggest.swift
@@ -519,12 +519,14 @@ public protocol SuggestStoreProtocol : AnyObject {
     
     func fetchProviderConfig(provider: SuggestionProvider) throws  -> SuggestProviderConfig?
     
-    func ingest(constraints: SuggestIngestionConstraints) throws 
+    func ingest(constraints: SuggestIngestionConstraints) throws  -> SuggestIngestionMetrics
     
     func interrupt(kind: InterruptKind?) 
     
     func query(query: SuggestionQuery) throws  -> [Suggestion]
     
+    func queryWithMetrics(query: SuggestionQuery) throws  -> QueryWithMetricsResult
+    
 }
 open class SuggestStore:
     SuggestStoreProtocol {
@@ -610,11 +612,12 @@ open func fetchProviderConfig(provider: SuggestionProvider)throws  -> SuggestPro
 })
 }
     
-open func ingest(constraints: SuggestIngestionConstraints)throws  {try rustCallWithError(FfiConverterTypeSuggestApiError.lift) {
+open func ingest(constraints: SuggestIngestionConstraints)throws  -> SuggestIngestionMetrics {
+    return try  FfiConverterTypeSuggestIngestionMetrics.lift(try rustCallWithError(FfiConverterTypeSuggestApiError.lift) {
     uniffi_suggest_fn_method_suggeststore_ingest(self.uniffiClonePointer(),
         FfiConverterTypeSuggestIngestionConstraints.lower(constraints),$0
     )
-}
+})
 }
     
 open func interrupt(kind: InterruptKind? = nil) {try! rustCall() {
@@ -632,6 +635,14 @@ open func query(query: SuggestionQuery)throws  -> [Suggestion] {
 })
 }
     
+open func queryWithMetrics(query: SuggestionQuery)throws  -> QueryWithMetricsResult {
+    return try  FfiConverterTypeQueryWithMetricsResult.lift(try rustCallWithError(FfiConverterTypeSuggestApiError.lift) {
+    uniffi_suggest_fn_method_suggeststore_query_with_metrics(self.uniffiClonePointer(),
+        FfiConverterTypeSuggestionQuery.lower(query),$0
+    )
+})
+}
+    
 
 }
 
@@ -837,6 +848,123 @@ public func FfiConverterTypeSuggestStoreBuilder_lower(_ value: SuggestStoreBuild
 }
 
 
+/**
+ * A single sample for a labeled timing distribution metric
+ */
+public struct LabeledTimingSample {
+    public var label: String
+    public var value: UInt64
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(label: String, value: UInt64) {
+        self.label = label
+        self.value = value
+    }
+}
+
+
+
+extension LabeledTimingSample: Equatable, Hashable {
+    public static func ==(lhs: LabeledTimingSample, rhs: LabeledTimingSample) -> Bool {
+        if lhs.label != rhs.label {
+            return false
+        }
+        if lhs.value != rhs.value {
+            return false
+        }
+        return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(label)
+        hasher.combine(value)
+    }
+}
+
+
+public struct FfiConverterTypeLabeledTimingSample: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> LabeledTimingSample {
+        return
+            try LabeledTimingSample(
+                label: FfiConverterString.read(from: &buf), 
+                value: FfiConverterUInt64.read(from: &buf)
+        )
+    }
+
+    public static func write(_ value: LabeledTimingSample, into buf: inout [UInt8]) {
+        FfiConverterString.write(value.label, into: &buf)
+        FfiConverterUInt64.write(value.value, into: &buf)
+    }
+}
+
+
+public func FfiConverterTypeLabeledTimingSample_lift(_ buf: RustBuffer) throws -> LabeledTimingSample {
+    return try FfiConverterTypeLabeledTimingSample.lift(buf)
+}
+
+public func FfiConverterTypeLabeledTimingSample_lower(_ value: LabeledTimingSample) -> RustBuffer {
+    return FfiConverterTypeLabeledTimingSample.lower(value)
+}
+
+
+public struct QueryWithMetricsResult {
+    public var suggestions: [Suggestion]
+    public var queryTimes: [LabeledTimingSample]
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(suggestions: [Suggestion], queryTimes: [LabeledTimingSample]) {
+        self.suggestions = suggestions
+        self.queryTimes = queryTimes
+    }
+}
+
+
+
+extension QueryWithMetricsResult: Equatable, Hashable {
+    public static func ==(lhs: QueryWithMetricsResult, rhs: QueryWithMetricsResult) -> Bool {
+        if lhs.suggestions != rhs.suggestions {
+            return false
+        }
+        if lhs.queryTimes != rhs.queryTimes {
+            return false
+        }
+        return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(suggestions)
+        hasher.combine(queryTimes)
+    }
+}
+
+
+public struct FfiConverterTypeQueryWithMetricsResult: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> QueryWithMetricsResult {
+        return
+            try QueryWithMetricsResult(
+                suggestions: FfiConverterSequenceTypeSuggestion.read(from: &buf), 
+                queryTimes: FfiConverterSequenceTypeLabeledTimingSample.read(from: &buf)
+        )
+    }
+
+    public static func write(_ value: QueryWithMetricsResult, into buf: inout [UInt8]) {
+        FfiConverterSequenceTypeSuggestion.write(value.suggestions, into: &buf)
+        FfiConverterSequenceTypeLabeledTimingSample.write(value.queryTimes, into: &buf)
+    }
+}
+
+
+public func FfiConverterTypeQueryWithMetricsResult_lift(_ buf: RustBuffer) throws -> QueryWithMetricsResult {
+    return try FfiConverterTypeQueryWithMetricsResult.lift(buf)
+}
+
+public func FfiConverterTypeQueryWithMetricsResult_lower(_ value: QueryWithMetricsResult) -> RustBuffer {
+    return FfiConverterTypeQueryWithMetricsResult.lower(value)
+}
+
+
 public struct SuggestGlobalConfig {
     public var showLessFrequentlyCap: Int32
 
@@ -943,6 +1071,63 @@ public func FfiConverterTypeSuggestIngestionConstraints_lower(_ value: SuggestIn
 }
 
 
+public struct SuggestIngestionMetrics {
+    public var ingestionTimes: [LabeledTimingSample]
+    public var downloadTimes: [LabeledTimingSample]
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(ingestionTimes: [LabeledTimingSample], downloadTimes: [LabeledTimingSample]) {
+        self.ingestionTimes = ingestionTimes
+        self.downloadTimes = downloadTimes
+    }
+}
+
+
+
+extension SuggestIngestionMetrics: Equatable, Hashable {
+    public static func ==(lhs: SuggestIngestionMetrics, rhs: SuggestIngestionMetrics) -> Bool {
+        if lhs.ingestionTimes != rhs.ingestionTimes {
+            return false
+        }
+        if lhs.downloadTimes != rhs.downloadTimes {
+            return false
+        }
+        return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(ingestionTimes)
+        hasher.combine(downloadTimes)
+    }
+}
+
+
+public struct FfiConverterTypeSuggestIngestionMetrics: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SuggestIngestionMetrics {
+        return
+            try SuggestIngestionMetrics(
+                ingestionTimes: FfiConverterSequenceTypeLabeledTimingSample.read(from: &buf), 
+                downloadTimes: FfiConverterSequenceTypeLabeledTimingSample.read(from: &buf)
+        )
+    }
+
+    public static func write(_ value: SuggestIngestionMetrics, into buf: inout [UInt8]) {
+        FfiConverterSequenceTypeLabeledTimingSample.write(value.ingestionTimes, into: &buf)
+        FfiConverterSequenceTypeLabeledTimingSample.write(value.downloadTimes, into: &buf)
+    }
+}
+
+
+public func FfiConverterTypeSuggestIngestionMetrics_lift(_ buf: RustBuffer) throws -> SuggestIngestionMetrics {
+    return try FfiConverterTypeSuggestIngestionMetrics.lift(buf)
+}
+
+public func FfiConverterTypeSuggestIngestionMetrics_lower(_ value: SuggestIngestionMetrics) -> RustBuffer {
+    return FfiConverterTypeSuggestIngestionMetrics.lower(value)
+}
+
+
 public struct SuggestionQuery {
     public var keyword: String
     public var providers: [SuggestionProvider]
@@ -1632,6 +1817,28 @@ fileprivate struct FfiConverterSequenceUInt8: FfiConverterRustBuffer {
     }
 }
 
+fileprivate struct FfiConverterSequenceTypeLabeledTimingSample: FfiConverterRustBuffer {
+    typealias SwiftType = [LabeledTimingSample]
+
+    public static func write(_ value: [LabeledTimingSample], into buf: inout [UInt8]) {
+        let len = Int32(value.count)
+        writeInt(&buf, len)
+        for item in value {
+            FfiConverterTypeLabeledTimingSample.write(item, into: &buf)
+        }
+    }
+
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [LabeledTimingSample] {
+        let len: Int32 = try readInt(&buf)
+        var seq = [LabeledTimingSample]()
+        seq.reserveCapacity(Int(len))
+        for _ in 0 ..< len {
+            seq.append(try FfiConverterTypeLabeledTimingSample.read(from: &buf))
+        }
+        return seq
+    }
+}
+
 fileprivate struct FfiConverterSequenceTypeSuggestion: FfiConverterRustBuffer {
     typealias SwiftType = [Suggestion]
 
@@ -1721,7 +1928,7 @@ private var initializationResult: InitializationResult {
     if (uniffi_suggest_checksum_method_suggeststore_fetch_provider_config() != 5906) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_suggest_checksum_method_suggeststore_ingest() != 4478) {
+    if (uniffi_suggest_checksum_method_suggeststore_ingest() != 27906) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_suggest_checksum_method_suggeststore_interrupt() != 17785) {
@@ -1730,6 +1937,9 @@ private var initializationResult: InitializationResult {
     if (uniffi_suggest_checksum_method_suggeststore_query() != 12875) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_suggest_checksum_method_suggeststore_query_with_metrics() != 29421) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_suggest_checksum_method_suggeststorebuilder_build() != 28243) {
         return InitializationResult.apiChecksumMismatch
     }
diff --git a/swift-source/all/Generated/suggestFFI.h b/swift-source/all/Generated/suggestFFI.h
@@ -293,7 +293,7 @@ RustBuffer uniffi_suggest_fn_method_suggeststore_fetch_provider_config(void*_Non
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_INGEST
 #define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_INGEST
-void uniffi_suggest_fn_method_suggeststore_ingest(void*_Nonnull ptr, RustBuffer constraints, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_suggest_fn_method_suggeststore_ingest(void*_Nonnull ptr, RustBuffer constraints, RustCallStatus *_Nonnull out_status
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_INTERRUPT
@@ -306,6 +306,11 @@ void uniffi_suggest_fn_method_suggeststore_interrupt(void*_Nonnull ptr, RustBuff
 RustBuffer uniffi_suggest_fn_method_suggeststore_query(void*_Nonnull ptr, RustBuffer query, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_QUERY_WITH_METRICS
+#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_METHOD_SUGGESTSTORE_QUERY_WITH_METRICS
+RustBuffer uniffi_suggest_fn_method_suggeststore_query_with_metrics(void*_Nonnull ptr, RustBuffer query, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_CLONE_SUGGESTSTOREBUILDER
 #define UNIFFI_FFIDEF_UNIFFI_SUGGEST_FN_CLONE_SUGGESTSTOREBUILDER
 void*_Nonnull uniffi_suggest_fn_clone_suggeststorebuilder(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -689,6 +694,12 @@ uint16_t uniffi_suggest_checksum_method_suggeststore_interrupt(void
 #define UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTORE_QUERY
 uint16_t uniffi_suggest_checksum_method_suggeststore_query(void
     
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTORE_QUERY_WITH_METRICS
+#define UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTORE_QUERY_WITH_METRICS
+uint16_t uniffi_suggest_checksum_method_suggeststore_query_with_metrics(void
+    
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_SUGGEST_CHECKSUM_METHOD_SUGGESTSTOREBUILDER_BUILD
diff --git a/swift-source/focus/Generated/Metrics/Metrics.swift b/swift-source/focus/Generated/Metrics/Metrics.swift
@@ -23,7 +23,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: 2024, month: 8, day: 6, hour: 5, minute: 16, second: 50))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 8, hour: 5, minute: 11, second: 21))
     }
 
     enum NimbusEvents {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ extension GleanMetrics {`
`23`	`23`	`// Intentionally left private, no external user can instantiate a new global object.`
`24`	`24`	`}`
`25`	`25`
`26`		`- public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 6, hour: 5, minute: 16, second: 48))`
	`26`	`+ public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 8, day: 8, hour: 5, minute: 11, second: 19))`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`enum NimbusEvents {`