Skip to content

Align the base64 feature branch with develop#1594

Merged
jonathanmos merged 67 commits into
feature/base64-jmoskovichfrom
jmoskovich/align-base64-with-develop
Sep 4, 2023
Merged

Align the base64 feature branch with develop#1594
jonathanmos merged 67 commits into
feature/base64-jmoskovichfrom
jmoskovich/align-base64-with-develop

Conversation

@jonathanmos

Copy link
Copy Markdown
Member

What does this PR do?

Resolve conflicts between develop and the base64 feature branch

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

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 13, 2023 15:02
…-for-features-in-integrations

Use `implementation` dependency for features in integrations modules
…loading

[RUMM-3448] Remove tracking of view loading time and fix unit tests
…ocumentation

RUMM-3465: Update documentation for SDK v2
…stats-memory-leak

RUMM-3475: Fix memory leak in `JankStats` usage
…d-sdk-android-ktx-module

RUMM-3476: Remove `dd-sdk-android-ktx` module
…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
xgouchet and others added 21 commits August 21, 2023 15:28
…ternalloggger-metrics-method

RUMM-924 Introduce the new InternalLogger#metric API
…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
# Conflicts:
#	features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/async/RecordedDataQueueHandlerTest.kt
@jonathanmos
jonathanmos requested review from a team as code owners August 31, 2023 14:10
@codecov-commenter

codecov-commenter commented Aug 31, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1594 (50f22a9) into feature/base64-jmoskovich (d4c8e5b) will increase coverage by 0.15%.
The diff coverage is 90.42%.

@@                      Coverage Diff                      @@
##           feature/base64-jmoskovich    #1594      +/-   ##
=============================================================
+ Coverage                      83.44%   83.59%   +0.15%     
=============================================================
  Files                            446      451       +5     
  Lines                          15181    15426     +245     
  Branches                        2288     2306      +18     
=============================================================
+ Hits                           12667    12894     +227     
- Misses                          1912     1919       +7     
- Partials                         602      613      +11     
Files Changed Coverage Δ
...roid/core/internal/data/upload/NoOpDataUploader.kt 0.00% <0.00%> (ø)
...tadog/android/core/internal/persistence/Storage.kt 100.00% <ø> (ø)
...ain/kotlin/com/datadog/android/rum/CloseableExt.kt 90.91% <ø> (ø)
...lin/com/datadog/android/rum/resource/ContextExt.kt 83.33% <ø> (ø)
...com/datadog/android/rum/resource/InputStreamExt.kt 50.00% <ø> (ø)
...droid/rum/tracking/FragmentViewTrackingStrategy.kt 87.04% <ø> (+6.00%) ⬆️
...om/datadog/android/telemetry/internal/Telemetry.kt 12.50% <0.00%> (-7.50%) ⬇️
...c/main/kotlin/com/datadog/android/trace/SpanExt.kt 88.24% <ø> (ø)
.../datadog/android/trace/sqlite/SqliteDatabaseExt.kt 91.67% <ø> (ø)
...m/datadog/android/okhttp/trace/OkHttpRequestExt.kt 100.00% <ø> (ø)
... and 50 more

... and 10 files with indirect coverage changes

@jonathanmos
jonathanmos merged commit e3addc0 into feature/base64-jmoskovich Sep 4, 2023
@jonathanmos
jonathanmos deleted the jmoskovich/align-base64-with-develop branch September 4, 2023 15:08
@xgouchet xgouchet added this to the 2.2.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.

7 participants