Skip to content

Commit dad8995

Browse files
Copilotlalitb
Copilot
and
lalitb
authored
chore: Update OpenTelemetry packages to v0.31.0 and fix breaking changes (#453)
Co-authored-by: Lalit Kumar Bhasin <[email protected]>
1 parent 0b83ef1 commit dad8995

File tree

26 files changed

+116
-84
lines changed

26 files changed

+116
-84
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# test only stable version of Rust on Windows and MacOS
2626
include:
2727
- rust: stable
28-
os: windows-2025
28+
os: windows-latest
2929
- rust: stable
3030
os: macos-latest
3131
- rust: stable
@@ -58,17 +58,17 @@ jobs:
5858
with:
5959
repo-token: ${{ secrets.GITHUB_TOKEN }}
6060
- name: Test (Windows)
61-
if: ${{ matrix.os == 'windows-2025'}}
61+
if: ${{ matrix.os == 'windows-latest'}}
6262
run: ./scripts/test.ps1
6363
shell: pwsh
6464
- name: Test (Unix)
65-
if: ${{ matrix.os != 'windows-2025'}}
65+
if: ${{ matrix.os != 'windows-latest'}}
6666
run: bash ./scripts/test.sh
6767
lint:
6868
strategy:
6969
matrix:
7070
# clippy must be run in every OS to lint platform-specific code
71-
os: [ubuntu-latest, windows-2025, macos-latest, ubuntu-22.04-arm]
71+
os: [ubuntu-latest, windows-latest, macos-latest, ubuntu-22.04-arm]
7272
runs-on: ${{ matrix.os }}
7373
steps:
7474
- name: Harden the runner (Audit all outbound calls)
@@ -89,11 +89,11 @@ jobs:
8989
- name: Format
9090
run: cargo fmt --all -- --check
9191
- name: Lint (Windows)
92-
if: ${{ matrix.os == 'windows-2025'}}
92+
if: ${{ matrix.os == 'windows-latest'}}
9393
run: ./scripts/lint.ps1
9494
shell: pwsh
9595
- name: Lint (Unix)
96-
if: ${{ matrix.os != 'windows-2025'}}
96+
if: ${{ matrix.os != 'windows-latest'}}
9797
run: ./scripts/lint.sh
9898
msrv:
9999
strategy:

‎Cargo.toml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ resolver = "2"
2929
debug = 1
3030

3131
[workspace.dependencies]
32-
opentelemetry = "0.30"
33-
opentelemetry-appender-tracing = "0.30"
34-
opentelemetry-http = "0.30"
35-
opentelemetry-proto = { version = "0.30", default-features = false }
36-
opentelemetry_sdk = { version = "0.30", default-features = false }
37-
opentelemetry-stdout = "0.30"
38-
opentelemetry-semantic-conventions = { version = "0.30", features = [
32+
opentelemetry = "0.31"
33+
opentelemetry-appender-tracing = "0.31"
34+
opentelemetry-http = "0.31"
35+
opentelemetry-proto = { version = "0.31", default-features = false }
36+
opentelemetry_sdk = { version = "0.31", default-features = false }
37+
opentelemetry-stdout = "0.31"
38+
opentelemetry-semantic-conventions = { version = "0.31", features = [
3939
"semconv_experimental",
4040
] }
4141
criterion = "0.7"

‎opentelemetry-contrib/src/trace/propagator/binary/base64_format.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ mod tests {
4949
fn to_base64_data() -> Vec<(SpanContext, String)> {
5050
vec![
5151
(SpanContext::new(
52-
TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
53-
SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()),
52+
TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
53+
SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()),
5454
"AABL+S81d7NNpqPOkp0ODkc2AQDwZ6oLqQK3AgE=".to_string()
5555
),
5656
(SpanContext::new(
57-
TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
58-
SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()),
57+
TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
58+
SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()),
5959
"AABL+S81d7NNpqPOkp0ODkc2AQDwZ6oLqQK3AgA=".to_string()
6060
),
6161
]

‎opentelemetry-contrib/src/trace/propagator/binary/binary_propagator.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,16 @@ mod tests {
9595
vec![
9696
// Context with sampled
9797
(SpanContext::new(
98-
TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
99-
SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), [
98+
TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
99+
SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), [
100100
0x00, 0x00, 0x4b, 0xf9, 0x2f, 0x35, 0x77, 0xb3, 0x4d, 0xa6, 0xa3, 0xce, 0x92, 0x9d, 0x0e, 0x0e, 0x47, 0x36,
101101
0x01, 0x00, 0xf0, 0x67, 0xaa, 0x0b, 0xa9, 0x02, 0xb7,
102102
0x02, 0x01,
103103
]),
104104
// Context without sampled
105105
(SpanContext::new(
106-
TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
107-
SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()), [
106+
TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),
107+
SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()), [
108108
0x00, 0x00, 0x4b, 0xf9, 0x2f, 0x35, 0x77, 0xb3, 0x4d, 0xa6, 0xa3, 0xce, 0x92, 0x9d, 0x0e, 0x0e, 0x47, 0x36,
109109
0x01, 0x00, 0xf0, 0x67, 0xaa, 0x0b, 0xa9, 0x02, 0xb7,
110110
0x02, 0x00,
@@ -118,19 +118,19 @@ mod tests {
118118
fn from_bytes_data() -> Vec<(SpanContext, Vec<u8>)> {
119119
vec![
120120
// Future version of the proto
121-
(SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), vec![
121+
(SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), vec![
122122
0x02, 0x00, 0x4b, 0xf9, 0x2f, 0x35, 0x77, 0xb3, 0x4d, 0xa6, 0xa3, 0xce, 0x92, 0x9d, 0x0e, 0x0e, 0x47, 0x36,
123123
0x01, 0x00, 0xf0, 0x67, 0xaa, 0x0b, 0xa9, 0x02, 0xb7,
124124
0x02, 0x01,
125125
]),
126126
// current version with sampled
127-
(SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), vec![
127+
(SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default()), vec![
128128
0x02, 0x00, 0x4b, 0xf9, 0x2f, 0x35, 0x77, 0xb3, 0x4d, 0xa6, 0xa3, 0xce, 0x92, 0x9d, 0x0e, 0x0e, 0x47, 0x36,
129129
0x01, 0x00, 0xf0, 0x67, 0xaa, 0x0b, 0xa9, 0x02, 0xb7,
130130
0x02, 0x01,
131131
]),
132132
// valid context without option
133-
(SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()), vec![
133+
(SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736),SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default()), vec![
134134
0x00, 0x00, 0x4b, 0xf9, 0x2f, 0x35, 0x77, 0xb3, 0x4d, 0xa6, 0xa3, 0xce, 0x92, 0x9d, 0x0e, 0x0e, 0x47, 0x36,
135135
0x01, 0x00, 0xf0, 0x67, 0xaa, 0x0b, 0xa9, 0x02, 0xb7,
136136
]),

‎opentelemetry-contrib/src/trace/propagator/trace_context_response.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ mod tests {
146146
#[rustfmt::skip]
147147
fn extract_data() -> Vec<(&'static str, SpanContext)> {
148148
vec![
149-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default())),
150-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
151-
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
152-
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
153-
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-08", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default())),
154-
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-XYZxsf09", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
155-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01-", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
156-
("01-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
149+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default())),
150+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
151+
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
152+
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
153+
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-08", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::default())),
154+
("02-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-XYZxsf09", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
155+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01-", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
156+
("01-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-09-", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::default())),
157157
]
158158
}
159159

@@ -182,9 +182,9 @@ mod tests {
182182
#[rustfmt::skip]
183183
fn inject_data() -> Vec<(&'static str, SpanContext)> {
184184
vec![
185-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())),
186-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())),
187-
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from_u128(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from_u64(0x00f0_67aa_0ba9_02b7), TraceFlags::new(0xff), true, TraceState::from_str("foo=bar").unwrap())),
185+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::SAMPLED, true, TraceState::from_str("foo=bar").unwrap())),
186+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-00", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::default(), true, TraceState::from_str("foo=bar").unwrap())),
187+
("00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01", SpanContext::new(TraceId::from(0x4bf9_2f35_77b3_4da6_a3ce_929d_0e0e_4736), SpanId::from(0x00f0_67aa_0ba9_02b7), TraceFlags::new(0xff), true, TraceState::from_str("foo=bar").unwrap())),
188188
("", SpanContext::empty_context()),
189189
]
190190
}

