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

RUMM-2337: Merge develop into sdkv2 branch #978

Merged
merged 74 commits into from
Jul 12, 2022

Conversation

0xnm
Copy link
Member

@0xnm 0xnm commented Jul 11, 2022

What does this PR do?

This change does the merge of develop branch into sdkv2 branch, conflicts are 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)

0xnm and others added 30 commits April 28, 2022 09:14
…o-1.13

Pull latest fixes into 1.13.0 release branch
…ew-agp-publishing-model

RUMM-2095: Support new AGP publishing model
…i-v1-related-classes

RUMM-2084: Delete API v1 related classes
…gs-per-level

RUMM-2042: Filter Datadog logs per level
Reorganizes the Sample RUM Sessions section from Troubleshooting to Advanced Configuration.
…n-iso-code-attribute

DOCS-3465 Android Data Collected Edit
Fix the logic of joining byte arrays when there is no items
…c-update

Android Advanced Configuration Edit
Add github diff link on PR generated by the CI on new versions
…als-uptate-frequency-option

RUMM-2076 Add the Configuration#setVitalsMonitorUpdateFrequency API
…ate-frequency-api-nightly-tests

RUMM-2183 Nightly tests for ConfigurationBuilder#setVitalsUpdateFrequency
…ampling

RUMM-2165: Add trace sampling for instrumented network requests
Joe Roskopf and others added 18 commits June 21, 2022 06:59
ISSUE-950 | Add method to set extra properties on the UserInfo object
…om-version

RUMM-2284: Update Room version
…itoring-token-references

Remove internal monitoring token references
…ndling-of-span-scope-for-rxjava

RUMM-2226: Fix handling of span scope in RxJava chain
…alls-with-implicit-receiver-in-UnsafeThirdPartyFunctionCall-check

RUMM-1876: Support calls with implicit receiver in UnsafeThirdPartyFunctionCall check
…bitleavingstaticmocks-check-crash-on-a-class-with-synthetic-members

RUMM-2182: Prevent crash of ProhibitLeavingStaticMocks check on a class with synthetic members
…precated-apis

RUMM-2329: Remove deprecated APIs
@0xnm 0xnm requested review from a team as code owners July 11, 2022 12:45
@codecov-commenter
Copy link

codecov-commenter commented Jul 11, 2022

Codecov Report

Merging #978 (c786ee2) into feature/sdkv2 (d5ae1b9) will increase coverage by 0.23%.
The diff coverage is 92.98%.

@@                Coverage Diff                @@
##           feature/sdkv2     #978      +/-   ##
=================================================
+ Coverage          82.42%   82.65%   +0.23%     
=================================================
  Files                291      296       +5     
  Lines               9482     9777     +295     
  Branches            1573     1617      +44     
=================================================
+ Hits                7815     8081     +266     
- Misses              1199     1212      +13     
- Partials             468      484      +16     
Impacted Files Coverage Δ
...om/datadog/android/ktx/sqlite/SqliteDatabaseExt.kt 92.86% <ø> (ø)
...n/kotlin/com/datadog/android/timber/DatadogTree.kt 55.56% <0.00%> (-44.44%) ⬇️
...adog/opentracing/propagation/DatadogHttpCodec.java 5.77% <ø> (+0.11%) ⬆️
...m/datadog/android/core/internal/utils/MiscUtils.kt 66.18% <ø> (ø)
...g/android/rum/internal/debug/UiRumDebugListener.kt 92.31% <ø> (ø)
...og/android/rum/internal/net/RumOkHttpUploaderV2.kt 100.00% <ø> (ø)
...dog/android/rum/resource/RumResourceInputStream.kt 90.77% <ø> (ø)
...re/internal/thread/NoOpScheduledExecutorService.kt 12.50% <12.50%> (ø)
...oid/src/main/kotlin/com/datadog/android/Datadog.kt 74.42% <33.33%> (-3.08%) ⬇️
...n/com/datadog/android/core/internal/CoreFeature.kt 91.02% <66.67%> (-1.00%) ⬇️
... and 48 more

@xgouchet xgouchet added the size-huge This PR is huge sized label Jul 11, 2022
Base automatically changed from nogorodnikov/rumm-2236/bring-unit-tests-back to feature/sdkv2 July 11, 2022 15:35
@0xnm 0xnm merged commit 384e618 into feature/sdkv2 Jul 12, 2022
@0xnm 0xnm deleted the nogorodnikov/rumm-2337/merge-develop-into-sdkv2 branch July 12, 2022 08:41
@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.

8 participants