Merge branch 'master' into tobias-wilfert/feat/emit-outcome-for-skipped-fields

Author: tobias-wilfert

CHANGELOG.md

@@ -5,14 +5,18 @@
 **Features**:
 
 - Add configuration to allow high cardinality tags in metrics. ([#4805](https://github.com/getsentry/relay/pull/4805))
+- Make client sdk mandatory for profile sample v2. ([#4853](https://github.com/getsentry/relay/pull/4853))
 
 **Internal**:
 
+- Introduces a new processing pipeline and implements it for logs. ([#4777](https://github.com/getsentry/relay/pull/4777))
 - Produce spans to the items topic. ([#4735](https://github.com/getsentry/relay/pull/4735))
 - Update opentelemetry-proto and sentry-protos dependencies. ([#4847](https://github.com/getsentry/relay/pull/4847))
 - Take into account more types of tokens when doing AI cost calculation. ([#4840](https://github.com/getsentry/relay/pull/4840))
 - Use the `FiniteF64` type for measurements. ([#4828](https://github.com/getsentry/relay/pull/4828))
 - Derive a `sentry.description` attribute for V2 spans ([#4832](https://github.com/getsentry/relay/pull/4832))
+- Consider `gen_ai` also as AI span op prefix. ([#4859](https://github.com/getsentry/relay/pull/4859))
+- Change pii scrubbing on some AI attributes to optional ([#4860](https://github.com/getsentry/relay/pull/4860))
 
 ## 25.6.1
 

Cargo.lock

@@ -30,6 +30,7 @@ strip = true
 dbg_macro = "warn"
 print_stdout = "warn"
 print_stderr = "warn"
+str_to_string = "warn"
 
 [workspace.lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(sentry)'] }

Cargo.toml

@@ -1,13 +1,15 @@
 #!/bin/bash
 
-/devinfra/scripts/checks/githubactions/checkruns.py \
-    getsentry/relay \
-    "${GO_REVISION_RELAY_REPO}" \
-    "Integration Tests" \
-    "Test All Features (ubuntu-latest)" \
-    "Publish Relay to Internal AR (relay)" \
-    "Publish Relay to Internal AR (relay-pop)" \
-    "Upload build artifacts to gocd (relay, linux/amd64)" \
-    "Upload build artifacts to gocd (relay, linux/arm64)" \
-    "Upload build artifacts to gocd (relay-pop, linux/amd64)" \
-    "Upload build artifacts to gocd (relay-pop, linux/arm64)" \
+echo 'Temporarily disabled because of: https://github.com/getsentry/devinfra-deployment-service/pull/695'
+
+# /devinfra/scripts/checks/githubactions/checkruns.py \
+#     getsentry/relay \
+#     "${GO_REVISION_RELAY_REPO}" \
+#     "Integration Tests" \
+#     "Test All Features (ubuntu-latest)" \
+#     "Publish Relay to Internal AR (relay)" \
+#     "Publish Relay to Internal AR (relay-pop)" \
+#     "Upload build artifacts to gocd (relay, linux/amd64)" \
+#     "Upload build artifacts to gocd (relay, linux/arm64)" \
+#     "Upload build artifacts to gocd (relay-pop, linux/amd64)" \
+#     "Upload build artifacts to gocd (relay-pop, linux/arm64)" \

gocd/templates/bash/github-check-runs.sh

@@ -98,7 +98,7 @@ fn glob_match_bytes(value: &[u8], pat: &str, options: GlobOptions) -> bool {
             pat.replace('\\', "/"),
         )
     } else {
-        (Cow::Borrowed(value), pat.to_string())
+        (Cow::Borrowed(value), pat.to_owned())
     };
     let key = (options, pat);
     let mut cache = GLOB_CACHE.lock().unwrap_or_else(PoisonError::into_inner);

relay-cabi/src/glob.rs

@@ -401,9 +401,9 @@ pub unsafe extern "C" fn relay_validate_rule_condition(value: *const RelayStr) -
     let ret_val = match serde_json::from_str::<RuleCondition>(unsafe { (*value).as_str() }) {
         Ok(condition) => {
             if condition.supported() {
-                "".to_string()
+                "".to_owned()
             } else {
-                "unsupported condition".to_string()
+                "unsupported condition".to_owned()
             }
         }
         Err(e) => e.to_string(),

relay-cabi/src/processing.rs

@@ -97,7 +97,7 @@ mod tests {
     #[test]
     fn test_cardinality_limit_json() {
         let limit = CardinalityLimit {
-            id: "some_id".to_string(),
+            id: "some_id".to_owned(),
             passive: false,
             report: false,
             window: SlidingWindow {

relay-cardinality/src/config.rs

@@ -160,7 +160,7 @@ impl Limiter for RedisSetLimiter {
                 continue;
             }
 
-            let id = &state.id().to_string();
+            let id = &state.id().to_owned();
             let scopes = num_scopes_tag(&state);
             let results = metric!(
                 timer(CardinalityLimiterTimers::Redis),

relay-cardinality/src/redis/limiter.rs

@@ -146,7 +146,7 @@ impl FromStr for UpstreamDescriptor<'static> {
 
         Ok(UpstreamDescriptor {
             host: match url.host_str() {
-                Some(host) => Cow::Owned(host.to_string()),
+                Some(host) => Cow::Owned(host.to_owned()),
                 None => return Err(UpstreamParseError::NoHost),
             },
             port: url.port().unwrap_or_else(|| scheme.default_port()),

relay-config/src/upstream.rs

@@ -112,7 +112,7 @@ pub fn add_span_metrics(project_config: &mut ProjectConfig) {
 /// These metrics are added to [`crate::GlobalConfig`] by the service and enabled
 /// by project configs in sentry.
 pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMapping>)> {
-    let is_ai = RuleCondition::glob("span.op", "ai.*");
+    let is_ai = RuleCondition::glob("span.op", "ai.*") | RuleCondition::glob("span.op", "gen_ai.*");
 
     let is_db = RuleCondition::eq("span.sentry_tags.category", "db")
         & !RuleCondition::glob("span.op", DISABLED_DATABASES)