Skip to content

Merge develop into SDK v2 branch#1147

Merged
0xnm merged 19 commits into
feature/sdkv2from
nogorodnikov/merge_develop_into_sdkv2_171122
Nov 21, 2022
Merged

Merge develop into SDK v2 branch#1147
0xnm merged 19 commits into
feature/sdkv2from
nogorodnikov/merge_develop_into_sdkv2_171122

Conversation

@0xnm

@0xnm 0xnm commented Nov 17, 2022

Copy link
Copy Markdown
Member

What does this PR do?

This PR does the 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)

fuzzybinary and others added 19 commits November 9, 2022 15:50
@fuzzybinary
Add device.architecture to logs
a426283 
The device architecture is needed for Flutter symbolication of logs
@xgouchet
Fix sample in README
f19fc3e
@xgouchet
Merge pull request #1141 from DataDog/xgouchet/site_documentation
931b063 
Fix sample in README
@plousada
RUMM-2625 Update default values for RUM events
45f0562 
Updates some default attributes of RUM events in order to standardize and unify behaviour across all sdk platforms.
@plousada
RUMM-2625 Extract UserInfo verification to extension function
e0b715c
@plousada
RUMM-2625 Fix connectivity reporting for views and actions
240b52e
@fuzzybinary
Merge branch 'develop' into jward/RUMM-2729-add-error-architecture
106c418
@fuzzybinary
Add telemetry configuration mapper
6093e33 
This will allow cross platform SDKs to modify the configuration before sending it to telemetry.
@fuzzybinary
Add a logger method to log error information from strings
09d5332 
This is needed for Flutter and React Native to pass their stack traces to the SDK for serialization.
@plousada
RUMM-2625 Add missing unit tests
3fb947c
@plousada
Merge pull request #1139 from DataDog/plousada/RUMM-2625/standardize-…
8ddbd15 
…rum-event-defaults

RUMM-2625 Update default values for RUM events
@fuzzybinary
Merge pull request #1142 from DataDog/jward/RUMM-2733-telemetry-confi…
f8ae7a0 
…guration-mapper

Add telemetry configuration mapper
@fuzzybinary
Parameter name change and add additional documentation
1749022
@fuzzybinary
Merge pull request #1143 from DataDog/jward/RUMM-2734-log-error-strings
a97b883 
Add a logger method to log error information from strings
@fuzzybinary
Update RUM telemetry schema
60d562e
@fuzzybinary
Merge pull request #1145 from DataDog/jward/rum-schema-update
f5d93f3 
Update telemetry schema
@fuzzybinary
Move log device.architecture member under dd
3b026cc
@fuzzybinary
Merge pull request #1140 from DataDog/jward/RUMM-2729-add-error-archi…
31fd86f 
…tecture

Add device.architecture to logs
@0xnm
Merge branch 'develop' into nogorodnikov/merge_develop_into_sdkv2_171122
181c96b
@xgouchet xgouchet added the size-huge This PR is huge sized label Nov 17, 2022
@0xnm
0xnm marked this pull request as ready for review November 17, 2022 14:45
@0xnm
0xnm requested review from a team as code owners November 17, 2022 14:45
@codecov-commenter

codecov-commenter commented Nov 21, 2022

Copy link
Copy Markdown

Codecov Report

Merging #1147 (181c96b) into feature/sdkv2 (07c6fe9) will decrease coverage by 0.04%.
The diff coverage is 82.29%.

@@                Coverage Diff                @@
##           feature/sdkv2    #1147      +/-   ##
=================================================
- Coverage          82.38%   82.34%   -0.04%     
=================================================
  Files                350      351       +1     
  Lines              11559    11748     +189     
  Branches            1980     2003      +23     
=================================================
+ Hits                9522     9673     +151     
- Misses              1423     1454      +31     
- Partials             614      621       +7
Impacted Files Coverage Δ
...droid/log/internal/logger/ConditionalLogHandler.kt 33.33% <0.00%> (-66.67%) ⬇️
...og/android/log/internal/logger/LogcatLogHandler.kt 64.15% <0.00%> (-13.12%) ⬇️
.../main/kotlin/com/datadog/android/rum/RumMonitor.kt 77.08% <ø> (ø)
...atadog/android/log/internal/domain/LogGenerator.kt 60.00% <40.00%> (-20.00%) ⬇️
...datadog/android/core/internal/utils/UserInfoExt.kt 50.00% <50.00%> (ø)
...android/rum/internal/ndk/DatadogNdkCrashHandler.kt 87.19% <63.64%> (-0.12%) ⬇️
...android/log/internal/logger/TelemetryLogHandler.kt 85.71% <66.67%> (+10.71%) ⬆️
.../datadog/android/log/internal/logger/LogHandler.kt 77.78% <75.00%> (-2.22%) ⬇️
...roid/rum/internal/domain/scope/RumResourceScope.kt 95.24% <78.95%> (-1.79%) ⬇️
.../android/rum/internal/domain/scope/RumViewScope.kt 95.24% <83.67%> (-1.14%) ⬇️
... and 23 more

@0xnm
0xnm merged commit dd58c5f into feature/sdkv2 Nov 21, 2022
@0xnm
0xnm deleted the nogorodnikov/merge_develop_into_sdkv2_171122 branch November 21, 2022 10:10
@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

Reviewers

@mariusc83 mariusc83 mariusc83 approved these changes
+1 more reviewer
@alai97 alai97 alai97 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size-huge This PR is huge sized

Projects

None yet

Milestone

1.16.0

Development

Successfully merging this pull request may close these issues.

7 participants

@0xnm @codecov-commenter @mariusc83 @alai97 @xgouchet @fuzzybinary @plousada