Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 use devflow to merge main into staging #2917

Merged
merged 2 commits into from
Aug 2, 2024

Conversation

thomas-lebeau
Copy link
Collaborator

@thomas-lebeau thomas-lebeau commented Aug 2, 2024

Motivation

Use devflow to merge main back into staging-XX.
If this fails, it will create a fix PR and log something like this:

couldn't merge the [main](https://github.com/DataDog/browser-sdk/tree/main) branch of [browser-sdk](https://github.com/DataDog/browser-sdk) into [thomas.lebeau/test-devflow-conflic](https://github.com/DataDog/browser-sdk/tree/thomas.lebeau/test-devflow-conflic), there was a conflict...

We have created a conflict resolution PR for you [#2916](https://github.com/DataDog/browser-sdk/pull/2916)
Alternatively, you can also reset the integration branch by using the following slack command: `/devflow reset-branch -r browser-sdk -b thomas.lebeau/test-devflow-conflic`

To get help about command usage, write `update-branch --help`

Changes

Testing

  • Local
  • Staging
  • Unit
  • End to end

I have gone over the contributing documentation.

@thomas-lebeau thomas-lebeau marked this pull request as ready for review August 2, 2024 12:55
@thomas-lebeau thomas-lebeau requested a review from a team as a code owner August 2, 2024 12:55
@thomas-lebeau thomas-lebeau force-pushed the thomas.lebeau/devflow branch from 2b09ef6 to 48ddccf Compare August 2, 2024 13:41
Copy link

cit-pr-commenter bot commented Aug 2, 2024

Bundles Sizes Evolution

📦 Bundle Name Base Size Local Size 𝚫 𝚫% Status
Rum 159.13 KiB 159.13 KiB 0 B 0.00%
Logs 55.79 KiB 55.79 KiB 0 B 0.00%
Rum Slim 107.73 KiB 107.73 KiB 0 B 0.00%
Worker 25.21 KiB 25.21 KiB 0 B 0.00%
🚀 CPU Performance
Action Name Base Average Cpu Time (ms) Local Average Cpu Time (ms) 𝚫
addglobalcontext 0.002 0.002 0.000
addaction 0.032 0.043 0.010
adderror 0.036 0.038 0.002
addtiming 0.001 0.001 0.000
startview 1.104 1.855 0.751
startstopsessionreplayrecording 0.889 1.345 0.456
logmessage 0.019 0.038 0.019
🧠 Memory Performance
Action Name Base Consumption Memory (bytes) Local Consumption Memory (bytes) 𝚫 (bytes)
addglobalcontext 20.31 KiB 22.62 KiB 2.32 KiB
addaction 71.55 KiB 72.81 KiB 1.27 KiB
adderror 85.70 KiB 85.12 KiB -599 B
addtiming 18.12 KiB 20.08 KiB 1.96 KiB
startview 348.30 KiB 352.56 KiB 4.26 KiB
startstopsessionreplayrecording 12.53 KiB 13.00 KiB 478 B
logmessage 70.06 KiB 70.42 KiB 362 B

🔗 RealWorld

@thomas-lebeau thomas-lebeau force-pushed the thomas.lebeau/devflow branch from 48ddccf to 2e3e2ae Compare August 2, 2024 14:08
@codecov-commenter
Copy link

codecov-commenter commented Aug 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.63%. Comparing base (a131fb7) to head (92738b7).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2917   +/-   ##
=======================================
  Coverage   93.63%   93.63%           
=======================================
  Files         268      268           
  Lines        7592     7592           
  Branches     1692     1692           
=======================================
  Hits         7109     7109           
  Misses        483      483           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Comment on lines 29 to 30
printError(message)
throw new Error(message)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💬 suggestion: ‏No need to print the error here, the thrown error message will be displayed by runMain

)
const jsonResponse = await rawResponse.json()

printLog(jsonResponse)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ question: ‏are you leaving this printLog for debug purpose?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, I wanted to remove it!

@thomas-lebeau thomas-lebeau force-pushed the thomas.lebeau/devflow branch from d7edd5f to 92738b7 Compare August 2, 2024 14:35
Copy link
Contributor

@cy-moi cy-moi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀🚀🚀

@thomas-lebeau thomas-lebeau merged commit 6b867f7 into main Aug 2, 2024
20 checks passed
@thomas-lebeau thomas-lebeau deleted the thomas.lebeau/devflow branch August 2, 2024 15:26
thomas-lebeau added a commit that referenced this pull request Aug 5, 2024
thomas-lebeau added a commit that referenced this pull request Aug 5, 2024
@thomas-lebeau thomas-lebeau restored the thomas.lebeau/devflow branch August 7, 2024 15:48
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.

4 participants