Auto update with latest AS Release v95.0.0 (#81)

* Updates Package.swift with v95.0.0 release

* Version 95.0.0

Co-authored-by: Firefox Sync Engineering <[email protected]>

Author: github-actions[bot]

Package.swift

@@ -1,12 +1,12 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "351cf3f6ec32d7ebd984ce1a5cd8349e6169c5f4ee2c5dd5a77082650c2a3486"
-let version = "v94.3.0"
+let checksum = "0bef856d3bfbf6df0b80fa9cab20b300bf27480fa476c55473380e1da6e34e81"
+let version = "v95.0.0"
 let url = "https://github.com/mozilla/application-services/releases/download/\(version)/MozillaRustComponents.xcframework.zip"
 
 // Focus xcframework
-let focusChecksum = "beac72a1fd86e489fc0bd404a9acf0c67990af06287d22e80a4f0bb0b228c9ea"
+let focusChecksum = "6bfd3351e0344f62d1d52b1c134bcd793476dfe43400f73582733933edf815f1"
 let focusUrl = "https://github.com/mozilla/application-services/releases/download/\(version)/FocusRustComponents.xcframework.zip"
 let package = Package(
     name: "MozillaRustComponentsSwift",

swift-source/all/Generated/Metrics/Metrics.swift

@@ -1,6 +1,6 @@
 // -*- mode: Swift -*-
 
-// AUTOGENERATED BY glean_parser v6.2.0. DO NOT EDIT. DO NOT COMMIT.
+// AUTOGENERATED BY glean_parser v6.2.1. DO NOT EDIT. DO NOT COMMIT.
 
 #if canImport(Foundation)
     import Foundation
@@ -26,14 +26,15 @@ 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: 2022, month: 9, day: 21, hour: 15, minute: 7, second: 42))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2022, month: 11, day: 1, hour: 15, minute: 7, second: 10))
     }
 
     enum NimbusEvents {
         struct EnrollmentExtra: EventExtras {
             var branch: String?
             var enrollmentId: String?
             var experiment: String?
+            var experimentType: String?
 
             func toExtraRecord() -> [String: String] {
                 var record = [String: String]()
@@ -47,6 +48,31 @@ extension GleanMetrics {
                 if let experiment = self.experiment {
                     record["experiment"] = String(experiment)
                 }
+                if let experimentType = self.experimentType {
+                    record["experiment_type"] = String(experimentType)
+                }
+
+                return record
+            }
+        }
+
+        struct EnrollFailedExtra: EventExtras {
+            var branch: String?
+            var experiment: String?
+            var reason: String?
+
+            func toExtraRecord() -> [String: String] {
+                var record = [String: String]()
+
+                if let branch = self.branch {
+                    record["branch"] = String(branch)
+                }
+                if let experiment = self.experiment {
+                    record["experiment"] = String(experiment)
+                }
+                if let reason = self.reason {
+                    record["reason"] = String(reason)
+                }
 
                 return record
             }
@@ -56,6 +82,7 @@ extension GleanMetrics {
             var branch: String?
             var enrollmentId: String?
             var experiment: String?
+            var reason: String?
 
             func toExtraRecord() -> [String: String] {
                 var record = [String: String]()
@@ -69,6 +96,27 @@ extension GleanMetrics {
                 if let experiment = self.experiment {
                     record["experiment"] = String(experiment)
                 }
+                if let reason = self.reason {
+                    record["reason"] = String(reason)
+                }
+
+                return record
+            }
+        }
+
+        struct UnenrollFailedExtra: EventExtras {
+            var experiment: String?
+            var reason: String?
+
+            func toExtraRecord() -> [String: String] {
+                var record = [String: String]()
+
+                if let experiment = self.experiment {
+                    record["experiment"] = String(experiment)
+                }
+                if let reason = self.reason {
+                    record["reason"] = String(reason)
+                }
 
                 return record
             }
@@ -98,21 +146,21 @@ extension GleanMetrics {
 
         struct ExposureExtra: EventExtras {
             var branch: String?
-            var enrollmentId: String?
             var experiment: String?
+            var featureId: String?
 
             func toExtraRecord() -> [String: String] {
                 var record = [String: String]()
 
                 if let branch = self.branch {
                     record["branch"] = String(branch)
                 }
-                if let enrollmentId = self.enrollmentId {
-                    record["enrollment_id"] = String(enrollmentId)
-                }
                 if let experiment = self.experiment {
                     record["experiment"] = String(experiment)
                 }
+                if let featureId = self.featureId {
+                    record["feature_id"] = String(featureId)
+                }
 
                 return record
             }
@@ -129,7 +177,19 @@ extension GleanMetrics {
                 lifetime: .ping,
                 disabled: false
             )
-            , ["branch", "enrollment_id", "experiment"]
+            , ["branch", "enrollment_id", "experiment", "experiment_type"]
+        )
+
+        /// Recorded when an enrollment fails, including the reason for the failure.
+        static let enrollFailed = EventMetricType<NoExtraKeys, EnrollFailedExtra>( // generated from nimbus_events.enroll_failed
+            CommonMetricData(
+                category: "nimbus_events",
+                name: "enroll_failed",
+                sendInPings: ["background-update", "events"],
+                lifetime: .ping,
+                disabled: false
+            )
+            , ["branch", "experiment", "reason"]
         )
 
         /// Recorded when either telemetry is disabled, or the experiment has run for its
@@ -143,7 +203,19 @@ extension GleanMetrics {
                 lifetime: .ping,
                 disabled: false
             )
-            , ["branch", "enrollment_id", "experiment"]
+            , ["branch", "enrollment_id", "experiment", "reason"]
+        )
+
+        /// Recorded when an unenrollment fails, including the reason for the failure.
+        static let unenrollFailed = EventMetricType<NoExtraKeys, UnenrollFailedExtra>( // generated from nimbus_events.unenroll_failed
+            CommonMetricData(
+                category: "nimbus_events",
+                name: "unenroll_failed",
+                sendInPings: ["background-update", "events"],
+                lifetime: .ping,
+                disabled: false
+            )
+            , ["experiment", "reason"]
         )
 
         /// Recorded when a user becomes ineligible to continue receiving the treatment for
@@ -171,7 +243,7 @@ extension GleanMetrics {
                 lifetime: .ping,
                 disabled: false
             )
-            , ["branch", "enrollment_id", "experiment"]
+            , ["branch", "experiment", "feature_id"]
         )
 
     }
@@ -213,7 +285,7 @@ extension GleanMetrics {
                 name: "sdk_unavailable_for_feature",
                 sendInPings: ["events"],
                 lifetime: .ping,
-                disabled: false
+                disabled: true
             )
             , ["feature_id"]
         )
@@ -226,7 +298,7 @@ extension GleanMetrics {
                 name: "cache_not_ready_for_feature",
                 sendInPings: ["events"],
                 lifetime: .ping,
-                disabled: false
+                disabled: true
             )
             , ["feature_id"]
         )

swift-source/all/Generated/errorFFI.h

@@ -46,27 +46,27 @@ typedef struct RustCallStatus {
 // ⚠️ increment the version suffix in all instances of UNIFFI_SHARED_HEADER_V4 in this file.           ⚠️
 #endif // def UNIFFI_SHARED_H
 
-void ffi_errorsupport_b986_ApplicationErrorReporter_init_callback(
+void ffi_errorsupport_4a62_ApplicationErrorReporter_init_callback(
       ForeignCallback  _Nonnull callback_stub,
     RustCallStatus *_Nonnull out_status
     );
-void errorsupport_b986_set_application_error_reporter(
+void errorsupport_4a62_set_application_error_reporter(
       uint64_t error_reporter,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_errorsupport_b986_rustbuffer_alloc(
+RustBuffer ffi_errorsupport_4a62_rustbuffer_alloc(
       int32_t size,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_errorsupport_b986_rustbuffer_from_bytes(
+RustBuffer ffi_errorsupport_4a62_rustbuffer_from_bytes(
       ForeignBytes bytes,
     RustCallStatus *_Nonnull out_status
     );
-void ffi_errorsupport_b986_rustbuffer_free(
+void ffi_errorsupport_4a62_rustbuffer_free(
       RustBuffer buf,
     RustCallStatus *_Nonnull out_status
     );
-RustBuffer ffi_errorsupport_b986_rustbuffer_reserve(
+RustBuffer ffi_errorsupport_4a62_rustbuffer_reserve(
       RustBuffer buf,int32_t additional,
     RustCallStatus *_Nonnull out_status
     );

swift-source/all/Generated/errorsupport.swift

@@ -19,13 +19,13 @@ private extension RustBuffer {
     }
 
     static func from(_ ptr: UnsafeBufferPointer<UInt8>) -> RustBuffer {
-        try! rustCall { ffi_errorsupport_b986_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
+        try! rustCall { ffi_errorsupport_4a62_rustbuffer_from_bytes(ForeignBytes(bufferPointer: ptr), $0) }
     }
 
     // Frees the buffer in place.
     // The buffer must not be used after this is called.
     func deallocate() {
-        try! rustCall { ffi_errorsupport_b986_rustbuffer_free(self, $0) }
+        try! rustCall { ffi_errorsupport_4a62_rustbuffer_free(self, $0) }
     }
 }
 
@@ -430,25 +430,40 @@ private let foreignCallbackCallbackInterfaceApplicationErrorReporter: ForeignCal
             // https://github.com/mozilla/uniffi-rs/issues/351
         }
 
-        let cb = try! FfiConverterCallbackInterfaceApplicationErrorReporter.lift(handle)
+        let cb: ApplicationErrorReporter
+        do {
+            cb = try FfiConverterCallbackInterfaceApplicationErrorReporter.lift(handle)
+        } catch {
+            out_buf.pointee = FfiConverterString.lower("ApplicationErrorReporter: Invalid handle")
+            return -1
+        }
+
         switch method {
         case IDX_CALLBACK_FREE:
             FfiConverterCallbackInterfaceApplicationErrorReporter.drop(handle: handle)
             // No return value.
             // See docs of ForeignCallback in `uniffi/src/ffi/foreigncallbacks.rs`
             return 0
         case 1:
-            let buffer = try! invokeReportError(cb, args)
-            out_buf.pointee = buffer
-            // Value written to out buffer.
-            // See docs of ForeignCallback in `uniffi/src/ffi/foreigncallbacks.rs`
-            return 1
+            do {
+                out_buf.pointee = try invokeReportError(cb, args)
+                // Value written to out buffer.
+                // See docs of ForeignCallback in `uniffi/src/ffi/foreigncallbacks.rs`
+                return 1
+            } catch {
+                out_buf.pointee = FfiConverterString.lower(String(describing: error))
+                return -1
+            }
         case 2:
-            let buffer = try! invokeReportBreadcrumb(cb, args)
-            out_buf.pointee = buffer
-            // Value written to out buffer.
-            // See docs of ForeignCallback in `uniffi/src/ffi/foreigncallbacks.rs`
-            return 1
+            do {
+                out_buf.pointee = try invokeReportBreadcrumb(cb, args)
+                // Value written to out buffer.
+                // See docs of ForeignCallback in `uniffi/src/ffi/foreigncallbacks.rs`
+                return 1
+            } catch {
+                out_buf.pointee = FfiConverterString.lower(String(describing: error))
+                return -1
+            }
 
         // This should never happen, because an out of bounds method index won't
         // ever be used. Once we can catch errors, we should return an InternalError.
@@ -466,7 +481,7 @@ private enum FfiConverterCallbackInterfaceApplicationErrorReporter {
     private static var callbackInitialized = false
     private static func initCallback() {
         try! rustCall { (err: UnsafeMutablePointer<RustCallStatus>) in
-            ffi_errorsupport_b986_ApplicationErrorReporter_init_callback(foreignCallbackCallbackInterfaceApplicationErrorReporter, err)
+            ffi_errorsupport_4a62_ApplicationErrorReporter_init_callback(foreignCallbackCallbackInterfaceApplicationErrorReporter, err)
         }
     }
 
@@ -518,7 +533,7 @@ public func setApplicationErrorReporter(errorReporter: ApplicationErrorReporter)
     try!
 
         rustCall {
-            errorsupport_b986_set_application_error_reporter(
+            errorsupport_4a62_set_application_error_reporter(
                 FfiConverterCallbackInterfaceApplicationErrorReporter.lower(errorReporter), $0
             )
         }