Skip to content

Commit

Permalink
telemetry-subscribers: remove feature flags (#20820)
Browse files Browse the repository at this point in the history
Remove the feature flags from the `telemetry-subscribers` crate. The
existing flags were not being properly handled which could have lead to
broken compilation if features were enabled/disabled and given we don't
make use of feature flags in the sui repo it makes things easier to
maintain with these removed.
  • Loading branch information
bmwill authored Jan 8, 2025
1 parent ba84a1b commit 80955a5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 18 deletions.
23 changes: 6 additions & 17 deletions crates/telemetry-subscribers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ publish = false

[dependencies]
atomic_float.workspace = true
console-subscriber = { workspace = true, optional = true }
console-subscriber.workspace = true
crossterm.workspace = true
once_cell.workspace = true
prometheus.workspace = true
tracing.workspace = true
tracing-appender.workspace = true
tracing-subscriber.workspace = true
opentelemetry = { version = "0.25.0", optional = true }
opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio"], optional = true }
opentelemetry-otlp = { version = "0.25.0", features = ["grpc-tonic"], optional = true }
tracing-opentelemetry = { version = "0.26.0", optional = true }
opentelemetry-proto = { version = "0.25", optional = true }
opentelemetry = { version = "0.25.0" }
opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.25.0", features = ["grpc-tonic"] }
tracing-opentelemetry = { version = "0.26.0" }
opentelemetry-proto = { version = "0.25" }
tokio = { workspace = true, features = ["full"] }
futures.workspace = true
clap.workspace = true
Expand All @@ -33,16 +33,5 @@ bytes-varint = { version = "1" }
tonic = { version = "0.12.3" }
prost = "0.13"

[features]
default = ["otlp"]
tokio-console = ["console-subscriber"]
otlp = [
"tracing-opentelemetry",
"opentelemetry",
"opentelemetry-otlp",
"opentelemetry-proto",
"opentelemetry_sdk"
]

[dev-dependencies]
camino.workspace = true
1 change: 0 additions & 1 deletion crates/telemetry-subscribers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ impl TelemetryConfig {
// tokio-console layer
// Please see https://docs.rs/console-subscriber/latest/console_subscriber/struct.Builder.html#configuration
// for environment vars/config options
#[cfg(feature = "tokio-console")]
if config.tokio_console {
layers.push(console_subscriber::spawn().boxed());
}
Expand Down

0 comments on commit 80955a5

Please sign in to comment.