Skip to content

Commit ed0ab75

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (121.0.20231117050326)
1 parent 183e924 commit ed0ab75

File tree

12 files changed

+620
-287
lines changed

12 files changed

+620
-287
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 = "c47e120669f3ac89d88a19a4e42ac6755370c2ab16d96a430a7d3c6bc304d190"
5-
let version = "121.0.20231115050443"
6-
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"
4+
let checksum = "8289bf2959f6ba4f6ca703569871a8c23d39aa135e34ae7d766b7f3a3d6c57d6"
5+
let version = "121.0.20231117050326"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231117050326/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "b9a36b6ab452437a6e4d16d941056324cd7565d375db897d21cb35b1751cbfd4"
10-
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"
9+
let focusChecksum = "14dcddc868c0324e91255eedea7080e584e0b9d492ddf757b8487caca5193247"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231117050326/artifacts/public/build/FocusRustComponents.xcframework.zip"
1111
let package = Package(
1212
name: "MozillaRustComponentsSwift",
1313
platforms: [.iOS(.v14)],

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

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,32 @@ 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: 11, day: 15, hour: 5, minute: 22, second: 6))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 17, hour: 5, minute: 21, second: 14))
2929
}
3030

3131
enum NimbusEvents {
32+
struct ActivationExtra: EventExtras {
33+
var branch: String?
34+
var experiment: String?
35+
var featureId: String?
36+
37+
func toExtraRecord() -> [String: String] {
38+
var record = [String: String]()
39+
40+
if let branch = self.branch {
41+
record["branch"] = String(branch)
42+
}
43+
if let experiment = self.experiment {
44+
record["experiment"] = String(experiment)
45+
}
46+
if let featureId = self.featureId {
47+
record["feature_id"] = String(featureId)
48+
}
49+
50+
return record
51+
}
52+
}
53+
3254
struct DisqualificationExtra: EventExtras {
3355
var branch: String?
3456
var experiment: String?
@@ -213,6 +235,19 @@ extension GleanMetrics {
213235
}
214236
}
215237

238+
/// Recorded when a feature is configured with an experimental configuration for
239+
/// the first time in this session.
240+
static let activation = EventMetricType<ActivationExtra>( // generated from nimbus_events.activation
241+
CommonMetricData(
242+
category: "nimbus_events",
243+
name: "activation",
244+
sendInPings: ["events"],
245+
lifetime: .ping,
246+
disabled: true
247+
)
248+
, ["branch", "experiment", "feature_id"]
249+
)
250+
216251
/// Recorded when a user becomes ineligible to continue receiving the treatment for
217252
/// an enrolled experiment, for reasons such as the user opting out of the
218253
/// experiment or no longer matching targeting for the experiment.

swift-source/all/Generated/fxa_client.swift

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,6 +1789,9 @@ public enum FxaError {
17891789
// Simple error enums only carry a message
17901790
case WrongAuthFlow(message: String)
17911791

1792+
// Simple error enums only carry a message
1793+
case OriginMismatch(message: String)
1794+
17921795
// Simple error enums only carry a message
17931796
case SyncScopedKeyMissingInServerResponse(message: String)
17941797

@@ -1825,15 +1828,19 @@ public struct FfiConverterTypeFxaError: FfiConverterRustBuffer {
18251828
message: FfiConverterString.read(from: &buf)
18261829
)
18271830

1828-
case 5: return try .SyncScopedKeyMissingInServerResponse(
1831+
case 5: return try .OriginMismatch(
1832+
message: FfiConverterString.read(from: &buf)
1833+
)
1834+
1835+
case 6: return try .SyncScopedKeyMissingInServerResponse(
18291836
message: FfiConverterString.read(from: &buf)
18301837
)
18311838

1832-
case 6: return try .Panic(
1839+
case 7: return try .Panic(
18331840
message: FfiConverterString.read(from: &buf)
18341841
)
18351842

1836-
case 7: return try .Other(
1843+
case 8: return try .Other(
18371844
message: FfiConverterString.read(from: &buf)
18381845
)
18391846

@@ -1851,12 +1858,14 @@ public struct FfiConverterTypeFxaError: FfiConverterRustBuffer {
18511858
writeInt(&buf, Int32(3))
18521859
case let .WrongAuthFlow(message):
18531860
writeInt(&buf, Int32(4))
1854-
case let .SyncScopedKeyMissingInServerResponse(message):
1861+
case let .OriginMismatch(message):
18551862
writeInt(&buf, Int32(5))
1856-
case let .Panic(message):
1863+
case let .SyncScopedKeyMissingInServerResponse(message):
18571864
writeInt(&buf, Int32(6))
1858-
case let .Other(message):
1865+
case let .Panic(message):
18591866
writeInt(&buf, Int32(7))
1867+
case let .Other(message):
1868+
writeInt(&buf, Int32(8))
18601869
}
18611870
}
18621871
}

0 commit comments

Comments
 (0)