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

Merge develop branch into SDK v2 branch #1138

Merged
merged 45 commits into from
Nov 10, 2022

Conversation

0xnm
Copy link
Contributor

@0xnm 0xnm commented Nov 9, 2022

What does this PR do?

This PR does the merge of develop branch into feature/sdkv2 branch, 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)

louiszawadzki and others added 30 commits October 25, 2022 18:21
…harmonic-mean-of-js-refresh-rate

RUMM-2687 Invert frame time to get js refresh rate
…plugin-class

Deprecate DatadogPlugin class and its usage
…lugin-deprecation

Suppress DatadogPlugin deprecation for instrumented tests
Flutter is now developing off source and will "pull" new versions when it deploys. This removes the Android step of "pushing" the new releases.
…ock-after-the-executors

Shutdown Kronos clock only after executors
…n_telemetry

RUMM-2630 RUM Configuration Telemetry
0xnm and others added 15 commits November 8, 2022 11:13
…ry-in-instrumented-rum-tests-assertions

Filter out telemetry in the assertions of instrumented RUM tests
…on-of-bundle#get-in-crash-service-test

Suppress the deprecation of Bundle#get in nightly test
Remove non-existent function in dogfood script
….0_into_develop

Merge release 1.15.0 into develop
@0xnm 0xnm requested a review from a team as a code owner November 9, 2022 11:45
@xgouchet xgouchet added the size-large This PR is large sized label Nov 9, 2022
@codecov-commenter
Copy link

codecov-commenter commented Nov 9, 2022

Codecov Report

Merging #1138 (dad8790) into feature/sdkv2 (c031096) will decrease coverage by 0.04%.
The diff coverage is 73.76%.

@@                Coverage Diff                @@
##           feature/sdkv2    #1138      +/-   ##
=================================================
- Coverage          82.49%   82.45%   -0.04%     
=================================================
  Files                349      350       +1     
  Lines              11422    11524     +102     
  Branches            1920     1957      +37     
=================================================
+ Hits                9422     9502      +80     
- Misses              1418     1421       +3     
- Partials             582      601      +19     
Impacted Files Coverage Δ
...n/kotlin/com/datadog/android/compose/Navigation.kt 60.98% <ø> (ø)
...in/com/datadog/android/core/internal/SdkFeature.kt 88.18% <ø> (ø)
.../rum/tracking/ActivityLifecycleTrackingStrategy.kt 95.65% <ø> (ø)
...ndroid/telemetry/internal/TelemetryEventHandler.kt 70.59% <54.10%> (-20.18%) ⬇️
.../kotlin/com/datadog/android/v2/core/DatadogCore.kt 89.39% <69.57%> (+0.56%) ⬆️
.../android/rum/internal/domain/scope/RumViewScope.kt 96.74% <85.71%> (+0.03%) ⬆️
...n/com/datadog/android/core/internal/CoreFeature.kt 91.24% <91.67%> (+0.11%) ⬆️
...n/kotlin/com/datadog/android/DatadogInterceptor.kt 86.81% <100.00%> (+0.30%) ⬆️
...atadog/android/core/configuration/Configuration.kt 98.52% <100.00%> (+1.17%) ⬆️
...c/main/kotlin/com/datadog/android/rum/GlobalRum.kt 63.83% <100.00%> (+0.79%) ⬆️
... and 20 more

@0xnm 0xnm merged commit c484bd6 into feature/sdkv2 Nov 10, 2022
@0xnm 0xnm deleted the nogorodnikov/merge-develop-into-sdkv2-091122 branch November 10, 2022 09:01
@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-large This PR is large sized
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants