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

Psalm Fix #253

Merged
merged 1 commit into from
Feb 21, 2021
Merged

Psalm Fix #253

merged 1 commit into from
Feb 21, 2021

Conversation

bobstrecansky
Copy link
Collaborator

@lalex's PR this week introduced a Psalm release that caused a test failure.

This fixes the template annotation that (I think) needs to happen to follow Psalm's directives.

Related github issue: vimeo/psalm#5203

@lalex
Copy link
Contributor

lalex commented Feb 17, 2021

@bobstrecansky I've tried to fix psalm error with a hotfix in this branch. At least it passes tests. But CorrelationContext itself is not in specs anymore. It is renamed to Baggage (open-telemetry/opentelemetry-specification#857).

@bobstrecansky
Copy link
Collaborator Author

Yup, my thought process was too fix this and then we can wholesale rename it later. I was planning on finishing this but got roped into oncall duty; will finish this up today

@codecov
Copy link

codecov bot commented Feb 18, 2021

Codecov Report

Merging #253 (32c2b78) into main (96d0feb) will decrease coverage by 0.31%.
The diff coverage is 71.42%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #253      +/-   ##
============================================
- Coverage     93.25%   92.93%   -0.32%     
- Complexity      410      416       +6     
============================================
  Files            41       42       +1     
  Lines           964      977      +13     
============================================
+ Hits            899      908       +9     
- Misses           65       69       +4     
Impacted Files Coverage Δ Complexity Δ
sdk/CorrelationContext.php 96.00% <ø> (ø) 12.00 <0.00> (ø)
sdk/Trace/TracerProvider.php 87.87% <50.00%> (-5.46%) 10.00 <2.00> (+1.00) ⬇️
sdk/Trace/RandomIdGenerator.php 80.00% <80.00%> (ø) 5.00 <5.00> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e69f9da...32c2b78. Read the comment docs.

@bobstrecansky
Copy link
Collaborator Author

@morrisonlevi @beniamin for review please.

@bobstrecansky bobstrecansky merged commit 07cdd5a into open-telemetry:main Feb 21, 2021
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