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.14.1 into develop #1061

Merged
merged 5 commits into from
Sep 29, 2022
Merged

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Sep 28, 2022

What does this PR do?

Merge release 1.14.1 into develop.

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)

fuzzybinary and others added 5 commits September 27, 2022 15:28
This utilizes a partial update of the RUM event schema to include 'architecture' but not some other changes in the most up to date schema, essentially putting it in a 'detached HEAD' state.
Architecture is taken from String.getProperty("os.arch") over Build.CPU_ABI both because CPU_ABI is deprecated and because os.arch appears to give us a result closer to what we want, without including the name of the CPU.
…-arch-into-1.14.0

Cherry-pick: Support sending CPU architecture as part of device info
@0xnm 0xnm requested a review from a team as a code owner September 28, 2022 12:55
@0xnm 0xnm changed the title Nogorodnikov/merge 1.14.1 into develop Merge release 1.14.1 into develop Sep 28, 2022
@codecov-commenter
Copy link

codecov-commenter commented Sep 28, 2022

Codecov Report

Merging #1061 (7650fb4) into develop (df4b21c) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #1061      +/-   ##
===========================================
+ Coverage    83.19%   83.21%   +0.02%     
===========================================
  Files          272      272              
  Lines         9268     9279      +11     
  Branches      1488     1494       +6     
===========================================
+ Hits          7710     7721      +11     
+ Misses        1144     1138       -6     
- Partials       414      420       +6     
Impacted Files Coverage Δ
...n/kotlin/com/datadog/android/timber/DatadogTree.kt 50.00% <0.00%> (-5.56%) ⬇️
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 85.41% <0.00%> (-3.24%) ⬇️
...tadog/android/tv/LeanbackViewAttributesProvider.kt 86.21% <0.00%> (-2.68%) ⬇️
...main/kotlin/com/datadog/android/rx/DatadogRxExt.kt 100.00% <0.00%> (ø)
...tadog/android/fresco/DatadogFrescoCacheListener.kt 100.00% <0.00%> (ø)
...kotlin/com/datadog/android/DatadogEventListener.kt 98.51% <0.00%> (+0.02%) ⬆️
.../src/main/kotlin/com/datadog/android/log/Logger.kt 96.03% <0.00%> (+0.03%) ⬆️
.../android/rum/internal/monitor/DatadogRumMonitor.kt 92.49% <0.00%> (+0.58%) ⬆️
...rc/main/java/com/datadog/opentracing/DDTracer.java 56.07% <0.00%> (+1.26%) ⬆️
...ain/java/com/datadog/opentracing/PendingTrace.java 57.76% <0.00%> (+1.72%) ⬆️
... and 2 more

@0xnm 0xnm merged commit 36fb6d6 into develop Sep 29, 2022
@0xnm 0xnm deleted the nogorodnikov/merge_1.14.1_into_develop branch September 29, 2022 07:03
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants