Skip to content

Commit d4b9bef

Browse files
authored
Match API and SDK crate name underscores (#875)
1 parent b9e6e64 commit d4b9bef

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

examples/jaeger-remote-sampler/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
opentelemetry-sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio", "jaeger_remote_sampler"] }
8-
opentelemetry-api = { path = "../../opentelemetry-api" }
7+
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio", "jaeger_remote_sampler"] }
8+
opentelemetry_api = { path = "../../opentelemetry-api" }
99
opentelemetry-http = { path = "../../opentelemetry-http", features = ["reqwest"] }
1010
reqwest = "0.11.10"
1111
tokio = { version = "1.18", features = ["macros", "rt-multi-thread"] }

opentelemetry-api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "opentelemetry-api"
2+
name = "opentelemetry_api"
33
version = "0.18.0"
44
description = "OpenTelemetry is a metrics collection and distributed tracing framework"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust"

opentelemetry-api/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
The Rust [OpenTelemetry](https://opentelemetry.io/) implementation.
88

9-
[![Crates.io: opentelemetry-api](https://img.shields.io/crates/v/opentelemetry-api.svg)](https://crates.io/crates/opentelemetry-api)
10-
[![Documentation](https://docs.rs/opentelemetry-api/badge.svg)](https://docs.rs/opentelemetry-api)
11-
[![LICENSE](https://img.shields.io/crates/l/opentelemetry-api)](./LICENSE)
9+
[![Crates.io: opentelemetry-api](https://img.shields.io/crates/v/opentelemetry_api.svg)](https://crates.io/crates/opentelemetry_api)
10+
[![Documentation](https://docs.rs/opentelemetry_api/badge.svg)](https://docs.rs/opentelemetry_api)
11+
[![LICENSE](https://img.shields.io/crates/l/opentelemetry_api)](./LICENSE)
1212
[![GitHub Actions CI](https://github.com/open-telemetry/opentelemetry-rust/workflows/CI/badge.svg)](https://github.com/open-telemetry/opentelemetry-rust/actions?query=workflow%3ACI+branch%3Amain)
1313
[![codecov](https://codecov.io/gh/open-telemetry/opentelemetry-rust/branch/main/graph/badge.svg)](https://codecov.io/gh/open-telemetry/opentelemetry-rust)
1414
[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/open-telemetry/opentelemetry-rust)
@@ -29,4 +29,4 @@ observability tools.
2929

3030
[Prometheus]: https://prometheus.io
3131
[Jaeger]: https://www.jaegertracing.io
32-
[msrv]: #supported-rust-versions
32+
[msrv]: #supported-rust-versions

opentelemetry-http/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bytes = "1"
1515
http = "0.2"
1616
hyper = { version = "0.14", default-features = false, features = ["http2", "client", "tcp"], optional = true }
1717
isahc = { version = "1.4", default-features = false, optional = true }
18-
opentelemetry-api = { version = "0.18", path = "../opentelemetry-api", features = ["trace"] }
18+
opentelemetry_api = { version = "0.18", path = "../opentelemetry-api", features = ["trace"] }
1919
reqwest = { version = "0.11", default-features = false, features = ["blocking"], optional = true }
2020
surf = { version = "2.0", default-features = false, optional = true }
2121
tokio = { version = "1.0", default-features = false, features = ["time"], optional = true }

opentelemetry-sdk/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "opentelemetry-sdk"
2+
name = "opentelemetry_sdk"
33
version = "0.18.0"
44
description = "The SDK for the OpenTelemetry metrics collection and distributed tracing framework"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust"
@@ -10,7 +10,7 @@ edition = "2021"
1010
rust-version = "1.56"
1111

1212
[dependencies]
13-
opentelemetry-api = { version = "0.18", path = "../opentelemetry-api/" }
13+
opentelemetry_api = { version = "0.18", path = "../opentelemetry-api/" }
1414
opentelemetry-http = { version = "0.7.0", path = "../opentelemetry-http", optional = true }
1515
async-std = { version = "1.6", features = ["unstable"], optional = true }
1616
async-trait = { version = "0.1", optional = true }
@@ -42,10 +42,10 @@ rand_distr = "0.4.0"
4242

4343
[features]
4444
default = ["trace"]
45-
trace = ["opentelemetry-api/trace", "crossbeam-channel", "rand", "async-trait", "percent-encoding"]
45+
trace = ["opentelemetry_api/trace", "crossbeam-channel", "rand", "async-trait", "percent-encoding"]
4646
jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url"]
47-
metrics = ["opentelemetry-api/metrics", "dashmap", "fnv"]
48-
testing = ["opentelemetry-api/testing", "trace", "metrics", "rt-async-std", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]
47+
metrics = ["opentelemetry_api/metrics", "dashmap", "fnv"]
48+
testing = ["opentelemetry_api/testing", "trace", "metrics", "rt-async-std", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]
4949
rt-tokio = ["tokio", "tokio-stream"]
5050
rt-tokio-current-thread = ["tokio", "tokio-stream"]
5151
rt-async-std = ["async-std"]

opentelemetry-sdk/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
The Rust [OpenTelemetry](https://opentelemetry.io/) implementation.
88

9-
[![Crates.io: opentelemetry-sdk](https://img.shields.io/crates/v/opentelemetry-sdk.svg)](https://crates.io/crates/opentelemetry-sdk)
10-
[![Documentation](https://docs.rs/opentelemetry-sdk/badge.svg)](https://docs.rs/opentelemetry-sdk)
11-
[![LICENSE](https://img.shields.io/crates/l/opentelemetry-sdk)](./LICENSE)
9+
[![Crates.io: opentelemetry-sdk](https://img.shields.io/crates/v/opentelemetry_sdk.svg)](https://crates.io/crates/opentelemetry_sdk)
10+
[![Documentation](https://docs.rs/opentelemetry_sdk/badge.svg)](https://docs.rs/opentelemetry_sdk)
11+
[![LICENSE](https://img.shields.io/crates/l/opentelemetry_sdk)](./LICENSE)
1212
[![GitHub Actions CI](https://github.com/open-telemetry/opentelemetry-rust/workflows/CI/badge.svg)](https://github.com/open-telemetry/opentelemetry-rust/actions?query=workflow%3ACI+branch%3Amain)
1313
[![codecov](https://codecov.io/gh/open-telemetry/opentelemetry-rust/branch/main/graph/badge.svg)](https://codecov.io/gh/open-telemetry/opentelemetry-rust)
1414
[![Gitter chat](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/open-telemetry/opentelemetry-rust)
@@ -29,4 +29,4 @@ observability tools.
2929

3030
[Prometheus]: https://prometheus.io
3131
[Jaeger]: https://www.jaegertracing.io
32-
[msrv]: #supported-rust-versions
32+
[msrv]: #supported-rust-versions

opentelemetry/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ all-features = true
2121
rustdoc-args = ["--cfg", "docsrs"]
2222

2323
[dependencies]
24-
opentelemetry-api = { version = "0.18.0", path = "../opentelemetry-api" }
25-
opentelemetry-sdk = { version = "0.18.0", path = "../opentelemetry-sdk" }
24+
opentelemetry_api = { version = "0.18.0", path = "../opentelemetry-api" }
25+
opentelemetry_sdk = { version = "0.18.0", path = "../opentelemetry-sdk" }
2626

2727
[features]
2828
default = ["trace"]
29-
trace = ["opentelemetry-api/trace", "opentelemetry-sdk/trace"]
30-
metrics = ["opentelemetry-api/metrics", "opentelemetry-sdk/metrics"]
31-
testing = ["opentelemetry-api/testing", "opentelemetry-sdk/testing"]
32-
rt-tokio = ["opentelemetry-sdk/rt-tokio"]
33-
rt-tokio-current-thread = ["opentelemetry-sdk/rt-tokio-current-thread"]
34-
rt-async-std = ["opentelemetry-sdk/rt-async-std"]
29+
trace = ["opentelemetry_api/trace", "opentelemetry_sdk/trace"]
30+
metrics = ["opentelemetry_api/metrics", "opentelemetry_sdk/metrics"]
31+
testing = ["opentelemetry_api/testing", "opentelemetry_sdk/testing"]
32+
rt-tokio = ["opentelemetry_sdk/rt-tokio"]
33+
rt-tokio-current-thread = ["opentelemetry_sdk/rt-tokio-current-thread"]
34+
rt-async-std = ["opentelemetry_sdk/rt-async-std"]

0 commit comments

Comments
 (0)