Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Sync Success Rate pixel #2277

Merged
merged 8 commits into from
Dec 20, 2023
Merged

Add Sync Success Rate pixel #2277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33b186b
Enable Sync Rate pixel
bwaresiak Dec 19, 2023
d40429d
Update after recent API changes
bwaresiak Dec 19, 2023
93bd48e
Remove orphaned bookmarks pixel
bwaresiak Dec 19, 2023
cbf33d4
Fix typo
bwaresiak Dec 20, 2023
89c9995
Update Package.resolved
bwaresiak Dec 20, 2023
3fa51c5
Tweaks after recent naming changes
bwaresiak Dec 20, 2023
2bf5109
Bump BSK ref
bwaresiak Dec 20, 2023
4bdeee6
Bump other dependencies
bwaresiak Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Core/BookmarksModelsErrorHandling.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ public class BookmarksModelsErrorHandling: EventMapping<BookmarksModelError> {

case .missingParent(let object):
domainEvent = .missingParent(object)
case .orphanedBookmarksPresent:
if let syncService, syncService.authState == .inactive {
domainEvent = .orphanedBookmarksPresent
}
}

if let domainEvent {
Expand Down
6 changes: 5 additions & 1 deletion Core/DailyPixel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ public final class DailyPixel {
/// Does not append any suffix unlike the alternative function below
public static func fire(pixel: Pixel.Event,
withAdditionalParameters params: [String: String] = [:],
includedParameters: [Pixel.QueryParameters] = [.atb, .appVersion],
onComplete: @escaping (Swift.Error?) -> Void = { _ in }) {

if !pixel.hasBeenFiredToday(dailyPixelStorage: storage) {
Pixel.fire(pixel: pixel, withAdditionalParameters: params, onComplete: onComplete)
Pixel.fire(pixel: pixel,
withAdditionalParameters: params,
includedParameters: includedParameters,
onComplete: onComplete)
updatePixelLastFireDate(pixel: pixel)
} else {
onComplete(Error.alreadyFired)
Expand Down
2 changes: 0 additions & 2 deletions Core/PixelEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,6 @@ extension Pixel {
case indexOutOfRange(BookmarksModelError.ModelType)
case saveFailed(BookmarksModelError.ModelType)
case missingParent(BookmarksModelError.ObjectType)
case orphanedBookmarksPresent

case bookmarksCouldNotLoadDatabase
case bookmarksCouldNotPrepareDatabase
Expand Down Expand Up @@ -1036,7 +1035,6 @@ extension Pixel.Event {
case .indexOutOfRange(let modelType): return "m_d_bookmarks_index_out_of_range_\(modelType.rawValue)"
case .saveFailed(let modelType): return "m_d_bookmarks_view_model_save_failed_\(modelType.rawValue)"
case .missingParent(let objectType): return "m_d_bookmark_model_missing_parent_\(objectType.rawValue)"
case .orphanedBookmarksPresent: return "m_d_bookmarks_orphans_present"

case .bookmarksCouldNotLoadDatabase: return "m_d_bookmarks_could_not_load_database"
case .bookmarksCouldNotPrepareDatabase: return "m_d_bookmarks_could_not_prepare_database"
Expand Down
4 changes: 2 additions & 2 deletions Core/SyncMetricsEventsHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public class SyncMetricsEventsHandler: EventMapping<MetricsEvent> {
super.init { event, _, _, _ in
switch event {
case .overrideEmailProtectionSettings:
Pixel.fire(pixel: .syncDuckAddressOverride)
Pixel.fire(pixel: .syncDuckAddressOverride, includedParameters: [.appVersion])
case .localTimestampResolutionTriggered(let feature):
Pixel.fire(pixel: .syncLocalTimestampResolutionTriggered(feature))
Pixel.fire(pixel: .syncLocalTimestampResolutionTriggered(feature), includedParameters: [.appVersion])
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9221,7 +9221,7 @@
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 95.0.0;
version = 96.0.0;
};
};
C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "ae9e9180f74d92c83fc3cc1d2fc23f4855fb361c",
"version" : "95.0.0"
"revision" : "e5c9e31b19b3cf78e2b704a60882ba24b9bc680d",
"version" : "96.0.0"
}
},
{
Expand Down
10 changes: 7 additions & 3 deletions DuckDuckGo/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
errorEvents: preMigrationErrorHandling
)

bookmarksDatabase.loadStore { [weak self] context, error in

Check warning on line 193 in DuckDuckGo/AppDelegate.swift

View workflow job for this annotation

GitHub Actions / Unit Tests 

variable 'self' was written to, but never read
guard let context = context else {
if let error = error {
Pixel.fire(pixel: .bookmarksCouldNotLoadDatabase,
Expand Down Expand Up @@ -289,9 +289,13 @@

isSyncInProgressCancellable = syncService.isSyncInProgressPublisher
.filter { $0 }
.prefix(1)
.sink { _ in
DailyPixel.fire(pixel: .syncDaily)
.sink { [weak syncService] _ in
DailyPixel.fire(pixel: .syncDaily, includedParameters: [.appVersion])
syncService?.syncDailyStats.sendStatsIfNeeded(handler: { params in
Pixel.fire(pixel: .syncSuccessRateDaily,
withAdditionalParameters: params,
includedParameters: [.appVersion])
})
}

#if APP_TRACKING_PROTECTION
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
self.dismissPresentedViewController()
self.showPreparingSync()
try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
Pixel.fire(pixel: .syncSignupDirect)
Pixel.fire(pixel: .syncSignupDirect, includedParameters: [.appVersion])
self.rootView.model.syncEnabled(recoveryCode: recoveryCode)
self.refreshDevices()
navigationController?.topViewController?.dismiss(animated: true, completion: showRecoveryPDF)
Expand Down
4 changes: 2 additions & 2 deletions DuckDuckGo/SyncSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
func loginAndShowDeviceConnected(recoveryKey: SyncCode.RecoveryKey) async throws {
let registeredDevices = try await syncService.login(recoveryKey, deviceName: deviceName, deviceType: deviceType)
mapDevices(registeredDevices)
Pixel.fire(pixel: .syncLogin)
Pixel.fire(pixel: .syncLogin, includedParameters: [.appVersion])
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.dismissVCAndShowRecoveryPDF()
}
Expand Down Expand Up @@ -281,7 +281,7 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
showPreparingSync()
if syncService.account == nil {
try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
Pixel.fire(pixel: .syncSignupConnect)
Pixel.fire(pixel: .syncSignupConnect, includedParameters: [.appVersion])
self.dismissVCAndShowRecoveryPDF()
shouldShowSyncEnabled = false
rootView.model.syncEnabled(recoveryCode: recoveryCode)
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/DuckUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ let package = Package(
targets: ["DuckUI"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "95.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "96.0.0"),
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SyncUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let package = Package(
],
dependencies: [
.package(path: "../DuckUI"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "95.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "96.0.0"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/Waitlist/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
targets: ["Waitlist", "WaitlistMocks"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "95.0.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "96.0.0"),
.package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0")
],
targets: [
Expand Down
Loading