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
138 changes: 15 additions & 123 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ k256 = { version = "0.13", default-features = false, features = [
] }
mockall = { version = "0.14.0", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
opentelemetry = { version = "0.28.0" }
opentelemetry-prometheus = { version = "0.28.0" }
opentelemetry_sdk = { version = "0.28.0" }
opentelemetry-otlp = { version = "0.28.0", features = [
opentelemetry = { version = "0.29.0" }
opentelemetry-prometheus = { version = "0.29.0" }
opentelemetry_sdk = { version = "0.29.0" }
opentelemetry-otlp = { version = "0.29.0", features = [
"grpc-tonic",
"trace",
"metrics",
] }
opentelemetry-http = { version = "0.28" }
opentelemetry-http = { version = "0.29" }
paste = { version = "1.0.15", default-features = false }
prometheus = { version = "0.13.4" }
quote = { version = "1.0.42", default-features = false }
Expand All @@ -166,20 +166,19 @@ sp1-sdk = { version = "5.2.2", default-features = false }
sp1-zkvm = { version = "5.2.2", default-features = false }
sparse-merkle-tree = { version = "0.6.1", default-features = false }
sqlx = { version = "0.8.6" }
strum = { version = "0.27.1" }
strum = { version = "0.28.0" }
strum_macros = { version = "0.28.0", default-features = false }
syn = { version = "2.0.104" }
tempfile = { version = "3.20.0", default-features = false }
test-log = { version = "0.2.18", default-features = false }
tracing-opentelemetry = "0.29.0"
tracing-opentelemetry = "0.30.0"
tokio = { version = "1.50.0" }
tokio-util = { version = "0.7.16" }
toml = { version = "0.9.11", default-features = false }
tower-http = { version = "0.6.5", default-features = false, features = [
"decompression-gzip",
] }
tower-service = { version = "0.3.3", default-features = false }
tower_governor = { version = "0.8" }
tracing = { version = "0.1", default-features = false }
tracing-subscriber = { version = "0.3.19", default-features = false }
turmoil = { version = "0.7" }
Expand Down
4 changes: 2 additions & 2 deletions crates/hyli-bus/src/utils/logger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ mod otlp_metrics {
use hyli_turmoil_shims::init_global_meter_provider;
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::metrics::periodic_reader_with_async_runtime::PeriodicReader;
use opentelemetry_sdk::metrics::{MetricResult, SdkMeterProvider};
use opentelemetry_sdk::metrics::SdkMeterProvider;
use opentelemetry_sdk::{runtime, Resource};

pub fn init(
endpoint: String,
service_name: String,
push_interval: Option<std::time::Duration>,
) -> MetricResult<()> {
) -> Result<(), opentelemetry_otlp::ExporterBuildError> {
let exporter = opentelemetry_otlp::MetricExporter::builder()
.with_tonic()
.with_endpoint(endpoint)
Expand Down
4 changes: 1 addition & 3 deletions crates/hyli-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ ureq = { workspace = true, features = ["json"] }

# Rate limiting proxy (optional feature)
axum = { workspace = true, optional = true }
tower_governor = { workspace = true, optional = true }
tower-http = { workspace = true, features = [
"trace",
"cors",
Expand All @@ -76,7 +75,6 @@ notify = { version = "8.2.0", optional = true }
risc0 = ["client-sdk/risc0"]
rate-proxy = [
"dep:axum",
"dep:tower_governor",
"dep:tower-http",
"dep:hyper",
"dep:hyper-util",
Expand All @@ -85,7 +83,7 @@ rate-proxy = [
"dep:notify",
]

default = ["ui", "rate-proxy"]
default = ["rate-proxy"]
ui = ["dep:ratatui", "dep:crossterm"]
turmoil = []

Expand Down
Loading
Loading