Skip to content

Commit

Permalink
Clean up dependencies (#1535)
Browse files Browse the repository at this point in the history
Co-authored-by: Cijo Thomas <[email protected]>
  • Loading branch information
djc and cijothomas authored Feb 15, 2024
1 parent cad63b6 commit c05b23d
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 18 deletions.
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,16 @@ debug = 1
async-std = "1.10"
async-trait = "0.1"
bytes = "1"
env_logger = "0.10"
env_logger = "0.10" # env_logger requires a newer MSRV
futures-core = "0.3"
futures-executor = "0.3"
futures-util = "0.3"
hyper = "0.14"
http = "0.2"
isahc = "1.4"
log = "0.4"
one_cell = "1.13"
once_cell = "1.13"
ordered-float = "4.0"
pin-project = "0.2"
pin-project-lite = "0.2"
prost = "0.11"
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-appender-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ rust-version = "1.65"

[dependencies]
log = { workspace = true, optional = true }
once_cell = { workspace = true }
opentelemetry = { version = "0.21", path = "../opentelemetry", features = ["logs"] }
opentelemetry_sdk = { version = "0.21", path = "../opentelemetry-sdk", features = ["logs"] }
tracing = { workspace = true, features = ["std"]}
tracing-core = { workspace = true }
tracing-log = { version = "0.2", optional = true }
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
once_cell = "1.13.0"

[dev-dependencies]
log = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-jaeger/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ opentelemetry = { version = "0.21", default-features = false, features = ["trace
opentelemetry_sdk = { version = "0.21", default-features = false, features = ["trace"], path = "../opentelemetry-sdk" }
opentelemetry-http = { version = "0.10", path = "../opentelemetry-http", optional = true }
opentelemetry-semantic-conventions = { version = "0.13", path = "../opentelemetry-semantic-conventions" }
opentelemetry-jaeger-propagator = { version = "0.1", path = "../opentelemetry-jaeger-propagator" }
pin-project-lite = { workspace = true, optional = true }
reqwest = { workspace = true, optional = true }
surf = { workspace = true, optional = true }
Expand All @@ -55,6 +54,7 @@ futures-util = { workspace = true, features = ["std", "alloc"]}
tokio = { workspace = true, features = ["net", "sync"] }
bytes = { workspace = true }
futures-executor = { workspace = true }
opentelemetry-jaeger-propagator = { version = "0.1", path = "../opentelemetry-jaeger-propagator" } # for doctests
opentelemetry_sdk = { features = ["trace", "testing", "rt-tokio"], path = "../opentelemetry-sdk" }

[dependencies.web-sys]
Expand Down
1 change: 0 additions & 1 deletion opentelemetry-otlp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ thiserror = { workspace = true }
tokio-stream = { workspace = true, features = ["net"] }
# need tokio runtime to run smoke tests.
opentelemetry_sdk = { features = ["trace", "rt-tokio", "testing"], path = "../opentelemetry-sdk" }
time = { version = "0.3", features = ["macros"] }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
futures-util = { workspace = true }
temp-env = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
publish = false

[dependencies]
once_cell = "1.17"
once_cell = { workspace = true }
opentelemetry = { path = "../../../opentelemetry" }
opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "metrics", "logs"] }
opentelemetry-otlp = { path = "../..", features = ["http-proto", "reqwest-client", "logs"] }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/examples/basic-otlp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "Apache-2.0"
publish = false

[dependencies]
once_cell = "1.17"
once_cell = { workspace = true }
opentelemetry = { path = "../../../opentelemetry", features = ["metrics", "logs"] }
opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "logs"] }
opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["tonic", "metrics", "logs"] }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/tests/integration_test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false


[dependencies]
once_cell = "1.17"
once_cell = { workspace = true }
opentelemetry = { path = "../../../opentelemetry", features = ["metrics", "logs"] }
opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "logs", "testing"] }
opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["tonic", "metrics", "logs"] }
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-prometheus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
once_cell = "1.17"
once_cell = { workspace = true }
opentelemetry = { version = "0.21", path = "../opentelemetry", default-features = false, features = ["metrics"] }
opentelemetry_sdk = { version = "0.21", path = "../opentelemetry-sdk", default-features = false, features = ["metrics"] }
prometheus = "0.13"
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ crossbeam-channel = { version = "0.5", optional = true }
futures-channel = "0.3"
futures-executor = { workspace = true }
futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
once_cell = "1.10"
once_cell = { workspace = true }
ordered-float = { workspace = true }
percent-encoding = { version = "2.0", optional = true }
rand = { workspace = true, features = ["std", "std_rng","small_rng"], optional = true }
Expand Down
6 changes: 2 additions & 4 deletions opentelemetry-semantic-conventions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ rust-version = "1.65"
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
opentelemetry = { version = "0.21", default-features = false, path = "../opentelemetry" }

[dev-dependencies]
opentelemetry_sdk = { features = ["trace"], path = "../opentelemetry-sdk" }
opentelemetry = { version = "0.21", default-features = false, path = "../opentelemetry" } # for doctests
opentelemetry_sdk = { features = ["trace"], path = "../opentelemetry-sdk" } # for doctests
2 changes: 1 addition & 1 deletion opentelemetry-zipkin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ surf-client = ["surf", "opentelemetry-http/surf"]

[dependencies]
async-trait = { workspace = true }
once_cell = { workspace = true }
opentelemetry = { version = "0.21", path = "../opentelemetry" }
opentelemetry_sdk = { version = "0.21", path = "../opentelemetry-sdk", features = ["trace"] }
opentelemetry-http = { version = "0.10", path = "../opentelemetry-http" }
opentelemetry-semantic-conventions = { version = "0.13", path = "../opentelemetry-semantic-conventions" }
serde_json = { workspace = true }
serde = { workspace = true, features = ["derive"] }
typed-builder = "0.12"
once_cell = "1.12"
http = { workspace = true }
reqwest = { workspace = true, optional = true}
surf = { workspace = true, optional = true}
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
futures-core = { workspace = true }
futures-sink = "0.3"
once_cell = "1.13.0"
once_cell = { workspace = true }
pin-project-lite = { workspace = true, optional = true }
thiserror = { workspace = true }
urlencoding = "2.1.2"
Expand Down
1 change: 0 additions & 1 deletion stress/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ num_cpus = "1.15.0"
opentelemetry = { path = "../opentelemetry", features = ["metrics", "logs", "trace"] }
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics", "logs", "trace"] }
opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing"}
opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"]}
rand = { version = "0.8.4", features = ["small_rng"] }
tracing = { workspace = true, features = ["std"]}
tracing-core = { workspace = true }
Expand Down

0 comments on commit c05b23d

Please sign in to comment.