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

[next] merge changes from main #5144

Merged
merged 32 commits into from
Nov 13, 2024

Conversation

pichlermarc
Copy link
Member

@pichlermarc pichlermarc commented Nov 12, 2024

Important

This PR needs to be merged by a maintainer as we need to merge it non-squashed. Otherwise we'll have to do the same work again.

Updates next with the latest changes from main, all changes here are pre-reviewed already

pichlermarc and others added 30 commits October 9, 2024 08:04
)

Co-authored-by: Marc Pichler <[email protected]>
Co-authored-by: Raphaël Thériault <[email protected]>
Co-authored-by: Jakub Ziółkowski <[email protected]>
Co-authored-by: David Luna <[email protected]>
Co-authored-by: Trent Mick <[email protected]>
Co-authored-by: Marylia Gutierrez <[email protected]>
Co-authored-by: Mend Renovate <[email protected]>
Co-authored-by: Mercy Bassey <[email protected]>
Co-authored-by: OpenTelemetry Bot <[email protected]>
…ports and making protected methods private (open-telemetry#5124)

Co-authored-by: Hector Hernandez <[email protected]>
@pichlermarc pichlermarc requested a review from a team as a code owner November 12, 2024 16:28
@pichlermarc
Copy link
Member Author

cc @david-luna - merging main into next as discussed in #5134 🙂

Copy link

codecov bot commented Nov 12, 2024

Codecov Report

Attention: Patch coverage is 93.51852% with 7 lines in your changes missing coverage. Please review.

Project coverage is 93.15%. Comparing base (b057c93) to head (4a394cc).
Report is 36 commits behind head on next.

Files with missing lines Patch % Lines
...ental/packages/opentelemetry-sdk-node/src/utils.ts 88.70% 7 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             next    #5144      +/-   ##
==========================================
- Coverage   93.24%   93.15%   -0.09%     
==========================================
  Files         318      315       -3     
  Lines        8231     8113     -118     
  Branches     1651     1633      -18     
==========================================
- Hits         7675     7558     -117     
+ Misses        556      555       -1     
Files with missing lines Coverage Δ
...gs-otlp-proto/src/platform/node/OTLPLogExporter.ts 100.00% <100.00%> (ø)
...imental/packages/opentelemetry-sdk-node/src/sdk.ts 97.38% <100.00%> (+1.90%) ⬆️
...perimental/packages/sdk-logs/src/LoggerProvider.ts 98.00% <100.00%> (+0.17%) ⬆️
experimental/packages/sdk-logs/src/config.ts 100.00% <ø> (ø)
...es/opentelemetry-resources/src/detect-resources.ts 65.30% <100.00%> (+0.72%) ⬆️
...elemetry-sdk-trace-base/src/BasicTracerProvider.ts 95.68% <100.00%> (+0.15%) ⬆️
...ackages/opentelemetry-sdk-trace-base/src/config.ts 88.63% <ø> (ø)
packages/sdk-metrics/src/MeterProvider.ts 100.00% <100.00%> (ø)
...etrics/src/export/PeriodicExportingMetricReader.ts 98.18% <100.00%> (+5.19%) ⬆️
...ental/packages/opentelemetry-sdk-node/src/utils.ts 87.95% <88.70%> (+2.23%) ⬆️

@pichlermarc pichlermarc merged commit a833d9c into open-telemetry:next Nov 13, 2024
18 checks passed
@pichlermarc pichlermarc deleted the next-main- branch November 13, 2024 17:10
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.