refactor: try_new2 -> try_new_with_dictionary

Author: morrisonlevi

libdd-profiling/benches/add_samples.rs

@@ -149,10 +149,10 @@ pub fn bench_add_sample_vs_add2(c: &mut Criterion) {
 
     c.bench_function("profile_add_sample2_frames_x1000", |b| {
         b.iter(|| {
-            let mut profile = profiling::internal::Profile::try_new2(
-                dict.try_clone().unwrap(),
+            let mut profile = profiling::internal::Profile::try_new_with_dictionary(
                 &sample_types2,
                 None,
+                dict.try_clone().unwrap(),
             )
             .unwrap();
             let (locations, values) = make_stack_api2(frames2.as_slice());

libdd-profiling/src/api2.rs

@@ -1,7 +1,7 @@
 // Copyright 2025-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::profiles::datatypes::{self, FunctionId2, MappingId2, StringId2};
+use crate::profiles::datatypes::{FunctionId2, MappingId2, StringId2};
 
 #[derive(Copy, Clone, Debug, Default)]
 #[repr(C)]
@@ -55,24 +55,3 @@ impl<'a> Label<'a> {
         }
     }
 }
-#[repr(C)]
-#[derive(Clone, Copy, Debug)]
-pub struct ValueType2 {
-    pub type_id: StringId2,
-    pub unit_id: StringId2,
-}
-
-impl From<ValueType2> for datatypes::ValueType {
-    fn from(value: ValueType2) -> datatypes::ValueType {
-        datatypes::ValueType {
-            type_id: value.type_id.into(),
-            unit_id: value.unit_id.into(),
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub struct Period2 {
-    pub r#type: ValueType2,
-    pub value: i64,
-}

libdd-profiling/src/internal/owned_types/mod.rs

@@ -2,9 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::api;
-use crate::api2::{Period2, ValueType2};
-use crate::profiles::collections::StringRef;
-use std::ops::Deref;
 
 #[cfg_attr(test, derive(bolero::generator::TypeGenerator))]
 #[derive(Clone, Debug)]
@@ -23,22 +20,6 @@ impl<'a> From<&'a api::ValueType<'a>> for ValueType {
     }
 }
 
-impl From<ValueType2> for ValueType {
-    fn from(value_type2: ValueType2) -> ValueType {
-        let typ: StringRef = value_type2.type_id.into();
-        let unit: StringRef = value_type2.unit_id.into();
-        ValueType {
-            typ: Box::from(typ.0.deref()),
-            unit: Box::from(unit.0.deref()),
-        }
-    }
-}
-impl From<&ValueType2> for ValueType {
-    fn from(value_type2: &ValueType2) -> ValueType {
-        ValueType::from(*value_type2)
-    }
-}
-
 impl<'a> From<&'a ValueType> for api::ValueType<'a> {
     fn from(value: &'a ValueType) -> Self {
         Self::new(&value.typ, &value.unit)
@@ -52,6 +33,13 @@ pub struct Period {
     pub value: i64,
 }
 
+impl<'a> From<api::Period<'a>> for Period {
+    #[inline]
+    fn from(period: api::Period<'a>) -> Self {
+        Period::from(&period)
+    }
+}
+
 impl<'a> From<&'a api::Period<'a>> for Period {
     #[inline]
     fn from(period: &'a api::Period<'a>) -> Self {
@@ -61,12 +49,3 @@ impl<'a> From<&'a api::Period<'a>> for Period {
         }
     }
 }
-
-impl From<Period2> for Period {
-    fn from(period2: Period2) -> Period {
-        Period {
-            typ: ValueType::from(period2.r#type),
-            value: 0,
-        }
-    }
-}

libdd-profiling/src/internal/profile/mod.rs

@@ -12,7 +12,6 @@ pub use profiles_dictionary_translator::*;
 use self::api::UpscalingInfo;
 use super::*;
 use crate::api::ManagedStringId;
-use crate::api2::{Period2, ValueType2};
 use crate::collections::identifiable::*;
 use crate::collections::string_storage::{CachedProfileId, ManagedStringStorage};
 use crate::collections::string_table::{self, StringTable};
@@ -384,7 +383,7 @@ impl Profile {
     ///
     /// All other fields are default.
     ///
-    /// It's recommended to use [`Profile::try_new2`] instead.
+    /// It's recommended to use [`Profile::try_new_with_dictionary`] instead.
     pub fn try_new(
         sample_types: &[api::ValueType],
         period: Option<api::Period>,
@@ -397,14 +396,13 @@ impl Profile {
         )
     }
 
-    /// Tries to create a profile with the given period and sample types. The
-    /// [`StringId2`]s should belong to the provided [`ProfilesDictionary`].
+    /// Tries to create a profile with the given period and sample types.
     #[inline(never)]
     #[cold]
-    pub fn try_new2(
+    pub fn try_new_with_dictionary(
+        sample_types: &[api::ValueType],
+        period: Option<api::Period>,
         profiles_dictionary: crate::profiles::collections::Arc<ProfilesDictionary>,
-        sample_types: &[ValueType2],
-        period: Option<Period2>,
     ) -> io::Result<Self> {
         let mut owned_sample_types = Vec::new();
         // Using try_reserve_exact because it will be converted to a Box<[]>,
@@ -2707,7 +2705,7 @@ mod api_tests {
 
     #[test]
     #[cfg_attr(miri, ignore)]
-    fn test_try_new2_and_try_add_sample2() {
+    fn test_try_new_with_dictionary_and_try_add_sample2() {
         struct Frame {
             file_name: &'static str,
             line_number: u32,
@@ -2716,14 +2714,7 @@ mod api_tests {
 
         // Create a ProfilesDictionary with realistic data from Ruby app
         let dict = crate::profiles::datatypes::ProfilesDictionary::try_new().unwrap();
-
-        // Create sample types
-        let samples_type = dict.try_insert_str2("samples").unwrap();
-        let count_unit = dict.try_insert_str2("count").unwrap();
-        let sample_types = vec![ValueType2 {
-            type_id: samples_type,
-            unit_id: count_unit,
-        }];
+        let sample_types = vec![api::ValueType::new("samples", "count")];
 
         // Ruby stack trace (leaf-to-root order)
         // Taken from a Ruby app, everything here is source-available
@@ -2784,7 +2775,8 @@ mod api_tests {
 
         // Create profile with dictionary
         let mut profile =
-            Profile::try_new2(dict.try_clone().unwrap(), &sample_types, None).unwrap();
+            Profile::try_new_with_dictionary(&sample_types, None, dict.try_clone().unwrap())
+                .unwrap();
 
         assert_eq!(profile.only_for_testing_num_aggregated_samples(), 0);