Skip to content
Open
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
7 changes: 5 additions & 2 deletions examples/http_server/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ use self::settings::{EndpointSettings, HttpServerSettings, ResponseSettings};
use anyhow::anyhow;
use foundations::cli::{Arg, ArgAction, Cli};
use foundations::settings::collections::Map;
use foundations::telemetry::{self, log, tracing, TelemetryConfig, TelemetryContext};
use foundations::telemetry::{
self,
hyper::{Body, Request, Response},
log, tracing, TelemetryConfig, TelemetryContext,
};
use foundations::BootstrapResult;
use futures_util::stream::{FuturesUnordered, StreamExt};
use hyper::server::conn::Http;
use hyper::service::service_fn;
use hyper::{Body, Request, Response};
use std::convert::Infallible;
use std::net::{SocketAddr, TcpListener as StdTcpListener};
use std::sync::Arc;
Expand Down
6 changes: 6 additions & 0 deletions foundations/src/telemetry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ pub use self::memory_profiler::MemoryProfiler;
#[cfg(feature = "telemetry-server")]
pub use self::server::{TelemetryRouteHandler, TelemetryRouteHandlerFuture, TelemetryServerRoute};

#[cfg(feature = "telemetry-server")]
/// Re-exported types from Hyper which are used in foundations public API
pub mod hyper {
pub use hyper::{Body, Method, Request, Response};
}

pub use self::driver::TelemetryDriver;
pub use self::telemetry_context::{
TelemetryContext, WithTelemetryContext, WithTelemetryContextLocal,
Expand Down
3 changes: 2 additions & 1 deletion foundations/src/telemetry/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ use super::settings::TelemetrySettings;
#[cfg(feature = "tracing")]
use super::tracing;
use crate::BootstrapResult;
use crate::telemetry::hyper::{Body, Method, Request, Response};
use anyhow::Context as _;
use futures_util::future::{BoxFuture, FutureExt};
use hyper::server::conn::{AddrIncoming, AddrStream};
use hyper::service::Service;
use hyper::{header, Body, Method, Request, Response, Server, StatusCode};
use hyper::{header, Server, StatusCode};
use percent_encoding::percent_decode_str;
use socket2::{Domain, SockAddr, Socket, Type};
use std::collections::HashMap;
Expand Down
6 changes: 4 additions & 2 deletions foundations/tests/telemetry_server.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use foundations::telemetry::settings::{
LivenessTrackingSettings, TelemetryServerSettings, TelemetrySettings, TracingSettings,
};
use foundations::telemetry::{TelemetryConfig, TelemetryContext, TelemetryServerRoute};
use foundations::telemetry::{
hyper::{Method, Response},
TelemetryConfig, TelemetryContext, TelemetryServerRoute,
};
use futures_util::FutureExt;
use hyper::{Method, Response};
use std::net::{Ipv4Addr, SocketAddr};

#[cfg(target_os = "linux")]
Expand Down