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

♻️ [RUM-2445] align rum and logs common context implementation #2564

Merged

Conversation

BenoitZugmeyer
Copy link
Member

@BenoitZugmeyer BenoitZugmeyer commented Jan 10, 2024

Motivation

This PR slightly refactors how common contexts are computed.

Changes

Align both implementations by:

  • move the logs buildCommonContext in its own module (similar to RUM)
  • craft a getCommonContext based on buildCommonContext in both rumPublicApi and logsPublicApi, and pass it to startRum and startLogs.

Testing

  • Local
  • Staging
  • Unit
  • End to end

I have gone over the contributing documentation.

@BenoitZugmeyer
Copy link
Member Author

/to-staging

@dd-devflow
Copy link
Contributor

dd-devflow bot commented Jan 10, 2024

🚂 Branch Integration: starting soon, merge in < 7m

Commit bfbbf3222b will soon be integrated into staging-02.

This build is going to start soon! (estimated merge in less than 7m)

you can cancel this operation by commenting your pull request with /to-staging -c!

@dd-devflow
Copy link
Contributor

dd-devflow bot commented Jan 10, 2024

🚨 Branch Integration: The build pipeline contains failing jobs for this merge request

We couldn't automatically merge the commit bfbbf3222b into staging-02.
Build pipeline has failing jobs for 8cbea75

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected before the end of the pipeline.

You should have a look at the pipeline, wait for the build to finish and investigate the failures.
When you are ready, re-add your pull request to the queue!

⚠️ Do NOT retry failed jobs directly.

They were executed on a temporary branch created by the merge queue. If you retry them, they are going to fail because the branch no longer exists.

If you think the errors come from a logical conflict with the target branch, you can create a fix by commenting this pull request with /create-fix-branch -b staging-02

Details

List of failed jobs:

Go to failed Gitlab pipeline.

If you need support, contact us on slack #ci-interfaces with those details!

Align both implementations by:

* move the logs `buildCommonContext` in its own module (similar to RUM)
* craft a `getCommonContext` based on `buildCommonContext` in both
  rumPublicApi and logsPublicApi, and pass it to `startRum` and
  `startLogs`.

This slightly refactors how common contexts are computed.
@BenoitZugmeyer BenoitZugmeyer force-pushed the benoit/consent--align-rum-and-logs-common-context branch from bfbbf32 to 37fd6d9 Compare January 11, 2024 09:23
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (4f28486) 92.85% compared to head (37fd6d9) 92.85%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2564   +/-   ##
=======================================
  Coverage   92.85%   92.85%           
=======================================
  Files         228      229    +1     
  Lines        6744     6745    +1     
  Branches     1480     1480           
=======================================
+ Hits         6262     6263    +1     
  Misses        482      482           

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

@BenoitZugmeyer
Copy link
Member Author

/to-staging

@dd-devflow
Copy link
Contributor

dd-devflow bot commented Jan 11, 2024

🚂 Branch Integration: starting soon, merge in < 7m

Commit 37fd6d92c0 will soon be integrated into staging-02.

This build is going to start soon! (estimated merge in less than 7m)

you can cancel this operation by commenting your pull request with /to-staging -c!

dd-mergequeue bot added a commit that referenced this pull request Jan 11, 2024
…mon-context into staging-02

Co-authored-by: Benoît Zugmeyer <benoit.zugmeyer@datadoghq.com>
@dd-devflow
Copy link
Contributor

dd-devflow bot commented Jan 11, 2024

🚂 Branch Integration: This commit was successfully integrated

Commit 37fd6d92c0 has been merged into staging-02 in merge commit 386eae285f.

Check out the triggered pipeline on Gitlab 🦊

@BenoitZugmeyer BenoitZugmeyer marked this pull request as ready for review January 11, 2024 14:16
@BenoitZugmeyer BenoitZugmeyer requested a review from a team as a code owner January 11, 2024 14:16
@BenoitZugmeyer BenoitZugmeyer merged commit d58ce17 into main Jan 15, 2024
18 checks passed
@BenoitZugmeyer BenoitZugmeyer deleted the benoit/consent--align-rum-and-logs-common-context branch January 15, 2024 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants