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.15.0 into develop #1135

Merged
merged 3 commits into from
Nov 9, 2022

Conversation

0xnm
Copy link
Contributor

@0xnm 0xnm commented Nov 9, 2022

What does this PR do?

This PR does the merge of release/1.15.0 branch into develop branch with 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 November 9, 2022 08:34
@codecov-commenter
Copy link

codecov-commenter commented Nov 9, 2022

Codecov Report

Merging #1135 (786e927) into develop (9753f83) will increase coverage by 0.04%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #1135      +/-   ##
===========================================
+ Coverage    83.17%   83.22%   +0.04%     
===========================================
  Files          274      274              
  Lines         9462     9462              
  Branches      1540     1540              
===========================================
+ Hits          7870     7874       +4     
+ Misses        1152     1150       -2     
+ Partials       440      438       -2     
Impacted Files Coverage Δ
...android/log/internal/logger/TelemetryLogHandler.kt 75.00% <0.00%> (-25.00%) ⬇️
...ndroid/core/internal/persistence/file/EventMeta.kt 80.00% <0.00%> (ø)
...ndroid/telemetry/internal/TelemetryEventHandler.kt 72.32% <0.00%> (ø)
...rc/main/java/com/datadog/opentracing/DDTracer.java 56.49% <0.00%> (+0.42%) ⬆️
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 88.65% <0.00%> (+1.08%) ⬆️
...ain/java/com/datadog/opentracing/PendingTrace.java 59.48% <0.00%> (+1.72%) ⬆️

@0xnm 0xnm merged commit b41e46f into develop Nov 9, 2022
@0xnm 0xnm deleted the nogorodnikov/merge_release_1.15.0_into_develop branch November 9, 2022 10:05
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants