Skip to content

Commit 4f8da3c

Browse files
authored
ref(ourlogs): Removes support for the envelope otel log item type (#5082)
Closes: #4884 In a follow up, we can remove the `relay-ourlogs` crate, as this is basically empty now.
1 parent 966f8f1 commit 4f8da3c

File tree

14 files changed

+21
-421
lines changed

14 files changed

+21
-421
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
**Breaking Changes**:
66

7+
- Removes support for the deprecated and early alpha only otel log item type. ([#5082](https://github.com/getsentry/relay/pull/5082))
78
- Only check for local project configs in static mode. ([#5057](https://github.com/getsentry/relay/pull/5057))
89

910
**Features**:

Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

relay-ourlogs/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ workspace = true
1616
chrono = { workspace = true }
1717
hex = { workspace = true }
1818
once_cell = { workspace = true }
19-
opentelemetry-proto = { workspace = true, features = [
20-
"gen-tonic",
21-
"with-serde",
22-
"logs",
23-
] }
2419
relay-event-schema = { workspace = true }
2520
relay-protocol = { workspace = true }
2621
relay-common = { workspace = true }

relay-ourlogs/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
html_favicon_url = "https://raw.githubusercontent.com/getsentry/relay/master/artwork/relay-icon.png"
77
)]
88

9-
mod ourlog;
109
mod size;
1110

12-
pub use self::ourlog::otel_to_sentry_log;
1311
pub use self::size::calculate_size;
14-
pub use opentelemetry_proto::tonic::logs::v1::LogRecord as OtelLog;

relay-ourlogs/src/ourlog.rs

Lines changed: 0 additions & 249 deletions
This file was deleted.

relay-server/src/envelope/item.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl Item {
120120
smallvec![(DataCategory::Session, item_count)]
121121
}
122122
ItemType::Statsd | ItemType::MetricBuckets => smallvec![],
123-
ItemType::Log | ItemType::OtelLog => smallvec![
123+
ItemType::Log => smallvec![
124124
(DataCategory::LogByte, self.len().max(1)),
125125
(DataCategory::LogItem, item_count)
126126
],
@@ -416,7 +416,6 @@ impl Item {
416416
| ItemType::Span
417417
| ItemType::Nel
418418
| ItemType::Log
419-
| ItemType::OtelLog
420419
| ItemType::OtelSpan
421420
| ItemType::OtelTracesData
422421
| ItemType::ProfileChunk => false,
@@ -451,7 +450,7 @@ impl Item {
451450
ItemType::Profile => true,
452451
ItemType::CheckIn => false,
453452
ItemType::Span => false,
454-
ItemType::Log | ItemType::OtelLog => false,
453+
ItemType::Log => false,
455454
ItemType::OtelSpan => false,
456455
ItemType::OtelTracesData => false,
457456
ItemType::ProfileChunk => false,
@@ -523,8 +522,6 @@ pub enum ItemType {
523522
ReplayVideo,
524523
/// Monitor check-in encoded as JSON.
525524
CheckIn,
526-
/// A log from the [OTEL Log format](https://opentelemetry.io/docs/specs/otel/logs/data-model/#log-and-event-record-definition)
527-
OtelLog,
528525
/// A log for the log product, not internal logs.
529526
Log,
530527
/// A standalone span.
@@ -585,7 +582,6 @@ impl ItemType {
585582
Self::ReplayVideo => "replay_video",
586583
Self::CheckIn => "check_in",
587584
Self::Log => "log",
588-
Self::OtelLog => "otel_log",
589585
Self::Span => "span",
590586
Self::OtelSpan => "otel_span",
591587
Self::OtelTracesData => "otel_traces_data",
@@ -636,7 +632,6 @@ impl ItemType {
636632
ItemType::ReplayRecording => false,
637633
ItemType::ReplayVideo => false,
638634
ItemType::CheckIn => true,
639-
ItemType::OtelLog => true,
640635
ItemType::Log => true,
641636
ItemType::Span => true,
642637
ItemType::OtelSpan => true,
@@ -680,7 +675,6 @@ impl std::str::FromStr for ItemType {
680675
"replay_video" => Self::ReplayVideo,
681676
"check_in" => Self::CheckIn,
682677
"log" => Self::Log,
683-
"otel_log" => Self::OtelLog,
684678
"span" => Self::Span,
685679
"otel_span" => Self::OtelSpan,
686680
"otel_traces_data" => Self::OtelTracesData,

0 commit comments

Comments
 (0)