Skip to content

Commit f074984

Browse files
authored
Merge branch 'main' into temporality-selector
2 parents 048c9b9 + 6422524 commit f074984

File tree

17 files changed

+72
-566
lines changed

17 files changed

+72
-566
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
coverage:
132132
continue-on-error: true
133133
runs-on: ubuntu-latest
134+
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }}
134135
steps:
135136
- uses: actions/checkout@v4
136137
with:

Cargo.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,31 @@ debug = 1
3838
async-std = "1.10"
3939
async-trait = "0.1"
4040
bytes = "1"
41-
env_logger = "0.10" # env_logger requires a newer MSRV
41+
env_logger = { version = "0.10", default-features = false } # env_logger requires a newer MSRV
4242
futures-core = "0.3"
4343
futures-executor = "0.3"
44-
futures-util = "0.3"
45-
hyper = "0.14"
46-
http = "0.2"
47-
isahc = "1.4"
44+
futures-util = { version = "0.3", default-features = false }
45+
hyper = { version = "0.14", default-features = false }
46+
http = { version = "0.2", default-features = false }
47+
isahc = { version = "1.4", default-features = false }
4848
log = "0.4"
4949
once_cell = "1.13"
5050
ordered-float = "4.0"
5151
pin-project-lite = "0.2"
5252
prost = "0.12"
5353
prost-build = "0.12"
5454
prost-types = "0.12"
55-
rand = "0.8"
56-
reqwest = "0.11"
57-
serde = "1.0"
55+
rand = { version = "0.8", default-features = false }
56+
reqwest = { version = "0.11", default-features = false }
57+
serde = { version = "1.0", default-features = false }
5858
serde_json = "1.0"
5959
temp-env = "0.3.6"
60-
thiserror = "1"
61-
tonic = "0.11"
60+
thiserror = { version = "1", default-features = false }
61+
tonic = { version = "0.11", default-features = false }
6262
tonic-build = "0.11"
63-
tokio = "1"
63+
tokio = { version = "1", default-features = false }
6464
tokio-stream = "0.1.1"
65-
tracing = "0.1"
66-
tracing-core = "0.1"
67-
tracing-subscriber = "0.3"
68-
url = "2.2"
65+
tracing = { version = "0.1", default-features = false }
66+
tracing-core = { version = "0.1", default-features = false }
67+
tracing-subscriber = { version = "0.3", default-features = false }
68+
url = { version = "2.2", default-features = false }

README.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ Project versioning information and stability guarantees can be found
6666
```rust
6767
use opentelemetry::{
6868
global,
69-
sdk::trace::TracerProvider,
7069
trace::{Tracer, TracerProvider as _},
7170
};
71+
use opentelemetry_sdk::trace::TracerProvider;
7272

7373
fn main() {
7474
// Create a new trace pipeline that prints to stdout
@@ -86,6 +86,16 @@ fn main() {
8686
}
8787
```
8888

89+
The example above requires the following packages:
90+
91+
```toml
92+
# Cargo.toml
93+
[dependencies]
94+
opentelemetry = "0.21"
95+
opentelemetry_sdk = "0.21"
96+
opentelemetry-stdout = { version = "0.2", features = ["trace"] }
97+
```
98+
8999
See the [examples](./examples) directory for different integration patterns.
90100

91101
## Ecosystem

examples/tracing-grpc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ path = "src/client.rs"
1515

1616
[dependencies]
1717
opentelemetry = { path = "../../opentelemetry" }
18-
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"]}
18+
opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
1919
opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["trace"] }
2020
prost = { workspace = true }
2121
tokio = { workspace = true, features = ["full"] }

opentelemetry-jaeger-propagator/Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,8 @@ opentelemetry = { version = "0.21", default-features = false, features = [
2525
"trace",
2626
], path = "../opentelemetry" }
2727

28-
tonic = { workspace = true, optional = true }
29-
prost = { workspace = true, optional = true }
30-
prost-types = { workspace = true, optional = true }
31-
3228
[dev-dependencies]
3329
opentelemetry_sdk = { features = ["testing"], path = "../opentelemetry-sdk" }
3430

3531
[features]
3632
default = []
37-
integration_test = []

opentelemetry-jaeger-propagator/src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,5 @@
8888
///
8989
/// [jaeger propagation format]: https://www.jaegertracing.io/docs/1.18/client-libraries/#propagation-format
9090
pub mod propagator;
91-
#[cfg(feature = "integration_test")]
92-
#[doc(hidden)]
93-
pub mod testing;
9491

9592
pub use propagator::Propagator;

0 commit comments

Comments
 (0)