Reenable blocklist experiment feature #5511
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
marcosholgado
commented
Jan 22, 2025
| @@ -3056,7 +3056,7 @@ class ContributesRemoteFeatureCodeGeneratorTest { | |||
| "testFeature", | |||
| """ | |||
| { | |||
| "hash": "3", | |||
There was a problem hiding this comment.
While at it, fixed this test that was wrong.
marcosholgado
force-pushed
the
feature/marcos/reenable_blocklist_exp
branch
from
06e709a to
259d6a3
Compare
marcosholgado
commented
Jan 22, 2025
| trackerDataDownloader.downloadTds() | ||
| .subscribeOn(Schedulers.io()) |
There was a problem hiding this comment.
We weren't downloading anything before 🤦
marcosholgado
commented
Jan 22, 2025
| @@ -40,7 +51,7 @@ class BlockListInterceptorApiPlugin constructor( | |||
| override fun intercept(chain: Chain): Response { | |||
| val request = chain.request().newBuilder() | |||
| val url = chain.request().url | |||
| if (!url.toString().contains(TDS_BASE_URL)) { | |||
| if (url.toString() != TDS_URL) { | |||
There was a problem hiding this comment.
We now check the full TDS url rather than the base url.
marcosholgado
commented
Jan 22, 2025
| chain.proceed(request.url("$TDS_BASE_URL$path").build()) | ||
| chain.proceed(request.url("$TDS_BASE_URL$path").build()).also { response -> | ||
| if (!response.isSuccessful) { | ||
| pixel.fire(BLOCKLIST_TDS_FAILURE, mapOf("code" to response.code.toString())) |
There was a problem hiding this comment.
Sending a pixel if the path on the remote config is wrong and the request fails.
marcosholgado
force-pushed
the
feature/marcos/reenable_blocklist_exp
branch
from
259d6a3 to
13496eb
Compare
aitorvs
reviewed
Jan 23, 2025
| const val TDS_BASE_URL = "https://staticcdn.duckduckgo.com/trackerblocking/" | ||
| const val TDS_PATH = "v5/current/android-tds.json" | ||
| const val TDS_URL = "$TDS_BASE_URL$TDS_PATH" |
There was a problem hiding this comment.
nit: I guess this can be reverted (removed) now (?)
aitorvs
approved these changes
Jan 23, 2025
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.
Task/Issue URL: https://app.asana.com/0/488551667048375/1209138858416176/f
Description
This PR reenables the blocklist feature but this time checking the full tds URL rather than the base url only.
Steps to test this PR
https://www.jsonblob.com/api/1331667217611415552for the remote configexperiment_enrollpixel for the control and the eTag (app.db in tdsmetadata table) should match the one from https://staticcdn.duckduckgo.com/trackerblocking/v5/current/ios-tds.json currently is75cff4e36f76d9a81af0643d775008c9something.json, change the version and the hash from the blocklist too.blocklist_experiment_tds_download_failurepixel with a corresponding error code.