diff --git a/Cargo.toml b/Cargo.toml index 717871ea14..2ff8573004 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,6 +53,31 @@ tracing = { version = ">=0.1.40", default-features = false } tracing-core = { version = ">=0.1.33", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } url = { version = "2.5", default-features = false } +anyhow = "1.0.94" +base64 = "0.22.1" +chrono = { version = "0.4.34", default-features = false } +ctor = "0.2.9" +ctrlc = "3.2.5" +futures-channel = "0.3" +futures-sink = "0.3" +glob = "0.3.1" +hex = "0.4.3" +lazy_static = "1.4.0" +num-format = "0.4.4" +num_cpus = "1.15.0" +opentelemetry-appender-tracing = { path = "opentelemetry-appender-tracing", default-features = false } +opentelemetry-otlp = { path = "opentelemetry-otlp" } +opentelemetry-stdout = { path = "opentelemetry-stdout" } +percent-encoding = "2.0" +rstest = "0.23.0" +schemars = "0.8" +sysinfo = "0.32" +tempfile = "3.3.0" +testcontainers = "0.23.1" +tracing-log = "0.2" +tracing-opentelemetry = "0.29" +typed-builder = "0.20" +uuid = "1.3" # Aviod use of crates.io version of these crates through the tracing-opentelemetry dependencies [patch.crates-io] diff --git a/examples/logs-basic/Cargo.toml b/examples/logs-basic/Cargo.toml index 275dbea8a3..669dba1500 100644 --- a/examples/logs-basic/Cargo.toml +++ b/examples/logs-basic/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] } -opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]} -opentelemetry-appender-tracing = { path = "../../opentelemetry-appender-tracing", default-features = false} +opentelemetry-stdout = { workspace = true, features = ["logs"] } +opentelemetry-appender-tracing = { workspace = true } tracing = { workspace = true, features = ["std"]} tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] } diff --git a/examples/metrics-advanced/Cargo.toml b/examples/metrics-advanced/Cargo.toml index 31cdf73a89..572a35762a 100644 --- a/examples/metrics-advanced/Cargo.toml +++ b/examples/metrics-advanced/Cargo.toml @@ -8,5 +8,5 @@ publish = false [dependencies] opentelemetry = { path = "../../opentelemetry", features = ["metrics"] } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views", "rt-tokio"] } -opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"] } +opentelemetry-stdout = { workspace = true, features = ["metrics"] } tokio = { workspace = true, features = ["full"] } diff --git a/examples/metrics-basic/Cargo.toml b/examples/metrics-basic/Cargo.toml index 69a8fc8628..c8c6854fde 100644 --- a/examples/metrics-basic/Cargo.toml +++ b/examples/metrics-basic/Cargo.toml @@ -8,6 +8,6 @@ publish = false [dependencies] opentelemetry = { path = "../../opentelemetry", features = ["metrics"] } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics", "rt-tokio"] } -opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"]} +opentelemetry-stdout = { workspace = true, features = ["metrics"] } tokio = { workspace = true, features = ["full"] } diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml index 1f3ade0c87..7ab0ac9fda 100644 --- a/examples/tracing-grpc/Cargo.toml +++ b/examples/tracing-grpc/Cargo.toml @@ -16,7 +16,7 @@ path = "src/client.rs" [dependencies] opentelemetry = { path = "../../opentelemetry" } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] } -opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] } +opentelemetry-stdout = { workspace = true, features = ["trace"] } prost = { workspace = true } tokio = { workspace = true, features = ["full"] } tonic = { workspace = true, features = ["server"] } diff --git a/examples/tracing-http-propagator/Cargo.toml b/examples/tracing-http-propagator/Cargo.toml index 7d13e666ed..9aa47859b7 100644 --- a/examples/tracing-http-propagator/Cargo.toml +++ b/examples/tracing-http-propagator/Cargo.toml @@ -23,5 +23,5 @@ tokio = { workspace = true, features = ["full"] } opentelemetry = { path = "../../opentelemetry" } opentelemetry_sdk = { path = "../../opentelemetry-sdk" } opentelemetry-http = { path = "../../opentelemetry-http" } -opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] } +opentelemetry-stdout = { workspace = true, features = ["trace"] } opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" } diff --git a/examples/tracing-jaeger/Cargo.toml b/examples/tracing-jaeger/Cargo.toml index 6257f0ebf0..566df46e64 100644 --- a/examples/tracing-jaeger/Cargo.toml +++ b/examples/tracing-jaeger/Cargo.toml @@ -8,5 +8,5 @@ publish = false [dependencies] opentelemetry = { path = "../../opentelemetry" } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] } -opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] } +opentelemetry-otlp = { workspace = true, features = ["tonic"] } tokio = { workspace = true, features = ["full"] } diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml index bd66ac3fa4..85d80df5e5 100644 --- a/opentelemetry-appender-log/Cargo.toml +++ b/opentelemetry-appender-log/Cargo.toml @@ -30,7 +30,7 @@ opentelemetry_sdk = { path = "../opentelemetry-sdk", features = [ "testing", "spec_unstable_logs_enabled", ] } -opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] } +opentelemetry-stdout = { workspace = true, features = ["logs"] } log = { workspace = true, features = ["kv_serde"] } tokio = { workspace = true } serde = { workspace = true, features = ["std", "derive"] } diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml index cd83d14791..c49d690669 100644 --- a/opentelemetry-appender-tracing/Cargo.toml +++ b/opentelemetry-appender-tracing/Cargo.toml @@ -15,17 +15,17 @@ log = { workspace = true, optional = true } opentelemetry = { version = "0.28", path = "../opentelemetry", features = ["logs"] } tracing = { workspace = true, features = ["std"]} tracing-core = { workspace = true } -tracing-log = { version = "0.2", optional = true } +tracing-log = { workspace = true, optional = true } tracing-subscriber = { workspace = true, features = ["registry", "std"] } -tracing-opentelemetry = { version = "0.29", optional = true } +tracing-opentelemetry = { workspace = true, optional = true } [dev-dependencies] log = { workspace = true } -opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] } +opentelemetry-stdout = { workspace = true, features = ["logs"] } opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["logs", "testing"] } tracing = { workspace = true, features = ["std"]} tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] } -tracing-log = "0.2" +tracing-log = { workspace = true } criterion = { workspace = true } tokio = { workspace = true, features = ["full"]} diff --git a/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml index 12ea5766b6..ea2a01cb94 100644 --- a/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml +++ b/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml @@ -12,8 +12,8 @@ reqwest-blocking = ["opentelemetry-otlp/reqwest-blocking-client"] [dependencies] opentelemetry = { path = "../../../opentelemetry" } opentelemetry_sdk = { path = "../../../opentelemetry-sdk" } -opentelemetry-otlp = { path = "../.."} -opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing"} +opentelemetry-otlp = { workspace = true } +opentelemetry-appender-tracing = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true, features = ["std"]} diff --git a/opentelemetry-otlp/examples/basic-otlp/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp/Cargo.toml index c2b785a499..bc068d0a44 100644 --- a/opentelemetry-otlp/examples/basic-otlp/Cargo.toml +++ b/opentelemetry-otlp/examples/basic-otlp/Cargo.toml @@ -8,9 +8,9 @@ publish = false [dependencies] opentelemetry = { path = "../../../opentelemetry" } opentelemetry_sdk = { path = "../../../opentelemetry-sdk" } -opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["grpc-tonic"] } -tokio = { version = "1.0", features = ["full"] } -opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing"} +opentelemetry-otlp = { workspace = true, features = ["grpc-tonic"] } +tokio = { workspace = true, features = ["full"] } +opentelemetry-appender-tracing = { workspace = true } tracing = { workspace = true, features = ["std"]} tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] } diff --git a/opentelemetry-otlp/tests/integration_test/Cargo.toml b/opentelemetry-otlp/tests/integration_test/Cargo.toml index 25743be4c4..8091dd9978 100644 --- a/opentelemetry-otlp/tests/integration_test/Cargo.toml +++ b/opentelemetry-otlp/tests/integration_test/Cargo.toml @@ -8,13 +8,13 @@ publish = false opentelemetry = { path = "../../../opentelemetry", features = [] } opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "testing"] } opentelemetry-proto = { path = "../../../opentelemetry-proto", features = ["gen-tonic-messages", "trace", "logs", "metrics", "with-serde"] } -tokio = { version = "1.0", features = ["full"] } -serde_json = "1" -testcontainers = { version = "0.23.1", features = ["http_wait"]} +tokio = { workspace = true, features = ["full"] } +serde_json = { workspace = true } +testcontainers = { workspace = true, features = ["http_wait"] } once_cell.workspace = true -anyhow = "1.0.94" -ctor = "0.2.9" -uuid = { version = "1.3", features = ["v4"] } +anyhow = { workspace = true } +ctor = { workspace = true } +uuid = { workspace = true, features = ["v4"] } tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] } tracing = {workspace = true} diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index dffabb7a02..415a61b88e 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -53,17 +53,17 @@ tonic = { workspace = true, optional = true, features = ["codegen", "prost"] } prost = { workspace = true, optional = true } opentelemetry = { version = "0.28", default-features = false, path = "../opentelemetry" } opentelemetry_sdk = { version = "0.28", default-features = false, path = "../opentelemetry-sdk" } -schemars = { version = "0.8", optional = true } +schemars = { workspace = true, optional = true } serde = { workspace = true, optional = true, features = ["serde_derive"] } -hex = { version = "0.4.3", optional = true } +hex = { workspace = true, optional = true } tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging -base64 = { version = "0.22.1", optional = true } +base64 = { workspace = true, optional = true } [dev-dependencies] opentelemetry = { features = ["testing"], path = "../opentelemetry" } tonic-build = { workspace = true } prost-build = { workspace = true } -tempfile = "3.3.0" +tempfile = { workspace = true } serde_json = { workspace = true } [lints] diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml index 10e138542a..45819b89c0 100644 --- a/opentelemetry-sdk/Cargo.toml +++ b/opentelemetry-sdk/Cargo.toml @@ -13,12 +13,12 @@ rust-version = "1.75.0" opentelemetry = { version = "0.28", path = "../opentelemetry/" } opentelemetry-http = { version = "0.28", path = "../opentelemetry-http", optional = true } async-std = { workspace = true, features = ["unstable"], optional = true } -futures-channel = "0.3" +futures-channel = { workspace = true } futures-executor = { workspace = true } futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] } -percent-encoding = { version = "2.0", optional = true } +percent-encoding = { workspace = true, optional = true } rand = { workspace = true, features = ["std", "std_rng", "small_rng", "os_rng", "thread_rng"], optional = true } -glob = { version = "0.3.1", optional =true} +glob = { workspace = true, optional = true } serde = { workspace = true, features = ["derive", "rc"], optional = true } serde_json = { workspace = true, optional = true } thiserror = { workspace = true } @@ -34,7 +34,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dev-dependencies] criterion = { workspace = true, features = ["html_reports"] } -rstest = "0.23.0" +rstest = { workspace = true } temp-env = { workspace = true } [target.'cfg(not(target_os = "windows"))'.dev-dependencies] diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml index c30f7c5df4..364a28a3ed 100644 --- a/opentelemetry-stdout/Cargo.toml +++ b/opentelemetry-stdout/Cargo.toml @@ -26,7 +26,7 @@ metrics = ["opentelemetry/metrics", "opentelemetry_sdk/metrics"] logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry_sdk/spec_unstable_logs_enabled"] [dependencies] -chrono = { version = "0.4.34", default-features = false, features = ["now"] } +chrono = { workspace = true, features = ["now"] } futures-util = { workspace = true, optional = true } opentelemetry = { version = "0.28", path = "../opentelemetry" } opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk" } @@ -34,7 +34,7 @@ opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk" } [dev-dependencies] opentelemetry = { path = "../opentelemetry", features = ["metrics"] } opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["rt-tokio", "metrics"] } -opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing"} +opentelemetry-appender-tracing = { workspace = true } tracing = { workspace = true, features = ["std"]} tracing-subscriber = { workspace = true, features = ["registry", "std"] } tokio = { workspace = true, features = ["full"] } diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml index c40059e7de..440b22888e 100644 --- a/opentelemetry-zipkin/Cargo.toml +++ b/opentelemetry-zipkin/Cargo.toml @@ -32,7 +32,7 @@ opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk", features opentelemetry-http = { version = "0.28", path = "../opentelemetry-http" } serde_json = { workspace = true } serde = { workspace = true, features = ["derive"] } -typed-builder = "0.20" +typed-builder = { workspace = true } http = { workspace = true } reqwest = { workspace = true, optional = true } thiserror = { workspace = true } diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml index 453fb40312..064d5004b3 100644 --- a/opentelemetry/Cargo.toml +++ b/opentelemetry/Cargo.toml @@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] futures-core = { workspace = true, optional = true } -futures-sink = { version = "0.3", optional = true } +futures-sink = { workspace = true, optional = true } pin-project-lite = { workspace = true, optional = true } thiserror = { workspace = true, optional = true} tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging diff --git a/stress/Cargo.toml b/stress/Cargo.toml index 4691def67f..bc666a6769 100644 --- a/stress/Cargo.toml +++ b/stress/Cargo.toml @@ -40,17 +40,17 @@ path = "src/random.rs" doc = false [dependencies] -ctrlc = "3.2.5" -lazy_static = "1.4.0" -num_cpus = "1.15.0" +ctrlc = { workspace = true } +lazy_static = { workspace = true } +num_cpus = { workspace = true } opentelemetry = { path = "../opentelemetry", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled"] } opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled"] } -opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing"} +opentelemetry-appender-tracing = { workspace = true } rand = { workspace = true, features = ["small_rng", "os_rng"] } tracing = { workspace = true, features = ["std"]} tracing-subscriber = { workspace = true, features = ["registry", "std"] } -num-format = "0.4.4" -sysinfo = { version = "0.32", optional = true } +num-format = { workspace = true } +sysinfo = { workspace = true, optional = true } futures-executor = { workspace = true } [features]