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

chore/hyper 1.1 upgrade #450

Merged
merged 11 commits into from
Mar 13, 2024
Merged

Conversation

evaneaston
Copy link
Contributor

@evaneaston evaneaston commented Feb 17, 2024

  • update to hyper 1.1
  • factor large PrometheusBuilder.build function into separate functions
  • move those functions into separate modules to reduce some of the feature driven uses
  • add an http-listener integration test

@evaneaston evaneaston changed the base branch from dependabot/cargo/hyper-1.1 to main February 17, 2024 02:11
@tobz
Copy link
Member

tobz commented Feb 20, 2024

Oh yeah, this is definitely a meaty one. :)

I would say that we should move the builder code into a new directory (builder) and split the push gateway code and HTTP listener code into their own files, otherwise it starts to get a little crowded.

Once that's sorted, and you've cleaned up some more of the leftover stuff (commented out code, print statements, etc) we can start talking through the actual changes.

@evaneaston
Copy link
Contributor Author

Sounds like a plan. That's the direction I was going to go. Now to find some more time.

@evaneaston
Copy link
Contributor Author

evaneaston commented Feb 28, 2024

@tobz Took a shot at reorganizing the exporters. I removed the nested closures of the http exporter as some might find it easier to read. I need to revisit Cargo.toml.

Copy link
Member

@tobz tobz left a comment

Choose a reason for hiding this comment

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

Overall, this is looking really good. Some of the hyper stuff is unfortunate given how much more verbose it's gotten, but alas. :)

Left a bunch of cleanup comments, and I think once those are addressed, I can take one more pass since it was a lot to digest at first.

@evaneaston evaneaston marked this pull request as ready for review March 4, 2024 04:48
@evaneaston
Copy link
Contributor Author

@tobz Would you like me to rebase and --signoff on my stuff. It'll require a diverging force push.

@tobz
Copy link
Member

tobz commented Mar 5, 2024

@tobz Would you like me to rebase and --signoff on my stuff. It'll require a diverging force push.

If that's cool with you, that'd be nice. Force pushing is fine.

dependabot bot and others added 8 commits March 5, 2024 18:25
Updates the requirements on [hyper](https://github.com/hyperium/hyper) to permit the latest version.
- [Release notes](https://github.com/hyperium/hyper/releases)
- [Changelog](https://github.com/hyperium/hyper/blob/v0.14.28/CHANGELOG.md)
- [Commits](hyperium/hyper@v0.14.0...v0.14.28)

---
updated-dependencies:
- dependency-name: hyper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Evan Easton <evan@eeaston.com>
…through deprecations.

Signed-off-by: Evan Easton <evan@eeaston.com>
 - factor large PrometheusBuilder.build function into separate functions in separate modules for http listener and push gateway
 - add an http-listener integration test

Signed-off-by: Evan Easton <evan@eeaston.com>
Signed-off-by: Evan Easton <evan@eeaston.com>
… of an exporter module

Signed-off-by: Evan Easton <evan@eeaston.com>
Signed-off-by: Evan Easton <evan@eeaston.com>
 - correct hack --feature-powerset failures

Signed-off-by: Evan Easton <evan@eeaston.com>
 - move peer address allow check into listener loop
 - only obtain peer_address.ip() if allowed_addresses Some
 - yank Arc<Inner> and just cline handle

Signed-off-by: Evan Easton <evan@eeaston.com>
 - get_available_port
     - rename of param
     - remove uneeded block
@tobz tobz added C-exporter Component: exporters such as Prometheus, TCP, etc. E-intermediate Effort: intermediate. T-chore Type: chore. labels Mar 9, 2024
@evaneaston
Copy link
Contributor Author

@tobz I pushed the tweak to fix the workflow fail.

@tobz
Copy link
Member

tobz commented Mar 11, 2024

@evaneaston Just noticed the merge to get up-to-date with main.

I'll take a final pass shortly and hopefully get this merged today. I think it's close enough that it's good enough to merge, since there's a lot of other changes queued up for release and I'll likely be doing some stylistic cleanup to my own preferences anyways.

@tobz tobz merged commit b195391 into metrics-rs:main Mar 13, 2024
12 checks passed
@tobz tobz added the S-awaiting-release Status: awaiting a release to be considered fixed/implemented. label Mar 13, 2024
@tobz
Copy link
Member

tobz commented Mar 16, 2024

Released in metrics-exporter-prometheus@v0.14.0.

Thanks again for your contribution!

@tobz tobz removed the S-awaiting-release Status: awaiting a release to be considered fixed/implemented. label Mar 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-exporter Component: exporters such as Prometheus, TCP, etc. E-intermediate Effort: intermediate. T-chore Type: chore.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants