Skip to content

Commit 1a90361

Browse files
authored
Merge branch 'main' into feature/update-prometheus-to-otel-27
2 parents 984b0d8 + cd54f24 commit 1a90361

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
runs-on: ubuntu-latest
133133
steps:
134134
- uses: actions/checkout@v4
135-
- uses: dtolnay/rust-toolchain@nightly
135+
- uses: dtolnay/rust-toolchain@stable
136136
with:
137137
components: rustfmt
138138
- uses: arduino/setup-protoc@v3

opentelemetry-sdk/benches/metrics_counter.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/*
22
The benchmark results:
33
criterion = "0.5.1"
4-
OS: Ubuntu 22.04.3 LTS (5.15.146.1-microsoft-standard-WSL2)
4+
rustc 1.82.0 (f6e511eec 2024-10-15)
5+
OS: Ubuntu 22.04.3 LTS (5.15.167.4-microsoft-standard-WSL2)
56
Hardware: AMD EPYC 7763 64-Core Processor - 2.44 GHz, 16vCPUs,
67
RAM: 64.0 GB
78
| Test | Average time|
89
|--------------------------------|-------------|
9-
| Counter_Add_Sorted | 193 ns |
10-
| Counter_Add_Unsorted | 209 ns |
10+
| Counter_Add_Sorted | 172 ns |
11+
| Counter_Add_Unsorted | 183 ns |
1112
| Counter_Overflow | 898 ns |
1213
| ThreadLocal_Random_Generator_5 | 37 ns |
1314
*/

opentelemetry-sdk/benches/metrics_gauge.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/*
22
The benchmark results:
33
criterion = "0.5.1"
4-
OS: Ubuntu 22.04.4 LTS (5.15.153.1-microsoft-standard-WSL2)
5-
Hardware: Intel(R) Xeon(R) Platinum 8370C CPU @ 2.80GHz, 16vCPUs,
4+
rustc 1.82.0 (f6e511eec 2024-10-15)
5+
OS: Ubuntu 22.04.4 LTS (5.15.167.4-microsoft-standard-WSL2)
6+
Hardware: AMD EPYC 7763 64-Core Processor - 2.44 GHz, 16vCPUs,
67
RAM: 64.0 GB
78
| Test | Average time|
89
|--------------------------------|-------------|
9-
| Gauge_Add | 178.37 ns |
10+
| Gauge_Add | 187.49 ns |
1011
*/
1112

1213
use criterion::{criterion_group, criterion_main, Criterion};

opentelemetry-sdk/benches/metrics_histogram.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/*
22
The benchmark results:
33
criterion = "0.5.1"
4-
OS: Ubuntu 22.04.4 LTS (5.15.153.1-microsoft-standard-WSL2)
5-
Hardware: Intel(R) Xeon(R) Platinum 8370C CPU @ 2.80GHz, 16vCPUs,
4+
rustc 1.82.0 (f6e511eec 2024-10-15)
5+
OS: Ubuntu 22.04.4 LTS (5.15.167.4-microsoft-standard-WSL2)
6+
Hardware: AMD EPYC 7763 64-Core Processor - 2.44 GHz, 16vCPUs,
67
RAM: 64.0 GB
78
| Test | Average time|
89
|--------------------------------|-------------|
9-
| Histogram_Record | 193.04 ns |
10+
| Histogram_Record | 225.04 ns |
1011
1112
*/
1213

0 commit comments

Comments
 (0)