Merge branch 'master' into pierre/metrics-summaries-push-to-separate-topic

Author: phacops

CHANGELOG.md

@@ -2,8 +2,13 @@
 
 ## Unreleased
 
+**Features**:
+
+- Add protobuf support for ingesting OpenTelemetry spans and use official `opentelemetry-proto` generated structs. ([#3044](https://github.com/getsentry/relay/pull/3044))
+
 **Internal**:
 
+- Set the span op on segments. ([#3082](https://github.com/getsentry/relay/pull/3082))
 - Push metrics summaries to their own topic. ([#3045](https://github.com/getsentry/relay/pull/3045))
 
 ## 24.1.2
@@ -14,7 +19,6 @@
 - Obtain `span.domain` field from the span data's `url.scheme` and `server.address` properties when applicable. ([#2975](https://github.com/getsentry/relay/pull/2975))
 - Do not truncate simplified SQL expressions. ([#3003](https://github.com/getsentry/relay/pull/3003))
 - Add `app_start_type` as a tag for self time and duration for app start spans. ([#3027](https://github.com/getsentry/relay/pull/3027)), ([#3066](https://github.com/getsentry/relay/pull/3066))
-- Add protobuf support for ingesting OpenTelemetry spans and use official `opentelemetry-proto` generated structs. ([#3044](https://github.com/getsentry/relay/pull/3044))
 
 **Internal**:
 

Cargo.lock

@@ -24,7 +24,7 @@ criterion = "0.5"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 insta = { version = "1.31.0", features = ["json", "redactions", "ron"] }
 hash32 = "0.3.1"
-hashbrown = "0.13.2"
+hashbrown = "0.14.3"
 itertools = "0.10.5"
 once_cell = "1.13.1"
 parking_lot = "0.12.1"

Cargo.toml

@@ -150,7 +150,7 @@ impl Inner {
 
         let expired = metric!(timer(CardinalityLimiterTimers::CacheVacuum), {
             self.cache
-                .drain_filter(|scope, cache| cache.current_slot < scope.active_slot(ts))
+                .extract_if(|scope, cache| cache.current_slot < scope.active_slot(ts))
                 .count()
         });
         metric!(counter(CardinalityLimiterCounters::RedisCacheVacuum) += expired as i64);

relay-cardinality/src/redis/cache.rs

@@ -32,6 +32,8 @@ pub struct RedisSetLimiter {
     script: CardinalityScript,
     cache: Cache,
     #[cfg(test)]
+    timestamp: UnixTimestamp,
+    #[cfg(test)]
     time_offset: std::time::Duration,
 }
 
@@ -44,6 +46,8 @@ impl RedisSetLimiter {
             script: CardinalityScript::load(),
             cache: Cache::new(options.cache_vacuum_interval),
             #[cfg(test)]
+            timestamp: UnixTimestamp::now(),
+            #[cfg(test)]
             time_offset: std::time::Duration::from_secs(0),
         }
     }
@@ -101,10 +105,11 @@ impl Limiter for RedisSetLimiter {
         E: IntoIterator<Item = Entry>,
         R: Rejections<'a>,
     {
+        #[cfg(not(test))]
         let timestamp = UnixTimestamp::now();
-        // Allows to fast forward time in tests.
+        // Allows to fast forward time in tests using a fixed offset.
         #[cfg(test)]
-        let timestamp = timestamp + self.time_offset;
+        let timestamp = self.timestamp + self.time_offset;
 
         let mut states = LimitState::from_limits(scoping, limits);
 

relay-cardinality/src/redis/limiter.rs

@@ -10,8 +10,6 @@
 )]
 #![recursion_limit = "256"]
 
-use std::str::FromStr;
-
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
 use syn::{Ident, Lit, Meta, NestedMeta};
@@ -439,29 +437,6 @@ impl FieldAttrs {
     }
 }
 
-#[derive(Copy, Clone, Default)]
-enum SkipSerialization {
-    #[default]
-    Never,
-    Null(bool),
-    Empty(bool),
-}
-
-impl FromStr for SkipSerialization {
-    type Err = ();
-
-    fn from_str(s: &str) -> Result<Self, ()> {
-        Ok(match s {
-            "never" => SkipSerialization::Never,
-            "null" => SkipSerialization::Null(false),
-            "null_deep" => SkipSerialization::Null(true),
-            "empty" => SkipSerialization::Empty(false),
-            "empty_deep" => SkipSerialization::Empty(true),
-            _ => return Err(()),
-        })
-    }
-}
-
 fn parse_field_attributes(
     index: usize,
     bi_ast: &syn::Field,

relay-event-derive/src/lib.rs

@@ -31,8 +31,12 @@ const MAX_EXTENSION_LENGTH: usize = 10;
 /// Attempts to replace identifiers in the span description with placeholders.
 ///
 /// Returns `None` if no scrubbing can be performed.
-pub(crate) fn scrub_span_description(span: &Span) -> Option<String> {
-    let description = span.description.as_str()?;
+pub(crate) fn scrub_span_description(
+    span: &Span,
+) -> (Option<String>, Option<Vec<sqlparser::ast::Statement>>) {
+    let Some(description) = span.description.as_str() else {
+        return (None, None);
+    };
 
     let data = span.data.value();
 
@@ -41,7 +45,9 @@ pub(crate) fn scrub_span_description(span: &Span) -> Option<String> {
         .and_then(|system| system.as_str());
     let span_origin = span.origin.as_str();
 
-    span.op
+    let mut parsed_sql = None;
+    let scrubbed_description = span
+        .op
         .as_str()
         .map(|op| op.split_once('.').unwrap_or((op, "")))
         .and_then(|(op, sub)| match (op, sub) {
@@ -64,7 +70,11 @@ pub(crate) fn scrub_span_description(span: &Span) -> Option<String> {
                     // the query type ("User find" for example).
                     Some(description.to_owned())
                 } else {
-                    sql::scrub_queries(db_system, description)
+                    let (scrubbed, mode) = sql::scrub_queries(db_system, description);
+                    if let sql::Mode::Parsed(ast) = mode {
+                        parsed_sql = Some(ast);
+                    }
+                    scrubbed
                 }
             }
             ("resource", ty) => scrub_resource(ty, description),
@@ -105,7 +115,8 @@ pub(crate) fn scrub_span_description(span: &Span) -> Option<String> {
             }
             ("file", _) => scrub_file(description),
             _ => None,
-        })
+        });
+    (scrubbed_description, parsed_sql)
 }
 
 /// A span declares `op: db.sql.query`, but contains mongodb.
@@ -437,9 +448,9 @@ mod tests {
                 let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
                 if $expected == "" {
-                    assert!(scrubbed.is_none());
+                    assert!(scrubbed.0.is_none());
                 } else {
-                    assert_eq!($expected, scrubbed.unwrap());
+                    assert_eq!($expected, scrubbed.0.unwrap());
                 }
             }
         };
@@ -917,7 +928,7 @@ mod tests {
         let mut span = Annotated::<Span>::from_json(json).unwrap();
         let span = span.value_mut().as_mut().unwrap();
         let scrubbed = scrub_span_description(span);
-        assert_eq!(scrubbed.as_deref(), Some("SELECT %s"));
+        assert_eq!(scrubbed.0.as_deref(), Some("SELECT %s"));
     }
 
     #[test]
@@ -932,7 +943,7 @@ mod tests {
         let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
         // When db.system is missing, no scrubbed description (i.e. no group) is set.
-        assert!(scrubbed.is_none());
+        assert!(scrubbed.0.is_none());
     }
 
     #[test]
@@ -950,7 +961,7 @@ mod tests {
         let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
         // Can be scrubbed with db system.
-        assert_eq!(scrubbed.as_deref(), Some("SELECT a FROM b"));
+        assert_eq!(scrubbed.0.as_deref(), Some("SELECT a FROM b"));
     }
 
     #[test]
@@ -965,7 +976,7 @@ mod tests {
 
         let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
-        assert_eq!(scrubbed.as_deref(), Some("INSERTED * 'UAEventData'"));
+        assert_eq!(scrubbed.0.as_deref(), Some("INSERTED * 'UAEventData'"));
     }
 
     #[test]
@@ -981,7 +992,7 @@ mod tests {
         let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
         assert_eq!(
-            scrubbed.as_deref(),
+            scrubbed.0.as_deref(),
             Some("UPDATED * 'QueuedRequest', DELETED * 'QueuedRequest'")
         );
     }
@@ -1001,6 +1012,6 @@ mod tests {
         let scrubbed = scrub_span_description(span.value_mut().as_mut().unwrap());
 
         // Can be scrubbed with db system.
-        assert_eq!(scrubbed.as_deref(), Some("my-component-name"));
+        assert_eq!(scrubbed.0.as_deref(), Some("my-component-name"));
     }
 }