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

RUMM-2752: Merge SDK v2 branch into develop branch #1159

Merged
merged 191 commits into from
Nov 25, 2022

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Nov 25, 2022

What does this PR do?

This PR does the merge of feature/sdkv2 branch into develop branch with all the conflicts resolved. No public breaking API changes are expected.

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)

xgouchet and others added 30 commits April 29, 2022 14:26
RUMM-2138 make SDK Features simple classes
…ormat

RUMM-2177: Use TLV format for data storage
…onfiguration

RUMM-2170 Create Feature configuration interfaces
…le-persistence-layer

RUMM-2235: Rework file persistence layer
…load-pipeline

RUMM-2208: SDK v2 upload pipeline
0xnm and others added 20 commits November 21, 2022 11:10
…_sdkv2_171122

Merge develop into SDK v2 branch
…ouch-and-screen-recorders

RUMM-2746 Sync SR touch and screen recorders
…ncer-tests-flakiness

Fix flakiness in DebouncerTest class
…-resolve-the-wireframe-opacity

RUMM-2298 Correctly resolve ShapeStyle opacity in Wireframes
…mplementation-of-internal-logger

RUMM-2754: Create implementation of InternalLogger
…-tests-in-MutationResolver

RUMM-2765 Fix unit tests flakiness in MutationResolverTest
…2-into-develop

RUMM-2752: Prepare merge of SDK v2 branch into develop branch
@0xnm 0xnm requested review from a team as code owners November 25, 2022 09:30
@codecov-commenter
Copy link

codecov-commenter commented Nov 25, 2022

Codecov Report

Merging #1159 (f2ef2be) into develop (f6e371d) will decrease coverage by 0.80%.
The diff coverage is 83.92%.

@@             Coverage Diff             @@
##           develop    #1159      +/-   ##
===========================================
- Coverage    83.00%   82.21%   -0.80%     
===========================================
  Files          275      353      +78     
  Lines         9683    11773    +2090     
  Branches      1568     2005     +437     
===========================================
+ Hits          8037     9678    +1641     
- Misses        1187     1473     +286     
- Partials       459      622     +163     
Impacted Files Coverage Δ
...n/kotlin/com/datadog/android/compose/Navigation.kt 60.98% <ø> (ø)
...id/core/internal/data/upload/DataUploadRunnable.kt 100.00% <ø> (ø)
...e/internal/net/info/CallbackNetworkInfoProvider.kt 91.94% <ø> (ø)
...ence/file/advanced/ConsentAwareFileOrchestrator.kt 88.89% <0.00%> (-3.42%) ⬇️
...internal/persistence/file/advanced/DataMigrator.kt 0.00% <ø> (ø)
...ernal/persistence/file/advanced/ScheduledWriter.kt 100.00% <ø> (ø)
...id/core/internal/system/NoOpAndroidInfoProvider.kt 100.00% <ø> (ø)
...adog/android/core/internal/utils/ConcurrencyExt.kt 100.00% <ø> (ø)
...datadog/android/core/internal/utils/UserInfoExt.kt 50.00% <ø> (ø)
...atadog/android/log/internal/domain/LogGenerator.kt 60.00% <ø> (-33.15%) ⬇️
... and 197 more

@0xnm 0xnm changed the title Merge SDK v2 branch into develop branch RUMM-2752: Merge SDK v2 branch into develop branch Nov 25, 2022
@xgouchet xgouchet added the size-huge This PR is huge sized label Nov 25, 2022
@0xnm 0xnm merged commit 9e9d02f into develop Nov 25, 2022
@0xnm 0xnm deleted the nogorodnikov/merge-sdkv2-into-develop-251122 branch November 25, 2022 13:35
@xgouchet xgouchet added this to the 1.16.0 milestone Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size-huge This PR is huge sized
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants