Merge `develop` branch into `feature/otel-support` branch by 0xnm · Pull Request #1998 · DataDog/dd-sdk-android

0xnm · 2024-04-17T15:39:40Z

What does this PR do?

This PR merges develop branch into feature/otel-support branch, which is useful because develop received some tooling and performance updates and changes.

All conflicts are 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)

…format

…anged

…rce-browser-sdk-fullsnapsot-when-context-changed" This reverts commit de212fc, reversing changes made to d02623f.

…feature-context-update-through-msb RUM-2875 Introduce the FeatureContextUpdateLitener API

…e-container-data-into-browser-rum-events RUM-2485 Provide the parent container information for browser rum events

Merge develop branch

…apabilities RUM-3281 Implement webview bridge getCapabilities

…ll_snapshot RUM-3302 detect full snapshot from webview sr

Merge develop

…elop_sr_webview

Merge develop into sr webview feature branch

…elop_sr_webview_3

…ew_3 merge develop into feature/sr-webview (3)

…batching RUM-3669 avoid feature flag spamming events

…dditional-properties-in-telemetry-errors RUM-4369: Support additional properties in Telemetry Error events

…k_telemetry RUM-4413 Add telemetry on SR resources track

…eplay

Improve UT for SR Obfuscators

…ge_telemetry RUM-4103 add telemetry to detect uncovered View/Drawable in Session Replay

Create package name consistency rule

Improve the TextViewMapper unit tests

Improve SeekBarMapper

…-in-local-ci Fix KtLint version in `local_ci` script

Fix SR flaky test

…nto-otel-support-170424

…ort-170424

codecov-commenter · 2024-05-21T12:59:10Z

Codecov Report

Attention: Patch coverage is 79.29883% with 124 lines in your changes are missing coverage. Please review.

Project coverage is 64.11%. Comparing base (6ea893f) to head (ad06c50).

Additional details and impacted files

@@                   Coverage Diff                    @@
##           feature/otel-support    #1998      +/-   ##
========================================================
+ Coverage                 63.58%   64.11%   +0.53%     
========================================================
  Files                       751      759       +8     
  Lines                     28333    28307      -26     
  Branches                   4679     4753      +74     
========================================================
+ Hits                      18015    18148     +133     
+ Misses                     9119     8926     -193     
- Partials                   1199     1233      +34

Files	Coverage Δ
...ore/src/main/kotlin/com/datadog/android/Datadog.kt	`76.25% <ø> (ø)`
...src/main/kotlin/com/datadog/android/DatadogSite.kt	`100.00% <100.00%> (ø)`
.../main/kotlin/com/datadog/android/_InternalProxy.kt	`63.64% <ø> (ø)`
...n/kotlin/com/datadog/android/api/InternalLogger.kt	`100.00% <ø> (ø)`
.../com/datadog/android/api/context/DatadogContext.kt	`100.00% <100.00%> (ø)`
.../kotlin/com/datadog/android/api/feature/Feature.kt	`100.00% <ø> (ø)`
...in/com/datadog/android/api/feature/FeatureScope.kt	`0.00% <ø> (ø)`
...in/kotlin/com/datadog/android/core/SdkReference.kt	`77.27% <ø> (ø)`
...droid/core/configuration/BackPressureMitigation.kt	`100.00% <100.00%> (ø)`
...android/core/configuration/BackPressureStrategy.kt	`100.00% <100.00%> (ø)`
... and 81 more

... and 290 files with indirect coverage changes

Fix some detekt issues

mariusc83 and others added 30 commits January 17, 2024 09:47

RUM-2484 Provide the SR privacy level through the DatadogEventBridge

44a906a

RUM-2590 Add recorded WebView scenario into the sample app

bf58d3a

RUM-2483 Introduce the WebViewWireframeMapper

8d777ab

RUM-2487 Provide the WebViewRecordConsumer for the JS bridge

7803795

Do not force new batch when persisting SR records

598cfe2

RUM-2622 Change the SR requestbody to match the new endpoint payload …

668b59b

…format

RUM-2572 WebView - force fullsnapshot in browser sdk when RUM view ch…

6d7088a

…anged

Revert "Merge pull request #1807 from DataDog/mconstantin/rum-2572/fo…

13a7578

…rce-browser-sdk-fullsnapsot-when-context-changed" This reverts commit de212fc, reversing changes made to d02623f.

RUM-2875 Introduce the FeatureContextUpdateLitener API

474b8b0

Merge pull request #1829 from DataDog/mconstantin/rum-2875/propagate-…

2470aa7

…feature-context-update-through-msb RUM-2875 Introduce the FeatureContextUpdateLitener API

RUM-2485 Provide the parent container information for browser rum events

688c2a7

Merge pull request #1831 from DataDog/mconstantin/rum-2485/provide-th…

fce374b

…e-container-data-into-browser-rum-events RUM-2485 Provide the parent container information for browser rum events

Merge branch 'develop' into sr-web-view-support/merge/develop

0e6f41a

Merge pull request #1849 from DataDog/sr-web-view-support/merge/develop

64b5013

Merge develop branch

RUM-3281 add getCapabilities to the Webview bridge

