Skip to content

Commit ac69af6

Browse files
gruebelcijothomaslalitb
authored
update rand dependency (#2681)
Co-authored-by: Cijo Thomas <[email protected]> Co-authored-by: Lalit Kumar Bhasin <[email protected]>
1 parent f4690f1 commit ac69af6

File tree

18 files changed

+70
-75
lines changed

18 files changed

+70
-75
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pin-project-lite = "0.2"
3636
prost = "0.13"
3737
prost-build = "0.13"
3838
prost-types = "0.13"
39-
rand = { version = "0.8", default-features = false }
39+
rand = { version = "0.9", default-features = false }
4040
reqwest = { version = "0.12", default-features = false }
4141
serde = { version = "1.0", default-features = false }
4242
serde_json = "1.0"

‎opentelemetry-sdk/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ futures-channel = "0.3"
1717
futures-executor = { workspace = true }
1818
futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
1919
percent-encoding = { version = "2.0", optional = true }
20-
rand = { workspace = true, features = ["std", "std_rng","small_rng"], optional = true }
20+
rand = { workspace = true, features = ["std", "std_rng", "small_rng", "os_rng", "thread_rng"], optional = true }
2121
glob = { version = "0.3.1", optional =true}
2222
serde = { workspace = true, features = ["derive", "rc"], optional = true }
2323
serde_json = { workspace = true, optional = true }

‎opentelemetry-sdk/benches/metric.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ fn bench_histogram(bound_count: usize) -> (SharedReader, Histogram<u64>) {
301301

302302
fn histograms(c: &mut Criterion) {
303303
let mut group = c.benchmark_group("Histogram");
304-
let mut rng = rand::thread_rng();
304+
let mut rng = rand::rng();
305305

306306
for bound_size in [10, 49, 50, 1000].iter() {
307307
let (_, hist) = bench_histogram(*bound_size);
@@ -313,7 +313,7 @@ fn histograms(c: &mut Criterion) {
313313
format!("V,{},{},{}", bound_size, attr_size, i),
314314
))
315315
}
316-
let value: u64 = rng.gen_range(0..MAX_BOUND).try_into().unwrap();
316+
let value: u64 = rng.random_range(0..MAX_BOUND).try_into().unwrap();
317317
group.bench_function(
318318
format!("Record{}Attrs{}bounds", attr_size, bound_size),
319319
|b| b.iter(|| hist.record(value, &attributes)),

‎opentelemetry-sdk/benches/metrics_counter.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use std::cell::RefCell;
3030

3131
thread_local! {
3232
/// Store random number generator for each thread
33-
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_entropy());
33+
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_os_rng());
3434
}
3535

3636
static ATTRIBUTE_VALUES: [&str; 10] = [
@@ -75,10 +75,10 @@ fn counter_add_sorted(c: &mut Criterion) {
7575
CURRENT_RNG.with(|rng| {
7676
let mut rng = rng.borrow_mut();
7777
[
78-
rng.gen_range(0..4),
79-
rng.gen_range(0..4),
80-
rng.gen_range(0..10),
81-
rng.gen_range(0..10),
78+
rng.random_range(0..4),
79+
rng.random_range(0..4),
80+
rng.random_range(0..10),
81+
rng.random_range(0..10),
8282
]
8383
})
8484
},
@@ -111,10 +111,10 @@ fn counter_add_unsorted(c: &mut Criterion) {
111111
CURRENT_RNG.with(|rng| {
112112
let mut rng = rng.borrow_mut();
113113
[
114-
rng.gen_range(0..4),
115-
rng.gen_range(0..4),
116-
rng.gen_range(0..10),
117-
rng.gen_range(0..10),
114+
rng.random_range(0..4),
115+
rng.random_range(0..4),
116+
rng.random_range(0..10),
117+
rng.random_range(0..10),
118118
]
119119
})
120120
},
@@ -147,10 +147,10 @@ fn counter_add_sorted_with_non_static_values(c: &mut Criterion, attribute_values
147147
CURRENT_RNG.with(|rng| {
148148
let mut rng = rng.borrow_mut();
149149
[
150-
rng.gen_range(0..4),
151-
rng.gen_range(0..4),
152-
rng.gen_range(0..10),
153-
rng.gen_range(0..10),
150+
rng.random_range(0..4),
151+
rng.random_range(0..4),
152+
rng.random_range(0..10),
153+
rng.random_range(0..10),
154154
]
155155
})
156156
},
@@ -199,10 +199,10 @@ fn counter_overflow(c: &mut Criterion) {
199199
let rands = CURRENT_RNG.with(|rng| {
200200
let mut rng = rng.borrow_mut();
201201
[
202-
rng.gen_range(0..4),
203-
rng.gen_range(0..4),
204-
rng.gen_range(0..10),
205-
rng.gen_range(0..10),
202+
rng.random_range(0..4),
203+
rng.random_range(0..4),
204+
rng.random_range(0..10),
205+
rng.random_range(0..10),
206206
]
207207
});
208208
let index_first_attribute = rands[0];
@@ -228,11 +228,11 @@ fn random_generator(c: &mut Criterion) {
228228
let __i1 = CURRENT_RNG.with(|rng| {
229229
let mut rng = rng.borrow_mut();
230230
[
231-
rng.gen_range(0..4),
232-
rng.gen_range(0..4),
233-
rng.gen_range(0..10),
234-
rng.gen_range(0..10),
235-
rng.gen_range(0..10),
231+
rng.random_range(0..4),
232+
rng.random_range(0..4),
233+
rng.random_range(0..10),
234+
rng.random_range(0..10),
235+
rng.random_range(0..10),
236236
]
237237
});
238238
});

‎opentelemetry-sdk/benches/metrics_gauge.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::cell::RefCell;
2424

2525
thread_local! {
2626
/// Store random number generator for each thread
27-
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_entropy());
27+
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_os_rng());
2828
}
2929

3030
static ATTRIBUTE_VALUES: [&str; 10] = [
@@ -55,10 +55,10 @@ fn gauge_record(c: &mut Criterion) {
5555
let rands = CURRENT_RNG.with(|rng| {
5656
let mut rng = rng.borrow_mut();
5757
[
58-
rng.gen_range(0..4),
59-
rng.gen_range(0..4),
60-
rng.gen_range(0..10),
61-
rng.gen_range(0..10),
58+
rng.random_range(0..4),
59+
rng.random_range(0..4),
60+
rng.random_range(0..10),
61+
rng.random_range(0..10),
6262
]
6363
});
6464
let index_first_attribute = rands[0];

‎opentelemetry-sdk/benches/metrics_histogram.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use std::cell::RefCell;
2828

2929
thread_local! {
3030
/// Store random number generator for each thread
31-
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_entropy());
31+
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_os_rng());
3232
}
3333

3434
static ATTRIBUTE_VALUES: [&str; 10] = [
@@ -68,10 +68,10 @@ fn histogram_record(c: &mut Criterion) {
6868
CURRENT_RNG.with(|rng| {
6969
let mut rng = rng.borrow_mut();
7070
[
71-
rng.gen_range(0..4),
72-
rng.gen_range(0..4),
73-
rng.gen_range(0..10),
74-
rng.gen_range(0..10),
71+
rng.random_range(0..4),
72+
rng.random_range(0..4),
73+
rng.random_range(0..10),
74+
rng.random_range(0..10),
7575
]
7676
})
7777
},
@@ -104,10 +104,10 @@ fn histogram_record_with_non_static_values(c: &mut Criterion, attribute_values:
104104
CURRENT_RNG.with(|rng| {
105105
let mut rng = rng.borrow_mut();
106106
[
107-
rng.gen_range(0..4),
108-
rng.gen_range(0..4),
109-
rng.gen_range(0..10),
110-
rng.gen_range(0..10),
107+
rng.random_range(0..4),
108+
rng.random_range(0..4),
109+
rng.random_range(0..10),
110+
rng.random_range(0..10),
111111
]
112112
})
113113
},

‎opentelemetry-sdk/src/metrics/mod.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,16 +1924,16 @@ mod tests {
19241924
let histogram = test_context.meter().u64_histogram("my_histogram").build();
19251925

19261926
// Act
1927-
let mut rand = rngs::SmallRng::from_entropy();
1927+
let mut rand = rngs::SmallRng::from_os_rng();
19281928
let values_kv1 = (0..50)
1929-
.map(|_| rand.gen_range(0..100))
1929+
.map(|_| rand.random_range(0..100))
19301930
.collect::<Vec<u64>>();
19311931
for value in values_kv1.iter() {
19321932
histogram.record(*value, &[KeyValue::new("key1", "value1")]);
19331933
}
19341934

19351935
let values_kv2 = (0..30)
1936-
.map(|_| rand.gen_range(0..100))
1936+
.map(|_| rand.random_range(0..100))
19371937
.collect::<Vec<u64>>();
19381938
for value in values_kv2.iter() {
19391939
histogram.record(*value, &[KeyValue::new("key1", "value2")]);

‎opentelemetry-sdk/src/trace/id_generator/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ impl IdGenerator for RandomIdGenerator {
3232

3333
thread_local! {
3434
/// Store random number generator for each thread
35-
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_entropy());
35+
static CURRENT_RNG: RefCell<rngs::SmallRng> = RefCell::new(rngs::SmallRng::from_os_rng());
3636
}

‎opentelemetry-sdk/src/trace/sampler.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ mod tests {
250250
use super::*;
251251
use crate::testing::trace::TestSpan;
252252
use opentelemetry::trace::{SpanContext, SpanId, TraceFlags};
253-
use rand::Rng;
253+
use rand::random;
254254

255255
#[rustfmt::skip]
256256
fn sampler_data() -> Vec<(&'static str, Sampler, f64, bool, bool)> {
@@ -301,7 +301,6 @@ mod tests {
301301
#[test]
302302
fn sampling() {
303303
let total = 10_000;
304-
let mut rng = rand::thread_rng();
305304
for (name, sampler, expectation, parent, sample_parent) in sampler_data() {
306305
let mut sampled = 0;
307306
for _ in 0..total {
@@ -324,7 +323,7 @@ mod tests {
324323
None
325324
};
326325

327-
let trace_id = TraceId::from(rng.gen::<u128>());
326+
let trace_id = TraceId::from(random::<u128>());
328327
if sampler
329328
.should_sample(
330329
parent_context.as_ref(),

‎opentelemetry-zipkin/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk", features
3232
opentelemetry-http = { version = "0.28", path = "../opentelemetry-http" }
3333
serde_json = { workspace = true }
3434
serde = { workspace = true, features = ["derive"] }
35-
typed-builder = "0.18"
35+
typed-builder = "0.20"
3636
http = { workspace = true }
3737
reqwest = { workspace = true, optional = true }
3838
thiserror = { workspace = true }

0 commit comments

Comments
 (0)