Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
- No longer writes Spans as trace items. ([#5152](https://github.com/getsentry/relay/pull/5152))
- Produce spans to `ingest-spans` by default. ([#5163](https://github.com/getsentry/relay/pull/5163))
- Add `retentions` to the project configuration and use them for logs. ([#5135](https://github.com/getsentry/relay/pull/5135))
- Produce Span V2 Kafka messages. ([#5151](https://github.com/getsentry/relay/pull/5151), [#5173](https://github.com/getsentry/relay/pull/5173), [#5199](https://github.com/getsentry/relay/pull/5199))
- Produce Span V2 Kafka messages. ([#5151](https://github.com/getsentry/relay/pull/5151), [#5173](https://github.com/getsentry/relay/pull/5173), [#5199](https://github.com/getsentry/relay/pull/5199), [#5216](https://github.com/getsentry/relay/pull/5216))
- Extract additional `user.geo.*` attributes on spans. ([#5194](https://github.com/getsentry/relay/pull/5194))
- Modernize session processing and move to Relay's new processing framework. ([#5201](https://github.com/getsentry/relay/pull/5201))
- Add TraceMetric data category. ([#5206](https://github.com/getsentry/relay/pull/5206))
Expand Down
3 changes: 0 additions & 3 deletions relay-event-schema/src/protocol/span.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
mod compat;
mod convert;

pub use compat::CompatSpan;

use std::fmt;
use std::ops::Deref;
use std::str::FromStr;
Expand Down
309 changes: 0 additions & 309 deletions relay-event-schema/src/protocol/span/compat.rs

This file was deleted.

3 changes: 0 additions & 3 deletions relay-server/src/envelope/content_type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ pub enum ContentType {
SpanV2Container,
/// `application/vnd.sentry.items.trace-metric+json`
TraceMetricContainer,
/// Internal, not serialized.
CompatSpan,
/// All integration content types.
Integration(Integration),
/// Any arbitrary content type not listed explicitly.
Expand All @@ -56,7 +54,6 @@ impl ContentType {
Self::LogContainer => "application/vnd.sentry.items.log+json",
Self::SpanV2Container => "application/vnd.sentry.items.span.v2+json",
Self::TraceMetricContainer => "application/vnd.sentry.items.trace-metric+json",
Self::CompatSpan => panic!("must not be serialized"),
Self::Integration(integration) => integration.as_content_type(),
Self::Other(other) => other,
}
Expand Down
9 changes: 1 addition & 8 deletions relay-server/src/managed/counted.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use relay_event_schema::protocol::{
CompatSpan, OurLog, SessionAggregateItem, SessionAggregates, SessionUpdate, Span, SpanV2,
TraceMetric,
OurLog, SessionAggregateItem, SessionAggregates, SessionUpdate, Span, SpanV2, TraceMetric,
};
use relay_protocol::Annotated;
use relay_quotas::DataCategory;
Expand Down Expand Up @@ -113,12 +112,6 @@ impl Counted for Annotated<Span> {
}
}

impl Counted for Annotated<CompatSpan> {
fn quantities(&self) -> Quantities {
smallvec::smallvec![(DataCategory::Span, 1), (DataCategory::SpanIndexed, 1)]
}
}

impl Counted for ExtractedMetrics {
fn quantities(&self) -> Quantities {
// We only consider project metrics, sampling project metrics should never carry outcomes,
Expand Down
Loading
Loading