Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 3 deletions relay-dynamic-config/src/feature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ pub enum Feature {
/// Enable the experimental Trace Attachment pipeline in Relay.
#[serde(rename = "projects:trace-attachment-processing")]
TraceAttachmentProcessing,
/// Enable the new Replay pipeline in Relay.
#[serde(rename = "organizations:new-replay-processing")]
NewReplayProcessing,
/// Forward compatibility.
#[doc(hidden)]
#[serde(other)]
Expand Down
20 changes: 0 additions & 20 deletions relay-event-normalization/src/replay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,6 @@ pub enum ReplayError {
/// One or more of the `trace_ids` have an error.
#[error("invalid trace_id specified")]
InvalidTraceId,

/// The Replay event could not be parsed from JSON.
#[error("invalid json")]
CouldNotParse(#[from] serde_json::Error),

/// The Replay event was parsed but did not match the schema.
#[error("no data found")]
NoContent,

/// The Replay contains invalid data or is missing a required field.
///
/// This is returned from [`validate`].
#[error("invalid payload {0}")]
InvalidPayload(String),

/// An error occurred during PII scrubbing of the Replay.
///
/// This erorr is usually returned when the PII configuration fails to parse.
#[error("failed to scrub PII: {0}")]
CouldNotScrub(String),
}

/// Checks if the Replay event is structurally valid.
Expand Down
46 changes: 1 addition & 45 deletions relay-server/src/services/processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ mod event;
mod metrics;
mod nel;
mod profile;
mod replay;
mod report;
mod span;

Expand Down Expand Up @@ -563,12 +562,6 @@ pub enum ProcessingError {
#[error("invalid processing group type")]
InvalidProcessingGroup(Box<InvalidProcessingGroupType>),

#[error("invalid replay")]
InvalidReplay(DiscardReason),

#[error("replay filtered with reason: {0:?}")]
ReplayFiltered(FilterStatKey),

#[cfg(feature = "processing")]
#[error("nintendo switch dying message processing failed {0:?}")]
InvalidNintendoDyingMessage(#[source] SwitchProcessingError),
Expand Down Expand Up @@ -619,8 +612,6 @@ impl ProcessingError {
Self::PiiConfigError(_) => Some(Outcome::Invalid(DiscardReason::ProjectStatePii)),
Self::MissingProjectId => None,
Self::EventFiltered(_) => None,
Self::InvalidReplay(reason) => Some(Outcome::Invalid(*reason)),
Self::ReplayFiltered(key) => Some(Outcome::Filtered(key.clone())),
Self::InvalidProcessingGroup(_) => None,

Self::ProcessingGroupMismatch => Some(Outcome::Invalid(DiscardReason::Internal)),
Expand Down Expand Up @@ -1498,33 +1489,6 @@ impl EnvelopeProcessorService {
Ok(Some(extracted_metrics))
}

/// Processes replays.
async fn process_replays(
&self,
managed_envelope: &mut TypedEnvelope<ReplayGroup>,
ctx: processing::Context<'_>,
) -> Result<Option<ProcessingExtractedMetrics>, ProcessingError> {
let mut extracted_metrics = ProcessingExtractedMetrics::new();

replay::process(
managed_envelope,
ctx.global_config,
ctx.config,
ctx.project_info,
&self.inner.geoip_lookup,
)?;

self.enforce_quotas(
managed_envelope,
Annotated::empty(),
&mut extracted_metrics,
ctx,
)
.await?;

Ok(Some(extracted_metrics))
}

async fn process_nel(
&self,
mut managed_envelope: ManagedEnvelope,
Expand Down Expand Up @@ -1694,16 +1658,8 @@ impl EnvelopeProcessorService {
ProcessingGroup::Standalone => run!(process_standalone, project_id, ctx),
ProcessingGroup::ClientReport => run!(process_client_reports, ctx),
ProcessingGroup::Replay => {
if ctx.project_info.has_feature(Feature::NewReplayProcessing) {
self.process_with_processor(
&self.inner.processing.replays,
managed_envelope,
ctx,
)
self.process_with_processor(&self.inner.processing.replays, managed_envelope, ctx)
.await
} else {
run!(process_replays, ctx)
}
}
ProcessingGroup::CheckIn => {
self.process_with_processor(&self.inner.processing.check_ins, managed_envelope, ctx)
Expand Down
Loading
Loading