Merge branch '14-feat-raw-json-string-or-serde_json-value-instead-of-structs' into 'main'

Resolve "feat: raw json (string or serde_json::Value) instead of structs"

Closes #14

See merge request !17

Cargo.lock

@@ -617,9 +617,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "mime"
@@ -842,9 +842,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-http-query"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7849dd7319357e220886589ea0a0760ff138cde2eedfbbfd2708caee0b15dfc"
+checksum = "5064f9bd466079eb96e7e8a920506c26053a040ee0a388c8f8e9280a50f5599a"
 dependencies = [
  "enum-as-inner",
  "mime",

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 enum-as-inner = "0.6.0"
-prometheus-http-query = "0.8.0"
+prometheus-http-query = "0.8.1"
 reqwest = "0.11.22"
 url = "2.5.0"
 serde = { version = "1.0.193", optional = true }

src/lib.rs

@@ -12,7 +12,7 @@ use std::fmt::Display;
 use prometheus_http_query::Client;
 use query::{ops::Operable, IntoQuery};
 use reqwest::header::HeaderValue;
-use result::{IntoQryResult, QryResult};
+use result::{IntoResult, QryResult, RawResult};
 use seal::Sealed;
 use url::Url;
 
@@ -86,8 +86,28 @@ impl QueryManager {
             builder = builder.timeout(*timeout);
         }
         match self.method {
-            Method::Get => builder.get().await.into_qry_result(),
-            Method::Post => builder.post().await.into_qry_result(),
+            Method::Get => builder.get().await.into_result(),
+            Method::Post => builder.post().await.into_result(),
+        }
+    }
+
+    /// Send a query to the Prometheus server and retreive raw response ([`reqwest::Response`])
+    ///
+    /// This method accepts any type that implements the `IntoQuery` trait.
+    /// The trait is implemented for `&str`, `String`, `&String`, and __mquery's__
+    /// internal types such as [`query::Metric`], [`query::Scalar`] and others that result
+    /// from the query builder API.
+    pub async fn query_raw<Q: IntoQuery>(&self, query: Q) -> RawResult {
+        let mut builder = self.client.query(query.into_query().as_ref());
+        if let Some((name, val)) = self.auth.get_header() {
+            builder = builder.header(name, val);
+        }
+        if let Some(timeout) = self.timeout.as_ref() {
+            builder = builder.timeout(*timeout);
+        }
+        match self.method {
+            Method::Get => builder.get_raw().await.into_result(),
+            Method::Post => builder.post_raw().await.into_result(),
         }
     }
 
@@ -146,8 +166,8 @@ impl QueryManager {
             builder = builder.timeout(*timeout);
         }
         match self.method {
-            Method::Get => builder.get().await.into_qry_result(),
-            Method::Post => builder.post().await.into_qry_result(),
+            Method::Get => builder.get().await.into_result(),
+            Method::Post => builder.post().await.into_result(),
         }
     }
 }

src/result.rs

@@ -11,14 +11,24 @@ use prometheus_http_query::{error, response};
 use std::fmt::{self, Display};
 
 pub type QryResult = std::result::Result<Data, Error>;
+pub type RawResult = std::result::Result<reqwest::Response, Error>;
 
 /// Internal trait used for converting the `prometheus-http-query` crate's query result into the internal result type
-pub(crate) trait IntoQryResult {
-    fn into_qry_result(self) -> QryResult;
+pub(crate) trait IntoResult {
+    type Result;
+    fn into_result(self) -> Self::Result;
 }
 
-impl IntoQryResult for Result<response::PromqlResult, error::Error> {
-    fn into_qry_result(self) -> QryResult {
+impl IntoResult for Result<response::PromqlResult, error::Error> {
+    type Result = QryResult;
+    fn into_result(self) -> Self::Result {
+        self.map(|r| r.into()).map_err(|e| e.into())
+    }
+}
+
+impl IntoResult for Result<reqwest::Response, error::Error> {
+    type Result = RawResult;
+    fn into_result(self) -> Self::Result {
         self.map(|r| r.into()).map_err(|e| e.into())
     }
 }

tests/api.rs

@@ -41,6 +41,14 @@ async fn multi_queries() {
     assert!(res.len() == 2);
 }
 
+#[tokio::test]
+async fn raw_response() {
+    QueryManager::new(utils::URL.parse().unwrap())
+        .query_raw("metric")
+        .await
+        .unwrap();
+}
+
 fn get_url_token() -> (String, String) {
     dotenv::dotenv().expect("No .env file found in working dir");
     (