fix: Feature flagging

getsentry · Jul 4, 2022 · dab1d3e · dab1d3e
1 parent 2c24a6f
commit dab1d3e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/relay-general/src/protocol/transaction.rs b/relay-general/src/protocol/transaction.rs
@@ -7,7 +7,7 @@ use crate::types::{Annotated, Empty, ErrorKind, FromValue, IntoValue, SkipSerial
 /// Describes how the name of the transaction was determined.
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[cfg_attr(feature = "jsonschema", derive(schemars::JsonSchema))]
-#[schemars(rename_all = "kebab-case")]
+#[cfg_attr(feature = "jsonschema", schemars(rename_all = "kebab-case"))]
 pub enum TransactionSource {
     /// User-defined name set through `set_transaction_name`.
     Custom,
@@ -24,7 +24,7 @@ pub enum TransactionSource {
     /// This is the default value set by Relay for legacy SDKs.
     Unknown,
     /// Any other unknown source that is not explicitly defined above.
-    #[schemars(skip)]
+    #[cfg_attr(feature = "jsonschema", schemars(skip))]
     Other(String),
 }
 

diff --git a/relay-general/tests/snapshots/test_fixtures__event_schema.snap b/relay-general/tests/snapshots/test_fixtures__event_schema.snap
@@ -2853,7 +2853,6 @@ expression: event_json_schema()
       "enum": [
         "custom",
         "url",
-        "url-fallback",
         "route",
         "view",
         "component",

diff --git a/relay-server/src/actors/envelopes.rs b/relay-server/src/actors/envelopes.rs
@@ -29,7 +29,7 @@ use relay_general::processor::{process_value, ProcessingState};
 use relay_general::protocol::{
     self, Breadcrumb, ClientReport, Csp, Event, EventId, EventType, ExpectCt, ExpectStaple, Hpkp,
     IpAddr, LenientString, Metrics, RelayInfo, SecurityReportType, SessionAggregates,
-    SessionAttributes, SessionUpdate, Timestamp, UserReport, Values,
+    SessionAttributes, SessionUpdate, Timestamp, TransactionSource, UserReport, Values,
 };
 use relay_general::store::ClockDriftProcessor;
 use relay_general::types::{Annotated, Array, FromValue, Object, ProcessingAction, Value};
@@ -66,7 +66,6 @@ use {
     crate::service::ServerErrorKind,
     crate::utils::{EnvelopeLimiter, ErrorBoundary},
     failure::ResultExt,
-    relay_general::protocol::TransactionSource,
     relay_general::store::{GeoIpLookup, StoreConfig, StoreProcessor},
     relay_quotas::{RateLimitingError, RedisRateLimiter},
     symbolic_unreal::{Unreal4Error, Unreal4ErrorKind},

diff --git a/relay-server/src/statsd.rs b/relay-server/src/statsd.rs
@@ -453,7 +453,6 @@ pub enum RelayCounters {
     ///  - `source`: The source of the transaction name on the client. See the [transaction source
     ///    documentation](https://develop.sentry.dev/sdk/event-payloads/properties/transaction_info/)
     ///    for all valid values.
-    #[cfg(feature = "processing")]
     EventTransactionSource,
     /// Number of HTTP requests reaching Relay.
     Requests,