Remove JsonSchema trait where it wasn't fully supported

getsentry · Jul 25, 2024 · 3e5e265 · 3e5e265
1 parent 1016748
commit 3e5e265
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/relay-dynamic-config/Cargo.toml b/relay-dynamic-config/Cargo.toml
@@ -11,7 +11,6 @@ publish = false
 
 [features]
 default = []
-jsonschema = []
 
 [lints]
 workspace = true

diff --git a/relay-dynamic-config/src/global.rs b/relay-dynamic-config/src/global.rs
@@ -19,7 +19,6 @@ use crate::{defaults, ErrorBoundary, MetricExtractionGroup, MetricExtractionGrou
 /// [`ProjectConfig`](crate::ProjectConfig)s small.
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
-#[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 pub struct GlobalConfig {
  /// Configuration for measurements normalization.
  #[serde(skip_serializing_if = "Option::is_none")]
@@ -106,7 +105,6 @@ fn is_err_or_empty(filters_config: &ErrorBoundary<GenericFiltersConfig>) -> bool
 /// All options passed down from Sentry to Relay.
 #[derive(Default, Clone, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(default)]
-#[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 pub struct Options {
  /// List of platform names for which we allow using unsampled profiles for the purpose
  /// of improving profile (function) metrics
@@ -235,7 +233,6 @@ pub struct Options {
 /// Kill switch for controlling the cardinality limiter.
 #[derive(Default, Clone, Copy, Debug, Serialize, Deserialize, PartialEq)]
 #[serde(rename_all = "lowercase")]
-#[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 pub enum CardinalityLimiterMode {
  /// Cardinality limiter is enabled.
  #[default]
@@ -251,7 +248,6 @@ pub enum CardinalityLimiterMode {
 
 /// Configuration container to control [`BucketEncoding`] per namespace.
 #[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq)]
-#[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
 #[serde(default)]
 pub struct BucketEncodings {
  transactions: BucketEncoding,

diff --git a/relay-event-normalization/src/normalize/user_agent.rs b/relay-event-normalization/src/normalize/user_agent.rs
@@ -195,8 +195,7 @@ impl<'a> RawUserAgentInfo<&'a str> {
 /// The client hint variable names mirror the name of the "SEC-CH" headers.
 ///
 /// See <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers#user_agent_client_hints>
-#[derive(Clone, Debug, Default, PartialEq)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
 pub struct ClientHints<S>
 where
  S: Default + AsRef<str>,