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 release/1.16.0 branch into develop branch #1194

Merged
merged 3 commits into from
Dec 14, 2022

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Dec 14, 2022

What does this PR do?

Merge release/1.16.0 branch into develop branch with conflicts (version in AndroidConfig.kt) 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 December 14, 2022 09:38
@codecov-commenter
Copy link

codecov-commenter commented Dec 14, 2022

Codecov Report

Merging #1194 (8d96378) into develop (e707d40) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #1194      +/-   ##
===========================================
- Coverage    82.31%   82.30%   -0.01%     
===========================================
  Files          353      353              
  Lines        11795    11790       -5     
  Branches      2007     2005       -2     
===========================================
- Hits          9708     9703       -5     
- Misses        1475     1476       +1     
+ Partials       612      611       -1     
Impacted Files Coverage Δ
...ndroid/telemetry/internal/TelemetryEventHandler.kt 68.91% <0.00%> (-3.36%) ⬇️
...rsistence/file/batch/PlainBatchFileReaderWriter.kt 86.27% <0.00%> (-2.94%) ⬇️
...d/v2/core/internal/storage/FileEventBatchWriter.kt 95.24% <0.00%> (-2.38%) ⬇️
...in/com/datadog/android/log/internal/LogsFeature.kt 88.71% <0.00%> (ø)
...n/com/datadog/android/v2/core/SdkInternalLogger.kt 80.77% <0.00%> (ø)
...android/v2/core/internal/DatadogContextProvider.kt 81.54% <0.00%> (ø)
.../android/rum/internal/monitor/DatadogRumMonitor.kt 93.37% <0.00%> (+0.55%) ⬆️
...android/log/internal/domain/DatadogLogGenerator.kt 97.32% <0.00%> (+1.34%) ⬆️
...droid/rum/tracking/FragmentViewTrackingStrategy.kt 78.85% <0.00%> (+3.85%) ⬆️
...m/datadog/android/core/internal/utils/ViewUtils.kt 81.82% <0.00%> (+9.09%) ⬆️
... and 1 more

@0xnm 0xnm merged commit 7da4be4 into develop Dec 14, 2022
@0xnm 0xnm deleted the nogorodnikov/merge-release-1.16.0-branch-into-develop branch December 14, 2022 11:16
@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.

4 participants