Skip to content

Commit 2232bf1

Browse files
author
Firefox Sync Engineering
committed
Nightly auto-update (121.0.20231104050329)
1 parent f435a81 commit 2232bf1

File tree

7 files changed

+21
-83
lines changed

7 files changed

+21
-83
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 = "6497f444bf840b69e631d01343413ee2329632ce3ebdcf876863050fba9c8bb3"
5-
let version = "121.0.20231103050336"
6-
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231103050336/artifacts/public/build/MozillaRustComponents.xcframework.zip"
4+
let checksum = "f8dfb5b75b501ab59a41102c80e802874cceb23025a7e8571664a971de961368"
5+
let version = "121.0.20231104050329"
6+
let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231104050329/artifacts/public/build/MozillaRustComponents.xcframework.zip"
77

88
// Focus xcframework
9-
let focusChecksum = "6f379b5fa529da32f88b69ed0cb2f644a0860d642781a3e81f9efa57748007da"
10-
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231103050336/artifacts/public/build/FocusRustComponents.xcframework.zip"
9+
let focusChecksum = "c2d4ffad5d759b48a1558fe77c89430faf6246dd586d81c8f53d4b268cf8f871"
10+
let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.121.20231104050329/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: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ 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: 3, hour: 5, minute: 24, second: 49))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 4, hour: 5, minute: 18, second: 18))
2929
}
3030

