Skip to content

Merge release 2.1.0 into master branch#1606

Merged
0xnm merged 53 commits into
masterfrom
nogorodnikov/merge-2.1.0-into-master
Sep 7, 2023
Merged

Merge release 2.1.0 into master branch#1606
0xnm merged 53 commits into
masterfrom
nogorodnikov/merge-2.1.0-into-master

Conversation

@0xnm

@0xnm 0xnm commented Sep 7, 2023

Copy link
Copy Markdown
Member

What does this PR do?

This PR does the merge of release 2.1.0 into master branch with all the conflicts resolved (there was one conflict in AndroidConfig.kt).

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 and others added 30 commits July 26, 2023 13:21
…k-explicitly-in-dogfood-script

Mention Datadog SDK explicitly in dogfood script
…use-the-windowmanager-in-background-thread

REPLAY-1905 Do not resolve WindowManager from Application context
…ample_rate

[RUMM-3449] Add sample rate to reported RUM events
…-readme-file-for-sr-modules

REPLAY-1302 Add the README files for SR modules
…he-sr-request-params

REPLAY-1895 Remove the query parameters from SR requests
Remove the bridge dogfooding step, bridge repo is archived
…ional-properties-for-telemetry-events

RUMM-3508 Add the additionalProperties capability to telemetry debug log event
…ernal-logger-in-sr-modules

REPLAY-1895 use internalLogger in SR modules
…qlite-source-set-folder-in-sample-app

Remove redundant sqlite product flavour folder in the sample app
…ternalloggger-metrics-method

RUMM-924 Introduce the new InternalLogger#metric API
mariusc83 and others added 22 commits August 23, 2023 17:08
…atch-deleted-telemetry

RUMM-3506 Collect the batch deleted telemetry
…ch-closed-telemetry

RUM-346 Collect the batch_closed telemetry
…ch-delete-in-background-property

RUM-952 Provide the inBackground property for batch_delete metric
…-lifecycle-monitor-in-core-instance-stop

Unregister process lifecycle monitor in core instance stop
…n-start-is-not-reported

RUM-971: Report ApplicationLaunch view even if first RUM event is not interaction
Update gitlab CI env variables for gitlab 16
…tion-tests-for-text-fields-page

RUM-807 Add SR integration tests for TextView and EditText view type
…when-disabling-jank-stats-tracking

RUM-986: Fix crash when disabling JankStats tracking
…elease-2.1.0

RUM-1021: Prepare release 2.1.0
@0xnm
0xnm requested a review from a team as a code owner September 7, 2023 08:03
@codecov-commenter

codecov-commenter commented Sep 7, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1606 (c9bacb3) into master (2d2c633) will increase coverage by 0.39%.
The diff coverage is 90.33%.

@@            Coverage Diff             @@
##           master    #1606      +/-   ##
==========================================
+ Coverage   83.29%   83.67%   +0.39%     
==========================================
  Files         437      443       +6     
  Lines       14749    15135     +386     
  Branches     2220     2265      +45     
==========================================
+ Hits        12284    12664     +380     
+ Misses       1879     1875       -4     
- Partials      586      596      +10     
Files Changed Coverage Δ
...roid/core/internal/data/upload/NoOpDataUploader.kt 0.00% <0.00%> (ø)
...tadog/android/core/internal/persistence/Storage.kt 100.00% <ø> (ø)
...om/datadog/android/telemetry/internal/Telemetry.kt 12.50% <0.00%> (-7.50%) ⬇️
...sionreplay/internal/net/BatchesToSegmentsMapper.kt 74.23% <43.75%> (-9.56%) ⬇️
...d/core/internal/data/upload/v2/NoOpDataUploader.kt 50.00% <50.00%> (ø)
...sessionreplay/internal/recorder/WindowInspector.kt 64.29% <58.33%> (+30.95%) ⬆️
...core/internal/data/upload/v2/DataUploadRunnable.kt 96.67% <71.43%> (-3.33%) ⬇️
...dog/android/core/internal/metrics/RemovalReason.kt 75.00% <75.00%> (ø)
...id/rum/internal/ndk/DatadogNdkCrashEventHandler.kt 85.85% <83.33%> (-0.43%) ⬇️
...nternal/recorder/listener/WindowsOnDrawListener.kt 89.29% <85.71%> (-6.71%) ⬇️
... and 39 more

... and 10 files with indirect coverage changes

@0xnm
0xnm changed the base branch from develop to master September 7, 2023 08:17
@0xnm
0xnm requested a review from a team as a code owner September 7, 2023 08:17
@0xnm
0xnm merged commit 4b27ada into master Sep 7, 2023
@0xnm
0xnm deleted the nogorodnikov/merge-2.1.0-into-master branch September 7, 2023 09:42
@xgouchet xgouchet added this to the 2.1.0 milestone Apr 5, 2024
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.

6 participants