Cleanup alive monitor config loading

score/launch_manager/src/alive/src/alive.cpp

@@ -18,9 +18,6 @@
 #include "score/mw/launch_manager/alive_monitor/details/AliveImpl.h"
 #include "score/mw/lifecycle/alive.h"
 
-// The public API is only sending alive notification. No need to support different checkpoints.
-static constexpr std::uint32_t kDefaultCheckpointId{1U};
-
 namespace score::mw::lifecycle
 {
 
@@ -38,7 +35,7 @@ void Alive::ReportAlive() const noexcept
 {
     if (aliveImplPtr.get() != nullptr)
     {
-        aliveImplPtr->ReportCheckpoint(kDefaultCheckpointId);
+        aliveImplPtr->ReportCheckpoint();
     }
 }
 

score/launch_manager/src/alive/src/details/AliveImpl.cpp

@@ -32,10 +32,9 @@ AliveImpl::AliveImpl(
     connectToPhmDaemon();
 }
 
-void AliveImpl::ReportCheckpoint(std::uint32_t f_checkpointId) const noexcept(true)
+void AliveImpl::ReportCheckpoint() const noexcept(true)
 {
-    (void)ipcClient->sendEmplace(
-        score::mw::lifecycle::internal::saf::timers::OsClock::getMonotonicSystemClock(), f_checkpointId);
+    (void)ipcClient->sendEmplace(internal::saf::timers::OsClock::getMonotonicSystemClock());
 }
 
 void AliveImpl::connectToPhmDaemon(void) noexcept(false)

score/launch_manager/src/alive/src/details/AliveImpl.h

@@ -66,8 +66,7 @@ class AliveImpl
     virtual ~AliveImpl() = default;
 
     /// @brief Reports an occurrence of a Checkpoint
-    /// @param [in] f_checkpointId   Checkpoint identifier.
-    void ReportCheckpoint(std::uint32_t f_checkpointId) const noexcept(true);
+    void ReportCheckpoint() const noexcept(true);
 
   private:
     /// @brief Connect the application process with PHM daemon using IPC

score/launch_manager/src/alive/src/details/AliveImpl_UT.cpp

@@ -54,7 +54,7 @@ TEST_F(AliveImplTest, ReportCheckpointSafeWhenNotConnected)
 
     setenv("LCM_ALIVE_INTERFACE_PATH", "nonexistent_ipc_path", 1);
     AliveImpl impl("test/instance");
-    EXPECT_NO_THROW(impl.ReportCheckpoint(42U));
+    EXPECT_NO_THROW(impl.ReportCheckpoint());
 }
 
 }  // namespace score::mw::lifecycle

score/launch_manager/src/daemon/src/alive_monitor/details/common/BUILD

@@ -13,27 +13,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//tests/utils/bazel:unit_test.bzl", "lm_cc_test")
 
-cc_library(
-    name = "alive_monitor_config",
-    srcs = ["AliveMonitorConfig.cpp"],
-    hdrs = ["AliveMonitorConfig.hpp"],
-    include_prefix = "score/mw/launch_manager/alive_monitor/details/common",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/common",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
-    deps = [
-        "//score/launch_manager/src/daemon/src/configuration:config",
-    ],
-)
-
-lm_cc_test(
-    name = "alive_monitor_config_UT",
-    srcs = ["AliveMonitorConfig_UT.cpp"],
-    deps = [
-        ":alive_monitor_config",
-        "@googletest//:gtest_main",
-    ],
-)
-
 cc_library(
     name = "observer",
     hdrs = ["Observer.hpp"],

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.cpp

@@ -27,7 +27,7 @@ AliveMonitorImpl::AliveMonitorImpl(
     const Config& config)
     : m_recovery_client(recovery_client),
       m_observable_event_receiver(std::move(observable_event_receiver)),
-      m_config(score::mw::lifecycle::internal::alive::aliveMonitorConfig(config))
+      m_config(config)
 {
 }
 

score/launch_manager/src/daemon/src/alive_monitor/details/daemon/AliveMonitorImpl.hpp

@@ -16,7 +16,6 @@
 #include <atomic>
 #include <memory>
 
-#include "score/mw/launch_manager/alive_monitor/details/common/AliveMonitorConfig.hpp"
 #include "score/mw/launch_manager/alive_monitor/details/daemon/IAliveMonitor.hpp"
 #include "score/mw/launch_manager/configuration/config.hpp"
 
@@ -41,7 +40,7 @@ using UptrISupervisionControlReceiver = std::unique_ptr<score::mw::lifecycle::IS
 using UptrPhmDaemon = std::unique_ptr<score::mw::lifecycle::internal::saf::daemon::PhmDaemon>;
 using OsClock = score::mw::lifecycle::internal::saf::timers::OsClockInterface;
 using Config = score::mw::lifecycle::internal::configuration::Config;
-using AliveMonitorConfig = score::mw::lifecycle::internal::alive::AliveMonitorConfig;
+using score::mw::lifecycle::internal::configuration::AliveSupervisionConfig;
 
 class AliveMonitorImpl : public IAliveMonitor
 {
@@ -60,7 +59,7 @@ class AliveMonitorImpl : public IAliveMonitor
     UptrPhmDaemon m_daemon{nullptr};
     OsClock m_osClock{};
     UptrISupervisionControlReceiver m_observable_event_receiver;
-    AliveMonitorConfig m_config;
+    const Config& m_config;
 };
 
 }  // namespace daemon