From ea82e35815d4eef1602b4bc505ac1a7448cb3a7e Mon Sep 17 00:00:00 2001 From: jjbayer Date: Tue, 2 Jul 2024 15:16:11 +0000 Subject: [PATCH] deploy: d895b7e881405bbd55410304459dd0809a164f98 --- .../span/tag_extraction/index.html | 2 +- .../processor/derive.ProcessValue.html | 2 +- relay_filter/fn.should_filter.html | 2 +- relay_filter/generic/index.html | 2 +- relay_filter/index.html | 2 +- relay_filter/struct.GenericFilterConfig.html | 4 +-- src/relay_dynamic_config/defaults.rs.html | 20 ++---------- .../normalize/span/tag_extraction.rs.html | 32 ------------------- 8 files changed, 9 insertions(+), 57 deletions(-) diff --git a/relay_event_normalization/span/tag_extraction/index.html b/relay_event_normalization/span/tag_extraction/index.html index bc61e0bca7..df26c65abe 100644 --- a/relay_event_normalization/span/tag_extraction/index.html +++ b/relay_event_normalization/span/tag_extraction/index.html @@ -1,3 +1,3 @@ -relay_event_normalization::span::tag_extraction - Rust

Module relay_event_normalization::span::tag_extraction

source ·
Expand description

Logic for persisting items into span.sentry_tags and span.measurements fields. +relay_event_normalization::span::tag_extraction - Rust

Module relay_event_normalization::span::tag_extraction

source ·
Expand description

Logic for persisting items into span.sentry_tags and span.measurements fields. These are then used for metrics extraction.

Enums§

  • SpanTagKey
    A list of supported span tags for tag extraction.

Statics§

Functions§

\ No newline at end of file diff --git a/relay_event_schema/processor/derive.ProcessValue.html b/relay_event_schema/processor/derive.ProcessValue.html index 12a4771ca6..eb67403624 100644 --- a/relay_event_schema/processor/derive.ProcessValue.html +++ b/relay_event_schema/processor/derive.ProcessValue.html @@ -1,4 +1,4 @@ -ProcessValue in relay_event_schema::processor - Rust

Derive Macro relay_event_schema::processor::ProcessValue

