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

Merge v1.10.1 changelog/version updates #3692

Merged
merged 3 commits into from
Mar 20, 2023

Conversation

dyladan
Copy link
Member

@dyladan dyladan commented Mar 20, 2023

Merges the v1.10.1 backports into main

everything here has already been approved and released in #3682

dyladan and others added 2 commits March 20, 2023 11:34
* fix(resource): make properties for async resource resolution optional (open-telemetry#3677)

* fix(resource): make properties for async resolution optional

* fix(changelog): add changelog

* fix(resources): add regression test

* fix(resources): remove ts-ignore in tests

---------

Co-authored-by: Daniel Dyla <[email protected]>

* Changelog

* Bump patch versions

* fix(resources): change fs/promises import to be node 12 compatible (open-telemetry#3681)

* fix(resources): change fs/promises import to be node 12 compatible

* fix(changelog): add changelog entry.

---------

Co-authored-by: Marc Pichler <[email protected]>
@dyladan dyladan requested a review from a team March 20, 2023 16:13
@codecov
Copy link

codecov bot commented Mar 20, 2023

Codecov Report

Merging #3692 (9af446a) into main (823f846) will decrease coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 9af446a differs from pull request most recent head ddd3f90. Consider uploading reports for the commit ddd3f90 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3692      +/-   ##
==========================================
- Coverage   93.70%   93.68%   -0.02%     
==========================================
  Files         277      277              
  Lines        8445     8445              
  Branches     1753     1753              
==========================================
- Hits         7913     7912       -1     
- Misses        532      533       +1     

see 1 file with indirect coverage changes

@dyladan dyladan merged commit ca700c4 into open-telemetry:main Mar 20, 2023
@dyladan dyladan deleted the v1.10.1-main branch March 20, 2023 19:25
Comment on lines -15 to -22
* fix(sdk-metrics): merge uncollected delta accumulations [#3667](https://github.com/open-telemetry/opentelemetry-js/pull/3667) @legendecas
* feat(resources): collect additional process attributes [#3605](https://github.com/open-telemetry/opentelemetry-js/pull/3605) @mwear

### :bug: (Bug Fix)

* fix(sdk-trace-web): make `parseUrl()` respect document.baseURI [#3670](https://github.com/open-telemetry/opentelemetry-js/pull/3670) @domasx2
* fix(resource): make properties for async resource resolution optional [#3677](https://github.com/open-telemetry/opentelemetry-js/pull/3677) @pichlermarc
* fix(resources): change fs/promises import to be node 12 compatible [#3681](https://github.com/open-telemetry/opentelemetry-js/pull/3681) @pichlermarc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dyladan Were these two changelog removals accidental?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see the "change fs/promises import to be node 12 compatible" one was in the 1.10.1 release below. However the "merge uncollected delta accumulations" changelog entry is gone. I'll ask on the 1.11.0 release issue.

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.

3 participants