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 master #1062

Merged
merged 5 commits into from
Sep 29, 2022
Merged

Conversation

0xnm
Copy link
Contributor

@0xnm 0xnm commented Sep 28, 2022

What does this PR do?

This change merges release 1.14.1 into master.

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:58
@xgouchet xgouchet added the size-medium This PR is medium sized label Sep 28, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #1062 (b61f5f9) into master (35dfa36) will decrease coverage by 0.06%.
The diff coverage is 94.44%.

@@            Coverage Diff             @@
##           master    #1062      +/-   ##
==========================================
- Coverage   83.18%   83.13%   -0.06%     
==========================================
  Files         272      272              
  Lines        9295     9305      +10     
  Branches     1500     1501       +1     
==========================================
+ Hits         7732     7735       +3     
- Misses       1154     1161       +7     
  Partials      409      409              
Impacted Files Coverage Δ
...core/internal/system/DefaultAndroidInfoProvider.kt 82.61% <0.00%> (-1.84%) ⬇️
...id/core/internal/system/NoOpAndroidInfoProvider.kt 100.00% <100.00%> (ø)
...ndroid/rum/internal/domain/scope/RumActionScope.kt 98.44% <100.00%> (+0.01%) ⬆️
...roid/rum/internal/domain/scope/RumResourceScope.kt 97.91% <100.00%> (+0.02%) ⬆️
.../android/rum/internal/domain/scope/RumViewScope.kt 96.90% <100.00%> (+0.03%) ⬆️
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 84.86% <100.00%> (-3.72%) ⬇️
...rc/main/java/com/datadog/opentracing/DDTracer.java 56.07% <0.00%> (+0.42%) ⬆️

@0xnm 0xnm merged commit 6d87061 into master Sep 29, 2022
@0xnm 0xnm deleted the nogorodnikov/merge_1.14.1_into_master branch September 29, 2022 07:03
@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
Labels
size-medium This PR is medium sized
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants