From f7bddbd968f84b72149b41916966c25a377ec40f Mon Sep 17 00:00:00 2001 From: elramen Date: Mon, 11 May 2026 13:08:10 +0200 Subject: [PATCH 1/2] ref: Qualify enum variants --- relay-server/src/endpoints/minidump.rs | 7 +++---- relay-server/src/endpoints/playstation.rs | 5 ++--- relay-server/src/processing/mod.rs | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/relay-server/src/endpoints/minidump.rs b/relay-server/src/endpoints/minidump.rs index 50771a419f5..fe9e3cfc41c 100644 --- a/relay-server/src/endpoints/minidump.rs +++ b/relay-server/src/endpoints/minidump.rs @@ -21,8 +21,7 @@ use zstd::stream::Decoder as ZstdDecoder; use crate::constants::{ITEM_NAME_BREADCRUMBS1, ITEM_NAME_BREADCRUMBS2, ITEM_NAME_EVENT}; use crate::endpoints::common::{self, BadStoreRequest, TextResponse, upload_to_objectstore}; -use crate::envelope::ContentType::Minidump; -use crate::envelope::{AttachmentType, Envelope, Item, ItemType}; +use crate::envelope::{AttachmentType, ContentType, Envelope, Item, ItemType}; use crate::extractors::{RawContentType, RequestMeta}; use crate::managed::{Managed, ManagedResult}; use crate::middlewares; @@ -299,7 +298,7 @@ async fn multipart_to_envelope( items.try_modify(|items, records| -> Result<(), BadStoreRequest> { let minidump_item = &mut items[minidump_idx]; - minidump_item.set_payload(Minidump, payload); + minidump_item.set_payload(ContentType::Minidump, payload); records.lenient(DataCategory::Attachment); // decoding the minidump changes its size if let Some(minidump_filename) = minidump_item.filename() { minidump_item.set_filename(remove_container_extension(minidump_filename).to_owned()) @@ -418,7 +417,7 @@ async fn raw_minidump_to_envelope( let minidump_data = request.extract().await?; item.try_modify(|inner, records| -> Result<(), BadStoreRequest> { let payload = decode_minidump(minidump_data, state.config().max_attachment_size())?; - inner.set_payload(Minidump, payload); + inner.set_payload(ContentType::Minidump, payload); records.lenient(DataCategory::Attachment); // decoding the minidump changes its size validate_minidump(&inner.payload())?; Ok(()) diff --git a/relay-server/src/endpoints/playstation.rs b/relay-server/src/endpoints/playstation.rs index 7863360abd7..bb3984c6c2b 100644 --- a/relay-server/src/endpoints/playstation.rs +++ b/relay-server/src/endpoints/playstation.rs @@ -14,8 +14,7 @@ use serde::Serialize; use tower_http::limit::RequestBodyLimitLayer; use crate::endpoints::common::{self, BadStoreRequest, TextResponse}; -use crate::envelope::ContentType::OctetStream; -use crate::envelope::{AttachmentType, Envelope, Item}; +use crate::envelope::{AttachmentType, ContentType, Envelope, Item}; use crate::extractors::{RawContentType, RequestMeta}; use crate::managed::Managed; use crate::middlewares; @@ -196,7 +195,7 @@ async fn multipart_to_envelope( .ok_or(BadStoreRequest::MissingProsperodump)?; let payload = prosperodump.payload(); validate_prosperodump(&payload)?; - prosperodump.set_payload(OctetStream, payload); + prosperodump.set_payload(ContentType::OctetStream, payload); Ok(()) })?; diff --git a/relay-server/src/processing/mod.rs b/relay-server/src/processing/mod.rs index 6391bbcbf0e..8d31d35161b 100644 --- a/relay-server/src/processing/mod.rs +++ b/relay-server/src/processing/mod.rs @@ -108,11 +108,11 @@ impl<'a> Context<'a> { /// when there is no full project config available. This is the case in stat and proxy /// Relays. pub fn should_filter(&self, feature: relay_dynamic_config::Feature) -> bool { - use relay_config::RelayMode::*; + use relay_config::RelayMode; match self.config.relay_mode() { - Proxy => false, - Managed => !self.project_info.has_feature(feature), + RelayMode::Proxy => false, + RelayMode::Managed => !self.project_info.has_feature(feature), } } From f85292ac01e7aa0de5ce1e3003eb1f7164a70336 Mon Sep 17 00:00:00 2001 From: elramen Date: Mon, 11 May 2026 13:18:57 +0200 Subject: [PATCH 2/2] move import to top --- relay-server/src/processing/mod.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/relay-server/src/processing/mod.rs b/relay-server/src/processing/mod.rs index 8d31d35161b..9fef0005e0f 100644 --- a/relay-server/src/processing/mod.rs +++ b/relay-server/src/processing/mod.rs @@ -6,7 +6,7 @@ //! //! The processor service, will then do its actual work using the processing logic defined here. -use relay_config::Config; +use relay_config::{Config, RelayMode}; use relay_dynamic_config::GlobalConfig; use relay_quotas::RateLimits; use relay_sampling::evaluation::ReservoirCounters; @@ -108,8 +108,6 @@ impl<'a> Context<'a> { /// when there is no full project config available. This is the case in stat and proxy /// Relays. pub fn should_filter(&self, feature: relay_dynamic_config::Feature) -> bool { - use relay_config::RelayMode; - match self.config.relay_mode() { RelayMode::Proxy => false, RelayMode::Managed => !self.project_info.has_feature(feature),