Closed Bug 1356331 Opened 3 years ago Closed 2 years ago

Remove any hotfix code from Firefox

Categories

(Toolkit :: Add-ons Manager, enhancement, P3)

Product:
Toolkit
Component:
Add-ons Manager
Type:
enhancement

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla60
Tracking Flags:
Tracking Status
firefox60 --- fixed

People

(Reporter: andy+bugzilla, Assigned: aswan)

References

Details

(Whiteboard: triaged)

Attachments

(2 files)

Bug 1356331 Remove hotfix from telemetry
59 bytes, text/x-review-board-request
chutten
: review+
Details
Bug 1356331 Remove hotfix code from addons manager and related tests
59 bytes, text/x-review-board-request
rhelmer
: review+
Details 
This might be a bit bigger than this, but it involves removing anything in Firefox that refers to the hotfix. A search for:

https://dxr.mozilla.org/mozilla-central/search?q=hotfix&redirect=true

Gives you a good start on what can be removed.
Priority: -- → P3
Whiteboard: triaged
Depends on: 1380041
I took a look at this and I see that we're reporting info on hotfix in the telemetry environment:
https://searchfox.org/mozilla-central/rev/b24e6342d744c5a83fab5c15972e11eeb69d68e6/toolkit/components/telemetry/TelemetryEnvironment.jsm#1304

Are we safe to remove that code (and accompanying docs etc) in this patch or does this require other changes to the telemetry ping processing pipeline?
Flags: needinfo?(chutten)
A quick look-through suggests we aren't using it for anything in particular on the client side. Pretty sure we're not doing anything with it on the server side either, but ni?mreid (for when he gets back on Monday) to be sure.

So, yes, it should be safe to remove it from the environment, the docs, and the tests.
Flags: needinfo?(chutten) → needinfo?(mreid)
Assignee: nobody → aswan
Attachment #8940057 - Flags: review?(chutten)
Attachment #8940058 - Flags: review?(rhelmer)
Comment on attachment 8940057 [details]
Bug 1356331 Remove hotfix from telemetry

https://reviewboard.mozilla.org/r/210338/#review216870

LGTM
Attachment #8940057 - Flags: review?(chutten) → review+
Depends on: 1260213
No longer depends on: 1380041
The "hotfixVersion" field is present in a couple of datasets[1][2], but as far as I can tell the field is always optional where present, so removing it from the client should not cause problems.

There are 11 queries in sql.telemetry.m.o which reference this field in the Longitudinal dataset, all of them targeting Fx versions 49 and earlier (mostly v47), so again this field should not be missed.


[1] https://github.com/mozilla-services/mozilla-pipeline-schemas/search?utf8=%E2%9C%93&q=hotfix&type=
[2] https://github.com/mozilla/telemetry-batch-view/blob/23767a733e1d5739ac26fdfc35e1eaeaca5805cd/src/main/scala/com/mozilla/telemetry/views/Longitudinal.scala#L266
Flags: needinfo?(mreid)
Comment on attachment 8940058 [details]
Bug 1356331 Remove hotfix code from addons manager and related tests

https://reviewboard.mozilla.org/r/210340/#review217976

lgtm, and I'll take a closer look once bug 1260213 lands (which I think we want to do first so we don't leave Fennec users out)
Attachment #8940058 - Flags: review?(rhelmer)
(In reply to Robert Helmer [:rhelmer] from comment #8)
> lgtm, and I'll take a closer look once bug 1260213 lands (which I think we
> want to do first so we don't leave Fennec users out)

Poke.  1260213 landed.
Flags: needinfo?(rhelmer)
Comment on attachment 8940058 [details]
Bug 1356331 Remove hotfix code from addons manager and related tests

https://reviewboard.mozilla.org/r/210340/#review221836
Attachment #8940058 - Flags: review+
Flags: needinfo?(rhelmer)
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s d8c7ba8ef758b9f1d8be8ddbd2dd9be85eb1fea2 -d 0777a1e9ff32: rebasing 444822:d8c7ba8ef758 "Bug 1356331 Remove hotfix from telemetry r=chutten"
merging toolkit/components/telemetry/TelemetryEnvironment.jsm
merging toolkit/components/telemetry/docs/data/environment.rst
merging toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
rebasing 444823:b3e4cbba81d3 "Bug 1356331 Remove hotfix code from addons manager and related tests r=rhelmer" (tip)
merging browser/app/profile/firefox.js
merging mobile/android/app/mobile.js
merging services/sync/modules/engines/addons.js
merging services/sync/tests/unit/test_addons_store.js
merging toolkit/mozapps/extensions/AddonManager.jsm
merging toolkit/mozapps/extensions/content/extensions.js
merging toolkit/mozapps/extensions/internal/AddonRepository.jsm
merging toolkit/mozapps/extensions/internal/XPIInstall.jsm
merging toolkit/mozapps/extensions/internal/XPIProvider.jsm
merging toolkit/mozapps/extensions/test/browser/browser_details.js
merging toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js
merging toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
merging toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
warning: conflicts while merging toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg rebase -s 4a5fe2d898d722031812012090d3bf468c7e2b92 -d ed992fa676dc: rebasing 444890:4a5fe2d898d7 "Bug 1356331 Remove hotfix from telemetry r=chutten"
merging toolkit/components/telemetry/TelemetryEnvironment.jsm
merging toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
rebasing 444891:0a2bfce212c8 "Bug 1356331 Remove hotfix code from addons manager and related tests r=rhelmer" (tip)
local [dest] changed toolkit/mozapps/extensions/test/xpcshell/test_hotfix.js which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
local [dest] changed toolkit/mozapps/extensions/test/xpcshell/test_hotfix_cert.js which other [source] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
merging services/sync/modules/engines/addons.js
merging services/sync/tests/unit/test_addons_store.js
merging toolkit/mozapps/extensions/AddonManager.jsm
merging toolkit/mozapps/extensions/content/extensions.js
merging toolkit/mozapps/extensions/internal/AddonRepository.jsm
merging toolkit/mozapps/extensions/internal/XPIInstall.jsm
merging toolkit/mozapps/extensions/internal/XPIProvider.jsm
merging toolkit/mozapps/extensions/test/browser/browser_details.js
merging toolkit/mozapps/extensions/test/xpcshell/test_backgroundupdate.js
warning: conflicts while merging toolkit/mozapps/extensions/AddonManager.jsm! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
Pushed by aswan@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/ca0c083e6199
Remove hotfix from telemetry r=chutten
https://hg.mozilla.org/integration/autoland/rev/2a17b39dcc33
Remove hotfix code from addons manager and related tests r=rhelmer
https://hg.mozilla.org/mozilla-central/rev/ca0c083e6199
https://hg.mozilla.org/mozilla-central/rev/2a17b39dcc33
Status: NEW → RESOLVED
Closed: 2 years ago
status-firefox60: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla60
Flags: qe-verify-
You need to log in before you can comment on or make changes to this bug.