chore: Consolidate internal crate dependencies to use workspace dependencies (#3085)

cijothomas · lalitb · web-flow · commit 3b0eb5d282aa · 2025-08-01T10:46:50.000-07:00
Co-authored-by: Lalit Kumar Bhasin &lt;lalit_fin@yahoo.com&gt;
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,9 +63,16 @@ const-hex = "1.14.1"
 lazy_static = "1.4.0"
 num-format = "0.4.4"
 num_cpus = "1.15.0"
+opentelemetry = { path = "opentelemetry", default-features = false }
+opentelemetry_sdk = { path = "opentelemetry-sdk", default-features = false }
+opentelemetry-appender-log = { path = "opentelemetry-appender-log", default-features = false }
 opentelemetry-appender-tracing = { path = "opentelemetry-appender-tracing", default-features = false }
-opentelemetry-otlp = { path = "opentelemetry-otlp" }
-opentelemetry-stdout = { path = "opentelemetry-stdout" }
+opentelemetry-http = { path = "opentelemetry-http", default-features = false }
+opentelemetry-jaeger-propagator = { path = "opentelemetry-jaeger-propagator", default-features = false }
+opentelemetry-otlp = { path = "opentelemetry-otlp", default-features = false }
+opentelemetry-proto = { path = "opentelemetry-proto", default-features = false }
+opentelemetry-semantic-conventions = { path = "opentelemetry-semantic-conventions", default-features = false }
+opentelemetry-stdout = { path = "opentelemetry-stdout", default-features = false }
 percent-encoding = "2.0"
 rstest = "0.23.0"
 schemars = "0.8"
diff --git a/examples/logs-basic/Cargo.toml b/examples/logs-basic/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 bench = false
 
 [dependencies]
-opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
+opentelemetry_sdk = { workspace = true, features = ["logs"] }
 opentelemetry-stdout = { workspace = true, features = ["logs"] }
 opentelemetry-appender-tracing = { workspace = true }
 tracing = { workspace = true, features = ["std"]}
diff --git a/examples/metrics-advanced/Cargo.toml b/examples/metrics-advanced/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/main.rs"
 bench = false
 
 [dependencies]
-opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk" }
+opentelemetry = { workspace = true, features = ["metrics"] }
+opentelemetry_sdk = { workspace = true }
 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
@@ -13,8 +13,8 @@ path = "src/main.rs"
 bench = false
 
 [dependencies]
-opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics"] }
+opentelemetry = { workspace = true, features = ["metrics"] }
+opentelemetry_sdk = { workspace = true, 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
@@ -18,8 +18,8 @@ path = "src/client.rs"
 bench = false
 
 [dependencies]
-opentelemetry = { path = "../../opentelemetry" }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] }
 opentelemetry-stdout = { workspace = true, features = ["trace"] }
 prost = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
diff --git a/examples/tracing-http-propagator/Cargo.toml b/examples/tracing-http-propagator/Cargo.toml
@@ -24,11 +24,11 @@ http-body-util = { workspace = true }
 hyper = { workspace = true, features = ["full"] }
 hyper-util = { workspace = true, features = ["full"] }
 tokio = { workspace = true, features = ["full"] }
-opentelemetry = { path = "../../opentelemetry" }
-opentelemetry_sdk = { path = "../../opentelemetry-sdk" }
-opentelemetry-http = { path = "../../opentelemetry-http" }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true }
+opentelemetry-http = { workspace = true }
 opentelemetry-stdout = { workspace = true, features = ["trace", "logs"] }
-opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
+opentelemetry-semantic-conventions = { workspace = true }
 opentelemetry-appender-tracing = { workspace = true }
 tracing = { workspace = true, features = ["std"]}
 tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml
@@ -15,25 +15,18 @@ autobenches = false
 bench = false
 
 [dependencies]
-opentelemetry = { version = "0.30", path = "../opentelemetry", features = [
-  "logs",
-] }
+opentelemetry = { workspace = true, features = ["logs"] }
 log = { workspace = true, features = ["kv", "std"] }
 serde = { workspace = true, optional = true, features = ["std"] }
-opentelemetry-semantic-conventions = { version = "0.30", path = "../opentelemetry-semantic-conventions", optional = true, features = [
-  "semconv_experimental",
-] }
+opentelemetry-semantic-conventions = { workspace = true, optional = true, features = ["semconv_experimental"] }
 
 [features]
 spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"]
 with-serde = ["log/kv_serde", "serde"]
 experimental_metadata_attributes = ["dep:opentelemetry-semantic-conventions"]
 
 [dev-dependencies]
-opentelemetry_sdk = { path = "../opentelemetry-sdk", features = [
-  "testing",
-  "spec_unstable_logs_enabled",
-] }
+opentelemetry_sdk = { workspace = true, features = ["testing", "spec_unstable_logs_enabled"] }
 opentelemetry-stdout = { workspace = true, features = ["logs"] }
 log = { workspace = true, features = ["kv_serde"] }
 tokio = { workspace = true }
diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml
@@ -13,7 +13,7 @@ autobenches = false
 
 [dependencies]
 log = { workspace = true, optional = true }
-opentelemetry = { version = "0.30", path = "../opentelemetry", features = ["logs"] }
+opentelemetry = { workspace = true, features = ["logs"] }
 tracing = { workspace = true, features = ["std"]}
 tracing-core = { workspace = true }
 tracing-log = { workspace = true, optional = true }
@@ -23,7 +23,7 @@ tracing-opentelemetry = { workspace = true, optional = true }
 [dev-dependencies]
 log = { workspace = true }
 opentelemetry-stdout = { workspace = true, features = ["logs"] }
-opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["logs", "testing"]  }
+opentelemetry_sdk = { workspace = true, features = ["logs", "testing", "internal-logs"] }
 tracing = { workspace = true, features = ["std"]}
 tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
 tracing-log = { workspace = true }
diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml
@@ -24,7 +24,7 @@ http = { workspace = true }
 http-body-util = { workspace = true, optional = true }
 hyper = { workspace = true, optional = true }
 hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
-opentelemetry = { version = "0.30", path = "../opentelemetry", features = ["trace"] }
+opentelemetry = { workspace = true, features = ["trace"] }
 reqwest = { workspace = true, features = ["blocking"], optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }
 
diff --git a/opentelemetry-jaeger-propagator/Cargo.toml b/opentelemetry-jaeger-propagator/Cargo.toml
@@ -21,12 +21,10 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-opentelemetry = { version = "0.30", default-features = false, features = [
-    "trace",
-], path = "../opentelemetry" }
+opentelemetry = { workspace = true, features = ["trace"] }
 
 [dev-dependencies]
-opentelemetry = { features = ["testing"], path = "../opentelemetry" }
+opentelemetry = { workspace = true, features = ["testing"] }
 
 [features]
 default = ["internal-logs"]
diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml
@@ -27,10 +27,10 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-opentelemetry = { version = "0.30", default-features = false, path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.30", default-features = false, path = "../opentelemetry-sdk" }
-opentelemetry-http = { version = "0.30", path = "../opentelemetry-http", optional = true }
-opentelemetry-proto = { version = "0.30", path = "../opentelemetry-proto", default-features = false }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true }
+opentelemetry-http = { workspace = true, optional = true }
+opentelemetry-proto = { workspace = true }
 tracing = {workspace = true, optional = true}
 
 prost = { workspace = true, optional = true }
@@ -45,7 +45,7 @@ serde_json = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio-stream = { workspace = true, features = ["net"] }
-opentelemetry_sdk = { features = ["trace", "testing"], path = "../opentelemetry-sdk" }
+opentelemetry_sdk = { workspace = true, features = ["trace", "testing"] }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 futures-util = { workspace = true }
 temp-env = { workspace = true }
@@ -56,7 +56,7 @@ tonic = { workspace = true, features = ["router", "server"] }
 trace = ["opentelemetry/trace", "opentelemetry_sdk/trace", "opentelemetry-proto/trace"]
 metrics = ["opentelemetry/metrics", "opentelemetry_sdk/metrics", "opentelemetry-proto/metrics"]
 logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry-proto/logs"]
-internal-logs = ["tracing", "opentelemetry/internal-logs"]
+internal-logs = ["tracing", "opentelemetry_sdk/internal-logs", "opentelemetry-http/internal-logs"]
 
 # add ons
 serialize = ["serde", "serde_json"]
diff --git a/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml
@@ -17,9 +17,9 @@ default = ["reqwest-blocking"]
 reqwest-blocking = ["opentelemetry-otlp/reqwest-blocking-client"]
 
 [dependencies]
-opentelemetry = { path = "../../../opentelemetry" }
-opentelemetry_sdk = { path = "../../../opentelemetry-sdk" }
-opentelemetry-otlp = { workspace = true }
+opentelemetry = { workspace = true, features = ["trace", "metrics", "logs"] }
+opentelemetry_sdk = { workspace = true, features = ["trace", "metrics", "logs"] }
+opentelemetry-otlp = { workspace = true, features = ["reqwest-blocking-client", "http-proto", "trace", "metrics", "logs", "internal-logs"] }
 opentelemetry-appender-tracing = { workspace = true }
 
 tokio = { workspace = true, features = ["full"] }
diff --git a/opentelemetry-otlp/examples/basic-otlp/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp/Cargo.toml
@@ -13,9 +13,9 @@ path = "src/main.rs"
 bench = false
 
 [dependencies]
