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 develop branch into SDK v2 branch #1034

Merged
merged 104 commits into from
Sep 5, 2022

Conversation

0xnm
Copy link
Contributor

@0xnm 0xnm commented Sep 5, 2022

What does this PR do?

This PR does a merge of develop branch into feature/sdkv2 branch with all the 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)

alai97 and others added 30 commits April 4, 2022 10:53
Doc edit for Android Mobile Vitals.
Co-authored-by: May Lee <may.lee@datadoghq.com>
Co-authored-by: Nikita Ogorodnikov <4046447+0xnm@users.noreply.github.com>
Adds RUM services information to introduce Unified Service Tagging.
Will change this back before merging!
DOCS-3301 add documentation to track background events
…-update

DOCS-3292 Android Mobile Vitals Edits
…update

DOCS-2277 Android Web View Tracking Edits
…disable-view-tracking-strategy

RUMM-2324: Let user to disable RUM view tracking strategy
…nteraction-tracking-reporting

RUMM-2322: Report back interaction as back type, prevent reporting empty target name
We expose internal methods through the _InternalProxy class, which is documented for internal use, and the `_internal` static member on the Datadog object. We keep Telemetry and RUM as separate proxies, in case we have to split them as v2 takes shape.

Exposing Telemetry requires adding a way for reporting errors that are not Throwable (for use in cross platform frameworks), so I modified the event to take `stack` and `kind` as strings instead.
alai97 and others added 19 commits August 25, 2022 11:39
Add Jetpack Compose to integrated libraries page.
Co-authored-by: Nikita Ogorodnikov <4046447+0xnm@users.noreply.github.com>
…ion-update

DOCS-3982 Android Integrated Libraries Update
Sync Doc Changes From Master to Develop
…ant-tag-to-logs

RUMM-2448: Add variant tag to logs
…-app-version

RUMM-2380: Enable custom application version support
…rustration-count-on-views

RUMM-2353: Report frustration count on views
….0-beta2_into_develop

Merge the head (1.14.0-beta2) of release/1.14.0 branch into develop branch
@0xnm 0xnm requested review from a team as code owners September 5, 2022 09:48
@0xnm 0xnm force-pushed the nogorodnikov/merge_develop_into_sdkv2_020922 branch from 88e479c to fcc8934 Compare September 5, 2022 12:58
@xgouchet xgouchet added the size-huge This PR is huge sized label Sep 5, 2022
@0xnm 0xnm merged commit 5577287 into feature/sdkv2 Sep 5, 2022
@0xnm 0xnm deleted the nogorodnikov/merge_develop_into_sdkv2_020922 branch September 5, 2022 13:31
@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

9 participants