Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion foundations/src/telemetry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,15 @@ pub use self::memory_profiler::MemoryProfiler;

#[cfg(feature = "telemetry-server")]
pub use self::server::{
BoxError, TelemetryRouteHandler, TelemetryRouteHandlerFuture, TelemetryServerRoute,
TelemetryRouteBody, TelemetryRouteHandler, TelemetryRouteHandlerFuture, TelemetryServerRoute,
};

#[cfg(feature = "telemetry-server")]
/// Re-exported crates which are used in public `telemetry` APIs.
pub mod reexports {
pub use hyper;
}

pub use self::telemetry_context::{
TelemetryContext, WithTelemetryContext, WithTelemetryContextLocal,
};
Expand Down
2 changes: 1 addition & 1 deletion foundations/src/telemetry/server/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl TelemetryListener {
}

pub use router::{
BoxError, TelemetryRouteHandler, TelemetryRouteHandlerFuture, TelemetryServerRoute,
TelemetryRouteBody, TelemetryRouteHandler, TelemetryRouteHandlerFuture, TelemetryServerRoute,
};

pub(super) struct TelemetryServerFuture {
Expand Down
14 changes: 7 additions & 7 deletions foundations/src/telemetry/server/router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ use std::collections::HashMap;
use std::convert::Infallible;
use std::sync::Arc;

/// Body type used in [`TelemetryServerRoute`] responses.
pub type TelemetryRouteBody = BoxBody<Bytes, crate::Error>;

/// Future returned by [`TelemetryServerRoute::handler`].
pub type TelemetryRouteHandlerFuture =
BoxFuture<'static, std::result::Result<Response<BoxBody<Bytes, BoxError>>, Infallible>>;

/// Error type returned by [`TelemetryRouteHandlerFuture`].
pub type BoxError = Box<dyn std::error::Error + Send + Sync>;
BoxFuture<'static, Result<Response<TelemetryRouteBody>, Infallible>>;

/// Telemetry route handler.
pub type TelemetryRouteHandler = Box<
Expand Down Expand Up @@ -156,7 +156,7 @@ impl Router {
}
}

async fn handle_request(&self, req: Request<Incoming>) -> Response<BoxBody<Bytes, BoxError>> {
async fn handle_request(&self, req: Request<Incoming>) -> Response<TelemetryRouteBody> {
let res = Response::builder();

let Ok(path) = percent_decode_str(req.uri().path()).decode_utf8() else {
Expand Down Expand Up @@ -188,7 +188,7 @@ impl Router {
}

impl Service<Request<Incoming>> for Router {
type Response = Response<BoxBody<Bytes, BoxError>>;
type Response = Response<TelemetryRouteBody>;
type Error = Infallible;
type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;

Expand All @@ -202,7 +202,7 @@ impl Service<Request<Incoming>> for Router {
fn into_response(
content_type: &str,
res: crate::Result<impl Into<Full<Bytes>>>,
) -> std::result::Result<Response<BoxBody<Bytes, BoxError>>, Infallible> {
) -> Result<Response<TelemetryRouteBody>, Infallible> {
Ok(match res {
Ok(data) => Response::builder()
.header(header::CONTENT_TYPE, content_type)
Expand Down
9 changes: 5 additions & 4 deletions foundations/tests/telemetry_server.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use foundations::telemetry::settings::{
LivenessTrackingSettings, TelemetryServerSettings, TelemetrySettings, TracingSettings,
};
use foundations::telemetry::{TelemetryConfig, TelemetryContext, TelemetryServerRoute};
use foundations::telemetry::{
reexports::hyper::{Method, Response},
TelemetryConfig, TelemetryContext, TelemetryRouteBody, TelemetryServerRoute,
};
use futures_util::FutureExt;
use http_body_util::combinators::BoxBody;
use http_body_util::{BodyExt, Full};
use hyper::{Method, Response};
use std::future::IntoFuture;
use std::net::{Ipv4Addr, SocketAddr};

Expand Down Expand Up @@ -56,7 +57,7 @@ async fn telemetry_server() {
methods: vec![Method::GET],
handler: Box::new(|_, _| {
async {
Ok(Response::new(BoxBody::new(
Ok(Response::new(TelemetryRouteBody::new(
Full::from("Hello").map_err(Into::into),
)))
}
Expand Down
Loading