Skip to content

Commit fb4e64e

Browse files
authored
Merge branch 'main' into cijothomas/mig-nits
2 parents cbec960 + f3a375c commit fb4e64e

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- rust: stable
2626
os: macos-latest
2727
- rust: stable
28-
os: otel-linux-arm64
28+
os: ubuntu-22.04-arm
2929
runs-on: ${{ matrix.os }}
3030
continue-on-error: ${{ matrix.rust == 'beta' }}
3131
steps:

opentelemetry-sdk/benches/log_exporter.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use opentelemetry_sdk::logs::LogBatch;
2323
use opentelemetry_sdk::logs::LogProcessor;
2424
use opentelemetry_sdk::logs::SdkLogRecord;
2525
use opentelemetry_sdk::logs::SdkLoggerProvider;
26+
#[cfg(not(target_os = "windows"))]
2627
use pprof::criterion::{Output, PProfProfiler};
2728
use std::fmt::Debug;
2829

opentelemetry-sdk/benches/metrics_counter.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use opentelemetry::{
2020
KeyValue,
2121
};
2222
use opentelemetry_sdk::metrics::{ManualReader, SdkMeterProvider};
23+
#[cfg(not(target_os = "windows"))]
2324
use pprof::criterion::{Output, PProfProfiler};
2425
use rand::{
2526
rngs::{self},

0 commit comments

Comments
 (0)