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

Merged
merged 140 commits into from
Nov 9, 2022

Conversation

0xnm
Copy link
Contributor

@0xnm 0xnm commented Nov 9, 2022

What does this PR do?

Fast-forward wasn't possible because of one very small conflict.

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)

xgouchet and others added 30 commits July 21, 2022 09:26
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.
…changes

Cherry-pick recent Gradle changes into develop branch
…generation-in-develop

Cherry-pick models generation changes into develop branch
…hitecture

Support sending CPU architecture as part of device info
…ple-app

Fix buttons overlap in the sample app
…error_tap

RUMM-2349 Add frustration signal 'Error Tap'
Co-authored-by: Bryce Eadie <bryce.eadie@datadoghq.com>
Replace references to iOS classes with correct Android equivalents.
…oad_headers

RUMM-2377 Add checks on intake request headers
Use a gitlab template for analysis generated files check
0xnm and others added 23 commits November 4, 2022 10:05
…ock-after-the-executors

Shutdown Kronos clock only after executors
…n_telemetry

RUMM-2630 RUM Configuration Telemetry
…ry-in-instrumented-rum-tests-assertions

Filter out telemetry in the assertions of instrumented RUM tests
@0xnm 0xnm requested review from a team as code owners November 9, 2022 08:31
@xgouchet xgouchet added the size-huge This PR is huge sized label Nov 9, 2022
@0xnm 0xnm merged commit 401bb31 into master Nov 9, 2022
@0xnm 0xnm deleted the nogorodnikov/merge_release_1.15.0_into_master branch November 9, 2022 12:53
@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-huge This PR is huge sized
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants