Skip to content

Commit 4faf349

Browse files
authored
Merge branch 'main' into use_semantic_crate
2 parents eabe867 + df12c2c commit 4faf349

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/markdown-link-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install markdown-link-check
18-
run: npm install -g markdown-link-check
18+
run: npm install -g markdown-link-check@3.11.2
1919

2020
- name: Run markdown-link-check
2121
run: |

opentelemetry/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ otel_unstable = []
4242

4343
[dev-dependencies]
4444
opentelemetry_sdk = { path = "../opentelemetry-sdk" } # for documentation tests
45-
criterion = { version = "0.4", features = ["html_reports"] }
45+
criterion = { version = "0.3" }
4646

4747
[[bench]]
4848
name = "noop_metrics"

opentelemetry/benches/noop_metrics.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use criterion::{criterion_group, criterion_main, Criterion};
1+
use criterion::{black_box, criterion_group, criterion_main, Criterion};
22
use opentelemetry::{
33
metrics::{noop::NoopMeterProvider, Counter, MeterProvider as _},
44
KeyValue,
@@ -67,24 +67,24 @@ fn noop_counter_add(c: &mut Criterion) {
6767
#[allow(clippy::useless_vec)]
6868
c.bench_function("CreateVector_KeyValue", |b| {
6969
b.iter(|| {
70-
let _v1 = vec![
70+
let _v1 = black_box(vec![
7171
KeyValue::new("attribute1", "value1"),
7272
KeyValue::new("attribute2", "value2"),
7373
KeyValue::new("attribute3", "value3"),
7474
KeyValue::new("attribute4", "value4"),
75-
];
75+
]);
7676
});
7777
});
7878

7979
#[allow(clippy::useless_vec)]
8080
c.bench_function("CreateDynamicVector_StringPair", |b| {
8181
b.iter(|| {
82-
let _v1 = vec![
82+
let _v1 = black_box(vec![
8383
("attribute1", "value1"),
8484
("attribute2", "value2"),
8585
("attribute3", "value3"),
8686
("attribute4", "value4"),
87-
];
87+
]);
8888
});
8989
});
9090
}

0 commit comments

Comments
 (0)