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.

Sign up for GitHub

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

Jump to bottom

1.10.1 backports #3682

Merged
merged 4 commits into from
Mar 20, 2023
Merged

1.10.1 backports #3682

merged 4 commits into from
Mar 20, 2023

Conversation

dyladan
Copy link
Member

@dyladan dyladan commented Mar 16, 2023 •
edited
Loading

Bumps the patch version for SDK packages.

Backported PRs:

Note: this PR goes into a branch specifically for the v1.10 release line since there was already a feat committed to main

pichlermarc and others added 2 commits March 16, 2023 12:00
@pichlermarc @dyladan
fix(resource): make properties for async resource resolution optional (…
af26ab4 
…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]>
@dyladan
Changelog
ee0ab8c
@dyladan dyladan requested a review from a team March 16, 2023 16:07
@codecov
Copy link

codecov bot commented Mar 16, 2023 •
edited
Loading

Codecov Report

Merging #3682 (60dd250) into v1.10 (56e6b1b) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head 60dd250 differs from pull request most recent head d44107d. Consider uploading reports for the commit d44107d to get more accurate results

Additional details and impacted files 
@@           Coverage Diff           @@
##            v1.10    #3682   +/-   ##
=======================================
  Coverage   93.56%   93.56%           
=======================================
  Files         275      275           
  Lines        8126     8129    +3     
  Branches     1691     1697    +6     
=======================================
+ Hits         7603     7606    +3     
  Misses        523      523
Impacted Files Coverage Δ
packages/opentelemetry-resources/src/Resource.ts 100.00% <100.00%> (ø)
...s/src/platform/node/machine-id/getMachineId-bsd.ts 100.00% <100.00%> (ø)
...src/platform/node/machine-id/getMachineId-linux.ts 100.00% <100.00%> (ø)
...y-sdk-trace-base/src/export/SimpleSpanProcessor.ts 92.10% <100.00%> (+0.67%) ⬆️

pichlermarc
pichlermarc approved these changes Mar 16, 2023
View reviewed changes
Copy link
Member

@pichlermarc pichlermarc left a comment

Choose a reason for hiding this comment

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

Looks good, thank you for the backporting this! 🙂

@pichlermarc @dyladan
fix(resources): change fs/promises import to be node 12 compatible (o…
d44107d 
…pen-telemetry#3681)

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

* fix(changelog): add changelog entry.
@dyladan dyladan changed the title fix(resource): make properties for async resource resolution optional… Release 1.10.1 proposal (backports) Mar 16, 2023
@dyladan dyladan changed the title Release 1.10.1 proposal (backports) 1.10.1 backports Mar 16, 2023
@Flarna
Copy link
Member

Flarna commented Mar 17, 2023

Why backport instead of just release main?

@dyladan
Copy link
Member Author

dyladan commented Mar 17, 2023

Why backport instead of just release main?

There was a feat merged so it would have to be a minor version. In the past I have just released a new minor version in cases like this but in this instance 1.10.0 can actually cause compilation failures so I thought it was more important to release a 1.10.1 fix.

@dyladan
Copy link
Member Author

dyladan commented Mar 17, 2023

Why backport instead of just release main?

To be clear before I merge this, are you asking purely out of curiosity or because you believe we're making a mistake here?

@Flarna
Copy link
Member

Flarna commented Mar 17, 2023

Just out of curiosity. Personally I see no benefit of backporting as the changes on main should not harm.

Flarna
Flarna reviewed Mar 18, 2023
View reviewed changes
examples/https/package.json
"@opentelemetry/sdk-trace-base": "1.10.0",
"@opentelemetry/sdk-trace-node": "1.10.0",
"@opentelemetry/semantic-conventions": "1.10.0"
"@opentelemetry/exporter-jaeger": "1.10.1",
Copy link
Member

Choose a reason for hiding this comment

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

Manually changing the versions indicate that there is no release automation on backport releases.
So it seems we have to take some extra care during the next main release to avoid that it selects the same versions for GA and/or experimental packages.

@dyladan dyladan merged commit 486df99 into open-telemetry:v1.10 Mar 20, 2023
@dyladan dyladan deleted the backport-3677 branch March 20, 2023 15:35
@dyladan dyladan mentioned this pull request Mar 20, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pichlermarc pichlermarc pichlermarc approved these changes

@Flarna Flarna Flarna approved these changes

@legendecas legendecas legendecas approved these changes

@mwear mwear mwear approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dyladan @Flarna @mwear @legendecas @pichlermarc