tikv
/
rust-prometheus
mirror of https://github.com/tikv/rust-prometheus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build(deps): update hyper requirement from ^0.14 to ^1.4 (#524) 

* build(deps): update hyper requirement from ^0.14 to ^1.4

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/master/CHANGELOG.md)
- [Commits](https://github.com/hyperium/hyper/compare/v0.14.0...v1.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

* examples: fix hyper server example

Signed-off-by: Luca BRUNO <lucab@lucabruno.net>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Luca BRUNO <lucab@lucabruno.net>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Luca BRUNO <lucab@lucabruno.net>
This commit is contained in:
dependabot[bot] 2025-03-19 16:16:45 +01:00 committed by GitHub
parent 4a0e282888
commit e5809b7ab9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -39,8 +39,9 @@ procfs = { version = "^0.16", optional = true, default-features = false }
[dev-dependencies]
criterion = "0.5"
getopts = "^0.2"
hyper = { version = "^0.14", features = ["server", "http1", "tcp"] }
tokio = { version = "^1.0", features = ["macros", "rt-multi-thread"] }
hyper = { version = "^1.6", features = ["http1", "server"] }
hyper-util = { version = "^0.1", features = ["http1", "server", "tokio"] }
tokio = { version = "^1.0", features = ["macros", "net", "rt-multi-thread"] }
[build-dependencies]
protobuf-codegen = { version = "^3.7.2", optional = true }

45
examples/example_hyper.rs
View File

@ -1,14 +1,20 @@
// Copyright 2019 TiKV Project Authors. Licensed under Apache-2.0.
use hyper::{
header::CONTENT_TYPE,
service::{make_service_fn, service_fn},
Body, Request, Response, Server,
};
use prometheus::{Counter, Encoder, Gauge, HistogramVec, TextEncoder};
use std::net::SocketAddr;
use hyper::body::Incoming;
use hyper::header::CONTENT_TYPE;
use hyper::server::conn::http1;
use hyper::service::service_fn;
use hyper::Request;
use hyper::Response;
use hyper_util::rt::TokioIo;
use lazy_static::lazy_static;
use prometheus::{labels, opts, register_counter, register_gauge, register_histogram_vec};
use prometheus::{Counter, Encoder, Gauge, HistogramVec, TextEncoder};
use tokio::net::TcpListener;
type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
lazy_static! {
static ref HTTP_COUNTER: Counter = register_counter!(opts!(
@ -31,22 +37,20 @@ lazy_static! {
.unwrap();
}
async fn serve_req(_req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
async fn serve_req(_req: Request<Incoming>) -> Result<Response<String>, BoxedErr> {
let encoder = TextEncoder::new();
HTTP_COUNTER.inc();
let timer = HTTP_REQ_HISTOGRAM.with_label_values(&["all"]).start_timer();
let metric_families = prometheus::gather();
let mut buffer = vec![];
encoder.encode(&metric_families, &mut buffer).unwrap();
HTTP_BODY_GAUGE.set(buffer.len() as f64);
let body = encoder.encode_to_string(&metric_families)?;
HTTP_BODY_GAUGE.set(body.len() as f64);
let response = Response::builder()
.status(200)
.header(CONTENT_TYPE, encoder.format_type())
.body(Body::from(buffer))
.unwrap();
.body(body)?;
timer.observe_duration();
@ -54,15 +58,18 @@ async fn serve_req(_req: Request<Body>) -> Result<Response<Body>, hyper::Error>
}
#[tokio::main]
async fn main() {
let addr = ([127, 0, 0, 1], 9898).into();
async fn main() -> Result<(), BoxedErr> {
let addr: SocketAddr = ([127, 0, 0, 1], 9898).into();
println!("Listening on http://{}", addr);
let listener = TcpListener::bind(addr).await?;
let serve_future = Server::bind(&addr).serve(make_service_fn(|_| async {
Ok::<_, hyper::Error>(service_fn(serve_req))
}));
loop {
let (stream, _) = listener.accept().await?;
let io = TokioIo::new(stream);
if let Err(err) = serve_future.await {
eprintln!("server error: {}", err);
let service = service_fn(serve_req);
if let Err(err) = http1::Builder::new().serve_connection(io, service).await {
eprintln!("server error: {:?}", err);
};
}
}