wip

Author: KowalskiThomas

ddtrace/internal/datadog/profiling/dd_wrapper/include/profile.hpp

@@ -46,8 +46,10 @@ class Profile
     // The profile object is initialized here as a skeleton object, but it
     // cannot be used until it's initialized by libdatadog
     ddog_prof_Profile cur_profile{};
+    ddog_prof_Profile last_profile{};
 
     Datadog::ProfilerStats cur_profiler_stats{};
+    Datadog::ProfilerStats last_profiler_stats{};
 
     // Internal access methods - not for direct use
     ddog_prof_Profile& profile_borrow_internal();

ddtrace/internal/datadog/profiling/dd_wrapper/src/profile.cpp

@@ -58,7 +58,20 @@ Datadog::Profile::reset_profile()
         return false;
     }
 
+    res = ddog_prof_Profile_reset(&last_profile);
+    if (!res.ok) {          // NOLINT (cppcoreguidelines-pro-type-union-access)
+        auto err = res.err; // NOLINT (cppcoreguidelines-pro-type-union-access)
+        if (!already_warned) {
+            already_warned = true;
+            const std::string errmsg = err_to_msg(&err, "Error resetting last_profile");
+            std::cerr << "Could not drop last_profile:" << errmsg << std::endl;
+        }
+        ddog_Error_drop(&err);
+        return false;
+    }
+
     cur_profiler_stats.reset_state();
+    last_profiler_stats.reset_state();
     return true;
 }
 
@@ -189,7 +202,15 @@ Datadog::Profile::one_time_init(SampleType type, unsigned int _max_nframes)
     if (!make_profile(sample_types, &default_period, cur_profile)) {
         if (!already_warned) {
             already_warned = true;
-            std::cerr << "Error initializing profile" << std::endl;
+            std::cerr << "Error initializing cur_profile" << std::endl;
+        }
+        return;
+    }
+
+    if (!make_profile(sample_types, &default_period, last_profile)) {
+        if (!already_warned) {
+            already_warned = true;
+            std::cerr << "Error initializing last_profile" << std::endl;
         }
         return;
     }
@@ -229,5 +250,6 @@ Datadog::Profile::postfork_child()
     new (&profile_mtx) std::mutex();
     // Reset the profile to clear any samples collected in the parent process
     cur_profiler_stats.reset_state();
+    last_profiler_stats.reset_state();
     reset_profile();
 }

ddtrace/internal/datadog/profiling/dd_wrapper/src/profile_borrow.cpp

@@ -6,6 +6,9 @@ Datadog::ProfileBorrow::ProfileBorrow(Profile& profile)
 {
     // Lock the mutex on construction
     profile_ptr->profile_borrow_internal();
+
+    std::swap(profile_ptr->cur_profile, profile_ptr->last_profile);
+    std::swap(profile_ptr->cur_profiler_stats, profile_ptr->last_profiler_stats);
 }
 
 Datadog::ProfileBorrow::~ProfileBorrow()
@@ -40,11 +43,11 @@ Datadog::ProfileBorrow::operator=(ProfileBorrow&& other) noexcept
 ddog_prof_Profile&
 Datadog::ProfileBorrow::profile()
 {
-    return profile_ptr->cur_profile;
+    return profile_ptr->last_profile;
 }
 
 Datadog::ProfilerStats&
 Datadog::ProfileBorrow::stats()
 {
-    return profile_ptr->cur_profiler_stats;
+    return profile_ptr->last_profiler_stats;
 }