Skip to content

Merge develop branch#1948

Merged
mariusc83 merged 49 commits into
feature/otel-supportfrom
mconstantin/merge-develop-brance-into-otel
Mar 28, 2024
Merged

Merge develop branch#1948
mariusc83 merged 49 commits into
feature/otel-supportfrom
mconstantin/merge-develop-brance-into-otel

Conversation

@mariusc83

Copy link
Copy Markdown
Member

What does this PR do?

A brief description of the change being made with this pull request.

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

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 30 commits March 12, 2024 17:15
This sets up an attribute, `LogAttributes.ERROR_FINGERPRINT` that is automatically transferred to the `Error` object in `LogEvent`s.

Also fixes RUM-2209 by adding the `LogEvent.Error.fingerprint` member
RUM-2907 Allow setting custom error fingerprint
…l-threads-for-non-fatal-anrs

RUM-3523: Report all threads for non-fatal ANRs
…res-and-reports-fatal-anrs

RUM-2878: Report fatal ANRs
…n-fatal-anr-reporting

RUM-2879: Disable non-fatal ANR reporting by default
…atting-rules

Adjust `ktlint` formatting rules
…-error-category-for-anrs

RUM-2926: Introduce `error.category` attribute for exceptions, categorize ANRs separately
…-modification-exception-when-reading-feature-flags

Prevent `ConcurrentModificationException` when reading feature flags
0xnm and others added 18 commits March 21, 2024 09:44
…0-into-develop

Merge release 2.7.0 into `develop` branch
…events-serialization-from-rum-view-scope

Add a test for the safe events serialization produced by `RumViewScope` in multi-threaded environment
…htlytests

Fix mime type for nightly tests
…on-tests

Disable some sr integration tests temporarily due to flakiness
…cation-startup-time-regression

RUM-3430: Fix application startup time regression
@mariusc83
mariusc83 requested review from a team as code owners March 27, 2024 16:51
@mariusc83
mariusc83 force-pushed the mconstantin/merge-develop-brance-into-otel branch from 338d2d6 to 364a08b Compare March 27, 2024 16:51
@mariusc83 mariusc83 self-assigned this Mar 27, 2024
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Merging #1948 (364a08b) into feature/otel-support (c224901) will increase coverage by 0.27%.
The diff coverage is 89.31%.

Additional details and impacted files
@@                   Coverage Diff                    @@
##           feature/otel-support    #1948      +/-   ##
========================================================
+ Coverage                 59.72%   59.99%   +0.27%     
========================================================
  Files                       796      803       +7     
  Lines                     29613    30043     +430     
  Branches                   4855     4928      +73     
========================================================
+ Hits                      17685    18022     +337     
- Misses                    10733    10807      +74     
- Partials                   1195     1214      +19     
Files Coverage Δ
.../kotlin/com/datadog/android/api/feature/Feature.kt 100.00% <ø> (ø)
...ain/kotlin/com/datadog/android/core/DatadogCore.kt 84.49% <100.00%> (+0.80%) ⬆️
...l/net/info/BroadcastReceiverNetworkInfoProvider.kt 93.88% <100.00%> (ø)
...e/internal/net/info/CallbackNetworkInfoProvider.kt 95.24% <100.00%> (ø)
...id/core/internal/system/BuildSdkVersionProvider.kt 100.00% <100.00%> (ø)
...m/datadog/android/core/internal/utils/NumberExt.kt 0.00% <ø> (ø)
...m/datadog/android/core/internal/utils/ThreadExt.kt 62.50% <100.00%> (ø)
...in/kotlin/com/datadog/android/log/LogAttributes.kt 0.00% <ø> (ø)
...om/datadog/android/ndk/internal/NdkCrashHandler.kt 100.00% <ø> (ø)
...gs/src/main/kotlin/com/datadog/android/log/Logs.kt 84.62% <ø> (ø)
... and 90 more

... and 26 files with indirect coverage changes

@mariusc83
mariusc83 merged commit 3cfe958 into feature/otel-support Mar 28, 2024
@mariusc83
mariusc83 deleted the mconstantin/merge-develop-brance-into-otel branch March 28, 2024 07:53
@xgouchet xgouchet added this to the 2.11.x milestone Jul 31, 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.

6 participants