Merge pull request #33 from kpn-dsh/hotfix/add-missing-reexport

Hotfix/add missing reexport

Author: toelo3

CHANGELOG.md

@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.0] - unreleased
+
+## [0.3.1] - 2024-03-25
+  
+### Fixed
+- Add missing prometheus export back to the SDK
+
+## [0.3.0] - yanked - 2024-03-25
 
 ### Changed
 - Metrics http server based on Hyper instead of Warp

Cargo.toml

@@ -12,7 +12,7 @@ license = "Apache-2.0"
 name = "dsh_sdk"
 readme = "README.md"
 repository = "https://github.com/kpn-dsh/dsh-sdk-platform-rs"
-version = "0.3.0"
+version = "0.3.1"
 
 [package.metadata.docs.rs]
 features = ["full"]

examples/custom_metrics.rs

@@ -1,5 +1,4 @@
 use dsh_sdk::metrics::*;
-use prometheus::{register_int_gauge_vec, IntGaugeVec};
 
 lazy_static! {
     pub static ref HIGH_FIVE_COUNTER: IntCounter =

src/metrics.rs

@@ -60,15 +60,13 @@ use hyper::{header, Method, Request, Response, StatusCode};
 use hyper_util::rt::TokioIo;
 pub use lazy_static::lazy_static;
 use log::{error, warn};
-pub use prometheus::register_int_counter;
-use prometheus::Encoder;
-pub use prometheus::IntCounter;
+pub use prometheus::*;
 use tokio::net::TcpListener;
 use tokio::task::JoinHandle;
 
 use crate::error::DshError;
 
-type Result<T> = std::result::Result<T, DshError>;
+type DshResult<T> = std::result::Result<T, DshError>;
 type BoxBody = http_body_util::combinators::BoxBody<Bytes, hyper::Error>;
 
 static NOTFOUND: &[u8] = b"404: Not Found";
@@ -121,7 +119,7 @@ static NOTFOUND: &[u8] = b"404: Not Found";
 ///    }
 /// }
 /// ```
-pub fn start_http_server(port: u16) -> JoinHandle<Result<()>> {
+pub fn start_http_server(port: u16) -> JoinHandle<DshResult<()>> {
     tokio::spawn(async move {
         let result = run_server(port).await;
         warn!("HTTP server stopped: {:?}", result);
@@ -130,15 +128,15 @@ pub fn start_http_server(port: u16) -> JoinHandle<Result<()>> {
 }
 
 /// Encode metrics to a string (UTF8)
-pub fn metrics_to_string() -> Result<String> {
+pub fn metrics_to_string() -> DshResult<String> {
     let encoder = prometheus::TextEncoder::new();
 
     let mut buffer = Vec::new();
     encoder.encode(&prometheus::gather(), &mut buffer)?;
     Ok(String::from_utf8(buffer)?)
 }
 
-async fn run_server(port: u16) -> Result<()> {
+async fn run_server(port: u16) -> DshResult<()> {
     let addr = SocketAddr::from(([0, 0, 0, 0], port));
     let listener = TcpListener::bind(addr).await?;
 
@@ -157,21 +155,21 @@ async fn handle_connection(stream: tokio::net::TcpStream) {
     }
 }
 
-async fn routes(req: Request<Incoming>) -> Result<Response<BoxBody>> {
+async fn routes(req: Request<Incoming>) -> DshResult<Response<BoxBody>> {
     match (req.method(), req.uri().path()) {
         (&Method::GET, "/metrics") => get_metrics(),
         (_, _) => not_found(),
     }
 }
 
-fn get_metrics() -> Result<Response<BoxBody>> {
+fn get_metrics() -> DshResult<Response<BoxBody>> {
     Ok(Response::builder()
         .status(StatusCode::OK)
         .header(header::CONTENT_TYPE, prometheus::TEXT_FORMAT)
         .body(full(metrics_to_string().unwrap_or_default()))?)
 }
 
-fn not_found() -> Result<Response<BoxBody>> {
+fn not_found() -> DshResult<Response<BoxBody>> {
     Ok(Response::builder()
         .status(StatusCode::NOT_FOUND)
         .body(full(NOTFOUND))?)