Skip to content

Commit 17de69a

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (120.0.20231013050343)
1 parent d86aea2 commit 17de69a

File tree

12 files changed

+735
-19
lines changed

12 files changed

+735
-19
lines changed

Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// swift-tools-version:5.4
22
import PackageDescription
33

4-
let checksum = "2bfb9d9109916d12e680441412b03d1ddc00901fdf01982c97ffd6a97b6b0162"
5-
let version = "120.0.20231012050441"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231012050441/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "2eb94b2393b6b8cae51c237dc055b8593fa7f7ce4d41949d3c9b9af07fd444ed"
5+
let version = "120.0.20231013050343"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231013050343/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "666448fc7f8607e4da2caf54dd05355d1e09a72da05dae4beb23cfe84066888f"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231012050441/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "084bd8be1c3579a40a4f771f26ae5ea96746d9052696e72b3660d7d942903d69"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.120.20231013050343/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

swift-source/all/FxAClient/MZKeychain/KeychainItemAccessibility.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,14 @@ public enum MZKeychainItemAccessibility {
9999
}
100100
}
101101

102-
private let keychainItemAccessibilityLookup: [MZKeychainItemAccessibility: CFString] = {
102+
private let keychainItemAccessibilityLookup: [MZKeychainItemAccessibility: CFString] =
103103
[
104104
.afterFirstUnlock: kSecAttrAccessibleAfterFirstUnlock,
105105
.afterFirstUnlockThisDeviceOnly: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly,
106106
.whenPasscodeSetThisDeviceOnly: kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly,
107107
.whenUnlocked: kSecAttrAccessibleWhenUnlocked,
108108
.whenUnlockedThisDeviceOnly: kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
109109
]
110-
}()
111110

112111
extension MZKeychainItemAccessibility: MZKeychainAttrRepresentable {
113112
var keychainAttrValue: CFString {

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extension GleanMetrics {
2525
// Intentionally left private, no external user can instantiate a new global object.
2626
}
2727

28-
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 10, day: 12, hour: 5, minute: 19, second: 32))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 10, day: 13, hour: 5, minute: 31, second: 17))
2929
}
3030

3131
enum NimbusEvents {
@@ -99,6 +99,40 @@ extension GleanMetrics {
9999
}
100100
}
101101

102+
struct EnrollmentStatusExtra: EventExtras {
103+
var branch: String?
104+
var conflictSlug: String?
105+
var errorString: String?
106+
var reason: String?
107+
var slug: String?
108+
var status: String?
109+
110+
func toExtraRecord() -> [String: String] {
111+
var record = [String: String]()
112+
113+
if let branch = self.branch {
114+
record["branch"] = String(branch)
115+
}
116+
if let conflictSlug = self.conflictSlug {
117+
record["conflict_slug"] = String(conflictSlug)
118+
}
119+
if let errorString = self.errorString {
120+
record["error_string"] = String(errorString)
121+
}
122+
if let reason = self.reason {
123+
record["reason"] = String(reason)
124+
}
125+
if let slug = self.slug {
126+
record["slug"] = String(slug)
127+
}
128+
if let status = self.status {
129+
record["status"] = String(status)
130+
}
131+
132+
return record
133+
}
134+
}
135+
102136
struct ExposureExtra: EventExtras {
103137
var branch: String?
104138
var experiment: String?
@@ -231,6 +265,19 @@ extension GleanMetrics {
231265
, ["branch", "enrollment_id", "experiment", "experiment_type"]
232266
)
233267

268+
/// Recorded for each enrollment status each time the SDK completes application of
269+
/// pending experiments.
270+
static let enrollmentStatus = EventMetricType<EnrollmentStatusExtra>( // generated from nimbus_events.enrollment_status
271+
CommonMetricData(
272+
category: "nimbus_events",
273+
name: "enrollment_status",
274+
sendInPings: ["events"],
275+
lifetime: .ping,
276+
disabled: false
277+
)
278+
, ["branch", "conflict_slug", "error_string", "reason", "slug", "status"]
279+
)
280+
234281
/// Recorded when a user actually observes an experimental treatment, or would have
235282
/// observed an experimental treatment if they had been in a branch that would have
236283
/// shown one.

0 commit comments

Comments
 (0)