Skip to content

Merge develop branch into feature/otel-support branch#2058

Merged
0xnm merged 29 commits into
feature/otel-supportfrom
nogorodnikov/merge-develop-into-otel
May 29, 2024
Merged

Merge develop branch into feature/otel-support branch#2058
0xnm merged 29 commits into
feature/otel-supportfrom
nogorodnikov/merge-develop-into-otel

Conversation

@0xnm

@0xnm 0xnm commented May 29, 2024

Copy link
Copy Markdown
Member

What does this PR do?

Since we did a 2.10.0 release and bumped dev version to 2.11.0, it makes sense to sync Otel branch with develop.

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)

xgouchet and others added 28 commits May 21, 2024 14:48
@xgouchet
Update the Method Call metric usage
f4f8507
@xgouchet
Merge pull request #2040 from DataDog/xgouchet/sr_perf
a783738 
Update the Method Call metric usage
@xgouchet
RUM-4516 add event type to write operation
cfa60ae
@xgouchet
RUM-4516 Add event type when writing logs
a1f63cd
@xgouchet
RUM-4516 Add event type when writing RUM events
878d51f
@xgouchet
RUM-4516 Add event type when writing SR events
9abd882
@xgouchet
RUM-4516 Add event type when writing Spans
a60c72a
@xgouchet
RUM-4516 Add event type when writing WebView events
6fadd84
@0xnm
Update static analysis pipeline version
7ba5635
@0xnm
Merge pull request #2045 from DataDog/nogorodnikov/update-static-anal…
ccc3255 
…ysis-pipeline-version

Update static analysis pipeline version
@xgouchet
Fix flaky test regarding PerformanceMeasure sampling rate
ded5bcb
@xgouchet
Merge pull request #2046 from DataDog/xgouchet/flaky_sampling_rate
dff6fea 
Fix flaky test regarding PerformanceMeasure sampling rate
@xgouchet
Merge pull request #2044 from DataDog/xgouchet/RUM-4516/flag_critical…
daec9a0 
…_events_custom_persistence

RUM-4516 flag critical events in custom persistence
@xgouchet
Delegate Drawable copy to background thread
a6f8b75
@0xnm
Prepare 2.10.0 release
407cac9
@0xnm
Next dev iteration
347654a
@xgouchet
Prevent obfuscation of Mapper classes
efb6200
@xgouchet
Merge pull request #2048 from DataDog/xgouchet/sr_performance_mutable…
de8989f 
…_list

RUM-4561 Delegate Drawable copy to background thread
@xgouchet
Delegate Drawable copy to background thread
0167ebd
@xgouchet
Prevent obfuscation of Mapper classes
0020db0
@xgouchet
RUM-4561 update changelog
3122210
@xgouchet
Improve telemetry from RecordedDataQueueHandler
d8e62f3
@0xnm
Merge pull request #2050 from DataDog/nogorodnikov/next-dev-iteration…
6dc7964 
…-2.11.0

Next dev iteration 2.11.0
@0xnm
Merge pull request #2049 from DataDog/nogorodnikov/prepare-release-2.…
45b2914 
…10.0

Prepare 2.10.0 release
@xgouchet
Merge pull request #2053 from DataDog/xgouchet/record_queue_telemetry
b844675 
Improve telemetry from RecordedDataQueueHandler
@0xnm
Merge pull request #2052 from DataDog/xgouchet/RUM-4561/sr_drawable_perf
a6f7ed2 
RUM-4561 Cherry pick Drawable Performance improvements
@0xnm
Merge release/2.10.0 branch into develop branch
8bd3a87
@0xnm
Merge pull request #2054 from DataDog/nogorodnikov/merge-release-2.10…
237641e 
….0-into-develop

Merge `release/2.10.0` branch into `develop` branch
@0xnm
0xnm requested review from a team as code owners May 29, 2024 08:11
@0xnm
0xnm force-pushed the nogorodnikov/merge-develop-into-otel branch from 2dd14d4 to 7ca025e Compare May 29, 2024 08:29
@codecov-commenter

codecov-commenter commented May 29, 2024 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 86.12440% with 29 lines in your changes are missing coverage. Please review.

Project coverage is 66.66%. Comparing base (c81732c) to head (7ca025e).

Additional details and impacted files 
@@                   Coverage Diff                    @@
##           feature/otel-support    #2058      +/-   ##
========================================================
- Coverage                 67.01%   66.66%   -0.36%     
========================================================
  Files                       734      737       +3     
  Lines                     27211    27244      +33     
  Branches                   4604     4598       -6     
========================================================
- Hits                      18235    18160      -75     
- Misses                     7773     7854      +81     
- Partials                   1203     1230      +27
Files Coverage Δ
...n/kotlin/com/datadog/android/api/InternalLogger.kt 100.00% <ø> (ø)
...in/com/datadog/android/api/feature/FeatureScope.kt 0.00% <ø> (ø)
...otlin/com/datadog/android/api/storage/EventType.kt 100.00% <100.00%> (ø)
...in/com/datadog/android/core/internal/SdkFeature.kt 89.10% <ø> (+2.77%) ⬆️
.../android/core/internal/logger/SdkInternalLogger.kt 86.73% <100.00%> (-6.67%) ⬇️
...oid/core/internal/metrics/MethodCalledTelemetry.kt 100.00% <100.00%> (ø)
...droid/core/internal/persistence/AbstractStorage.kt 100.00% <100.00%> (ø)
.../core/internal/persistence/FileEventBatchWriter.kt 97.50% <ø> (ø)
.../core/internal/persistence/NoOpEventBatchWriter.kt 100.00% <ø> (ø)
.../datadog/android/core/metrics/PerformanceMetric.kt 0.00% <ø> (ø)
... and 28 more

... and 20 files with indirect coverage changes

@0xnm
0xnm merged commit 1dd0f18 into feature/otel-support May 29, 2024
@0xnm
0xnm deleted the nogorodnikov/merge-develop-into-otel branch May 29, 2024 09:44
@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

Reviewers

@mariusc83 mariusc83 mariusc83 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.11.x

Development

Successfully merging this pull request may close these issues.

4 participants

@0xnm @codecov-commenter @mariusc83 @xgouchet