Skip to content

Commit 81fea07

Browse files
rex4539cijothomas
andauthored
Avoid duplicate crates (open-telemetry#2703)
Co-authored-by: Cijo Thomas <cijo.thomas@gmail.com>
1 parent bfd9f31 commit 81fea07

File tree

18 files changed

+66
-41
lines changed

18 files changed

+66
-41
lines changed

Cargo.toml

+25
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,31 @@ tracing = { version = ">=0.1.40", default-features = false }
5353
tracing-core = { version = ">=0.1.33", default-features = false }
5454
tracing-subscriber = { version = "0.3", default-features = false }
5555
url = { version = "2.5", default-features = false }
56+
anyhow = "1.0.94"
57+
base64 = "0.22.1"
58+
chrono = { version = "0.4.34", default-features = false }
59+
ctor = "0.2.9"
60+
ctrlc = "3.2.5"
61+
futures-channel = "0.3"
62+
futures-sink = "0.3"
63+
glob = "0.3.1"
64+
hex = "0.4.3"
65+
lazy_static = "1.4.0"
66+
num-format = "0.4.4"
67+
num_cpus = "1.15.0"
68+
opentelemetry-appender-tracing = { path = "opentelemetry-appender-tracing", default-features = false }
69+
opentelemetry-otlp = { path = "opentelemetry-otlp" }
70+
opentelemetry-stdout = { path = "opentelemetry-stdout" }
71+
percent-encoding = "2.0"
72+
rstest = "0.23.0"
73+
schemars = "0.8"
74+
sysinfo = "0.32"
75+
tempfile = "3.3.0"
76+
testcontainers = "0.23.1"
77+
tracing-log = "0.2"
78+
tracing-opentelemetry = "0.29"
79+
typed-builder = "0.20"
80+
uuid = "1.3"
5681

5782
# Aviod use of crates.io version of these crates through the tracing-opentelemetry dependencies
5883
[patch.crates-io]

examples/logs-basic/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ publish = false
77

88
[dependencies]
99
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
10-
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]}
11-
opentelemetry-appender-tracing = { path = "../../opentelemetry-appender-tracing", default-features = false}
10+
opentelemetry-stdout = { workspace = true, features = ["logs"] }
11+
opentelemetry-appender-tracing = { workspace = true }
1212
tracing = { workspace = true, features = ["std"]}
1313
tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }

examples/metrics-advanced/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ publish = false
88
[dependencies]
99
opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
1010
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["spec_unstable_metrics_views", "rt-tokio"] }
11-
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"] }
11+
opentelemetry-stdout = { workspace = true, features = ["metrics"] }
1212
tokio = { workspace = true, features = ["full"] }

examples/metrics-basic/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ publish = false
88
[dependencies]
99
opentelemetry = { path = "../../opentelemetry", features = ["metrics"] }
1010
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["metrics", "rt-tokio"] }
11-
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["metrics"]}
11+
opentelemetry-stdout = { workspace = true, features = ["metrics"] }
1212
tokio = { workspace = true, features = ["full"] }
1313

examples/tracing-grpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ path = "src/client.rs"
1616
[dependencies]
1717
opentelemetry = { path = "../../opentelemetry" }
1818
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
19-
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] }
19+
opentelemetry-stdout = { workspace = true, features = ["trace"] }
2020
prost = { workspace = true }
2121
tokio = { workspace = true, features = ["full"] }
2222
tonic = { workspace = true, features = ["server"] }

examples/tracing-http-propagator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ tokio = { workspace = true, features = ["full"] }
2323
opentelemetry = { path = "../../opentelemetry" }
2424
opentelemetry_sdk = { path = "../../opentelemetry-sdk" }
2525
opentelemetry-http = { path = "../../opentelemetry-http" }
26-
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] }
26+
opentelemetry-stdout = { workspace = true, features = ["trace"] }
2727
opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }

examples/tracing-jaeger/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ publish = false
88
[dependencies]
99
opentelemetry = { path = "../../opentelemetry" }
1010
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
11-
opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] }
11+
opentelemetry-otlp = { workspace = true, features = ["tonic"] }
1212
tokio = { workspace = true, features = ["full"] }

opentelemetry-appender-log/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ opentelemetry_sdk = { path = "../opentelemetry-sdk", features = [
3030
"testing",
3131
"spec_unstable_logs_enabled",
3232
] }
33-
opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] }
33+
opentelemetry-stdout = { workspace = true, features = ["logs"] }
3434
log = { workspace = true, features = ["kv_serde"] }
3535
tokio = { workspace = true }
3636
serde = { workspace = true, features = ["std", "derive"] }

