review comments

Author: jjbayer

Cargo.lock

@@ -180,9 +180,11 @@ sentry = { version = "0.41.0", default-features = false, features = [
 ] }
 sentry-core = "0.41.0"
 sentry-kafka-schemas = { version = "2.1.14", default-features = false }
-sentry-release-parser = { version = "1.4.0", default-features = false, features = ["semver-1"] }
+sentry-release-parser = { version = "1.4.0", default-features = false, features = [
+  "semver-1",
+] }
 sentry-types = "0.41.0"
-sentry_protos = "0.4.2"
+sentry_protos = "0.4.8"
 serde = { version = "=1.0.228", features = ["derive", "rc"] }
 serde-transcode = "1.1.1"
 serde-vars = "0.2.0"

Cargo.toml

@@ -4,7 +4,7 @@ use chrono::{DateTime, Utc};
 use relay_event_schema::protocol::{AttachmentV2Meta, Attributes, SpanId};
 use relay_protocol::{Annotated, IntoValue, Value};
 use relay_quotas::Scoping;
-use sentry_protos::snuba::v1::{AnyValue, TraceItem, any_value};
+use sentry_protos::snuba::v1::{AnyValue, TraceItem, TraceItemType, any_value};
 
 use crate::managed::{Managed, Rejected};
 use crate::processing::Retention;
@@ -77,7 +77,7 @@ fn attachment_to_trace_item(meta: Annotated<AttachmentV2Meta>, ctx: Context) ->
         span_id: ctx.span_id,
     };
 
-    let attributes = attributes.into_value()?;
+    let attributes = attributes.into_value().unwrap_or_default();
 
     let client_sample_rate = extract_client_sample_rate(&attributes).unwrap_or(1.0);
 
@@ -86,8 +86,8 @@ fn attachment_to_trace_item(meta: Annotated<AttachmentV2Meta>, ctx: Context) ->
         project_id: ctx.scoping.project_id.value(),
         trace_id: trace_id.into_value()?.to_string(),
         item_id: attachment_id.into_value()?.into_bytes().to_vec(),
-        item_type: 10, // FIXME: use enum from sentry-protos
-        timestamp: timestamp.into_value().map(|ts| proto_timestamp(ts.0)),
+        item_type: TraceItemType::Attachment.into(),
+        timestamp: Some(proto_timestamp(timestamp.into_value()?.0)),
         attributes: convert_attributes(annotated_meta, attributes, fields),
         client_sample_rate,
         server_sample_rate: ctx.server_sample_rate.unwrap_or(1.0),

relay-server/src/processing/spans/store/attachment.rs

@@ -81,6 +81,8 @@ impl Counted for StoreAttachment {
 pub enum Error {
     #[error("timeout")]
     Timeout,
+    #[error("load shed")]
+    LoadShed,
     #[error("upload failed: {0}")]
     UploadFailed(#[from] objectstore_client::Error),
     #[error("UUID conversion failed: {0}")]
@@ -91,6 +93,7 @@ impl Error {
     fn as_str(&self) -> &'static str {
         match self {
             Error::Timeout => "timeout",
+            Error::LoadShed => "load-shed",
             Error::UploadFailed(_) => "upload_failed",
             Error::Uuid(_) => "uuid",
         }
@@ -161,9 +164,14 @@ impl UploadService {
                 result = "load_shed",
                 type = message.ty(),
             );
-            if let Upload::Envelope(envelope) = message {
-                // for now, this will just forward to the store endpoint without uploading attachment
-                self.inner.store.send(envelope);
+            match message {
+                Upload::Envelope(envelope) => {
+                    // Event attachments can still go the old route.
+                    self.inner.store.send(envelope);
+                }
+                Upload::Attachment(managed) => {
+                    let _ = managed.reject_err(Error::LoadShed);
+                }
             }
             return;
         }