Skip to content

Commit 4ebae2c

Browse files
authored
Upgrade to opentelemetry 0.31 (#230)
Signed-off-by: tison <[email protected]>
1 parent 4fdf560 commit 4ebae2c

File tree

3 files changed

+45
-16
lines changed

3 files changed

+45
-16
lines changed

CHANGELOG.md

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

55
- The attributes `code.filepath`, `code.lineno`, and `code.namespace` have been renamed to `code.file.path`, and
66
`code.line.number`, and `code.module.name`, to align with the opentelemetry semantic conventions for code.
7+
- Upgrade from opentelemetry 0.30.0 to 0.31.0. Refer to the upstream
8+
[changelog](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-sdk/CHANGELOG.md#0310)
9+
for more information.
710

811
### Removed
912

Cargo.toml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@ rust-version = "1.75.0"
1818
[features]
1919
default = ["tracing-log", "metrics"]
2020
# Enables support for exporting OpenTelemetry metrics
21-
metrics = ["opentelemetry/metrics","opentelemetry_sdk/metrics", "smallvec"]
21+
metrics = ["opentelemetry/metrics", "opentelemetry_sdk/metrics", "smallvec"]
2222

2323
[dependencies]
24-
opentelemetry = { version = "0.30.0", default-features = false, features = ["trace"] }
25-
opentelemetry_sdk = { version = "0.30.0", default-features = false, features = ["trace"] }
24+
opentelemetry = { version = "0.31.0", default-features = false, features = [
25+
"trace",
26+
] }
27+
opentelemetry_sdk = { version = "0.31.0", default-features = false, features = [
28+
"trace",
29+
] }
2630
tracing = { version = "0.1.35", default-features = false, features = ["std"] }
2731
tracing-core = "0.1.28"
28-
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std"] }
32+
tracing-subscriber = { version = "0.3.0", default-features = false, features = [
33+
"registry",
34+
"std",
35+
] }
2936
tracing-log = { version = "0.2.0", default-features = false, optional = true }
3037
rustversion = "1.0.9"
3138
smallvec = { version = "1.0", optional = true }
@@ -36,18 +43,37 @@ lazy_static = { version = "1.0.2", optional = true }
3643

3744
[dev-dependencies]
3845
async-trait = "0.1.56"
39-
criterion = { version = "0.5.1", default-features = false, features = ["html_reports"] }
40-
opentelemetry = { version = "0.30.0", features = ["trace", "metrics"] }
41-
opentelemetry_sdk = { version = "0.30.0", default-features = false, features = ["trace", "rt-tokio", "experimental_metrics_custom_reader", "testing"] }
42-
opentelemetry-stdout = { version = "0.30.0", features = ["trace", "metrics"] }
43-
opentelemetry-otlp = { version = "0.30.0", features = ["metrics", "grpc-tonic"] }
44-
opentelemetry-semantic-conventions = { version = "0.30.0", features = ["semconv_experimental"] }
46+
criterion = { version = "0.5.1", default-features = false, features = [
47+
"html_reports",
48+
] }
49+
opentelemetry = { version = "0.31.0", features = ["trace", "metrics"] }
50+
opentelemetry_sdk = { version = "0.31.0", default-features = false, features = [
51+
"trace",
52+
"rt-tokio",
53+
"experimental_metrics_custom_reader",
54+
"testing",
55+
] }
56+
opentelemetry-stdout = { version = "0.31.0", features = ["trace", "metrics"] }
57+
opentelemetry-otlp = { version = "0.31.0", features = [
58+
"metrics",
59+
"grpc-tonic",
60+
] }
61+
opentelemetry-semantic-conventions = { version = "0.31.0", features = [
62+
"semconv_experimental",
63+
] }
4564
futures-util = { version = "0.3.17", default-features = false }
4665
tokio = { version = "1", features = ["full"] }
4766
tokio-stream = "0.1"
48-
tracing = { version = "0.1.35", default-features = false, features = ["std", "attributes"] }
67+
tracing = { version = "0.1.35", default-features = false, features = [
68+
"std",
69+
"attributes",
70+
] }
4971
tracing-error = "0.2.0"
50-
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std", "fmt"] }
72+
tracing-subscriber = { version = "0.3.0", default-features = false, features = [
73+
"registry",
74+
"std",
75+
"fmt",
76+
] }
5177

5278
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
5379
pprof = { version = "0.15.0", features = ["flamegraph", "criterion"] }

tests/span_ext.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ fn test_add_link_variants() {
171171
let (_tracer, provider, exporter, subscriber) = test_tracer();
172172

173173
let link_builder_cx = opentelemetry::trace::SpanContext::new(
174-
opentelemetry::trace::TraceId::from_u128(0x1234567890abcdef1234567890abcdef),
175-
opentelemetry::trace::SpanId::from_u64(0x1234567890abcdef),
174+
opentelemetry::trace::TraceId::from(0x1234567890abcdef1234567890abcdef),
175+
opentelemetry::trace::SpanId::from(0x1234567890abcdef),
176176
opentelemetry::trace::TraceFlags::default(),
177177
true, // Is remote
178178
opentelemetry::trace::TraceState::default(),
179179
);
180180
let link_current_cx = opentelemetry::trace::SpanContext::new(
181-
opentelemetry::trace::TraceId::from_u128(0xabcdef1234567890abcdef1234567890),
182-
opentelemetry::trace::SpanId::from_u64(0xabcdef1234567890),
181+
opentelemetry::trace::TraceId::from(0xabcdef1234567890abcdef1234567890),
182+
opentelemetry::trace::SpanId::from(0xabcdef1234567890),
183183
opentelemetry::trace::TraceFlags::default(),
184184
true, // Is remote
185185
opentelemetry::trace::TraceState::default(),

0 commit comments

Comments
 (0)