opentelemetry-appender-tracing/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ log = { workspace = true, optional = true }
1515
opentelemetry = { version = "0.28", path = "../opentelemetry", features = ["logs"] }
1616
tracing = { workspace = true, features = ["std"]}
1717
tracing-core = { workspace = true }
18-
tracing-log = { version = "0.2", optional = true }
18+
tracing-log = { workspace = true, optional = true }
1919
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
20-
tracing-opentelemetry = { version = "0.29", optional = true }
20+
tracing-opentelemetry = { workspace = true, optional = true }
2121

2222
[dev-dependencies]
2323
log = { workspace = true }
24-
opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] }
24+
opentelemetry-stdout = { workspace = true, features = ["logs"] }
2525
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["logs", "testing"] }
2626
tracing = { workspace = true, features = ["std"]}
2727
tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
28-
tracing-log = "0.2"
28+
tracing-log = { workspace = true }
2929
criterion = { workspace = true }
3030
tokio = { workspace = true, features = ["full"]}
3131

opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ reqwest-blocking = ["opentelemetry-otlp/reqwest-blocking-client"]
1212
[dependencies]
1313
opentelemetry = { path = "../../../opentelemetry" }
1414
opentelemetry_sdk = { path = "../../../opentelemetry-sdk" }
15-
opentelemetry-otlp = { path = "../.."}
16-
opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing"}
15+
opentelemetry-otlp = { workspace = true }
16+
opentelemetry-appender-tracing = { workspace = true }
1717

1818
tokio = { workspace = true, features = ["full"] }
1919
tracing = { workspace = true, features = ["std"]}

opentelemetry-otlp/examples/basic-otlp/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ publish = false
88
[dependencies]
99
opentelemetry = { path = "../../../opentelemetry" }
1010
opentelemetry_sdk = { path = "../../../opentelemetry-sdk" }
11-
opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["grpc-tonic"] }
12-
tokio = { version = "1.0", features = ["full"] }
13-
opentelemetry-appender-tracing = { path = "../../../opentelemetry-appender-tracing"}
11+
opentelemetry-otlp = { workspace = true, features = ["grpc-tonic"] }
12+
tokio = { workspace = true, features = ["full"] }
13+
opentelemetry-appender-tracing = { workspace = true }
1414
tracing = { workspace = true, features = ["std"]}
1515
tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
1616

opentelemetry-otlp/tests/integration_test/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ publish = false
88
opentelemetry = { path = "../../../opentelemetry", features = [] }
99
opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "testing"] }
1010
opentelemetry-proto = { path = "../../../opentelemetry-proto", features = ["gen-tonic-messages", "trace", "logs", "metrics", "with-serde"] }
11-
tokio = { version = "1.0", features = ["full"] }
12-
serde_json = "1"
13-
testcontainers = { version = "0.23.1", features = ["http_wait"]}
11+
tokio = { workspace = true, features = ["full"] }
12+
serde_json = { workspace = true }
13+
testcontainers = { workspace = true, features = ["http_wait"] }
1414
once_cell.workspace = true
15-
anyhow = "1.0.94"
16-
ctor = "0.2.9"
17-
uuid = { version = "1.3", features = ["v4"] }
15+
anyhow = { workspace = true }
16+
ctor = { workspace = true }
17+
uuid = { workspace = true, features = ["v4"] }
1818
tracing-subscriber = { workspace = true, features = ["env-filter","registry", "std", "fmt"] }
1919
tracing = {workspace = true}
2020

opentelemetry-proto/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,17 @@ tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
5353
prost = { workspace = true, optional = true }
5454
opentelemetry = { version = "0.28", default-features = false, path = "../opentelemetry" }
5555
opentelemetry_sdk = { version = "0.28", default-features = false, path = "../opentelemetry-sdk" }
56-
schemars = { version = "0.8", optional = true }
56+
schemars = { workspace = true, optional = true }
5757
serde = { workspace = true, optional = true, features = ["serde_derive"] }
58-
hex = { version = "0.4.3", optional = true }
58+
hex = { workspace = true, optional = true }
5959
tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging
60-
base64 = { version = "0.22.1", optional = true }
60+
base64 = { workspace = true, optional = true }
6161

