Skip to content

Merge release/2.3.0 branch into master branch#1741

Merged
0xnm merged 115 commits into
masterfrom
nogorodnikov/merge-release-2.3.0-into-master
Nov 22, 2023
Merged

Merge release/2.3.0 branch into master branch#1741
0xnm merged 115 commits into
masterfrom
nogorodnikov/merge-release-2.3.0-into-master

Conversation

@0xnm

@0xnm 0xnm commented Nov 22, 2023

Copy link
Copy Markdown
Member

What does this PR do?

This PR merges release/2.3.0 branch into master branch.

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 October 2, 2023 11:15
…elease-2.2.0

RUM-1218: Prepare release 2.2.0
…evelop

Merge release 2.2.0 branch into develop
…loads

Fix SR functional tests payloads after develop roll - back
…he-order-is-kept-for-records-with-same-timestamp

RUM-891 Unit test to confirm SR records order is kept when having same timestamps
…ors_locally

Disable warning as errors locally
…tch-lock-in-ndk-signal-catcher-logic

RUM-1330 Make sure we use try-locks in our NDK signal catcher
…fixtures

(1/3) RUM-392 create core testFixtures source set
…fixtures

(2/3) RUM-392 refactor shared android library build script
…fixtures

(3/3) RUM-392 let all modules use the shared fixtures
…eturning-event-metadata-to-readers

RUM-1578: Support returning event metadata to the readers
xgouchet and others added 24 commits November 16, 2023 16:22
…tics_info

(7/9) RUM-2127 Add synthetics info to RUM Resources
…izer

Fix flaky test in RumEventDeserializer
…registered-rum-monitor-when-rum-feature-is-stopped

RUM-1017: Unregister RUM monitor when associated RUM feature is stopped
…tics_info

(8/9) RUM-2127 Add synthetics info to RUM Long Tasks
…handler

Fix flaky test in TelemetryEventHandlerTest
…tics_info

(9/9) RUM-2127 track synthetics info from activity extras
…strator

Fix flaky test in BatchFileOrchestratorTest
Reduce noise in logs when building the project
Fix flaky test in MainLooperLongTaskStrategyTest
…ault-uploading-configuration

RUM-1835 Lower the upload frequency and batch size enum values
…d-as-int

RUM-2245 Generate wireframe ids as 32bit Int
@0xnm
0xnm requested a review from a team as a code owner November 22, 2023 07:57
@codecov-commenter

codecov-commenter commented Nov 22, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1741 (5e59e1e) into master (34b298a) will decrease coverage by 0.24%.
The diff coverage is 86.64%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1741      +/-   ##
==========================================
- Coverage   83.59%   83.35%   -0.24%     
==========================================
  Files         458      465       +7     
  Lines       15767    16179     +412     
  Branches     2354     2411      +57     
==========================================
+ Hits        13180    13486     +306     
- Misses       1962     2030      +68     
- Partials      625      663      +38     
Files Coverage Δ
...tlin/com/datadog/android/api/net/RequestFactory.kt 100.00% <ø> (ø)
...android/api/storage/FeatureStorageConfiguration.kt 100.00% <100.00%> (ø)
...n/kotlin/com/datadog/android/core/StrictModeExt.kt 100.00% <100.00%> (ø)
...android/core/configuration/BatchProcessingLevel.kt 100.00% <100.00%> (ø)
...om/datadog/android/core/configuration/BatchSize.kt 100.00% <100.00%> (ø)
...atadog/android/core/configuration/Configuration.kt 96.51% <100.00%> (+0.31%) ⬆️
...adog/android/core/configuration/UploadFrequency.kt 100.00% <100.00%> (ø)
...n/com/datadog/android/core/internal/CoreFeature.kt 87.83% <100.00%> (+0.09%) ⬆️
.../internal/configuration/DataUploadConfiguration.kt 100.00% <100.00%> (ø)
...g/android/core/internal/data/upload/DataFlusher.kt 95.00% <100.00%> (+0.26%) ⬆️
... and 79 more

... and 20 files with indirect coverage changes

@0xnm
0xnm merged commit 81e1ef6 into master Nov 22, 2023
@0xnm
0xnm deleted the nogorodnikov/merge-release-2.3.0-into-master branch November 22, 2023 08:52
@xgouchet xgouchet added this to the 2.3.0 milestone Apr 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants