Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: read body #2

Merged
merged 5 commits into from
May 9, 2023
Merged

fix: read body #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e715b2
read all bytes
jiacai2050 May 9, 2023
6984334
add bytes dep
jiacai2050 May 9, 2023
7a13eed
bump version
jiacai2050 May 9, 2023
d27becd
fix clippy
jiacai2050 May 9, 2023
5858683
fix clippy
jiacai2050 May 9, 2023
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
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "prom-remote-api"
version = "0.2.1"
version = "0.2.2"
edition = "2021"
license = "Apache-2.0"
description = "Prometheus remote storage API for Rust"
Expand All @@ -12,6 +12,7 @@ readme = "README.md"

[dependencies]
async-trait = "0.1.61"
bytes = "1.4.0"
futures = "0.3.25"
prost = "0.11.6"
snap = "1.1.0"
Expand Down
1 change: 0 additions & 1 deletion examples/simple.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ fn generate_samples(start_ms: i64, end_ms: i64, step_ms: i64) -> Vec<Sample> {

// range query
(start_ms..end_ms)
.into_iter()
.step_by(step_ms as usize)
.enumerate()
.map(|(i, timestamp)| Sample {
Expand Down
9 changes: 5 additions & 4 deletions src/web/warp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use std::convert::Infallible;

use bytes::Bytes;
use prost::Message;
use warp::{
body,
Expand All @@ -11,7 +12,7 @@ use warp::{
StatusCode,
},
reject::{self, Reject},
reply, Buf, Filter, Rejection, Reply,
reply, Filter, Rejection, Reply,
};

use crate::{
Expand Down Expand Up @@ -63,16 +64,16 @@ impl Reject for Error {}
// https://github.com/ParkMyCar/warp-protobuf/blob/master/src/lib.rs#L102
pub fn protobuf_body<T: Message + Send + Default>(
) -> impl Filter<Extract = (T,), Error = Rejection> + Copy {
async fn from_reader<T: Message + Send + Default>(buf: impl Buf) -> Result<T, Rejection> {
util::decode_snappy(buf.chunk())
async fn from_reader<T: Message + Send + Default>(bytes: Bytes) -> Result<T, Rejection> {
util::decode_snappy(&bytes)
.map_err(reject::custom)
.and_then(|decoded_buf| {
T::decode(decoded_buf.as_slice())
.map_err(|err| reject::custom(Error::ProtoDecode(err)))
})
}

body::aggregate().and_then(from_reader)
body::bytes().and_then(from_reader)
}

impl warp::Reply for ReadResponse {
Expand Down