‎opentelemetry-datadog/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg", "docsrs"]
1818
[features]
1919
default = ["intern-ahash"]
2020
agent-sampling = []
21-
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
21+
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest-blocking"]
2222
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]
2323
surf-client = ["dep:surf"]
2424
intern-ahash = ["ahash"]

‎opentelemetry-datadog/benches/datadog_exporter.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ fn get_array_of_booleans(rng: &mut ThreadRng) -> Value {
126126

127127
fn get_span(trace_id: u128, parent_span_id: u64, span_id: u64, rng: &mut ThreadRng) -> SpanData {
128128
let span_context = SpanContext::new(
129-
TraceId::from_u128(trace_id),
130-
SpanId::from_u64(span_id),
129+
TraceId::from(trace_id),
130+
SpanId::from(span_id),
131131
TraceFlags::default(),
132132
false,
133133
TraceState::default(),
@@ -165,7 +165,8 @@ fn get_span(trace_id: u128, parent_span_id: u64, span_id: u64, rng: &mut ThreadR
165165

166166
SpanData {
167167
span_context,
168-
parent_span_id: SpanId::from_u64(parent_span_id),
168+
parent_span_id: SpanId::from(parent_span_id),
169+
parent_span_is_remote: false,
169170
span_kind: SpanKind::Client,
170171
name: "resource".into(),
171172
start_time,

‎opentelemetry-datadog/src/exporter/model/mod.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ pub(crate) mod tests {
215215

216216
pub(crate) fn get_span(trace_id: u128, parent_span_id: u64, span_id: u64) -> trace::SpanData {
217217
let span_context = SpanContext::new(
218-
TraceId::from_u128(trace_id),
219-
SpanId::from_u64(span_id),
218+
TraceId::from(trace_id),
219+
SpanId::from(span_id),
220220
TraceFlags::default(),
221221
false,
222222
TraceState::default(),
@@ -232,7 +232,8 @@ pub(crate) mod tests {
232232

233233
trace::SpanData {
234234
span_context,
235-
parent_span_id: SpanId::from_u64(parent_span_id),
235+
parent_span_id: SpanId::from(parent_span_id),
236+
parent_span_is_remote: false,
236237
span_kind: SpanKind::Client,
237238
name: "resource".into(),
238239
start_time,

0 commit comments

Comments
 (0)