PR feedback

Signed-off-by: Brian L. Troutwine <brian.troutwine@datadoghq.com>
DataDog · Sep 19, 2023 · 50733b7 · 50733b7
1 parent ef635bb
commit 50733b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [0.18.1-rc6]
+### Changed
+- The configuration option `float_weight` is changed to `float_probability`.
+
 ## [0.18.1-rc5]
 ### Changed
 - Capitalization is renamed to snake-case in value configuration.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lading/Cargo.toml b/lading/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lading"
-version = "0.18.1-rc5"
+version = "0.18.1-rc6"
 authors = ["Brian L. Troutwine <brian.troutwine@datadoghq.com>", "George Hahn <george.hahn@datadoghq.com"]
 edition = "2021"
 license = "MIT"

diff --git a/lading_payload/src/dogstatsd.rs b/lading_payload/src/dogstatsd.rs
@@ -29,7 +29,7 @@ fn contexts_maximum() -> u16 {
 
 fn value_config() -> ValueConf {
     ValueConf {
-        float_weight: 128, // 50%
+        float_probability: 0.5, // 50%
         range: ValueRange::Inclusive {
             min: i64::MIN,
             max: i64::MAX,
@@ -132,7 +132,7 @@ impl Default for MetricWeights {
 #[derive(Debug, Deserialize, Clone, PartialEq, Copy)]
 pub struct ValueConf {
     /// Odds out of 256 that the value will be a float and not an integer.
-    float_weight: u8,
+    float_probability: f32,
     range: ValueRange,
 }
 

diff --git a/lading_payload/src/dogstatsd/common.rs b/lading_payload/src/dogstatsd/common.rs
@@ -1,7 +1,7 @@
 use std::fmt;
 
 use rand::{
-    distributions::{Standard, Uniform},
+    distributions::{OpenClosed01, Standard, Uniform},
     prelude::Distribution,
     Rng,
 };
@@ -21,12 +21,12 @@ pub(crate) enum NumValue {
 #[derive(Clone, Debug)]
 pub(crate) enum NumValueGenerator {
     Constant {
-        float_weight: u8,
+        float_probability: f32,
         int: i64,
         float: f64,
     },
     Uniform {
-        float_weight: u8,
+        float_probability: f32,
         int_distr: Uniform<i64>,
         float_distr: Uniform<f64>,
     },
@@ -37,12 +37,12 @@ impl NumValueGenerator {
     pub(crate) fn new(conf: ValueConf) -> Self {
         match conf.range {
             ValueRange::Constant(c) => Self::Constant {
-                float_weight: conf.float_weight,
+                float_probability: conf.float_probability,
                 int: c,
                 float: c as f64,
             },
             ValueRange::Inclusive { min, max } => Self::Uniform {
-                float_weight: conf.float_weight,
+                float_probability: conf.float_probability,
                 int_distr: Uniform::new_inclusive(min, max),
                 float_distr: Uniform::new_inclusive(min as f64, max as f64),
             },
@@ -57,24 +57,25 @@ impl<'a> Generator<'a> for NumValueGenerator {
     where
         R: rand::Rng + ?Sized,
     {
+        let prob: f32 = OpenClosed01.sample(rng);
         match self {
             Self::Constant {
-                float_weight,
+                float_probability,
                 int,
                 float,
             } => {
-                if rng.gen_ratio(u32::from(*float_weight), 256) {
+                if prob < *float_probability {
                     NumValue::Float(*float)
                 } else {
                     NumValue::Int(*int)
                 }
             }
             Self::Uniform {
-                float_weight,
+                float_probability,
                 int_distr,
                 float_distr,
             } => {
-                if rng.gen_ratio(u32::from(*float_weight), 256) {
+                if prob < *float_probability {
                     NumValue::Float(float_distr.sample(rng))
                 } else {
                     NumValue::Int(int_distr.sample(rng))