Skip to content

Commit 7dfe35b

Browse files
committed
⬆️ upgrade to opentelemtry 0.23
FIXE Support for `[email protected]` #145
1 parent 8052745 commit 7dfe35b

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

Cargo.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,24 @@ rust-version = "1.73.0"
2323

2424
[workspace.dependencies]
2525
http = "^1"
26-
opentelemetry = { version = "0.22", features = [
26+
opentelemetry = { version = "0.23", features = [
2727
"trace",
2828
], default-features = false }
29-
opentelemetry_sdk = { version = "0.22", default-features = false, features = [
29+
opentelemetry_sdk = { version = "0.23", default-features = false, features = [
3030
"rt-tokio",
3131
] }
32-
opentelemetry-aws = { version = "0.10", default-features = false }
33-
opentelemetry-jaeger = { version = "0.21", default-features = false }
34-
opentelemetry-jaeger-propagator = { version = "0.1", default-features = false }
35-
opentelemetry-semantic-conventions = { version = "0.14", default-features = false }
36-
opentelemetry-zipkin = { version = "0.20", default-features = false }
37-
opentelemetry-otlp = { version = "0.15", default-features = false }
38-
opentelemetry-proto = { version = "0.5", default-features = false }
39-
opentelemetry-stdout = { version = "0.3" }
32+
opentelemetry-aws = { version = "0.11", default-features = false }
33+
opentelemetry-jaeger = { version = "0.22", default-features = false }
34+
opentelemetry-jaeger-propagator = { version = "0.2", default-features = false }
35+
opentelemetry-resource-detectors = { version = "0.2.0", default-features = false }
36+
opentelemetry-semantic-conventions = { version = "0.15", default-features = false }
37+
opentelemetry-zipkin = { version = "0.21", default-features = false }
38+
opentelemetry-otlp = { version = "0.16", default-features = false }
39+
opentelemetry-proto = { version = "0.6", default-features = false }
40+
opentelemetry-stdout = { version = "0.4" }
4041
tonic = { version = "0.11", default-features = false } #should be sync with opentelemetry-proto
4142
tracing = "0.1"
42-
tracing-opentelemetry = "0.23"
43+
tracing-opentelemetry = "0.24"
4344

4445
[profile.dev.package.insta]
4546
opt-level = 3

examples/axum-otlp/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
1111
"otlp",
1212
"tracing_subscriber_ext",
1313
] }
14-
opentelemetry = "0.22"
15-
opentelemetry-otlp = { version = "0.14", optional = true }
14+
opentelemetry = "0.23"
15+
opentelemetry-otlp = { version = "0.16", optional = true }
1616
serde_json = "1.0.79"
1717
tokio = { version = "1.0", features = ["full"] }
1818
tracing = "0.1"

examples/grpc/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
1010
"tracing_subscriber_ext",
1111
"logfmt",
1212
] }
13-
opentelemetry = "0.22"
13+
opentelemetry = "0.23"
1414
prost = "0.12"
1515
tokio = { version = "1.0", features = ["full"] }
16-
tonic = { version = "0.10", features = [
16+
tonic = { version = "0.11", features = [
1717
"transport",
1818
"channel",
1919
"codegen",
2020
], default-features = false }
21-
tonic-health = "0.10"
22-
tonic-reflection = "0.10"
23-
tonic-tracing-opentelemetry = "0.15" #{ path = "../../tonic-tracing-opentelemetry" }
21+
tonic-health = "0.11"
22+
tonic-reflection = "0.11"
23+
tonic-tracing-opentelemetry = { path = "../../tonic-tracing-opentelemetry" }
2424
tower = "0.4"
2525
tracing = "0.1"
2626
tracing-opentelemetry-instrumentation-sdk = "0.15" # { path = "../../tracing-opentelemetry-instrumentation-sdk" }
2727

2828
[build-dependencies]
29-
tonic-build = { version = "0.10", default-features = false, features = [
29+
tonic-build = { version = "0.11", default-features = false, features = [
3030
"transport",
3131
"prost",
3232
] }

examples/load/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
1010
"tracing_subscriber_ext",
1111
] }
1212
memory-stats = "1.1"
13-
opentelemetry = "0.22"
13+
opentelemetry = "0.23"
1414
serde_json = "1.0.79"
1515
tokio = { version = "1.0", features = ["full"] }
1616
tracing = "0.1"

init-tracing-opentelemetry/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ opentelemetry-otlp = { workspace = true, optional = true, features = [
1919
"grpc-tonic",
2020
"trace",
2121
] }
22+
opentelemetry-resource-detectors = { workspace = true }
2223
opentelemetry-stdout = { workspace = true, features = [
2324
"trace",
2425
], optional = true }
@@ -58,7 +59,11 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
5859

5960
[features]
6061
jaeger = ["dep:opentelemetry-jaeger-propagator"]
61-
otlp = ["opentelemetry-otlp/http-proto", "opentelemetry-otlp/reqwest-client", "tracer"]
62+
otlp = [
63+
"opentelemetry-otlp/http-proto",
64+
"opentelemetry-otlp/reqwest-client",
65+
"tracer",
66+
]
6267
stdout = ["dep:opentelemetry-stdout", "tracer"]
6368
tracer = ["dep:opentelemetry-semantic-conventions"]
6469
xray = ["dep:opentelemetry-aws"]

init-tracing-opentelemetry/src/resource.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use opentelemetry::KeyValue;
2-
use opentelemetry_sdk::{
3-
resource::{OsResourceDetector, ResourceDetector},
4-
Resource,
5-
};
2+
use opentelemetry_resource_detectors::OsResourceDetector;
3+
use opentelemetry_sdk::{resource::ResourceDetector, Resource};
64
use opentelemetry_semantic_conventions::resource;
75
use std::time::Duration;
86

0 commit comments

Comments
 (0)