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

Merge release 2.2.0 branch into develop #1657

Merged
merged 10 commits into from
Oct 4, 2023

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Oct 4, 2023

What does this PR do?

This PR does the merge of release/2.2.0 into develop branch with all the conflicts resolved.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

@0xnm 0xnm requested a review from a team as a code owner October 4, 2023 10:38
@codecov-commenter
Copy link

codecov-commenter commented Oct 4, 2023

Codecov Report

Merging #1657 (31a0671) into develop (c6d8de8) will increase coverage by 0.26%.
The diff coverage is 90.29%.

❗ Current head 31a0671 differs from pull request most recent head c93892c. Consider uploading reports for the commit c93892c to get more accurate results

@@             Coverage Diff             @@
##           develop    #1657      +/-   ##
===========================================
+ Coverage    83.62%   83.88%   +0.26%     
===========================================
  Files          456      458       +2     
  Lines        15692    15767      +75     
  Branches      2346     2354       +8     
===========================================
+ Hits         13122    13225     +103     
+ Misses        1944     1930      -14     
+ Partials       626      612      -14     
Files Coverage Δ
...droid/core/internal/receiver/ThreadSafeReceiver.kt 100.00% <100.00%> (ø)
...otlin/com/datadog/android/rum/RumResourceMethod.kt 100.00% <100.00%> (ø)
...g/android/rum/internal/domain/scope/RumEventExt.kt 93.06% <100.00%> (+0.69%) ⬆️
...g/android/rum/internal/domain/scope/RumRawEvent.kt 100.00% <100.00%> (ø)
...roid/rum/internal/domain/scope/RumResourceScope.kt 95.36% <100.00%> (ø)
...dog/android/rum/resource/RumResourceInputStream.kt 92.42% <100.00%> (ø)
...adog/android/sessionreplay/SessionReplayPrivacy.kt 100.00% <100.00%> (ø)
...lay/internal/recorder/mapper/EditTextViewMapper.kt 100.00% <100.00%> (ø)
...play/internal/recorder/mapper/ImageButtonMapper.kt 93.55% <100.00%> (ø)
...n/com/datadog/android/okhttp/DatadogInterceptor.kt 71.94% <100.00%> (+2.65%) ⬆️
... and 2 more

... and 17 files with indirect coverage changes

@0xnm 0xnm merged commit 39b0b1f into develop Oct 4, 2023
5 checks passed
@0xnm 0xnm deleted the nogorodnikov/merge-2.2.0-into-develop branch October 4, 2023 11:02
@xgouchet xgouchet added this to the 2.3.0 milestone Dec 13, 2023
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