1713693 - Add an ETP shim for Doubleclick

Status: RESOLVED FIXED

(Core :: Privacy: Anti-Tracking, enhancement)

Description

[Thomas Wisniewski [:twisniewski]]

Sites often break when pubads or securepubads are blocked. Shimming them will prevent various kinds of breakage ranging from sites not properly loading to videos not appearing.

Comment 1

[Thomas Wisniewski [:twisniewski]]

Attachment: Bug 1713693 - Add a SmartBlock shim for Doubleclick; r?denschub

Comment 2

[Dorel Luca [:dluca]]

Backed out changeset 82f3980be0c0 (bug 1713693) for build bustage on Linux. CLOSED TREE

Log:
https://treeherder.mozilla.org/logviewer?job_id=344483965&repo=autoland&lineNumber=69369

Push with failures:
https://treeherder.mozilla.org/jobs?repo=autoland&group_state=expanded&revision=82f3980be0c0e6a408fd403457170d759a205810

Backout:
https://hg.mozilla.org/integration/autoland/rev/7e5b7b7787a922af129d9cb95fcce82cbecc8e2b

Comment 3

[Thomas Wisniewski [:twisniewski]]

Always fun to see a duplicate filename error when that file is 0-sized :)

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/52a7608366bd
Add a SmartBlock shim for Doubleclick; r=denschub,webcompat-reviewers

Comment 5

[Dorel Luca [:dluca]]

Backed out changeset 52a7608366bd (bug 1713693) for Build bustages. CLOSED TREE

Log:
https://treeherder.mozilla.org/logviewer?job_id=344487067&repo=autoland&lineNumber=69104

Push with failures:
https://treeherder.mozilla.org/jobs?repo=autoland&group_state=expanded&revision=52a7608366bdf28c9d3704fbf9b49d8638356700

Backout:
https://hg.mozilla.org/integration/autoland/rev/6b5755eaf66c6139271c0737b11e44460095f59e

Comment 6

[Thomas Wisniewski [:twisniewski]]

Wait, what? There is no other file named empty-shim.txt in-tree that I can see. So it's not the duplicate filename which isn't allowed, but we aren't allowed to have more than one empty file in-tree? That seems oddly heavy-handed, and I think my only option will be to explicitly allow it as a dupe.

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/21e5a34cf792
Add a SmartBlock shim for Doubleclick; r=denschub,webcompat-reviewers

Comment 8

[Atila Butkovits]

Backed out for causing build bustages.

Backout link: https://hg.mozilla.org/integration/autoland/rev/e159619172337e2f45a81b141174d137b0d86fb9

Push with failures: https://treeherder.mozilla.org/jobs?repo=autoland&searchStr=linux%2Cx64%2Ctsan%2Cbuild-linux64-tsan%2Fopt%2Cbo&revision=21e5a34cf7926086c7d38ec52c322959477c100d&selectedTaskRun=eQERNQvORWWeaGqmv9l2WA.0

Failure log: https://treeherder.mozilla.org/logviewer?job_id=344494316&repo=autoland&lineNumber=76599

Comment 9

[Thomas Wisniewski [:twisniewski]]

Ah, I used to wrong format for the allowlist this time. Sorry for the churn.

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/a0e84f443e91
Add a SmartBlock shim for Doubleclick; r=denschub,webcompat-reviewers

Comment 11

[Atila Butkovits]

Backed out for causing build bustage.

Backout link: https://hg.mozilla.org/integration/autoland/rev/51665fb50c6bd7c5c07d5e49369da103631a7fce

Failure log: https://treeherder.mozilla.org/logviewer?job_id=344499924&repo=autoland&lineNumber=73816

Push with failures: https://treeherder.mozilla.org/jobs?repo=autoland&selectedTaskRun=DosmjNSkTvWGLocMt6HeaA.0&resultStatus=testfailed%2Cbusted%2Cexception&revision=a0e84f443e91876a93783f6fee5fb93765f0a41e&searchStr=Linux%2Cx64%2Casan%2Cbuild-linux64-asan%2Fopt%2CBo

Comment 12

[Thomas Wisniewski [:twisniewski]]

Ok, I'm fresh out of ideas as to what's going on now from the error in the log. I'll have to ask around to find out what might be going on here.

Comment 13

[Thomas Wisniewski [:twisniewski]]

:glandium, :egao, would either of you have any idea what's going on here? This is the part of the log with the error for the current patch version:

[task 2021-07-06T20:10:43.352Z] 20:10:43     INFO -  package> WARNING: Found 48 duplicated files taking 8017589 bytes (uncompressed)
[task 2021-07-06T20:10:43.352Z] 20:10:43     INFO -  package> ERROR: The following duplicated files are not allowed:
[task 2021-07-06T20:10:43.352Z] 20:10:43     INFO -  package> removed-files
[task 2021-07-06T20:10:43.352Z] 20:10:43    ERROR -  package> make[5]: *** [/builds/worker/checkouts/gecko/toolkit/mozapps/installer/packager.mk:26: stage-package] Error 1
[task 2021-07-06T20:10:43.352Z] 20:10:43     INFO -  package> make[5]: Leaving directory '/builds/worker/workspace/obj-build/browser/installer'
[task 2021-07-06T20:10:43.353Z] 20:10:43    ERROR -  package> make[4]: *** [/builds/worker/checkouts/gecko/toolkit/mozapps/installer/packager.mk:111: make-package] Error 2
[task 2021-07-06T20:10:43.353Z] 20:10:43    ERROR -  package> make[3]: *** [/builds/worker/checkouts/gecko/config/rules.mk:355: default] Error 2
[task 2021-07-06T20:10:43.353Z] 20:10:43    ERROR -  package> make[2]: *** [/builds/worker/checkouts/gecko/browser/build.mk:6: package] Error 2
[task 2021-07-06T20:10:43.353Z] 20:10:43    ERROR -  make[1]: *** [/builds/worker/checkouts/gecko/build/moz-automation.mk:110: automation/package] Error 2
[task 2021-07-06T20:10:43.353Z] 20:10:43     INFO -  make[1]: *** Waiting for unfinished jobs....

The file throwing it off is again an empty file named empty-shim.txt.

Comment 14

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

The removed-files file is generated during the build and empty if GTK is used. Add an exception to allowed-dupes.mn.

Comment 15

[Thomas Wisniewski [:twisniewski]]

:aryx, I did add these lines to allowed-dupes.mn in the patch:

# Bug 1713693 - empty-shim.txt, an intentionally blank file used by SmartBlock (0 bytes)
browser/features/[e-mail]/shims/empty-shim.txt

Is that insufficient?

Comment 16

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

1. It needs to be wrapped by a #ifdef MOZ_GTK (else there will be test failures about an unused exception).
2. The test log regards removed-files. Both files should be mention based on the other rules there.

Comment 17

[Thomas Wisniewski [:twisniewski]]

Thanks, but I'm still not quite sure what you mean. Placing that ifdef around the code I added to allowed-dupes doesn't make the removed-files error go away, so I must be missing something (sorry if I'm being a bit slow on the uptake here!): https://treeherder.mozilla.org/jobs?repo=try&revision=48b0b7cd2cbd66c755b11aca20ffa3eca08bcc77

Comment 18

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Add another line in your block with literally removed-files so it contains both files mentioned earlier in the log.

Comment 19

[Thomas Wisniewski [:twisniewski]]

Oh, that's all you meant? Wow, maybe that week off did me more harm than good :S

Comment 20

[Thomas Wisniewski [:twisniewski]]

Attachment: Bug 1713693 - Add a SmartBlock shim for Doubleclick; r?denschub

Comment 21

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/1058c8349d91
Add a SmartBlock shim for Doubleclick; r=denschub,webcompat-reviewers

Comment 22

[Marian-Vasile Laza]

https://hg.mozilla.org/mozilla-central/rev/1058c8349d91