Initial changes for compilation time tracking. #1111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bwaresiak
reviewed
Dec 3, 2024
Sources/BrowserServicesKit/ContentBlocking/ContentBlockingRulesCompilationTask.swift
Outdated
Show resolved
Hide resolved
Sources/BrowserServicesKit/ContentBlocking/ContentBlockingRulesLookupTask.swift
Outdated
Show resolved
Hide resolved
Sources/BrowserServicesKit/ContentBlocking/ContentBlockerRulesManager.swift
Outdated
Show resolved
Hide resolved
…mpilation_time_tracking
studiosutara
commented
Dec 6, 2024
| @@ -388,6 +386,15 @@ public class ContentBlockerRulesManager: CompiledRuleListsSource { | |||
| unprotectedSitesHash: nil)) | |||
| } | |||
|
|
|||
| // todo - this hard code is a placeholder till I figure out how to check for this task vs. Ad attr task | |||
| if task.rulesList.name == "TrackerDataSet" { | |||
There was a problem hiding this comment.
I think I saw an enum for this somewhere, but cannot recall. What is the best way to check for the correct task?
There was a problem hiding this comment.
I think you have in mind DefaultContentBlockerRulesListsSource 's Constants
bwaresiak
reviewed
Dec 6, 2024
| // todo - this hard code is a placeholder till I figure out how to check for this task vs. Ad attr task | ||
| if task.rulesList.name == "TrackerDataSet" { | ||
| if let perfInfo = result.performanceInfo { | ||
| self.errorReporting?.fire(.contentBlockingCompilationTaskPerformance(retryCount: perfInfo.iterationCount, |
There was a problem hiding this comment.
We want to exclude lookups right?
| @@ -65,10 +86,14 @@ extension ContentBlockerRulesManager { | |||
| DispatchQueue.main.async { | |||
| let identifier = model.rulesIdentifier.stringValue | |||
| Logger.contentBlocking.debug("Lookup CBR with \(identifier, privacy: .public)") | |||
| // Todo: how do we exclude this case from compilation time where the result is returned from cache | |||
There was a problem hiding this comment.
I think since we have resultType, this comment is addressed?
|
|
||
| let perfInfo = compilationTime.map { | ||
| CompilationResult.PerformanceInfo(compilationTime: $0, | ||
| iterationCount: getCompilationRetryCount()) |
There was a problem hiding this comment.
Iteration time would be 1 + retryCount per what we've discussed.
…mpilation_time_tracking # Conflicts: # Sources/BrowserServicesKit/ContentBlocking/ContentBlockingRulesLookupTask.swift
bwaresiak
reviewed
Dec 9, 2024
Sources/BrowserServicesKit/ContentBlocking/ContentBlockingRulesCompilationTask.swift
Show resolved
Hide resolved
bwaresiak
reviewed
Dec 9, 2024
| @@ -24,23 +24,24 @@ extension ContentBlockerRulesManager { | |||
|
|
|||
| final class LookupRulesTask { | |||
|
|
|||
| typealias LookupResult = (compiledRulesList: WKContentRuleList, model: ContentBlockerRulesSourceModel) | |||
| // This type has been overloaded multiple times, I'm collapsing them all into CompilationResult type | |||
| // typealias LookupResult = (compiledRulesList: WKContentRuleList, model: ContentBlockerRulesSourceModel) | |||
bwaresiak
approved these changes
Dec 9, 2024
samsymons
added a commit
that referenced
this pull request
Dec 19, 2024
* main: (24 commits) change api (#1133) Ensure authToken is present before calling refreshAuthTokenIfNeeded Add 'locale' to report broken site params Add 'locale' to report broken site params Ensure authToken is present before calling refreshAuthTokenIfNeeded Privacy Pro Free Trials - Models and API (#1120) remove MaliciousSiteProtectionSubfeature (#1131) Malware protection 6: Malware integration (#1099) Add underlying error to PrivacyStatsError (#1130) Initial changes for compilation time tracking. (#1111) iOS System level credential provider (#1127) Increase ratio of complete form saves (#1124) Add PrivacyStatsError.failedToClearPrivacyStats (#1128) Update autofill to 16.0.0 (#1122) Update local network routing (#1117) Update RMF version matching to ignore build number (#1118) Fix threading issue between using a Semaphore and async/await (#1115) add experiment test fake feature (#1119) Bump Tests/BrowserServicesKitTests/Resources/privacy-reference-tests from `a603ff9` to `6133e7d` (#1109) experiment default metrics pixels (#1107) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please review the release process for BrowserServicesKit here.
Required:
Task/Issue URL: https://app.asana.com/0/1208613456171888/1208801514911205/f
iOS PR:
macOS PR:
What kind of version bump will this require?: Major/Minor/Patch
Optional:
Tech Design URL:
CC:
Description:
Steps to test this PR:
1.
1.
OS Testing:
Internal references:
Software Engineering Expectations
Technical Design Template