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

Upgrade to hyper/http v1.0 #1674

Merged
merged 33 commits into from
Jul 12, 2024
Merged

Upgrade to hyper/http v1.0 #1674

merged 33 commits into from
Jul 12, 2024

Conversation

aumetra
Copy link
Contributor

@aumetra aumetra commented Apr 22, 2024

Fixes #1427

Blocked by:

Changes

  • Update all hyper and http dependencies to v1.x
  • Update reqwest to v0.12
  • Remove isahc since it's still stuck on http v0.2

Merge requirement checklist

  • CONTRIBUTING guidelines followed
  • Unit tests added/updated (if applicable)
  • Appropriate CHANGELOG.md files updated for non-trivial, user-facing changes
  • Changes in public API reviewed (if applicable)

Copy link

linux-foundation-easycla bot commented Apr 22, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@aumetra
Copy link
Contributor Author

aumetra commented Apr 22, 2024

Lint needs to have a feature enabled that's transitively enabled if the full workspace is checked, will do that later.
The external types check is broken because the nightly used is too old and axum unconditionally enables the diagnostic attribute on nightly without the feature flag because they assume everyone is at least on a nightly that is 1.68

Copy link

@mladedav mladedav left a comment

Choose a reason for hiding this comment

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

I have a few minor points. Feel free to ignore it if you don't care about the features as this should never break anyone unless a downstream crate or cargo make breaking changes and at that point all bets are off.

I think this could also be merged without waiting on tonic by adding a dependency on [email protected] to opentelemetry-otlp and using that for tonic-specific errors since that's the only place where these types figure as far as I could find.

examples/tracing-http-propagator/src/server.rs Outdated Show resolved Hide resolved
opentelemetry-http/Cargo.toml Outdated Show resolved Hide resolved
opentelemetry-http/src/lib.rs Outdated Show resolved Hide resolved
opentelemetry-jaeger/Cargo.toml Outdated Show resolved Hide resolved
opentelemetry-zipkin/src/lib.rs Outdated Show resolved Hide resolved
@aumetra
Copy link
Contributor Author

aumetra commented May 3, 2024

Sidenote: The some tests in this repository seem flakey? Locally I sometimes have to rerun the tests a few times before they pass. Weird.

Cargo.toml Outdated Show resolved Hide resolved
@TommyCpp
Copy link
Contributor

TommyCpp commented May 8, 2024

The some tests in this repository seem flakey

Yeah feel free to report those test in #1559. Most of them are because global setup / env vars and we are working on addressing them as they pop up

Cargo.toml Outdated Show resolved Hide resolved
Copy link

codecov bot commented May 9, 2024

Codecov Report

Attention: Patch coverage is 10.00000% with 18 lines in your changes missing coverage. Please review.

Project coverage is 75.0%. Comparing base (df815bd) to head (7d9670f).
Report is 1 commits behind head on main.

Files Patch % Lines
opentelemetry-http/src/lib.rs 0.0% 18 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #1674     +/-   ##
=======================================
- Coverage   75.0%   75.0%   -0.1%     
=======================================
  Files        122     122             
  Lines      20276   20290     +14     
=======================================
  Hits       15222   15222             
- Misses      5054    5068     +14     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@aumetra
Copy link
Contributor Author

aumetra commented May 9, 2024

(missed that one during the last rebase)

@NOBLES5E
Copy link
Contributor

I was wondering if this is planned to be merged anytime soon?

@aumetra
Copy link
Contributor Author

aumetra commented May 17, 2024

I was wondering if this is planned to be merged anytime soon?

I'm intending to get this over the finish line eventually, issue is just that the tonic PR is still pending

@lalitb
Copy link
Member

lalitb commented Jun 13, 2024

@aumetra The tonic PR is merged. do you think we can now remove the patch from this PR, and make it ready to review/merge.

Edit - Or probably better to wait for tonic release with merged changes.

@aumetra
Copy link
Contributor Author

aumetra commented Jun 13, 2024

As soon as it's released, sure!

@aumetra
Copy link
Contributor Author

aumetra commented Jun 21, 2024

Seems like tonic is close to releasing v0.12 with hyper v1 support.
After they publish it, I'll rebase and remove the patches

hyperium/tonic#1740

Copy link
Contributor

@djc djc left a comment

Choose a reason for hiding this comment

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

(Drive-by feedback:)

This is looking pretty good, looking forward to getting this released! Have some nits for your consideration.

opentelemetry-appender-log/CHANGELOG.md Outdated Show resolved Hide resolved
opentelemetry-appender-log/CHANGELOG.md Outdated Show resolved Hide resolved
opentelemetry-http/CHANGELOG.md Outdated Show resolved Hide resolved
opentelemetry-otlp/CHANGELOG.md Outdated Show resolved Hide resolved
opentelemetry-zipkin/CHANGELOG.md Outdated Show resolved Hide resolved
Cargo.toml Show resolved Hide resolved
@aumetra
Copy link
Contributor Author

aumetra commented Jul 11, 2024

@aumetra Is the upgrade to opentelemetry-proto submodule intended/required? If not, can we remove it from this PR, to be handled separately.

Not intended. Probably mistyped somewhere when attempting to reset the git submodule. Gonna revert that

opentelemetry-http/src/lib.rs Outdated Show resolved Hide resolved
Copy link
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the work @aumetra. Will keep this open for another day to give other approvers a chance to review before merging.

@lalitb lalitb added the integration tests Run integration tests label Jul 12, 2024
@lalitb lalitb merged commit 621a5a9 into open-telemetry:main Jul 12, 2024
26 of 27 checks passed
@djc
Copy link
Contributor

djc commented Jul 12, 2024

@lalitb are you planning a release? Need help with that?

@lalitb
Copy link
Member

lalitb commented Jul 12, 2024

@lalitb are you planning a release? Need help with that?

@djc yes I believe @cijothomas plans to do a release today if there are no issues.

@djc
Copy link
Contributor

djc commented Jul 12, 2024

Great, looking forward to it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration tests Run integration tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature]: Port opentelemetry-http to hyper 1.x
8 participants