-opentelemetry = { path = "../../../opentelemetry" }
-opentelemetry_sdk = { path = "../../../opentelemetry-sdk" }
-opentelemetry-otlp = { workspace = true, features = ["grpc-tonic"] }
+opentelemetry = { workspace = true, features = ["trace", "metrics", "logs"] }
+opentelemetry_sdk = { workspace = true, features = ["trace", "metrics", "logs"] }
+opentelemetry-otlp = { workspace = true, features = ["grpc-tonic", "trace", "metrics", "logs", "internal-logs"] }
 tokio = { workspace = true, features = ["full"] }
 opentelemetry-appender-tracing = { workspace = true }
 tracing = { workspace = true, features = ["std"]}
diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
@@ -54,15 +54,15 @@ with-serde = ["serde", "const-hex", "base64"]
 [dependencies]
 tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
 prost = { workspace = true, optional = true }
-opentelemetry = { version = "0.30", default-features = false, path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.30", default-features = false, path = "../opentelemetry-sdk" }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true, features = ["serde_derive"] }
 const-hex = { workspace = true, optional = true }
 base64 = { workspace = true, optional = true }
 
 [dev-dependencies]
-opentelemetry = { features = ["testing"], path = "../opentelemetry" }
+opentelemetry = { workspace = true, features = ["testing"] }
 tonic-build = { workspace = true }
 prost-build = { workspace = true }
 tempfile = { workspace = true }
diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml
@@ -11,8 +11,8 @@ rust-version = "1.75.0"
 autobenches = false
 
 [dependencies]
-opentelemetry = { version = "0.30", path = "../opentelemetry/" }
-opentelemetry-http = { version = "0.30", path = "../opentelemetry-http", optional = true }
+opentelemetry = { workspace = true }
+opentelemetry-http = { workspace = true, optional = true }
 futures-channel = { workspace = true }
 futures-executor = { workspace = true }
 futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
@@ -42,7 +42,7 @@ pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
 default = ["trace", "metrics", "logs", "internal-logs"]
 trace = ["opentelemetry/trace", "rand", "percent-encoding"]
 jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url", "experimental_async_runtime"]
-logs = ["opentelemetry/logs", "serde_json"]
+logs = ["opentelemetry/logs", "opentelemetry/trace", "serde_json"]
 spec_unstable_logs_enabled = ["logs", "opentelemetry/spec_unstable_logs_enabled"]
 metrics = ["opentelemetry/metrics"]
 testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]
diff --git a/opentelemetry-semantic-conventions/Cargo.toml b/opentelemetry-semantic-conventions/Cargo.toml
@@ -25,8 +25,8 @@ default = []
 semconv_experimental = []
 
 [dev-dependencies]
-opentelemetry = { default-features = false, path = "../opentelemetry" } # for doctests
-opentelemetry_sdk = { features = ["trace"], path = "../opentelemetry-sdk" } # for doctests
+opentelemetry = { workspace = true } # for doctests
+opentelemetry_sdk = { workspace = true, features = ["trace"] } # for doctests
 
 [lints]
 workspace = true
diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml
@@ -28,12 +28,10 @@ logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry_sdk/spec_
 
 [dependencies]
 chrono = { workspace = true, features = ["now"] }
-opentelemetry = { version = "0.30", path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.30", path = "../opentelemetry-sdk" }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true }
 
 [dev-dependencies]
-opentelemetry = { path = "../opentelemetry", features = ["metrics"] }
-opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics"] }
 opentelemetry-appender-tracing = { workspace = true }
 tracing = { workspace = true, features = ["std"]}
 tracing-subscriber = { workspace = true, features = ["registry", "std"] }
diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml
@@ -28,9 +28,9 @@ reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
 
 [dependencies]
 once_cell = { workspace = true }
-opentelemetry = { version = "0.30", path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.30", path = "../opentelemetry-sdk", features = ["trace"] }
-opentelemetry-http = { version = "0.30", path = "../opentelemetry-http" }
+opentelemetry = { workspace = true }
+opentelemetry_sdk = { workspace = true, features = ["trace"] }
+opentelemetry-http = { workspace = true }
 serde_json = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 typed-builder = { workspace = true }
@@ -44,7 +44,7 @@ bytes = { workspace = true }
 futures-util = { workspace = true, features = ["io"] }
 http-body-util = { workspace = true }
 hyper-util = { workspace = true, features = ["client-legacy", "http1", "tokio"] }
-opentelemetry_sdk = { default-features = false, features = ["trace", "testing"], path = "../opentelemetry-sdk" }
+opentelemetry_sdk = { workspace = true, features = ["trace", "testing"] }
 temp-env = { workspace = true }
 
 [lints]
