Handle Text and Log marker payloads with their marker schema - #6247
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6247 +/- ##
==========================================
+ Coverage 83.58% 83.73% +0.14%
==========================================
Files 350 350
Lines 37498 37523 +25
Branches 10539 10543 +4
==========================================
+ Hits 31343 31420 +77
+ Misses 5728 5676 -52
Partials 427 427 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
fatadel
reviewed
Aug 7, 2026
mstange
reviewed
Aug 7, 2026
Comment on lines
+694
to
+695
| for (const field of markerSchema.fields) { | ||
| if (field.key === fieldKey) { |
Contributor
There was a problem hiding this comment.
This will iterate the schema fields for every sanitized text marker. In other places we precompute the string index fields per marker type, could we use the precomputed map instead?
mstange
reviewed
Aug 7, 2026
| ): string | null { | ||
| if ('message' in data) { | ||
| if (!data.message) { | ||
| const message = resolveLogMarkerMessage(data.message, stringArray); |
Contributor
There was a problem hiding this comment.
So here we check the payload whereas in the other place we check the schema. Should we check the schema here too?
Member
Author
There was a problem hiding this comment.
Yep, looks like I missed that one initially, updated!
Firefox now outputs the Text marker's `name` and the Log marker's `message` as unique strings, so the payload holds a string table index instead of the text itself. The two Text marker PII sanitizers and the MOZ_LOG formatting read those fields directly and threw an error. This patch fixes these issues by always looking at the marker schema and not having any arbitrary assumptions about some certain marker types. It was a bad idea to have these custom handlings in the past instead of relying on the marker schema in the first place.
canova
force-pushed
the
push-ruskmklkuxou
branch
from
August 10, 2026 11:09
1832c65 to
0c71bb8
Compare
mstange
approved these changes
Aug 10, 2026
Contributor
|
Looking forward to this being merged. Currently trying to debug some issues on Nightly profiles, and extractGeckoLogs isn't working. |
canova
enabled auto-merge
August 10, 2026 14:15
Member
Author
|
@valenting Sorry for the issue! I'll deploy it soon. But note that the Firefox patch has been backed out in Nightly, so if you update your Nightly you should be able to use |
canova
added a commit
to canova/perf.html
that referenced
this pull request
Aug 10, 2026
…ker changes are picked up in the frontends The Text marker's `name` and the Log marker's `message` are unique strings now, so their payloads hold a string table index instead of the text. But we realized that the frontend had some hardcoded assumptions about these marker types, and they weren't looking at the schema at all. That's fixed in firefox-devtools#6247. There is nothing to upgrade because the frontend reads the field format from the marker schema. But since older frontends read these two fields directly, this bump makes sure that they get updated. Bugzilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2054010
canova
added a commit
to canova/perf.html
that referenced
this pull request
Aug 10, 2026
…ker changes are picked up in the frontends The Text marker's `name` and the Log marker's `message` are unique strings now, so their payloads hold a string table index instead of the text. But we realized that the frontend had some hardcoded assumptions about these marker types, and they weren't looking at the schema at all. That's fixed in firefox-devtools#6247. There is nothing to upgrade because the frontend reads the field format from the marker schema. But since older frontends read these two fields directly, this bump makes sure that they get updated. Bugzilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2054010
canova
added a commit
that referenced
this pull request
Aug 10, 2026
…ker changes are picked up in the frontends (#6252) The Text marker's `name` and the Log marker's `message` are unique strings now, so their payloads hold a string table index instead of the text. But we realized that the frontend had some hardcoded assumptions about these marker types, and they weren't looking at the schema at all. That's fixed in #6247. There is nothing to upgrade because the frontend reads the field format from the marker schema. But since older frontends read these two fields directly, this bump makes sure that they get updated. Bugzilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2054010
Merged
canova
added a commit
that referenced
this pull request
Aug 10, 2026
Changes: [fatadel] Create the Network track from the timeline-network schema display location (#6224) [Markus Stange] Only call `getRawFrameTableBuilderWithExistingContents` once per symbolication batch. (#6233) [fatadel] Improve discoverability of downloading a local profile (#6216) [Nazım Can Altınova] Handle the cli daemon startup failures more gracefully with better errors (#6241) [Nazım Can Altınova] Add the ability to apply source maps from the CLI (#6229) [Nazım Can Altınova] Handle Text and Log marker payloads with their marker schema (#6247) [Nazım Can Altınova] Bump the Gecko profile version to make sure that the Text and Log marker changes are picked up in the frontends (#6252) [fatadel] Deactivate a menu button as soon as its panel is dismissed (#6251) [Nazım Can Altınova] 🔃 Sync: l10n -> main (August 10, 2026) (#6253) [Nazım Can Altınova] Bump profiler-cli version to 0.8.0 (#6254) And special thanks to our localizers: de: Ger de: Michael Köhler el: George kitsoukakis en-CA: chutten en-CA: Saurabh en-GB: Ian Neal es-CL: ravmn fy-NL, nl: Fjoerfoks fr: Théo Chevalier fy-NL: Fjoerfoks ia: Melo46 it: Francesco Lodolo [:flod] nl: Fjoerfoks ru: michellemelsspam ru: Valery Ledovskoy tr: giray tr: Selim Şumlu zh-TW: Pin-guang Chen
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Main | Deploy preview
Fixes #6245
Firefox now outputs the Text marker's
nameand the Log marker'smessageas unique strings, so the payload holds a string table index instead of the text itself. The two Text marker PII sanitizers and the MOZ_LOG formatting read those fields directly and threw an error.This patch fixes these issues by always looking at the marker schema and not having any arbitrary assumptions about some certain marker types. It was a bad idea to have these custom handlings in the past instead of relying on the marker schema in the first place.