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

Adding pixel info for content blocking compilation performance tracking #3634

Merged
merged 19 commits into from
Dec 9, 2024
Merged

Adding pixel info for content blocking compilation performance tracking #3634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
78cd052
Adding pixel info for content blocking compilation performance tracking
studiosutara Dec 6, 2024
131e43e
Fixing pixel name for mac format
studiosutara Dec 6, 2024
f21414a
Addressing review comments
studiosutara Dec 6, 2024
143a8ba
Merge branch 'main' into smodi/compilation_time_tracking
bwaresiak Dec 9, 2024
5df7171
Update BSK ref
bwaresiak Dec 9, 2024
13e0ef8
renaming retrycount to iterationcount
studiosutara Dec 9, 2024
4abce7c
updating bsk commit hash
studiosutara Dec 9, 2024
3004dd1
Merge commit 'c718fdba077d64b9b5baf93e23b5bb583e214e5e' into smodi/co…
studiosutara Dec 9, 2024
0a5d243
Merge commit '65bfa9763e7bc10aba49f4ceb415237750ad8bc4' into smodi/co…
studiosutara Dec 9, 2024
f4784d8
updating BSK branch
studiosutara Dec 9, 2024
08fa091
reverting autofill revision change that was done by mistake
studiosutara Dec 9, 2024
2955081
Merge commit 'ca800e4db771a64a2731ba40b303504f6320ee24' into smodi/co…
studiosutara Dec 9, 2024
71aa5b4
Updating BSK to latest commit
studiosutara Dec 9, 2024
805f42f
Merge commit '13fd87086e249c0a2c54bb5a0d23902f72ac49bc' into smodi/co…
studiosutara Dec 9, 2024
44262d1
Fixing compilation issue
studiosutara Dec 9, 2024
6c66988
Fixing merge issue
studiosutara Dec 9, 2024
52f0d55
Fixing merge conflict
studiosutara Dec 9, 2024
6a25e77
fixing indentation
studiosutara Dec 9, 2024
a9b40d6
Updating BSK version
studiosutara Dec 9, 2024
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
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 @@ -15225,7 +15225,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 219.1.0;
version = 220.0.0;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
6 changes: 3 additions & 3 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 @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "6c335fb4355e7128dd9fb9fd25ac3de8942846ad",
"version" : "219.1.0"
"revision" : "55e7de13a99793329993367169c9b6bafbd07bac",
"version" : "220.0.0"
}
},
{
Expand Down Expand Up @@ -75,7 +75,7 @@
{
"identity" : "lottie-spm",
"kind" : "remoteSourceControl",
"location" : "https://github.com/airbnb/lottie-spm",
"location" : "https://github.com/airbnb/lottie-spm.git",
"state" : {
"revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
"version" : "4.4.3"
Expand Down
9 changes: 5 additions & 4 deletions DuckDuckGo/ContentBlocker/ContentBlocking.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,11 @@ final class AppContentBlocking {

case .contentBlockingLRCMissing:
domainEvent = .contentBlockingLRCMissing
case .contentBlockingCompilationTime:
// Temporarily avoid firing this pixel. This can be re-enabled if it's determined to be necessary later.
// domainEvent = .contentBlockingCompilationTime
return

case .contentBlockingCompilationTaskPerformance(let iterationCount, let timeBucketAggregation):
let timeBucket = GeneralPixel.CompileTimeBucketAggregation(number: timeBucketAggregation)
domainEvent = .contentBlockingCompilationTaskPerformance(iterationCount: iterationCount,
timeBucketAggregation: timeBucket)
}

PixelKit.fire(DebugEvent(domainEvent, error: error), withAdditionalParameters: parameters) { _, error in
Expand Down
50 changes: 49 additions & 1 deletion DuckDuckGo/Statistics/GeneralPixel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ enum GeneralPixel: PixelKitEventV2 {
case contentBlockingFetchLRCSucceeded
case contentBlockingNoMatchInLRC
case contentBlockingLRCMissing
case contentBlockingCompilationTaskPerformance(iterationCount: Int, timeBucketAggregation: CompileTimeBucketAggregation)

case secureVaultInitError(error: Error)
case secureVaultError(error: Error)
Expand Down Expand Up @@ -675,7 +676,7 @@ enum GeneralPixel: PixelKitEventV2 {
case .duckPlayerContingencyLearnMoreClicked:
return "duckplayer_mac_contingency_learn-more-clicked"

// Duck Player Temporary Overlay Pixels
// Duck Player Temporary Overlay Pixels
case .duckPlayerYouTubeOverlayNavigationBack:
return "duckplayer_youtube_overlay_navigation_back"
case .duckPlayerYouTubeOverlayNavigationRefresh:
Expand Down Expand Up @@ -946,6 +947,9 @@ enum GeneralPixel: PixelKitEventV2 {
case .contentBlockingLRCMissing:
return "content_blocking_lrc_missing"

case .contentBlockingCompilationTaskPerformance(let iterationCount, let timeBucketAggregation):
return "content_blocking_compilation_loops_\(iterationCount)_time_\(timeBucketAggregation)"

case .secureVaultInitError:
return "secure_vault_init_error"
case .secureVaultError:
Expand Down Expand Up @@ -1446,4 +1450,48 @@ enum GeneralPixel: PixelKitEventV2 {
enum AutofillParameterKeys {
static var backfilled = "backfilled"
}

public enum CompileTimeBucketAggregation: String, CustomStringConvertible {

public var description: String { rawValue }

case lessThan1 = "1"
case lessThan2 = "2"
case lessThan3 = "3"
case lessThan4 = "4"
case lessThan5 = "5"
case lessThan6 = "6"
case lessThan7 = "7"
case lessThan8 = "8"
case lessThan9 = "9"
case lessThan10 = "10"
case more
bwaresiak marked this conversation as resolved.
Show resolved Hide resolved

public init(number: Double) {
switch number {
case ...1:
self = .lessThan1
case ...2:
self = .lessThan2
case ...3:
self = .lessThan3
case ...4:
self = .lessThan4
case ...5:
self = .lessThan5
case ...6:
self = .lessThan6
case ...7:
self = .lessThan7
case ...8:
self = .lessThan8
case ...9:
self = .lessThan9
case ...10:
self = .lessThan10
default:
self = .more
}
}
}
}
2 changes: 1 addition & 1 deletion LocalPackages/DataBrokerProtection/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ let package = Package(
targets: ["DataBrokerProtection"])
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../AppKitExtensions"),
.package(path: "../XPCHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/FeatureFlags/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(
targets: ["FeatureFlags"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
],
targets: [
// Targets are the basic building blocks of a package, defining a module or a test suite.
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NetworkProtectionMac/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(
.library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
.package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
.package(path: "../AppLauncher"),
.package(path: "../UDSHelper"),
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/NewTabPage/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(
targets: ["NewTabPage"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
.package(path: "../WebKitExtensions"),
.package(path: "../Utilities"),
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/SubscriptionUI/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
targets: ["SubscriptionUI"]),
],
dependencies: [
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
.package(path: "../SwiftUIExtensions"),
.package(path: "../FeatureFlags")
],
Expand Down
2 changes: 1 addition & 1 deletion LocalPackages/WebKitExtensions/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(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "219.1.0"),
.package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "220.0.0"),
.package(path: "../AppKitExtensions")
],
targets: [
Expand Down
Loading