source · 
#[derive(ProcessValue)]
+ProcessValue in relay_event_schema::processor - Rust
Derive Macro relay_event_schema::processor::ProcessValue
#[derive(ProcessValue)]
 {
     // Attributes available to this derive:
     #[metastructure]
diff --git a/relay_filter/fn.should_filter.html b/relay_filter/fn.should_filter.html
index 0619ce1e28..d6a3299d0e 100644
--- a/relay_filter/fn.should_filter.html
+++ b/relay_filter/fn.should_filter.html
@@ -1,4 +1,4 @@
-should_filter in relay_filter - Rust
Function relay_filter::should_filter
source · 
pub fn should_filter<F: Filterable + Getter>(
+should_filter in relay_filter - Rust
Function relay_filter::should_filter
source · 
pub fn should_filter<F: Filterable + Getter>(
     item: &F,
     client_ip: Option<IpAddr>,
     config: &ProjectFiltersConfig,
diff --git a/relay_filter/generic/index.html b/relay_filter/generic/index.html
index 6442ffee3d..e21dc50dcf 100644
--- a/relay_filter/generic/index.html
+++ b/relay_filter/generic/index.html
@@ -1,4 +1,4 @@
-relay_filter::generic - Rust
Module relay_filter::generic
source · 
Expand description
Implements generic filtering based on the [RuleCondition] DSL.

+relay_filter::generic - Rust
Module relay_filter::generic
source · 
Expand description
Implements generic filtering based on the RuleCondition DSL.

 
Multiple generic filters can be defined and they are going to be checked in FIFO order. The
 first one that matches, will result in the event being discarded with a FilterStatKey
 identifying the matching filter.

diff --git a/relay_filter/index.html b/relay_filter/index.html
index 5a44ac6212..10c1d04736 100644
--- a/relay_filter/index.html
+++ b/relay_filter/index.html
@@ -6,4 +6,4 @@
 
  • web crawlers (filter events sent by user agents known to be web crawlers)
    • 
 
  • legacy browsers (filter events originating from legacy browsers, can be configured)
    • 
 
-
    Re-exports§
    Modules§
    • browser_extensions
      Implements filtering for events caused by problematic browsers extensions.
    • client_ips
      Implements event filtering based on the client ip address.
    • csp
      Implements event filtering for events originating from CSP endpoints
    • error_messages
      Implements event filtering based on the error message
    • generic
      Implements generic filtering based on the [RuleCondition] DSL.
    • legacy_browsers
      Implements filtering for events originating from legacy browsers.
    • localhost
      Implements filtering for events originating from the localhost
    • transaction_name
      Implements event filtering based on whether the endpoint called is a healthcheck endpoint.
    • web_crawlers
      Filters events coming from user agents known to be web crawlers.
    Structs§
    Enums§
    • FilterStatKey
      Identifies which filter dropped an event for which reason.
    • LegacyBrowser
      A browser class to be filtered by the legacy browser filter.
    Traits§
    • Filterable
      A data item to which filters can be applied.
    Functions§
    • should_filter
      Checks whether an event should be filtered for a particular configuration.
    
\ No newline at end of file
+
    Re-exports§
    Modules§
    • browser_extensions
      Implements filtering for events caused by problematic browsers extensions.
    • client_ips
      Implements event filtering based on the client ip address.
    • csp
      Implements event filtering for events originating from CSP endpoints
    • error_messages
      Implements event filtering based on the error message
    • generic
      Implements generic filtering based on the RuleCondition DSL.
    • legacy_browsers
      Implements filtering for events originating from legacy browsers.
    • localhost
      Implements filtering for events originating from the localhost
    • transaction_name
      Implements event filtering based on whether the endpoint called is a healthcheck endpoint.
    • web_crawlers
      Filters events coming from user agents known to be web crawlers.
    Structs§
    Enums§
    • FilterStatKey
      Identifies which filter dropped an event for which reason.
    • LegacyBrowser
      A browser class to be filtered by the legacy browser filter.
    Traits§
    • Filterable
      A data item to which filters can be applied.
    Functions§
    • should_filter
      Checks whether an event should be filtered for a particular configuration.
    
\ No newline at end of file
diff --git a/relay_filter/struct.GenericFilterConfig.html b/relay_filter/struct.GenericFilterConfig.html
index 856af6c24b..ea28fe7b4c 100644
--- a/relay_filter/struct.GenericFilterConfig.html
+++ b/relay_filter/struct.GenericFilterConfig.html
@@ -1,11 +1,11 @@
 GenericFilterConfig in relay_filter - Rust
    Struct relay_filter::GenericFilterConfig
    source · 
    pub struct GenericFilterConfig {
     pub id: String,
     pub is_enabled: bool,
-    pub condition: Option<RuleCondition>,
+    pub condition: Option<RuleCondition>,
 }
    Expand description
    Configuration for a generic filter.
    
 
    Fields§
    §id: String
    Unique identifier of the generic filter.
    
 
    §is_enabled: bool
    Specifies whether this filter is enabled.
    
-
    §condition: Option<RuleCondition>
    The condition for the filter.
    
+
    §condition: Option<RuleCondition>
    The condition for the filter.
    
 
    Implementations§
    source§
    impl GenericFilterConfig
    source
    pub fn is_empty(&self) -> bool
    Returns true if the filter is not enabled or no condition was supplied.
    
 
    Trait Implementations§
    source§
    impl Clone for GenericFilterConfig
    source§
    fn clone(&self) -> GenericFilterConfig
    Returns a copy of the value. Read more
    1.0.0 · source§
    fn clone_from(&mut self, source: &Self)
    Performs copy-assignment from source. Read more
    source§
    impl Debug for GenericFilterConfig
    source§
    fn fmt(&self, f: &mut Formatter<'_>) -> Result
    Formats the value using the given formatter. Read more
    source§
    impl Default for GenericFilterConfig
    source§
    fn default() -> GenericFilterConfig
    Returns the “default value” for a type. Read more
    source§
    impl<'de> Deserialize<'de> for GenericFilterConfig
    source§
    fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>
    where
     __D: Deserializer<'de>,
    Deserialize this value from the given Serde deserializer. Read more
    source§
    impl PartialEq for GenericFilterConfig
    source§
    fn eq(&self, other: &GenericFilterConfig) -> bool
    This method tests for self and other values to be equal, and is used
diff --git a/src/relay_dynamic_config/defaults.rs.html b/src/relay_dynamic_config/defaults.rs.html
index e114f86389..e246e620c9 100644
--- a/src/relay_dynamic_config/defaults.rs.html
+++ b/src/relay_dynamic_config/defaults.rs.html
@@ -945,14 +945,6 @@
 945
 946
 947
-948
-949
-950
-951
-952
-953
-954
-955
 
    use relay_base_schema::data_category::DataCategory;
 use relay_common::glob2::LazyGlob;
 use relay_event_normalization::utils::MAX_DURATION_MOBILE_MS;
@@ -1147,14 +1139,6 @@
     let is_app_start = RuleCondition::glob("span.op", "app.start.*")
         & RuleCondition::eq("span.description", APP_START_ROOT_SPAN_DESCRIPTIONS);
 
-    // Metrics for common modules:
-    let is_common = is_app_start.clone()
-        | is_db.clone()
-        | is_resource.clone()
-        | is_http.clone()
-        | is_mobile.clone()
-        | is_interaction.clone();
-
     // Metrics for addon modules are only extracted if the feature flag is enabled:
     let is_addon = is_ai.clone() | is_queue_op.clone() | is_cache.clone();
 
@@ -1166,7 +1150,7 @@
                     category: DataCategory::Span,
                     mri: "d:spans/exclusive_time@millisecond".into(),
                     field: Some("span.exclusive_time".into()),
-                    condition: Some(!is_addon.clone() & is_common.clone()),
+                    condition: Some(!is_addon.clone()),
                     tags: vec![],
                 },
                 MetricSpec {
@@ -1241,7 +1225,7 @@
                     category: DataCategory::Span,
                     mri: "d:spans/duration@millisecond".into(),
                     field: Some("span.duration".into()),
-                    condition: Some(!is_addon.clone() & is_common.clone()),
+                    condition: Some(!is_addon.clone()),
                     tags: vec![],
                 },
                 MetricSpec {
diff --git a/src/relay_event_normalization/normalize/span/tag_extraction.rs.html b/src/relay_event_normalization/normalize/span/tag_extraction.rs.html
index cad56df0aa..9779ef99ba 100644
--- a/src/relay_event_normalization/normalize/span/tag_extraction.rs.html
+++ b/src/relay_event_normalization/normalize/span/tag_extraction.rs.html
@@ -2431,22 +2431,6 @@
 2431
 2432
 2433
-2434
-2435
-2436
-2437
-2438
-2439
-2440
-2441
-2442
-2443
-2444
-2445
-2446
-2447
-2448
-2449
 
    //! Logic for persisting items into `span.sentry_tags` and `span.measurements` fields.
 //! These are then used for metrics extraction.
 use std::borrow::Cow;
@@ -4879,21 +4863,5 @@
             "admin@sentry.io"
         );
     }
-
-    #[test]
-    fn long_descriptions_are_truncated() {
-        let json = r#"{
-            "description": "SELECT column FROM table1 WHERE another_col = %s AND yet_another_col = something_very_longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg",
-            "op": "db"
-        }"#;
-
-        let span = Annotated::<Span>::from_json(json)
-            .unwrap()
-            .into_value()
-            .unwrap();
-
-        let tags = extract_tags(&span, 200, None, None, false, None);
-        assert_eq!(tags[&SpanTagKey::Description], "SELECT column FROM table1 WHERE another_col = %s AND yet_another_col = something_very_longggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg*");
-    }
 }
    \ No newline at end of file