Skip to content

cherry-pick(#31768): fix(trace viewer): library-only trace should not merge actions#31780

Merged
yury-s merged 2 commits intomicrosoft:release-1.45from
yury-s:cp-trace-actions
Jul 22, 2024
Merged

cherry-pick(#31768): fix(trace viewer): library-only trace should not merge actions#31780
yury-s merged 2 commits intomicrosoft:release-1.45from
yury-s:cp-trace-actions

Conversation

@yury-s
Copy link
Copy Markdown
Member

@yury-s yury-s commented Jul 20, 2024

This PR cherry-picks two trace viewer fixes:
cherry-pick(#31768): fix(trace viewer): library-only trace should not merge actions
cherry-pick(#31564): fix(trace): do not corrupt test runner actions when no library trace is present

Reference: microsoft/playwright-java#1617

…actions when no library trace is present

Recent logic that matches either by `stepId` or by `apiName`+`wallTime`
did not account for "no library trace" scenario.
@yury-s yury-s requested a review from dgozman July 20, 2024 00:51
@github-actions

This comment has been minimized.

…hould not merge actions

Without `wallTime`, actions are matched by `actionName:undefined` and
all actions with the same are merged.

Fixes microsoft#31764.
@yury-s yury-s force-pushed the cp-trace-actions branch from c44e4a1 to 8b976f4 Compare July 22, 2024 15:20
@github-actions
Copy link
Copy Markdown
Contributor

Test results for "tests 1"

2 flaky ⚠️ [playwright-test] › ui-mode-test-screencast.spec.ts:21:5 › should show screenshots
⚠️ [webkit-page] › page/workers.spec.ts:243:3 › should support offline

28749 passed, 692 skipped
✔️✔️✔️

Merge workflow run.

@yury-s yury-s merged commit b129aba into microsoft:release-1.45 Jul 22, 2024
@yury-s yury-s deleted the cp-trace-actions branch July 22, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants