Merge branch 'master' into feat/upstream-pending

* master:
  feat(sampling): Support custom tags and more contexts (#1268)
  deps: Update symbolic to pull in Unreal parser fixes (#1266)
  Bring in CLA Lite (#1257)
  release: 0.8.11
  ref(profiling): Normalize all profiles (#1250)
  feat(profiling): Add a profile data category and count profiles in an envelope to apply rate limits (#1259)
  fix: Raise a new InvalidCompression Outcome for invalid Unreal compression (#1237)
  chore: Update logo for dark or light theme (#1262)
  ref: Use Duration to compute breakdowns and span durations (#1260)

Author: jan-auer

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+
+
+
+<!-- Describe your PR here. -->
+
+
+
+<!--
+
+  Sentry employees and contractors can delete or ignore the following.
+
+-->
+
+### Legal Boilerplate
+
+Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.

CHANGELOG.md

@@ -13,6 +13,7 @@
 - fix(metrics): Enforce metric name length limit. ([#1238](https://github.com/getsentry/relay/pull/1238))
 - Accept and forward unknown Envelope items. In processing mode, drop items individually rather than rejecting the entire request. This allows SDKs to send new data in combined Envelopes in the future. ([#1246](https://github.com/getsentry/relay/pull/1246))
 - Stop extracting metrics with outdated names from sessions. ([#1251](https://github.com/getsentry/relay/pull/1251), [#1252](https://github.com/getsentry/relay/pull/1252))
+- Update symbolic to pull in fixed Unreal parser that now correctly handles zero-length files. ([#1266](https://github.com/getsentry/relay/pull/1266))
 
 **Internal**:
 
@@ -22,6 +23,10 @@
 - Remove the unused "internal" data category. ([#1245](https://github.com/getsentry/relay/pull/1245))
 - Add the client and version as `sdk` tag to extracted session metrics in the format `name/version`. ([#1248](https://github.com/getsentry/relay/pull/1248))
 - Expose `shutdown_timeout` in `OverridableConfig` ([#1247](https://github.com/getsentry/relay/pull/1247))
+- Normalize all profiles and reject invalid ones. ([#1250](https://github.com/getsentry/relay/pull/1250))
+- Raise a new InvalidCompression Outcome for invalid Unreal compression. ([#1237](https://github.com/getsentry/relay/pull/1237))
+- Add a profile data category and count profiles in an envelope to apply rate limits. ([#1259](https://github.com/getsentry/relay/pull/1259))
+- Support dynamic sampling by custom tags, operating system name and version, as well as device name and family. ([#1268](https://github.com/getsentry/relay/pull/1268))
 
 ## 22.4.0
 

Cargo.lock

@@ -1,8 +1,11 @@
 <p align="center">
-  <a href="https://sentry.io" target="_blank" align="center">
-    <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" width="280">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <picture>
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-white.png" media="(prefers-color-scheme: dark)" />
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
+      <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" alt="Sentry" width="280">
+    </picture>
   </a>
-  <br />
 </p>
 
 # Official Sentry Relay

README.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## Unreleased
+## 0.8.11
 
 - Add protocol support for custom units on transaction measurements. ([#1256](https://github.com/getsentry/relay/pull/1256))
+- Add a profile data category and count profiles in an envelope to apply rate limits. ([#1259](https://github.com/getsentry/relay/pull/1259))
 
 ## 0.8.10
 

py/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "relay-cabi"
-version = "0.8.10"
+version = "0.8.11"
 authors = ["Sentry <[email protected]>"]
 homepage = "https://getsentry.github.io/relay/"
 repository = "https://github.com/getsentry/relay"

relay-cabi/Cargo.toml

@@ -107,6 +107,8 @@ pub enum DataCategory {
     Attachment = 4,
     /// Session updates. Quantity is the number of updates in the batch.
     Session = 5,
+    /// A profile
+    Profile = 6,
     /// Any other data category not known by this Relay.
     #[serde(other)]
     Unknown = -1,
@@ -122,6 +124,7 @@ impl DataCategory {
             "security" => Self::Security,
             "attachment" => Self::Attachment,
             "session" => Self::Session,
+            "profile" => Self::Profile,
             _ => Self::Unknown,
         }
     }
@@ -135,6 +138,7 @@ impl DataCategory {
             Self::Security => "security",
             Self::Attachment => "attachment",
             Self::Session => "session",
+            Self::Profile => "profile",
             Self::Unknown => "unknown",
         }
     }

relay-common/src/constants.rs

@@ -16,6 +16,51 @@ pub fn instant_to_date_time(instant: Instant) -> chrono::DateTime<chrono::Utc> {
     instant_to_system_time(instant).into()
 }
 
+/// Returns the number of milliseconds contained by this `Duration` as `f64`.
+///
+/// The returned value does include the fractional (nanosecond) part of the duration.
+///
+/// # Example
+///
+/// ```
+/// use std::time::Duration;
+///
+/// let duration = Duration::from_nanos(2_125_000);
+/// let millis = relay_common::duration_to_millis(duration);
+/// assert_eq!(millis, 2.125);
+/// ```
+pub fn duration_to_millis(duration: Duration) -> f64 {
+    (duration.as_secs_f64() * 1_000_000_000f64).round() / 1_000_000f64
+}
+
+/// Returns the positive number of milliseconds contained by this `Duration` as `f64`.
+///
+/// The returned value does include the fractional (nanosecond) part of the duration. If the
+/// duration is negative, this returns `0.0`;
+///
+/// # Example
+///
+/// ```
+/// use chrono::Duration;
+///
+/// let duration = Duration::nanoseconds(2_125_000);
+/// let millis = relay_common::chrono_to_positive_millis(duration);
+/// assert_eq!(millis, 2.125);
+/// ```
+///
+/// Negative durations are clamped to `0.0`:
+///
+/// ```
+/// use chrono::Duration;
+///
+/// let duration = Duration::nanoseconds(-2_125_000);
+/// let millis = relay_common::chrono_to_positive_millis(duration);
+/// assert_eq!(millis, 0.0);
+/// ```
+pub fn chrono_to_positive_millis(duration: chrono::Duration) -> f64 {
+    duration_to_millis(duration.to_std().unwrap_or_default())
+}
+
 /// The conversion result of [`UnixTimestamp::to_instant`].
 ///
 /// If the time is outside of what can be represented in an [`Instant`], this is `Past` or

relay-common/src/time.rs

@@ -1,8 +1,11 @@
 <p align="center">
-  <a href="https://sentry.io" target="_blank" align="center">
-    <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" width="280">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <picture>
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-white.png" media="(prefers-color-scheme: dark)" />
+      <source srcset="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)" />
+      <img src="https://sentry-brand.storage.googleapis.com/sentry-logo-black.png" alt="Sentry" width="280">
+    </picture>
   </a>
-  <br />
 </p>
 
 # General - Sentry Annotated Protocol

relay-general/README.md

@@ -22,7 +22,7 @@ use crate::types::{
 /// be stripped liberally because it would break processing for certain platforms.
 ///
 /// Those strings get special treatment in our PII processor to avoid stripping the basename.
-#[derive(Debug, FromValue, IntoValue, Empty, Clone, PartialEq)]
+#[derive(Debug, FromValue, IntoValue, Empty, Clone, PartialEq, Deserialize, Serialize)]
 #[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 pub struct NativeImagePath(pub String);
 

relay-general/src/protocol/debugmeta.rs

@@ -46,6 +46,18 @@ impl FromValue for TagEntry {
 #[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 pub struct Tags(pub PairList<TagEntry>);
 
+impl Tags {
+    /// Returns a reference to the value of the tag, if it exists.
+    ///
+    /// If the tag with the specified key exists multiple times, the first instance is returned. If
+    /// no tag with the given key exists or the tag entry is erroneous, `None` is returned`.
+    ///
+    /// To retrieve the [`Annotated`] wrapper of the tag value, use [`PairList::get`] instead.
+    pub fn get(&self, key: &str) -> Option<&str> {
+        self.0.get_value(key).map(String::as_str)
+    }
+}
+
 impl std::ops::Deref for Tags {
     type Target = Array<TagEntry>;
 

relay-general/src/protocol/tags.rs

@@ -4,7 +4,7 @@ use std::cmp::Ordering;
 use std::fmt;
 use std::iter::{FromIterator, IntoIterator};
 use std::net;
-use std::ops::{Add, Deref, DerefMut};
+use std::ops::{Add, Sub};
 use std::str::FromStr;
 
 use chrono::{DateTime, Datelike, Duration, LocalResult, NaiveDateTime, TimeZone, Utc};
@@ -211,6 +211,33 @@ where
             .position(|entry| entry.as_pair().0.as_str() == Some(key))
     }
 
+    /// Returns a reference to the annotated value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the pairlist's key type. If there are multiple entries
+    /// with the same key, the first is returned.
+    pub fn get<'a, Q>(&'a self, key: Q) -> Option<&Annotated<V>>
+    where
+        Q: AsRef<str>,
+        K: 'a,
+    {
+        self.position(key)
+            .and_then(|pos| self.0.get(pos))
+            .and_then(Annotated::value)
+            .map(|pair| pair.as_pair().1)
+    }
+
+    /// Returns a reference to the value corresponding to the key.
+    ///
+    /// The key may be any borrowed form of the pairlist's key type. If there are multiple entries
+    /// with the same key, the first is returned.
+    pub fn get_value<'a, Q>(&'a self, key: Q) -> Option<&V>
+    where
+        Q: AsRef<str>,
+        K: 'a,
+    {
+        self.get(key).and_then(Annotated::value)
+    }
+
     /// Returns `true` if the pair list contains a value for the specified key.
     pub fn contains<Q>(&self, key: Q) -> bool
     where
@@ -467,6 +494,7 @@ hex_metrastructure!(RegVal, "register value");
 pub struct Addr(pub u64);
 
 hex_metrastructure!(Addr, "address");
+relay_common::impl_str_serde!(Addr, "an address");
 
 /// An ip address.
 #[derive(
@@ -892,20 +920,6 @@ impl From<DateTime<Utc>> for Timestamp {
     }
 }
 
-impl Deref for Timestamp {
-    type Target = DateTime<Utc>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Timestamp {
-    fn deref_mut(&mut self) -> &mut <Self as Deref>::Target {
-        &mut self.0
-    }
-}
-
 impl Add<Duration> for Timestamp {
     type Output = Self;
 
@@ -914,6 +928,14 @@ impl Add<Duration> for Timestamp {
     }
 }
 
+impl Sub<Timestamp> for Timestamp {
+    type Output = chrono::Duration;
+
+    fn sub(self, rhs: Timestamp) -> Self::Output {
+        self.into_inner() - rhs.into_inner()
+    }
+}
+
 impl PartialEq<DateTime<Utc>> for Timestamp {
     fn eq(&self, other: &DateTime<Utc>) -> bool {
         &self.0 == other

relay-general/src/protocol/types.rs

@@ -171,7 +171,7 @@ impl<'a> NormalizeProcessor<'a> {
             Ok(())
         })?;
 
-        ClockDriftProcessor::new(sent_at.map(|x| *x), received_at)
+        ClockDriftProcessor::new(sent_at.map(|ts| ts.into_inner()), received_at)
             .error_kind(error_kind)
             .process_event(event, meta, state)?;