Merge branch 'master' into tobias-wilfert/feat/migrate-process-client-reports

Author: tobias-wilfert

.github/workflows/ci.yml

@@ -464,7 +464,7 @@ jobs:
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           pattern: "${{ matrix.image_name }}@*"
           merge-multiple: true
@@ -543,7 +543,7 @@ jobs:
           gcloud auth configure-docker us-central1-docker.pkg.dev
 
       # Logic taken from: build-docker
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           pattern: "internal-${{ matrix.image_name }}@*"
           merge-multiple: true
@@ -663,7 +663,7 @@ jobs:
           # You must use the Cloud SDK version 390.0.0 or later to authenticate the bq and gsutil tools.
           version: ">= 390.0.0"
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           pattern: "internal-${{ matrix.image_name }}@*"
           merge-multiple: true
@@ -797,7 +797,7 @@ jobs:
 
       - name: Download Docker Image
         if: "github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]'"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: relay-docker-image
 

CHANGELOG.md

@@ -10,13 +10,17 @@
 - Add `sentry.origin` attribute to OTLP spans. ([#5294](https://github.com/getsentry/relay/pull/5294))
 - Normalize deprecated attribute names according to `sentry-conventions` for logs and V2 spans. ([#5257](https://github.com/getsentry/relay/pull/5257))
 - Allow sample rate per trace metric. ([#5317](https://github.com/getsentry/relay/pull/5317))
+- Remove the profile context from transactions if profiles are currently rate limited. ([#5346](https://github.com/getsentry/relay/pull/5346))
+- Replace `is_remote` with `is_segment` on the Span V2 schema. ([#5306](https://github.com/getsentry/relay/pull/5306))
+- Add `response_timeout` config setting for Redis. ([#5329](https://github.com/getsentry/relay/pull/5329))
 
 **Breaking Changes**:
 
 - Simplify proxy mode to forward without processing. ([#5165](https://github.com/getsentry/relay/pull/5165))
 
 **Bug Fixes**:
 
+- Fix array attributes not being applied to standalone spans. ([#5337](https://github.com/getsentry/relay/pull/5337))
 - Envelopes created from integrations can now be spooled. ([#5284](https://github.com/getsentry/relay/pull/5284))
 - Make referer optional in Vercel Log Drain Transform. ([#5273](https://github.com/getsentry/relay/pull/5273))
 - Fix potentially missing attachment outcomes when rate limiting. ([#5301](https://github.com/getsentry/relay/pull/5301))

Cargo.lock

@@ -106,7 +106,6 @@ criterion = "0.5.1"
 crossbeam-channel = "0.5.15"
 data-encoding = "2.9.0"
 deadpool = "0.12.3"
-deadpool-redis = "0.20.0"
 debugid = "0.8.0"
 dialoguer = "0.11.0"
 dynfmt = "0.1.5"
@@ -177,7 +176,7 @@ sentry = { version = "0.41.0", default-features = false, features = [
   "transport",
 ] }
 sentry-core = "0.41.0"
-sentry-kafka-schemas = { version = "2.1.7", default-features = false }
+sentry-kafka-schemas = { version = "2.1.14", default-features = false }
 sentry-release-parser = { version = "1.3.2", default-features = false }
 sentry-types = "0.41.0"
 sentry_protos = "0.4.2"

Cargo.toml

@@ -1,35 +1,16 @@
 # Changelog
 
-# Unreleased
-
-- Introduces a project scope sampling rule type. ([#5077](https://github.com/getsentry/relay/pull/5077))
-- Add InstallableBuild and SizeAnalysis data categories. ([#5084](https://github.com/getsentry/relay/pull/5084))
-- Add `retentions` to the project configuration. ([#5135](https://github.com/getsentry/relay/pull/5135))
-- Normalization: Trim event tag keys & values to 200 chars instead of dropping them. ([#5198](https://github.com/getsentry/relay/pull/5198))
-- Add TraceMetric data category. ([#5206](https://github.com/getsentry/relay/pull/5206))
-
 ## 0.9.19
 
 ### Various fixes & improvements
 
-- build(py): Upgrade python to 3.13 (#5323) by @jjbayer
-- build(py): Revert `uv`, `devenv`, `pre-commit` (#5321) by @jjbayer
-- build(py): Remove py/pyproject.toml altogether (#5314) by @jjbayer
-- build(py): Revert dynamic version, ignore pyproject.toml instead (#5313) by @jjbayer
-- build(py): Use dynamic version (#5311) by @jjbayer
-- feat(dev): Add devenv, uv, pre-commit (take 2) (#5248) by @joshuarli
+- fix(billing): Use camel case for retentions config #5303 by @jjbayer
 
 ## 0.9.17
 
 ### Various fixes & improvements
 
-- Revert "feat(dev): Add devenv, uv, pre-commit" (#5232) by @Dav1dde
-- feat(dev): Add devenv, uv, pre-commit (#5070) by @joshuarli
-- feat(spans): Map span.status unknown_error to internal_error (#5202) by @obostjancic
 - feat(billing): Add TraceMetric datacategory (#5206) by @k-fish
-- feat(normalization): Trim tag keys & values (#5198) by @jjbayer
-- release: 0.9.16 (4b63e713) by @getsentry-bot
-- feat(billing): Add retentions to project configs (#5135) by @vbro
 
 ## 0.9.16
 

py/CHANGELOG.md

@@ -21,7 +21,7 @@ fn build_redis_client() -> AsyncRedisClient {
     let url =
         std::env::var("RELAY_REDIS_URL").unwrap_or_else(|_| "redis://127.0.0.1:6379".to_owned());
 
-    AsyncRedisClient::single(&url, &RedisConfigOptions::default()).unwrap()
+    AsyncRedisClient::single("bench", &url, &RedisConfigOptions::default()).unwrap()
 }
 
 async fn build_limiter(client: AsyncRedisClient, reset_redis: bool) -> RedisSetLimiter {

relay-cardinality/benches/redis_impl.rs

@@ -290,7 +290,7 @@ mod tests {
             max_connections: 1,
             ..Default::default()
         };
-        let redis = AsyncRedisClient::single(&url, &opts).unwrap();
+        let redis = AsyncRedisClient::single("test", &url, &opts).unwrap();
 
         RedisSetLimiter::new(
             RedisSetLimiterOptions {

relay-cardinality/src/redis/limiter.rs

@@ -226,7 +226,7 @@ mod tests {
             max_connections: 1,
             ..Default::default()
         };
-        AsyncRedisClient::single(&url, &opts).unwrap()
+        AsyncRedisClient::single("test", &url, &opts).unwrap()
     }
 
     fn keys(prefix: Uuid, keys: &[&str]) -> impl Iterator<Item = String> {

relay-cardinality/src/redis/script.rs

@@ -1173,6 +1173,9 @@ pub struct Processing {
     /// Maximum rate limit to report to clients.
     #[serde(default = "default_max_rate_limit")]
     pub max_rate_limit: Option<u32>,
+    /// Configuration for attachment uploads.
+    #[serde(default)]
+    pub upload: UploadServiceConfig,
 }
 
 impl Default for Processing {
@@ -1191,6 +1194,7 @@ impl Default for Processing {
             attachment_chunk_size: default_chunk_size(),
             projectconfig_cache_prefix: default_projectconfig_cache_prefix(),
             max_rate_limit: default_max_rate_limit(),
+            upload: UploadServiceConfig::default(),
         }
     }
 }
@@ -1239,6 +1243,26 @@ impl Default for OutcomeAggregatorConfig {
     }
 }
 
+/// Configuration values for attachment uploads.
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(default)]
+pub struct UploadServiceConfig {
+    /// Maximum concurrency of uploads.
+    pub max_concurrent_requests: usize,
+
+    /// Maximum duration of an attachment upload in seconds. Uploads that take longer are discarded.
+    pub timeout: u64,
+}
+
+impl Default for UploadServiceConfig {
+    fn default() -> Self {
+        Self {
+            max_concurrent_requests: 100,
+            timeout: 60,
+        }
+    }
+}
+
 /// Determines how to emit outcomes.
 /// For compatibility reasons, this can either be true, false or AsClientReports
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -2493,6 +2517,11 @@ impl Config {
         &self.values.processing.topics.unused
     }
 
+    /// Configuration of the attachment upload service.
+    pub fn upload(&self) -> &UploadServiceConfig {
+        &self.values.processing.upload
+    }
+
     /// Redis servers to connect to for project configs, cardinality limits,
     /// rate limiting, and metrics metadata.
     pub fn redis(&self) -> Option<RedisConfigsRef<'_>> {

relay-config/src/config.rs

@@ -39,6 +39,11 @@ pub struct PartialRedisConfigOptions {
     /// blocking when the pool is exhausted.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub wait_timeout: Option<u64>,
+    /// Sets the maximum time in seconds to wait for a result when sending a Redis command.
+    ///
+    /// If a command exceeds this timeout, the connection will be recycled.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub response_timeout: Option<u64>,
     /// Sets the number of times after which the connection will check whether it is active when
     /// being recycled.
     ///
@@ -55,6 +60,7 @@ impl Default for PartialRedisConfigOptions {
             create_timeout: Some(3),
             recycle_timeout: Some(2),
             wait_timeout: None,
+            response_timeout: Some(30),
             recycle_check_frequency: 100,
         }
     }
@@ -224,6 +230,7 @@ fn build_redis_config_options(
         create_timeout: options.create_timeout,
         recycle_timeout: options.recycle_timeout,
         wait_timeout: options.wait_timeout,
+        response_timeout: options.response_timeout,
         recycle_check_frequency: options.recycle_check_frequency,
     }
 }
@@ -403,6 +410,7 @@ quotas:
           "idle_timeout": 60,
           "create_timeout": 3,
           "recycle_timeout": 2,
+          "response_timeout": 30,
           "recycle_check_frequency": 100
         }
         "###);
@@ -425,6 +433,7 @@ quotas:
           "idle_timeout": 60,
           "create_timeout": 3,
           "recycle_timeout": 2,
+          "response_timeout": 30,
           "recycle_check_frequency": 100
         }
         "###);
@@ -544,6 +553,7 @@ max_connections: 20
           "idle_timeout": 60,
           "create_timeout": 3,
           "recycle_timeout": 2,
+          "response_timeout": 30,
           "recycle_check_frequency": 100
         }
         "###);
@@ -572,6 +582,7 @@ max_connections: 20
           "idle_timeout": 60,
           "create_timeout": 3,
           "recycle_timeout": 2,
+          "response_timeout": 30,
           "recycle_check_frequency": 100
         }
         "###);
@@ -611,13 +622,15 @@ max_connections: 20
             "idle_timeout": 60,
             "create_timeout": 3,
             "recycle_timeout": 2,
+            "response_timeout": 30,
             "recycle_check_frequency": 100
           },
           "cardinality": {
             "server": "redis://127.0.0.1:6379",
             "idle_timeout": 60,
             "create_timeout": 3,
             "recycle_timeout": 2,
+            "response_timeout": 30,
             "recycle_check_frequency": 100
           },
           "quotas": {
@@ -629,6 +642,7 @@ max_connections: 20
             "idle_timeout": 60,
             "create_timeout": 3,
             "recycle_timeout": 2,
+            "response_timeout": 30,
             "recycle_check_frequency": 100
           }
         }