Skip to content

Commit

Permalink
chore: Revert "chore: Update Otel and tower-http dependencies (#374)" (
Browse files Browse the repository at this point in the history
…#377)

This reverts commit c6c699f.
  • Loading branch information
spencewenski authored Sep 26, 2024
1 parent c6c699f commit 1b72cc3
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@ dotenvy = "0.15.5"
# Tracing
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.17", features = ["env-filter", "json"] }
opentelemetry-semantic-conventions = "0.25.0"
opentelemetry = { version = "0.25.0", features = ["trace", "metrics", "logs"], optional = true }
opentelemetry_sdk = { version = "0.25.0", features = ["tokio", "rt-tokio", "metrics", "logs", "trace"], optional = true }
opentelemetry-otlp = { version = "0.25.0", features = ["metrics", "trace", "logs"], optional = true }
opentelemetry-semantic-conventions = "0.16.0"
opentelemetry = { version = "0.24.0", features = ["trace", "metrics", "logs"], optional = true }
opentelemetry_sdk = { version = "0.24.1", features = ["tokio", "rt-tokio", "metrics", "logs", "trace"], optional = true }
opentelemetry-otlp = { version = "0.17.0", features = ["metrics", "trace", "logs"], optional = true }
# Roadster technically doesn't need a direct dependency on `prost`, but we add one here to allow our
# `cargo minimal-versions check` check to pass -- `opentelemetry-proto` requires version `0.13.2` or higher
# in order to compile -- it fails to compile with `0.13.1` even though its dependencies don't specify `0.13.2`.
prost = { workspace = true, optional = true }
tracing-opentelemetry = { version = "0.26.0", features = ["metrics"], optional = true }
tracing-opentelemetry = { version = "0.25.0", features = ["metrics"], optional = true }

# Controllers
# `axum` is not optional because we use the `FromRef` trait pretty extensively, even in parts of
# the code that wouldn't otherwise need `axum`.
axum = { workspace = true, features = ["macros"] }
axum-extra = { version = "0.9.0", features = ["typed-header", "cookie"], optional = true }
tower = { version = "0.5.0", optional = true }
tower-http = { version = "0.6.0", features = ["trace", "timeout", "request-id", "util", "normalize-path", "sensitive-headers", "catch-panic", "compression-full", "decompression-full", "limit", "cors"], optional = true }
tower-http = { version = "0.5.0", features = ["trace", "timeout", "request-id", "util", "normalize-path", "sensitive-headers", "catch-panic", "compression-full", "decompression-full", "limit", "cors"], optional = true }
aide = { workspace = true, features = ["axum", "redoc", "scalar", "macros"], optional = true }
schemars = { workspace = true, optional = true }
http-body-util = "0.1.0"
Expand Down Expand Up @@ -153,7 +153,7 @@ rstest = { version = "0.22.0" }

# Others
# Todo: minimize tokio features included in `roadster`
tokio = { version = "1.38.0", features = ["full"] }
tokio = { version = "1.34.0", features = ["full"] }
# For CancellationToken
tokio-util = { version = "0.7.10" }
anyhow = "1.0.86"
Expand Down

0 comments on commit 1b72cc3

Please sign in to comment.