Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
- Updated to rand 0.10.x

## [0.32.0]
## Changed
Expand Down
50 changes: 44 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metrics-exporter-prometheus = { version = "0.18", default-features = false, feat
] }
prost = "0.14"
prost-build = "0.14"
rand = { version = "0.9", default-features = false }
rand = { version = "0.10", default-features = false }
rustc-hash = "2.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion lading/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ num-traits = { version = "0.2", default-features = false }
once_cell = { workspace = true }
opentelemetry-proto = { workspace = true }
prost = { workspace = true }
rand = { workspace = true, features = ["small_rng", "thread_rng"] }
rand = { workspace = true, features = ["thread_rng"] }
regex = { version = "1.12" }
reqwest = { version = "0.12", default-features = false, features = [
"default-tls",
Expand Down
2 changes: 1 addition & 1 deletion lading/src/blackhole/sqs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use bytes::Bytes;
use http_body_util::{BodyExt, combinators::BoxBody};
use hyper::{Request, Response, StatusCode};
use metrics::counter;
use rand::{Rng, distr::Alphanumeric};
use rand::{RngExt, distr::Alphanumeric};
use serde::{Deserialize, Serialize};
use std::{fmt::Write, net::SocketAddr};
use tracing::{debug, error};
Expand Down
2 changes: 1 addition & 1 deletion lading/src/generator/file_gen/logrotate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use tokio::time::{Instant, MissedTickBehavior, interval_at};
use byte_unit::Byte;
use futures::future::join_all;
use metrics::counter;
use rand::{Rng, SeedableRng, prelude::StdRng};
use rand::{RngExt, SeedableRng, prelude::StdRng};
use serde::{Deserialize, Serialize};
use tokio::{
fs,
Expand Down
2 changes: 1 addition & 1 deletion lading/src/generator/file_gen/logrotate_fs/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use bytes::Bytes;
use lading_payload::block;
use metrics::counter;
use rand::{Rng, SeedableRng, rngs::SmallRng};
use rand::{Rng, RngExt, SeedableRng, rngs::SmallRng};
use rustc_hash::FxHashMap;
use std::collections::BTreeSet;
use tracing::info;
Expand Down
2 changes: 1 addition & 1 deletion lading/src/generator/kubernetes/state_machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ mod tests {
}

fn generate_event_sequence(seed: u64, instances: u32) -> Vec<Event> {
use rand::{Rng, SeedableRng, rngs::StdRng};
use rand::{RngExt, SeedableRng, rngs::StdRng};

let mut rng = StdRng::seed_from_u64(seed);
let mut events = Vec::new();
Expand Down
5 changes: 2 additions & 3 deletions lading_capture/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ path = "../lading_fuzz"
optional = true

[dependencies.rand]
version = "0.9"
default-features = false
features = ["small_rng", "std"]
workspace = true
features = ["std"]
optional = true

[dependencies.anyhow]
Expand Down
2 changes: 1 addition & 1 deletion lading_capture/src/bin/fuzz_capture_harness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use lading_capture::{
formats::jsonl, line::Line, manager::CaptureManager, manager::RealClock,
test::writer::InMemoryWriter, validate,
};
use rand::{Rng, SeedableRng, rngs::SmallRng};
use rand::{Rng, RngExt, SeedableRng, rngs::SmallRng};
use std::io::{self, Read};
use std::process::ExitCode;
use std::time::{Duration, Instant};
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ byte-unit = { workspace = true }
chrono = { workspace = true }
opentelemetry-proto = { workspace = true }
prost = { workspace = true }
rand = { workspace = true, features = ["small_rng", "std", "std_rng"] }
rand = { workspace = true, features = ["std", "std_rng"] }
rustc-hash = { workspace = true }
rmp-serde = { version = "1.3", default-features = false }
serde = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions lading_payload/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ cargo-fuzz = true
[dependencies]
libfuzzer-sys = "0.4"
arbitrary = { version = "1", features = ["derive"] }
rand = { version = "0.9", default-features = false, features = [
"small_rng",
rand = { version = "0.10", default-features = false, features = [
"std",
"std_rng",
] }
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/apache_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::{Error, Generator, common::strings};

use core::fmt;
use rand::{Rng, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};
use std::io::Write;

const PATH_NAMES: [&str; 25] = [
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/ascii.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::io::Write;

use rand::Rng;
use rand::{Rng, RngExt};

use crate::{Error, common::strings};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::num::NonZeroU32;

use byte_unit::{Byte, Unit};
use bytes::{BufMut, Bytes, BytesMut, buf::Writer};
use rand::Rng;
use rand::{Rng, RngExt};
use serde::{Deserialize, Serialize};
use tokio::time::Instant;
use tracing::{Level, debug, error, info, span, warn};
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/common/config.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Common configuration for all lading payloads

use rand::distr::uniform::SampleUniform;
use rand::{RngExt, distr::uniform::SampleUniform};
use serde::Deserialize;
use std::{cmp, fmt};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/common/strings.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Code for the quick creation of randomize strings

use enum_dispatch::enum_dispatch;
use rand::seq::IndexedRandom;
use rand::{RngExt, seq::IndexedRandom};

mod random_string_pool;
mod string_list_pool;
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/common/strings/random_string_pool.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use rand::Rng;
use rand::distr::uniform::SampleUniform;
use rand::{Rng, RngExt};
use std::ops::Range;
use std::rc::Rc;

Expand Down
2 changes: 2 additions & 0 deletions lading_payload/src/common/strings/string_list_pool.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use rand::RngExt;

use super::{Handle, Pool};

/// Error type for `StringListPool` pattern expansion
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/common/tags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::cell::{Cell, RefCell};
use std::collections::HashSet;
use std::rc::Rc;

use rand::Rng;
use rand::distr::{Distribution, OpenClosed01};
use rand::{Rng, RngExt};
use rand::{SeedableRng, rngs::SmallRng};
use tracing::warn;

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/datadog_logs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::io::Write;

use rand::{Rng, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};

use crate::{Error, Generator, common::strings};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/dogstatsd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::{fmt, io::Write, rc::Rc};

use rand::{Rng, distr::weighted::WeightedIndex, prelude::Distribution};
use rand::{Rng, RngExt, distr::weighted::WeightedIndex, prelude::Distribution};
use serde::Deserialize;
use tracing::{debug, warn};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/dogstatsd/common.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::fmt;

use rand::{
Rng,
Rng, RngExt,
distr::{OpenClosed01, StandardUniform, Uniform},
prelude::Distribution,
};
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/dogstatsd/event.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! `DogStatsD` event.
use std::{fmt, ops::Range};

use rand::{Rng, distr::StandardUniform, prelude::Distribution};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution};

use crate::{Error, Generator, common::strings};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/dogstatsd/service_check.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! `DogStatsD` service check.
use std::fmt;

use rand::{Rng, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};

use crate::{
Error, Generator,
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/fluent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use std::collections::BTreeMap;
use std::io::Write;

use rand::Rng;
use rand::{Rng, RngExt};
use rmp_serde::Serializer;
use serde::Serialize;
use serde_tuple::Serialize_tuple;
Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use std::io::Write;

use rand::{Rng, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};
use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution, seq::IndexedRandom};

use crate::Error;

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/opentelemetry/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use opentelemetry_proto::tonic::{
collector::logs::v1::ExportLogsServiceRequest, logs::v1::ResourceLogs,
};
use prost::Message;
use rand::Rng;
use rand::{Rng, RngExt};
use serde::Deserialize;
use std::{cell::RefCell, io::Write, rc::Rc};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/opentelemetry/log/templates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use opentelemetry_proto::tonic::{
};
use prost::Message;
use rand::{
Rng,
Rng, RngExt,
distr::{Distribution, weighted::WeightedIndex},
};

Expand Down
1 change: 1 addition & 0 deletions lading_payload/src/opentelemetry/metric.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
pub(crate) mod templates;
pub(crate) mod unit;

use rand::RngExt;
use std::rc::Rc;
use std::{cell::RefCell, io::Write};

Expand Down
2 changes: 1 addition & 1 deletion lading_payload/src/opentelemetry/metric/templates.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use opentelemetry_proto::tonic::{
};
use prost::Message;
use rand::{
Rng,
Rng, RngExt,
distr::{Distribution, StandardUniform, weighted::WeightedIndex},
};
use tracing::debug;
Expand Down
Loading
Loading