e22c43e

Merge pull request #1871 from DataDog/xgouchet/RUM-3281/webview_get_c…

731551f

…apabilities RUM-3281 Implement webview bridge getCapabilities

RUM-3302 detect full snapshot from webview sr

c3b45d2

Merge pull request #1908 from DataDog/xgouchet/RUM-3302/handle_has_fu…

dec970a

…ll_snapshot RUM-3302 detect full snapshot from webview sr

Merge branch 'develop' into xgouchet/merge_develop

7b32a80

Merge pull request #1915 from DataDog/xgouchet/merge_develop

df4c3ca

Merge develop

Merge remote-tracking branch 'origin/develop' into xgouchet/merge_dev…

6ca9992

…elop_sr_webview

Merge pull request #1917 from DataDog/xgouchet/merge_develop_sr_webview

2027b2d

Merge develop into sr webview feature branch

Merge remote-tracking branch 'origin/develop' into xgouchet/merge_dev…

319193a

…elop_sr_webview_3

Merge pull request #1922 from DataDog/xgouchet/merge_develop_sr_webvi…

26824c4

…ew_3 merge develop into feature/sr-webview (3)

RUM-3669 avoid feature flag spamming events

23e64db

RUM-3669 update API name

d9db73b

RUM-3669 rename api in tests

8f43597

Merge pull request #1932 from DataDog/xgouchet/RUM-3669/feature_flag_…

d9b9645

…batching RUM-3669 avoid feature flag spamming events

RUM-3670 Create a BackPressureStrategy

ae9a07c

RUM-3670 Let user set a custom BackPressureStrategy

ed36cff

0xnm and others added 21 commits May 3, 2024 17:05

RUM-4369: Support additional properties in Telemetry Error events

9b200e9

Merge pull request #2025 from DataDog/nogorodnikov/rum-4369/support-a…

ddf2286

…dditional-properties-in-telemetry-errors RUM-4369: Support additional properties in Telemetry Error events

RUM-4413 Add telemetry on sr resources track

b5d0296

Merge pull request #2027 from DataDog/xgouchet/RUM-4413/resource_trac…

7566da7

…k_telemetry RUM-4413 Add telemetry on SR resources track

RUM-4103 add telemetry to detect uncovered View/Drawable in Session R…

74cf7ef

…eplay

Improve UT for SR Obfuscators

4ad6c3c

Merge pull request #2031 from DataDog/xgouchet/sr_ut_obfuscators

20de109

Improve UT for SR Obfuscators

Merge pull request #2028 from DataDog/xgouchet/RUM-4103/add_sr_covera…

e77c5f5

…ge_telemetry RUM-4103 add telemetry to detect uncovered View/Drawable in Session Replay

Add detekt rule to check package name with types visibility

49ca7fb

Fix package visibility consistency

f284941

Merge pull request #2032 from DataDog/xgouchet/sr_packages

34b4ff3

Create package name consistency rule

Improve the TextViewMapper unit tests

a814f9f

Merge pull request #2034 from DataDog/xgouchet/sr_ut_textviewmapper

988232e

Improve the TextViewMapper unit tests

Improve SeekBar mapping

a23e0e0

Merge pull request #2037 from DataDog/xgouchet/sr_ut_seekbar

a0e05c3

Improve SeekBarMapper

Fix KtLint version in local_ci script

9866df4

Fix SR flaky test

9887c26

Merge pull request #2039 from DataDog/nogorodnikov/fix-ktlint-version…

c03bdaf

…-in-local-ci Fix KtLint version in `local_ci` script

Merge pull request #2042 from DataDog/xgouchet/flaky_tests

9117094

Fix SR flaky test

Merge branch 'feature/otel-support' into nogorodnikov/merge-develop-i…

497e58f

…nto-otel-support-170424

Merge branch 'develop' into nogorodnikov/merge-develop-into-otel-supp…

8162d06

…ort-170424

0xnm dismissed stale reviews from xgouchet and mariusc83 via 8162d06 May 21, 2024 12:55

mariusc83 added 2 commits May 21, 2024 16:47

Fix some detekt issues

4f942d6

Merge pull request #2043 from DataDog/mconstantin/fix-detekt-issues

ad06c50

Fix some detekt issues

xgouchet approved these changes May 21, 2024

View reviewed changes

0xnm merged commit 8c0daac into feature/otel-support May 21, 2024

0xnm deleted the nogorodnikov/merge-develop-into-otel-support-170424 branch May 21, 2024 16:14

xgouchet added this to the 2.11.x milestone Jul 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge `develop` branch into `feature/otel-support` branch#1998

Merge `develop` branch into `feature/otel-support` branch#1998
0xnm merged 212 commits into
feature/otel-supportfrom
nogorodnikov/merge-develop-into-otel-support-170424

0xnm commented Apr 17, 2024

Uh oh!

codecov-commenter commented May 21, 2024 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Conversation

0xnm commented Apr 17, 2024

What does this PR do?

Review checklist (to be filled by reviewers)

Uh oh!

codecov-commenter commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov-commenter commented May 21, 2024 •

edited

Loading