Skip to content

fix: ingestion restriction #1533

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
nitisht merged 1 commit into from
Feb 3, 2026
Merged

fix: ingestion restriction #1533

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
8 changes: 4 additions & 4 deletions src/handlers/http/ingest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ pub async fn ingest(
.await?;

//if stream exists, fetch the stream log source
//return error if the stream log source is otel traces or otel metrics
validate_stream_for_ingestion(&stream_name)?;
//return error if the stream log source is otel traces or otel metrics or otel logs
validate_stream_for_ingestion(&stream_name, &log_source)?;

PARSEABLE
.add_update_log_source(&stream_name, log_source_entry)
Expand Down Expand Up @@ -415,8 +415,8 @@ pub async fn post_event(
}

//if stream exists, fetch the stream log source
//return error if the stream log source is otel traces or otel metrics
validate_stream_for_ingestion(&stream_name)?;
//return error if the stream log source is otel traces or otel metrics or otel logs
validate_stream_for_ingestion(&stream_name, &log_source)?;

flatten_and_push_logs(
json,
Expand Down
15 changes: 14 additions & 1 deletion src/handlers/http/modal/utils/ingest_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,10 @@ fn verify_dataset_fields_count(stream_name: &str) -> Result<(), PostError> {
Ok(())
}

pub fn validate_stream_for_ingestion(stream_name: &str) -> Result<(), PostError> {
pub fn validate_stream_for_ingestion(
stream_name: &str,
log_source: &LogSource,
) -> Result<(), PostError> {
let stream = PARSEABLE.get_stream(stream_name)?;

// Validate that the stream's log source is compatible
Expand All @@ -289,6 +292,16 @@ pub fn validate_stream_for_ingestion(stream_name: &str) -> Result<(), PostError>
})
.ok_or(PostError::IncorrectLogFormat(stream_name.to_string()))?;

// If stream has OtelLogs as log source, only allow OtelLogs ingestion
let has_otel_logs = stream
.get_log_source()
.iter()
.any(|entry| entry.log_source_format == LogSource::OtelLogs);

if has_otel_logs && *log_source != LogSource::OtelLogs {
return Err(PostError::IncorrectLogFormat(stream_name.to_string()));
}

// Check for time partition
if stream.get_time_partition().is_some() {
return Err(PostError::Invalid(anyhow::anyhow!(
Expand Down
Loading