6262
[dev-dependencies]
6363
opentelemetry = { features = ["testing"], path = "../opentelemetry" }
6464
tonic-build = { workspace = true }
6565
prost-build = { workspace = true }
66-
tempfile = "3.3.0"
66+
tempfile = { workspace = true }
6767
serde_json = { workspace = true }
6868

6969
[lints]

opentelemetry-sdk/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ rust-version = "1.75.0"
1313
opentelemetry = { version = "0.28", path = "../opentelemetry/" }
1414
opentelemetry-http = { version = "0.28", path = "../opentelemetry-http", optional = true }
1515
async-std = { workspace = true, features = ["unstable"], optional = true }
16-
futures-channel = "0.3"
16+
futures-channel = { workspace = true }
1717
futures-executor = { workspace = true }
1818
futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
19-
percent-encoding = { version = "2.0", optional = true }
19+
percent-encoding = { workspace = true, optional = true }
2020
rand = { workspace = true, features = ["std", "std_rng", "small_rng", "os_rng", "thread_rng"], optional = true }
21-
glob = { version = "0.3.1", optional =true}
21+
glob = { workspace = true, optional = true }
2222
serde = { workspace = true, features = ["derive", "rc"], optional = true }
2323
serde_json = { workspace = true, optional = true }
2424
thiserror = { workspace = true }
@@ -34,7 +34,7 @@ rustdoc-args = ["--cfg", "docsrs"]
3434

3535
[dev-dependencies]
3636
criterion = { workspace = true, features = ["html_reports"] }
37-
rstest = "0.23.0"
37+
rstest = { workspace = true }
3838
temp-env = { workspace = true }
3939

4040
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]

opentelemetry-stdout/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ metrics = ["opentelemetry/metrics", "opentelemetry_sdk/metrics"]
2626
logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry_sdk/spec_unstable_logs_enabled"]
2727

2828
[dependencies]
29-
chrono = { version = "0.4.34", default-features = false, features = ["now"] }
29+
chrono = { workspace = true, features = ["now"] }
3030
futures-util = { workspace = true, optional = true }
3131
opentelemetry = { version = "0.28", path = "../opentelemetry" }
3232
opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk" }
3333

3434
[dev-dependencies]
3535
opentelemetry = { path = "../opentelemetry", features = ["metrics"] }
3636
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["rt-tokio", "metrics"] }
37-
opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing"}
37+
opentelemetry-appender-tracing = { workspace = true }
3838
tracing = { workspace = true, features = ["std"]}
3939
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
4040
tokio = { workspace = true, features = ["full"] }

opentelemetry-zipkin/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk", features
3232
opentelemetry-http = { version = "0.28", path = "../opentelemetry-http" }
3333
serde_json = { workspace = true }
3434
serde = { workspace = true, features = ["derive"] }
35-
typed-builder = "0.20"
35+
typed-builder = { workspace = true }
3636
http = { workspace = true }
3737
reqwest = { workspace = true, optional = true }
3838
thiserror = { workspace = true }

opentelemetry/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rustdoc-args = ["--cfg", "docsrs"]
2222

2323
[dependencies]
2424
futures-core = { workspace = true, optional = true }
25-
futures-sink = { version = "0.3", optional = true }
25+
futures-sink = { workspace = true, optional = true }
2626
pin-project-lite = { workspace = true, optional = true }
2727
thiserror = { workspace = true, optional = true}
2828
tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging

stress/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ path = "src/random.rs"
4040
doc = false
4141

4242
[dependencies]
43-
ctrlc = "3.2.5"
44-
lazy_static = "1.4.0"
45-
num_cpus = "1.15.0"
43+
ctrlc = { workspace = true }
44+
lazy_static = { workspace = true }
45+
num_cpus = { workspace = true }
4646
opentelemetry = { path = "../opentelemetry", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled"] }
4747
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics", "logs", "trace", "spec_unstable_logs_enabled"] }
48-
opentelemetry-appender-tracing = { path = "../opentelemetry-appender-tracing"}
48+
opentelemetry-appender-tracing = { workspace = true }
4949
rand = { workspace = true, features = ["small_rng", "os_rng"] }
5050
tracing = { workspace = true, features = ["std"]}
5151
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
52-
num-format = "0.4.4"
53-
sysinfo = { version = "0.32", optional = true }
52+
num-format = { workspace = true }
53+
sysinfo = { workspace = true, optional = true }
5454
futures-executor = { workspace = true }
5555

5656
[features]

0 commit comments

Comments
 (0)