The other merge-conflict is from code that we removed on central in https://hg.mozilla.org/mozilla-central/rev/65677e6aa05d#l1.57 That change is slightly awkward to rebase around (since it adds some state that straddles code that's now split between two functions). Given that the lines in question are just for unused telemetry (per the commit message), it seems like we should just uplift that patch as well, rather than trying to delicately edit this bug's patch to preserve those lines to still collect apparently-unused telemetry.
Bug 1861259 Comment 24 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
The other merge-conflict is from some telemetry code that we removed on central in https://hg.mozilla.org/mozilla-central/rev/65677e6aa05d#l1.57 but still exists on ESR115. That change is slightly awkward to rebase around (since it adds some state that straddles code that's now split between two functions). Given that the lines in question are just for unused telemetry (per the commit message), it seems like we should just uplift that patch as well, rather than trying to delicately edit this bug's patch to preserve those lines to still collect apparently-unused telemetry.
The other merge-conflict is from some telemetry code that we removed on central in https://hg.mozilla.org/mozilla-central/rev/65677e6aa05d#l1.57 but still exists on ESR115. That change is slightly awkward to rebase around (since it involves some state that straddles code that's now split between two functions). Given that the lines in question are just for unused telemetry (per the commit message), it seems like we should just uplift that patch as well, rather than trying to delicately edit this bug's patch to preserve those lines to still collect apparently-unused telemetry.
The other merge-conflict is from some telemetry code that we removed on central in https://hg.mozilla.org/mozilla-central/rev/65677e6aa05d#l1.57 but still exists on ESR115. That change is slightly awkward to rebase around (since it involves some state that straddles code that's now split between two functions). Given that the lines in question are just for unused telemetry (per the commit message in the commit that removed it from central), it seems like we should just uplift that patch as well, rather than trying to delicately edit this bug's patch to preserve those lines to still collect apparently-unused telemetry.