Skip to content

Merge release 1.16.0 branch into develop#1228

Merged
0xnm merged 11 commits into
developfrom
nogorodnikov/merge-release-1.16.0-into-develop
Jan 10, 2023
Merged

Merge release 1.16.0 branch into develop#1228
0xnm merged 11 commits into
developfrom
nogorodnikov/merge-release-1.16.0-into-develop

Conversation

@0xnm

@0xnm 0xnm commented Jan 10, 2023

Copy link
Copy Markdown
Member

What does this PR do?

This PR does the merge of release/1.16.0 branch into develop branch with 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)

@0xnm
0xnm requested a review from a team as a code owner January 10, 2023 10:19
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Merging #1228 (439628f) into develop (cf38803) will increase coverage by 0.18%.
The diff coverage is 90.32%.

@@             Coverage Diff             @@
##           develop    #1228      +/-   ##
===========================================
+ Coverage    82.36%   82.54%   +0.18%     
===========================================
  Files          353      353              
  Lines        11809    11830      +21     
  Branches      2011     2014       +3     
===========================================
+ Hits          9726     9764      +38     
+ Misses        1474     1459      -15     
+ Partials       609      607       -2     
Impacted Files Coverage Δ
...android/v2/core/internal/DatadogContextProvider.kt 85.29% <80.00%> (+3.76%) ⬆️
...otlin/com/datadog/android/tracing/AndroidTracer.kt 92.59% <85.71%> (-1.44%) ⬇️
...android/log/internal/domain/DatadogLogGenerator.kt 96.08% <100.00%> (+0.78%) ⬆️
...d/v2/core/internal/storage/FileEventBatchWriter.kt 95.24% <0.00%> (-2.38%) ⬇️
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 86.21% <0.00%> (-1.48%) ⬇️
...ain/java/com/datadog/opentracing/PendingTrace.java 59.48% <0.00%> (-0.86%) ⬇️
.../kotlin/com/datadog/android/v2/core/DatadogCore.kt 89.86% <0.00%> (-0.46%) ⬇️
...rc/main/java/com/datadog/opentracing/DDTracer.java 56.07% <0.00%> (-0.42%) ⬇️
.../android/rum/internal/domain/scope/RumViewScope.kt 95.24% <0.00%> (-0.18%) ⬇️
...android/v2/core/internal/net/DataOkHttpUploader.kt 94.52% <0.00%> (ø)
... and 9 more

@0xnm
0xnm merged commit 8f5c193 into develop Jan 10, 2023
@0xnm
0xnm deleted the nogorodnikov/merge-release-1.16.0-into-develop branch January 10, 2023 14:00
@xgouchet xgouchet added this to the 1.17.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.

3 participants