Integration

src/core/cm/alerts/alerts.cpp

@@ -222,12 +222,12 @@ Error Alerts::SendAlerts()
 {
     LockGuard lock {mMutex};
 
-    LOG_DBG() << "Send alerts timer triggered";
-
     if (!mIsRunning || !mIsConnected || mAlerts.IsEmpty()) {
         return ErrorEnum::eNone;
     }
 
+    LOG_DBG() << "Send alerts timer triggered";
+
     if (mSkippedAlerts > 0) {
         LOG_WRN() << "Alerts skipped due to cache is full" << Log::Field("count", mSkippedAlerts);
 
@@ -243,6 +243,8 @@ Error Alerts::SendAlerts()
     while (!mAlerts.IsEmpty()) {
         auto package = CreatePackage();
 
+        LOG_INF() << "Send alerts" << Log::Field("alertsCount", package->mItems.Size());
+
         if (auto err = mSender->SendAlerts(*package); !err.IsNone()) {
             return AOS_ERROR_WRAP(err);
         }

src/core/cm/imagemanager/imagemanager.cpp

@@ -104,7 +104,13 @@ Error ImageManager::DownloadUpdateItems(const Array<UpdateItemInfo>& itemsInfo,
     const Array<crypto::CertificateInfo>& certificates, const Array<crypto::CertificateChainInfo>& certificateChains,
     Array<UpdateItemStatus>& statuses)
 {
-    LOG_DBG() << "Download update items" << Log::Field("count", itemsInfo.Size());
+    LOG_INF() << "Download update items" << Log::Field("count", itemsInfo.Size());
+
+    for (const auto& itemInfo : itemsInfo) {
+        LOG_INF() << "Download update item" << Log::Field("itemID", itemInfo.mItemID)
+                  << Log::Field("type", itemInfo.mType) << Log::Field("version", itemInfo.mVersion)
+                  << Log::Field("indexDigest", itemInfo.mIndexDigest);
+    }
 
     if (!StartAction()) {
         return ErrorEnum::eCanceled;
@@ -188,7 +194,12 @@ Error ImageManager::DownloadUpdateItems(const Array<UpdateItemInfo>& itemsInfo,
 
 Error ImageManager::InstallUpdateItems(const Array<UpdateItemInfo>& itemsInfo, Array<UpdateItemStatus>& statuses)
 {
-    LOG_DBG() << "Install update items" << Log::Field("count", itemsInfo.Size());
+    LOG_INF() << "Install update items" << Log::Field("count", itemsInfo.Size());
+
+    for (const auto& itemInfo : itemsInfo) {
+        LOG_INF() << "Install update item" << Log::Field("itemID", itemInfo.mItemID)
+                  << Log::Field("type", itemInfo.mType) << Log::Field("version", itemInfo.mVersion);
+    }
 
     if (!StartAction()) {
         return ErrorEnum::eCanceled;
@@ -1089,7 +1100,7 @@ Error ImageManager::GetBlobInfo(const String& digest, BlobInfo& blobInfo)
                 return AOS_ERROR_WRAP(waitErr);
             }
 
-            LOG_INF() << "Retrying get blobs info" << Log::Field("digest", digest);
+            LOG_DBG() << "Retrying get blobs info" << Log::Field("digest", digest);
 
             continue;
         }
@@ -1242,7 +1253,7 @@ Error ImageManager::PerformDownload(const BlobInfo& blobInfo, const String& down
                 return err;
             }
 
-            LOG_INF() << "Retrying download" << Log::Field("url", blobInfo.mURLs[0])
+            LOG_DBG() << "Retrying download" << Log::Field("url", blobInfo.mURLs[0])
                       << Log::Field("path", downloadPath);
 
             continue;
@@ -1382,6 +1393,12 @@ void ImageManager::NotifyItemsStatusesChanged(const Array<UpdateItemStatus>& sta
 {
     LockGuard lock {mMutex};
 
+    for (const auto& status : statuses) {
+        LOG_DBG() << "Item status changed" << Log::Field("itemID", status.mItemID)
+                  << Log::Field("version", status.mVersion) << Log::Field("state", ItemState(status.mState))
+                  << Log::Field("error", status.mError);
+    }
+
     for (auto* listener : mListeners) {
         listener->OnItemsStatusesChanged(statuses);
     }

src/core/cm/launcher/launcher.cpp

@@ -75,11 +75,11 @@ Error Launcher::Init(const Config& config, nodeinfoprovider::NodeInfoProviderItf
 
 Error Launcher::Start()
 {
-    LOG_DBG() << "Start Launcher";
-
     LockGuard balancingLock {mBalancingMutex};
     LockGuard updateLock {mUpdateMutex};
 
+    LOG_DBG() << "Start Launcher";
+
     mIsRunning = true;
 
     // Start managers.
@@ -139,10 +139,10 @@ Error Launcher::Start()
 
 Error Launcher::Stop()
 {
-    LOG_DBG() << "Stop Launcher";
-
     UniqueLock updateLock {mUpdateMutex};
 
+    LOG_DBG() << "Stop Launcher";
+
     // Finish monitoring thread.
     mIsRunning             = false;
     mDisableProcessUpdates = false;
@@ -187,11 +187,17 @@ Error Launcher::Stop()
 
 Error Launcher::RunInstances(const Array<RunInstanceRequest>& requests, Array<InstanceStatus>& statuses)
 {
-    LOG_DBG() << "Run instances";
-
     UniqueLock balancingLock {mBalancingMutex};
     UniqueLock updateLock {mUpdateMutex};
 
+    LOG_INF() << "Run instances" << Log::Field("numRequests", requests.Size());
+
+    for (const auto& request : requests) {
+        LOG_INF() << "Run instance request" << Log::Field("itemID", request.mItemID)
+                  << Log::Field("type", request.mUpdateItemType) << Log::Field("version", request.mVersion)
+                  << Log::Field("numInstances", request.mNumInstances);
+    }
+
     WaitAllNodesConnected(updateLock);
 
     if (!mIsRunning) {
@@ -310,6 +316,13 @@ void Launcher::UpdateInstanceStatuses()
         return;
     }
 
+    for (const auto& status : mInstanceStatuses) {
+        LOG_INF() << "Instance status changed" << Log::Field("instance", static_cast<const InstanceIdent&>(status))
+                  << Log::Field("version", status.mVersion) << Log::Field("nodeID", status.mNodeID)
+                  << Log::Field("runtimeID", status.mRuntimeID) << Log::Field("manifestDigest", status.mManifestDigest)
+                  << Log::Field("state", status.mState) << Log::Field(status.mError);
+    }
+
     for (auto& listener : mInstanceStatusListeners) {
         listener->OnInstancesStatusesChanged(mInstanceStatuses);
     }
@@ -403,7 +416,7 @@ void Launcher::ProcessUpdate()
                     LOG_ERR() << "Failed to resend instances" << Log::Field(AOS_ERROR_WRAP(err));
                 }
             } else {
-                LOG_INF() << "Rebalancing will be performed, skip resending instances";
+                LOG_DBG() << "Rebalancing will be performed, skip resending instances";
             }
 
             mUpdatedNodes.Clear();
@@ -514,7 +527,10 @@ void Launcher::CreateRequestedInstances(
 
 Error Launcher::OnInstanceStatusReceived(const InstanceStatus& status)
 {
-    LOG_INF() << "Instance status received" << Log::Field("instance", static_cast<const InstanceIdent&>(status));
+    LOG_INF() << "Instance status received" << Log::Field("instance", static_cast<const InstanceIdent&>(status))
+              << Log::Field("version", status.mVersion) << Log::Field("nodeID", status.mNodeID)
+              << Log::Field("runtimeID", status.mRuntimeID) << Log::Field("manifestDigest", status.mManifestDigest)
+              << Log::Field("state", status.mState) << Log::Field(status.mError);
 
     LockGuard updateLock {mUpdateMutex};
 
@@ -529,7 +545,13 @@ Error Launcher::OnInstanceStatusReceived(const InstanceStatus& status)
 
 Error Launcher::OnNodeInstancesStatusesReceived(const String& nodeID, const Array<InstanceStatus>& statuses)
 {
-    LOG_INF() << "Node instances statuses received" << Log::Field("nodeID", nodeID);
+    for (const auto& status : statuses) {
+        LOG_INF() << "Node instance status received"
+                  << Log::Field("instance", static_cast<const InstanceIdent&>(status))
+                  << Log::Field("version", status.mVersion) << Log::Field("nodeID", status.mNodeID)
+                  << Log::Field("runtimeID", status.mRuntimeID) << Log::Field("manifestDigest", status.mManifestDigest)
+                  << Log::Field("state", status.mState) << Log::Field(status.mError);
+    }
 
     LockGuard updateLock {mUpdateMutex};
 

src/core/cm/launcher/node.cpp

@@ -331,10 +331,20 @@ Error Node::SendScheduledInstances(
         }
     }
 
-    LOG_INF() << "Send scheduled instances" << Log::Field("nodeID", mInfo.mNodeID)
+    LOG_INF() << "Update node instances" << Log::Field("nodeID", mInfo.mNodeID)
               << Log::Field("stopInstances", stopInstances->Size())
               << Log::Field("startInstances", startInstances->Size());
 
+    for (const auto& instance : *stopInstances) {
+        LOG_INF() << "Update node stop instance" << Log::Field("instance", static_cast<const InstanceIdent&>(instance))
+                  << Log::Field("version", instance.mVersion) << Log::Field("runtimeID", instance.mRuntimeID);
+    }
+
+    for (const auto& instance : *startInstances) {
+        LOG_INF() << "Update node start instance" << Log::Field("instance", static_cast<const InstanceIdent&>(instance))
+                  << Log::Field("version", instance.mVersion) << Log::Field("runtimeID", instance.mRuntimeID);
+    }
+
     if (auto err = mInstanceRunner->UpdateInstances(mInfo.mNodeID, *stopInstances, *startInstances); !err.IsNone()) {
         return AOS_ERROR_WRAP(err);
     }
@@ -382,6 +392,16 @@ RetWithError<bool> Node::ResendInstances(
               << Log::Field("stopInstances", stopInstances->Size())
               << Log::Field("startInstances", startInstances->Size());
 
+    for (const auto& instance : *stopInstances) {
+        LOG_INF() << "Update node stop instance" << Log::Field("instance", static_cast<const InstanceIdent&>(instance))
+                  << Log::Field("version", instance.mVersion) << Log::Field("runtimeID", instance.mRuntimeID);
+    }
+
+    for (const auto& instance : *startInstances) {
+        LOG_INF() << "Update node start instance" << Log::Field("instance", static_cast<const InstanceIdent&>(instance))
+                  << Log::Field("version", instance.mVersion) << Log::Field("runtimeID", instance.mRuntimeID);
+    }
+
     if (auto err = mInstanceRunner->UpdateInstances(mInfo.mNodeID, *stopInstances, *startInstances); !err.IsNone()) {
         return {false, AOS_ERROR_WRAP(err)};
     }

src/core/cm/launcher/tests/launcher.cpp

@@ -124,7 +124,7 @@ class CMLauncherTest : public testing::Test {
     {
         tests::utils::InitLog();
 
-        LOG_INF() << "Launcher size: size=" << sizeof(Launcher);
+        LOG_INF() << "Launcher size" << Log::Field("size", sizeof(Launcher));
 
         ASSERT_TRUE(mIdentProvider.SetSubjects({cSubject1}).IsNone());
     }

src/core/cm/monitoring/monitoring.cpp

@@ -277,6 +277,9 @@ Error Monitoring::SendMonitoringData()
         return ErrorEnum::eNone;
     }
 
+    LOG_INF() << "Send monitoring data" << Log::Field("nodesCount", mMonitoring.mNodes.Size())
+              << Log::Field("instancesCount", mMonitoring.mInstances.Size());
+
     if (auto err = mSender->SendMonitoring(mMonitoring); !err.IsNone()) {
         return AOS_ERROR_WRAP(err);
     }

src/core/cm/nodeinfoprovider/nodeinfoprovider.cpp

@@ -216,7 +216,7 @@ void NodeInfoProvider::OnNodeInfoChanged(const NodeInfo& info)
 {
     LockGuard lock {mMutex};
 
-    LOG_DBG() << "Node info changed" << Log::Field("nodeID", info.mNodeID) << Log::Field("state", info.mState)
+    LOG_DBG() << "IAM node info changed" << Log::Field("nodeID", info.mNodeID) << Log::Field("state", info.mState)
               << Log::Field("isConnected", info.mIsConnected) << Log::Field(info.mError);
 
     auto it = AddOrGetCacheItem(info.mNodeID);
@@ -253,8 +253,9 @@ void NodeInfoProvider::NotifyListeners(const NodeInfoCache& info)
 
     info.GetUnitNodeInfo(*unitNodeInfo);
 
-    LOG_DBG() << "Send node info changed" << Log::Field("nodeID", unitNodeInfo->mNodeID)
-              << Log::Field("state", unitNodeInfo->mState) << Log::Field("isConnected", unitNodeInfo->mIsConnected);
+    LOG_INF() << "Node info changed" << Log::Field("nodeID", unitNodeInfo->mNodeID)
+              << Log::Field("state", unitNodeInfo->mState) << Log::Field("isConnected", unitNodeInfo->mIsConnected)
+              << Log::Field(unitNodeInfo->mError);
 
     for (auto* listener : mListeners) {
         listener->OnNodeInfoChanged(*unitNodeInfo);

src/core/cm/storagestate/storagestate.cpp

@@ -87,7 +87,7 @@ Error StorageState::Start()
 {
     LockGuard lock {mMutex};
 
-    LOG_INF() << "Start storage state";
+    LOG_DBG() << "Start storage state";
 
     if (auto err = InitStateWatching(); !err.IsNone()) {
         return AOS_ERROR_WRAP(err);
@@ -100,7 +100,7 @@ Error StorageState::Stop()
 {
     LockGuard lock {mMutex};
 
-    LOG_INF() << "Stop storage state";
+    LOG_DBG() << "Stop storage state";
 
     while (!mStates.IsEmpty()) {
         if (auto err = StopStateWatching(mStates.Front().mInstanceIdent);
@@ -531,7 +531,7 @@ Error StorageState::StopStateWatching(const InstanceIdent& instanceIdent)
 
     auto it = mStates.FindIf([&instanceIdent](const auto& item) { return item.mInstanceIdent == instanceIdent; });
     if (it == mStates.end()) {
-        return ErrorEnum::eNotFound;
+        return ErrorEnum::eNone;
     }
 
     auto err = mFSWatcher->Unsubscribe(it->mFilePath.CStr(), *this);

src/core/cm/storagestate/tests/storagestate.cpp

@@ -535,7 +535,7 @@ TEST_F(StorageStateTests, Cleanup)
     EXPECT_TRUE(err.IsNone());
 
     err = mStorageState.Cleanup(cInstanceIdent);
-    EXPECT_TRUE(err.Is(ErrorEnum::eNotFound));
+    EXPECT_TRUE(err.IsNone());
 
     InstanceInfo storageData;
 

src/core/cm/unitconfig/unitconfig.cpp

@@ -53,7 +53,7 @@ Error UnitConfig::CheckUnitConfig(const aos::UnitConfig& config)
 {
     LockGuard lock {mMutex};
 
-    LOG_DBG() << "Check unit config" << Log::Field("version", config.mVersion);
+    LOG_INF() << "Check unit config" << Log::Field("version", config.mVersion);
 
     if (mUnitConfigState != UnitConfigStateEnum::eInstalled) {
         LOG_WRN() << "Skip unit config version check due to state" << Log::Field("state", mUnitConfigState)
@@ -104,7 +104,7 @@ Error UnitConfig::UpdateUnitConfig(const aos::UnitConfig& unitConfig)
 {
     LockGuard lock {mMutex};
 
-    LOG_DBG() << "Update unit config" << Log::Field("version", unitConfig.mVersion);
+    LOG_INF() << "Update unit config" << Log::Field("version", unitConfig.mVersion);
 
     if (mUnitConfigState != UnitConfigStateEnum::eInstalled && mUnitConfigState != UnitConfigStateEnum::eAbsent) {
         LOG_WRN() << "Skip unit config version check due to state" << Log::Field("state", mUnitConfigState)