Skip to content

Merge release 2.2.0 branch into develop#1657

Merged
0xnm merged 10 commits into
developfrom
nogorodnikov/merge-2.2.0-into-develop
Oct 4, 2023
Merged

Merge release 2.2.0 branch into develop#1657
0xnm merged 10 commits into
developfrom
nogorodnikov/merge-2.2.0-into-develop

Conversation

@0xnm

@0xnm 0xnm commented Oct 4, 2023

Copy link
Copy Markdown
Member

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)

jonathanmos and others added 10 commits October 3, 2023 13:07
@jonathanmos
Revert "RUM-1002 Implement base64 for imageviews"
e135321 
This reverts commit 3100b41.
@jonathanmos
Merge pull request #1655 from DataDog/jmoskovich/revert-base64-imagev…
100edc9 
…iews

Revert "RUM-1002 Implement base64 for imageviews"
@0xnm
RUM-1236: Support overloaded methods with same arguments for no-op im…
c182749 
…plementation generation
@0xnm
RUM-1236: Use enum for HTTP method parameter of RumMonitor#startResou…
5bcb223 
…rce API
@0xnm
Merge pull request #1653 from DataDog/nogorodnikov/rum-1236/use-enum-…
d3a3f83 
…for-http-method-arg-in-rummonitor-startresource-api

RUM-1236: Use enum for HTTP method parameter of `RumMonitor#startResource API`
@0xnm
RUM-1218: Prepare release 2.2.0
80245a7
@0xnm
Update AGP to 8.1.1
b163bd6
@0xnm
Merge pull request #1656 from DataDog/nogorodnikov/agp_8.1.1
814ad79 
Update AGP to 8.1.1
@0xnm
Merge pull request #1652 from DataDog/nogorodnikov/rum-1218/prepare-r…
31a0671 
…elease-2.2.0

RUM-1218: Prepare release 2.2.0
@0xnm
Merge branch 'release/2.2.0' into nogorodnikov/merge-2.2.0-into-develop
c93892c
@0xnm
0xnm requested a review from a team as a code owner October 4, 2023 10:38
@codecov-commenter

codecov-commenter commented Oct 4, 2023 •
edited
Loading

Copy link
Copy Markdown

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
@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

Reviewers

1 more reviewer
@xgouchet xgouchet xgouchet approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.3.0

Development

Successfully merging this pull request may close these issues.

4 participants

@0xnm @codecov-commenter @xgouchet @jonathanmos