3131
enum NimbusEvents {
3232
struct DisqualificationExtra: EventExtras {
3333
var branch: String?
34-
var enrollmentId: String?
3534
var experiment: String?
3635

3736
func toExtraRecord() -> [String: String] {
@@ -40,9 +39,6 @@ extension GleanMetrics {
4039
if let branch = self.branch {
4140
record["branch"] = String(branch)
4241
}
43-
if let enrollmentId = self.enrollmentId {
44-
record["enrollment_id"] = String(enrollmentId)
45-
}
4642
if let experiment = self.experiment {
4743
record["experiment"] = String(experiment)
4844
}
@@ -75,7 +71,6 @@ extension GleanMetrics {
7571

7672
struct EnrollmentExtra: EventExtras {
7773
var branch: String?
78-
var enrollmentId: String?
7974
var experiment: String?
8075
var experimentType: String?
8176

@@ -85,9 +80,6 @@ extension GleanMetrics {
8580
if let branch = self.branch {
8681
record["branch"] = String(branch)
8782
}
88-
if let enrollmentId = self.enrollmentId {
89-
record["enrollment_id"] = String(enrollmentId)
90-
}
9183
if let experiment = self.experiment {
9284
record["experiment"] = String(experiment)
9385
}
@@ -201,7 +193,6 @@ extension GleanMetrics {
201193

202194
struct UnenrollmentExtra: EventExtras {
203195
var branch: String?
204-
var enrollmentId: String?
205196
var experiment: String?
206197
var reason: String?
207198

@@ -211,9 +202,6 @@ extension GleanMetrics {
211202
if let branch = self.branch {
212203
record["branch"] = String(branch)
213204
}
214-
if let enrollmentId = self.enrollmentId {
215-
record["enrollment_id"] = String(enrollmentId)
216-
}
217205
if let experiment = self.experiment {
218206
record["experiment"] = String(experiment)
219207
}
@@ -236,7 +224,7 @@ extension GleanMetrics {
236224
lifetime: .ping,
237225
disabled: false
238226
)
239-
, ["branch", "enrollment_id", "experiment"]
227+
, ["branch", "experiment"]
240228
)
241229

242230
/// Recorded when an enrollment fails, including the reason for the failure.
@@ -262,7 +250,7 @@ extension GleanMetrics {
262250
lifetime: .ping,
263251
disabled: false
264252
)
265-
, ["branch", "enrollment_id", "experiment", "experiment_type"]
253+
, ["branch", "experiment", "experiment_type"]
266254
)
267255

268256
/// Recorded for each enrollment status each time the SDK completes application of
@@ -328,7 +316,7 @@ extension GleanMetrics {
328316
lifetime: .ping,
329317
disabled: false
330318
)
331-
, ["branch", "enrollment_id", "experiment", "reason"]
319+
, ["branch", "experiment", "reason"]
332320
)
333321

334322
}

‎swift-source/all/Generated/nimbus.swift

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,17 +1151,15 @@ public struct EnrolledExperiment {
11511151
public var userFacingName: String
11521152
public var userFacingDescription: String
11531153
public var branchSlug: String
1154-
public var enrollmentId: String
11551154

11561155
// Default memberwise initializers are never public by default, so we
11571156
// declare one manually.
1158-
public init(featureIds: [String], slug: String, userFacingName: String, userFacingDescription: String, branchSlug: String, enrollmentId: String) {
1157+
public init(featureIds: [String], slug: String, userFacingName: String, userFacingDescription: String, branchSlug: String) {
11591158
self.featureIds = featureIds
11601159
self.slug = slug
11611160
self.userFacingName = userFacingName
11621161
self.userFacingDescription = userFacingDescription
11631162
self.branchSlug = branchSlug
1164-
self.enrollmentId = enrollmentId
11651163
}
11661164
}
11671165

@@ -1182,9 +1180,6 @@ extension EnrolledExperiment: Equatable, Hashable {
11821180
if lhs.branchSlug != rhs.branchSlug {
11831181
return false
11841182
}
1185-
if lhs.enrollmentId != rhs.enrollmentId {
1186-
return false
1187-
}
11881183
return true
11891184
}
11901185

@@ -1194,7 +1189,6 @@ extension EnrolledExperiment: Equatable, Hashable {
11941189
hasher.combine(userFacingName)
11951190
hasher.combine(userFacingDescription)
11961191
hasher.combine(branchSlug)
1197-
hasher.combine(enrollmentId)
11981192
}
11991193
}
12001194

@@ -1205,8 +1199,7 @@ public struct FfiConverterTypeEnrolledExperiment: FfiConverterRustBuffer {
12051199
slug: FfiConverterString.read(from: &buf),
12061200
userFacingName: FfiConverterString.read(from: &buf),
12071201
userFacingDescription: FfiConverterString.read(from: &buf),
1208-
branchSlug: FfiConverterString.read(from: &buf),
1209-
enrollmentId: FfiConverterString.read(from: &buf)
1202+
branchSlug: FfiConverterString.read(from: &buf)
12101203
)
12111204
}
12121205

@@ -1216,7 +1209,6 @@ public struct FfiConverterTypeEnrolledExperiment: FfiConverterRustBuffer {
12161209
FfiConverterString.write(value.userFacingName, into: &buf)
12171210
FfiConverterString.write(value.userFacingDescription, into: &buf)
12181211
FfiConverterString.write(value.branchSlug, into: &buf)
1219-
FfiConverterString.write(value.enrollmentId, into: &buf)
12201212
}
12211213
}
12221214

@@ -1290,16 +1282,14 @@ public func FfiConverterTypeEnrolledFeature_lower(_ value: EnrolledFeature) -> R
12901282
public struct EnrollmentChangeEvent {
12911283
public var experimentSlug: String
12921284
public var branchSlug: String
1293-
public var enrollmentId: String
12941285
public var reason: String?
12951286
public var change: EnrollmentChangeEventType
12961287

12971288
// Default memberwise initializers are never public by default, so we
12981289
// declare one manually.
1299-
public init(experimentSlug: String, branchSlug: String, enrollmentId: String, reason: String?, change: EnrollmentChangeEventType) {
1290+
public init(experimentSlug: String, branchSlug: String, reason: String?, change: EnrollmentChangeEventType) {
13001291
self.experimentSlug = experimentSlug
13011292
self.branchSlug = branchSlug
1302-
self.enrollmentId = enrollmentId
13031293
self.reason = reason
13041294
self.change = change
13051295
}
@@ -1313,9 +1303,6 @@ extension EnrollmentChangeEvent: Equatable, Hashable {
13131303
if lhs.branchSlug != rhs.branchSlug {
13141304
return false
13151305
}
1316-
if lhs.enrollmentId != rhs.enrollmentId {
1317-
return false
1318-
}
13191306
if lhs.reason != rhs.reason {
13201307
return false
13211308
}
@@ -1328,7 +1315,6 @@ extension EnrollmentChangeEvent: Equatable, Hashable {
13281315
public func hash(into hasher: inout Hasher) {
13291316
hasher.combine(experimentSlug)
13301317
hasher.combine(branchSlug)
1331-
hasher.combine(enrollmentId)
13321318
hasher.combine(reason)
13331319
hasher.combine(change)
13341320
}
@@ -1339,7 +1325,6 @@ public struct FfiConverterTypeEnrollmentChangeEvent: FfiConverterRustBuffer {
13391325
return try EnrollmentChangeEvent(
13401326
experimentSlug: FfiConverterString.read(from: &buf),
13411327
branchSlug: FfiConverterString.read(from: &buf),
1342-
enrollmentId: FfiConverterString.read(from: &buf),
13431328
reason: FfiConverterOptionString.read(from: &buf),
13441329
change: FfiConverterTypeEnrollmentChangeEventType.read(from: &buf)
13451330
)
@@ -1348,7 +1333,6 @@ public struct FfiConverterTypeEnrollmentChangeEvent: FfiConverterRustBuffer {
13481333
public static func write(_ value: EnrollmentChangeEvent, into buf: inout [UInt8]) {
13491334
FfiConverterString.write(value.experimentSlug, into: &buf)
13501335
FfiConverterString.write(value.branchSlug, into: &buf)
1351-
FfiConverterString.write(value.enrollmentId, into: &buf)
13521336
FfiConverterOptionString.write(value.reason, into: &buf)
13531337
FfiConverterTypeEnrollmentChangeEventType.write(value.change, into: &buf)
13541338
}

‎swift-source/all/Nimbus/Nimbus.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ extension Nimbus: FeaturesInterface {
185185
Glean.shared.setExperimentActive(
186186
experiment.slug,
187187
branch: experiment.branchSlug,
188-
extra: ["enrollmentId": experiment.enrollmentId]
188+
extra: nil
189189
)
190190
}
191191
}
@@ -196,19 +196,16 @@ extension Nimbus: FeaturesInterface {
196196
case .enrollment:
197197
GleanMetrics.NimbusEvents.enrollment.record(GleanMetrics.NimbusEvents.EnrollmentExtra(
198198
branch: event.branchSlug,
199-
enrollmentId: event.enrollmentId,
200199
experiment: event.experimentSlug
201200
))
202201
case .disqualification:
203202
GleanMetrics.NimbusEvents.disqualification.record(GleanMetrics.NimbusEvents.DisqualificationExtra(
204203
branch: event.branchSlug,
205-
enrollmentId: event.enrollmentId,
206204
experiment: event.experimentSlug
207205
))
208206
case .unenrollment:
209207
GleanMetrics.NimbusEvents.unenrollment.record(GleanMetrics.NimbusEvents.UnenrollmentExtra(
210208
branch: event.branchSlug,
211-
enrollmentId: event.enrollmentId,
212209
experiment: event.experimentSlug
213210
))
214211

‎swift-source/focus/Generated/Metrics/Metrics.swift

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ 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: 3, hour: 5, minute: 24, second: 52))
28+
public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 4, hour: 5, minute: 18, second: 21))
2929
}
3030

3131
enum NimbusEvents {
3232
struct DisqualificationExtra: EventExtras {
3333
var branch: String?
34-
var enrollmentId: String?
3534
var experiment: String?
3635

3736
func toExtraRecord() -> [String: String] {
@@ -40,9 +39,6 @@ extension GleanMetrics {
4039
if let branch = self.branch {
4140
record["branch"] = String(branch)
4241
}
43-
if let enrollmentId = self.enrollmentId {
44-
record["enrollment_id"] = String(enrollmentId)
45-
}
4642
if let experiment = self.experiment {
4743
record["experiment"] = String(experiment)
4844
}
@@ -75,7 +71,6 @@ extension GleanMetrics {
7571

7672
struct EnrollmentExtra: EventExtras {
7773
var branch: String?
78-
var enrollmentId: String?
7974
var experiment: String?
8075
var experimentType: String?
8176

@@ -85,9 +80,6 @@ extension GleanMetrics {
8580
if let branch = self.branch {
8681
record["branch"] = String(branch)
8782
}
88-
if let enrollmentId = self.enrollmentId {
89-
record["enrollment_id"] = String(enrollmentId)
90-
}
9183
if let experiment = self.experiment {
9284
record["experiment"] = String(experiment)
9385
}
@@ -201,7 +193,6 @@ extension GleanMetrics {
201193

202194
struct UnenrollmentExtra: EventExtras {
203195
var branch: String?
204-
var enrollmentId: String?
205196
var experiment: String?
206197
var reason: String?
207198

@@ -211,9 +202,6 @@ extension GleanMetrics {
211202
if let branch = self.branch {
212203
record["branch"] = String(branch)
213204
}
214-
if let enrollmentId = self.enrollmentId {
215-
record["enrollment_id"] = String(enrollmentId)
216-
}
217205
if let experiment = self.experiment {
218206
record["experiment"] = String(experiment)
219207
}
@@ -236,7 +224,7 @@ extension GleanMetrics {
236224
lifetime: .ping,
237225
disabled: false
238226
)
239-
, ["branch", "enrollment_id", "experiment"]
227+
, ["branch", "experiment"]
240228
)
241229

242230
/// Recorded when an enrollment fails, including the reason for the failure.
@@ -262,7 +250,7 @@ extension GleanMetrics {
262250
lifetime: .ping,
263251
disabled: false
264252
)
265-
, ["branch", "enrollment_id", "experiment", "experiment_type"]
253+
, ["branch", "experiment", "experiment_type"]
266254
)
267255

268256
/// Recorded for each enrollment status each time the SDK completes application of
@@ -328,7 +316,7 @@ extension GleanMetrics {
328316
lifetime: .ping,
329317
disabled: false
330318
)
331-
, ["branch", "enrollment_id", "experiment", "reason"]
319+
, ["branch", "experiment", "reason"]
332320
)
333321

334322
}

0 commit comments

Comments
 (0)