Skip to content

Merge 1.14.0 release branch into develop branch#1047

Merged
0xnm merged 8 commits into
developfrom
nogorodnikov/merge_release_1.14.0_into_develop
Sep 20, 2022
Merged

Merge 1.14.0 release branch into develop branch#1047
0xnm merged 8 commits into
developfrom
nogorodnikov/merge_release_1.14.0_into_develop

Conversation

@0xnm

@0xnm 0xnm commented Sep 20, 2022

Copy link
Copy Markdown
Member

What does this PR do?

This change does the merge of the release/1.14.0 into develop branch. All the merge 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)

0xnm and others added 8 commits September 14, 2022 14:32
@0xnm
RUMM-2492: Check if WorkManager is initialized before using it
8696ce8
@fuzzybinary @0xnm
Add configuration method to disable action tracking.
78b19a9
@fuzzybinary @0xnm
Mark disableInteractionTracking as not testable.
7f6485f
@0xnm
Merge pull request #1042 from DataDog/nogorodnikov/rumm-2492/check-if…
500bfae 
…-workmanager-is-initialized

RUMM-2492: Check if WorkManager is initialized before using it
@0xnm
Merge pull request #1043 from DataDog/nogorodnikov/cherry-pick-disabl…
2f52993 
…e-interaction-tracking

Cherry-pick "disable action tracking" into 1.14.0
@0xnm
Prepare final release of 1.14.0
53f15ca
@0xnm
Merge pull request #1044 from DataDog/nogorodnikov/prepare_final_rele…
6fede7a 
…ase_1.14.0

Prepare final release of 1.14.0
@0xnm
Merge branch 'release/1.14.0' into nogorodnikov/merge_release_1.14.0_…
abcfc0f 
…into_develop
@0xnm
0xnm requested a review from a team as a code owner September 20, 2022 09:41
@codecov-commenter

codecov-commenter commented Sep 20, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1047 (abcfc0f) into develop (cd01017) will decrease coverage by 0.06%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop    #1047      +/-   ##
===========================================
- Coverage    83.21%   83.15%   -0.06%     
===========================================
  Files          272      272              
  Lines         9260     9268       +8     
  Branches      1485     1488       +3     
===========================================
+ Hits          7705     7706       +1     
- Misses        1139     1146       +7     
  Partials       416      416
Impacted Files Coverage Δ
...ore/internal/lifecycle/ProcessLifecycleCallback.kt 84.62% <100.00%> (+11.89%) ⬆️
...og/android/core/internal/utils/WorkManagerUtils.kt 100.00% <100.00%> (ø)
.../android/error/internal/DatadogExceptionHandler.kt 90.91% <100.00%> (+0.28%) ⬆️
...ndroid/core/internal/persistence/file/EventMeta.kt 80.00% <0.00%> (-10.00%) ⬇️
...id/webview/internal/rum/WebViewRumEventConsumer.kt 76.74% <0.00%> (-9.30%) ⬇️
...ain/java/com/datadog/opentracing/PendingTrace.java 56.03% <0.00%> (-1.72%) ⬇️
...rc/main/java/com/datadog/opentracing/DDTracer.java 54.81% <0.00%> (-1.26%) ⬇️
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 87.03% <0.00%> (-1.08%) ⬇️
...core/internal/system/DefaultAndroidInfoProvider.kt 82.61% <0.00%> (+2.17%) ⬆️
... and 3 more

@0xnm
0xnm merged commit df4b21c into develop Sep 20, 2022
@0xnm
0xnm deleted the nogorodnikov/merge_release_1.14.0_into_develop branch September 20, 2022 11:23
@xgouchet xgouchet added this to the 1.15.0 milestone Dec 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@xgouchet xgouchet xgouchet approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size-tiny

Projects

None yet

Milestone

1.15.0

Development

Successfully merging this pull request may close these issues.

4 participants

@0xnm @codecov-commenter @xgouchet @fuzzybinary