Skip to content

Fix ingestion api #388

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

Merged
merged 1 commit into from
May 1, 2023
Merged

Fix ingestion api #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions server/src/handlers/http/ingest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
*
*/

use std::sync::Arc;

use actix_web::http::header::ContentType;
use actix_web::{HttpRequest, HttpResponse};
use arrow_schema::Schema;
Expand All @@ -29,6 +27,7 @@ use crate::event::error::EventError;
use crate::event::format::EventFormat;
use crate::event::{self, format};
use crate::handlers::{PREFIX_META, PREFIX_TAGS, SEPARATOR, STREAM_NAME_HEADER_KEY};
use crate::metadata::error::stream_info::MetadataError;
use crate::metadata::STREAM_INFO;
use crate::utils::header_parsing::{collect_labelled_headers, ParseHeaderError};

Expand Down Expand Up @@ -62,7 +61,8 @@ pub async fn post_event(req: HttpRequest, body: Bytes) -> Result<HttpResponse, P
}

async fn push_logs(stream_name: String, req: HttpRequest, body: Bytes) -> Result<(), PostError> {
let (size, rb) = into_event_batch(req, body, &get_stream_schema(&stream_name))?;
let schema = STREAM_INFO.schema(&stream_name)?;
let (size, rb) = into_event_batch(req, body, &schema)?;

event::Event {
rb,
Expand Down Expand Up @@ -95,12 +95,10 @@ fn into_event_batch(
Ok((size, rb))
}

fn get_stream_schema(stream_name: &str) -> Arc<Schema> {
STREAM_INFO.schema(stream_name).unwrap()
}

#[derive(Debug, thiserror::Error)]
pub enum PostError {
#[error("{0}")]
StreamNotFound(#[from] MetadataError),
#[error("Could not deserialize into JSON object, {0}")]
SerdeError(#[from] serde_json::Error),
#[error("Header Error: {0}")]
Expand All @@ -121,6 +119,7 @@ impl actix_web::ResponseError for PostError {
PostError::Event(_) => StatusCode::INTERNAL_SERVER_ERROR,
PostError::Invalid(_) => StatusCode::BAD_REQUEST,
PostError::CreateStream(_) => StatusCode::INTERNAL_SERVER_ERROR,
PostError::StreamNotFound(_) => StatusCode::NOT_FOUND,
}
}

Expand Down