Skip to content

Feature move logprovider config #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
al1img merged 3 commits into from
Jun 30, 2025
Merged

Feature move logprovider config #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1adb091
common: logprovider: use core lib logprovider config
mlohvynenko Jun 25, 2025
3b5ff35
mp: use core lib log provider config structure
mlohvynenko Jun 25, 2025
abd00fb
sm: use core lib log provider config structure
mlohvynenko Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/common/logprovider/archivator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace aos::common::logprovider {

Archivator::Archivator(sm::logprovider::LogObserverItf& logReceiver, const Config& config)
Archivator::Archivator(sm::logprovider::LogObserverItf& logReceiver, const aos::logprovider::Config& config)
: mLogReceiver(logReceiver)
, mConfig(config)
{
Expand Down
7 changes: 3 additions & 4 deletions src/common/logprovider/archivator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

#include <aos/common/cloudprotocol/cloudprotocol.hpp>
#include <aos/common/cloudprotocol/log.hpp>
#include <aos/common/logprovider/config.hpp>
#include <aos/sm/logprovider.hpp>

#include "config.hpp"

namespace aos::common::logprovider {

/**
Expand All @@ -33,7 +32,7 @@ class Archivator {
* @param logReceiver log receiver.
* @param config logprovider config.
*/
Archivator(sm::logprovider::LogObserverItf& logReceiver, const Config& config);
Archivator(sm::logprovider::LogObserverItf& logReceiver, const aos::logprovider::Config& config);

/**
* Adds log message to the archivator.
Expand All @@ -56,7 +55,7 @@ class Archivator {
Error AddLogPart();

sm::logprovider::LogObserverItf& mLogReceiver;
Config mConfig;
aos::logprovider::Config mConfig;

uint64_t mPartCount = {};
uint64_t mPartSize = {};
Expand Down
28 changes: 0 additions & 28 deletions src/common/logprovider/config.hpp
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/common/logprovider/tests/archivator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ class LogObserverMock : public sm::logprovider::LogObserverItf {

class ArchivatorTest : public Test {
public:
LogObserverMock mLogObserver;
Config mConfig {1024, 5};
LogObserverMock mLogObserver;
aos::logprovider::Config mConfig {1024, 5};
};

/***********************************************************************************************************************
Expand Down
6 changes: 3 additions & 3 deletions src/mp/config/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ IAMConfig ParseIAMConfig(const common::utils::CaseInsensitiveObjectWrapper& obje
};
}

common::logprovider::Config ParseLogProviderConfig(const common::utils::CaseInsensitiveObjectWrapper& object)
aos::logprovider::Config ParseLogProviderConfig(const common::utils::CaseInsensitiveObjectWrapper& object)
{
if (!object.Has("LogProvider")) {
return common::logprovider::Config {
return aos::logprovider::Config {
cDefaultMaxLogPartSize,
cDefaultMaxLogPartCount,
};
}

auto logProviderObject = object.GetObject("LogProvider");

return common::logprovider::Config {
return aos::logprovider::Config {
logProviderObject.GetValue<uint64_t>("MaxPartSize", cDefaultMaxLogPartSize),
logProviderObject.GetValue<uint64_t>("MaxPartCount", cDefaultMaxLogPartCount),
};
Expand Down
20 changes: 10 additions & 10 deletions src/mp/config/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#include <string>

#include <aos/common/logprovider/config.hpp>
#include <aos/common/tools/error.hpp>

#include <common/logprovider/config.hpp>
#include <common/utils/time.hpp>

namespace aos::mp::config {
Expand Down Expand Up @@ -65,15 +65,15 @@ struct CMConfig {
* Configuration.
*/
struct Config {
std::string mWorkingDir;
VChanConfig mVChan;
CMConfig mCMConfig;
std::string mCertStorage;
std::string mCACert;
std::string mImageStoreDir;
Download mDownload;
IAMConfig mIAMConfig;
common::logprovider::Config mLogProviderConfig;
std::string mWorkingDir;
VChanConfig mVChan;
CMConfig mCMConfig;
std::string mCertStorage;
std::string mCACert;
std::string mImageStoreDir;
Download mDownload;
IAMConfig mIAMConfig;
aos::logprovider::Config mLogProviderConfig;
};

/***********************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/mp/logprovider/archivemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace aos::mp::logprovider {
* Public
**********************************************************************************************************************/

Error ArchiveManager::Init(sm::logprovider::LogObserverItf& logReceiver, const common::logprovider::Config& config)
Error ArchiveManager::Init(sm::logprovider::LogObserverItf& logReceiver, const aos::logprovider::Config& config)
{
LOG_DBG() << "Init archive manager";

Expand Down
6 changes: 3 additions & 3 deletions src/mp/logprovider/archivemanager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class ArchiveManager {
* @param config configuration.
* @return Error.
*/
Error Init(sm::logprovider::LogObserverItf& logReceiver, const common::logprovider::Config& config);
Error Init(sm::logprovider::LogObserverItf& logReceiver, const aos::logprovider::Config& config);

/**
* Starts archive manager.
Expand Down Expand Up @@ -66,7 +66,7 @@ class ArchiveManager {

struct ArchiveContext {
ArchiveContext(const std::string& logID, sm::logprovider::LogObserverItf& logReceiver,
const common::logprovider::Config& config)
const aos::logprovider::Config& config)
: mLogID(logID)
, mUpdated(Time::Now())
, mArchivator(logReceiver, config)
Expand All @@ -89,7 +89,7 @@ class ArchiveManager {
std::thread mThread;
std::condition_variable mCondVar;
std::mutex mMutex;
common::logprovider::Config mConfig = {};
aos::logprovider::Config mConfig = {};
sm::logprovider::LogObserverItf* mLogReceiver = {};
std::vector<std::shared_ptr<ArchiveContext>> mArchiveContexts;
std::queue<std::shared_ptr<servicemanager::v4::LogData>> mLogQueue;
Expand Down
6 changes: 3 additions & 3 deletions src/mp/logprovider/tests/archivemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ class ArchiveManagerTest : public ::testing::Test {

void TearDown() override { }

common::logprovider::Config mConfig;
LogObserverStub mLogObserver;
ArchiveManager mArchiveManager;
aos::logprovider::Config mConfig;
LogObserverStub mLogObserver;
ArchiveManager mArchiveManager;
};

/***********************************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/sm/config/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void ParseMonitoringConfig(const common::utils::CaseInsensitiveObjectWrapper& ob
AOS_ERROR_CHECK_AND_THROW(err, "error parsing averageWindow tag");
}

void ParseLoggingConfig(const common::utils::CaseInsensitiveObjectWrapper& object, common::logprovider::Config& config)
void ParseLoggingConfig(const common::utils::CaseInsensitiveObjectWrapper& object, aos::logprovider::Config& config)
{
config.mMaxPartSize = object.GetValue<uint64_t>("maxPartSize", cloudprotocol::cLogContentLen);
config.mMaxPartCount = object.GetValue<uint64_t>("maxPartCount", 80);
Expand Down
32 changes: 16 additions & 16 deletions src/sm/config/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

#include <Poco/Dynamic/Var.h>

#include <aos/common/logprovider/config.hpp>
#include <aos/common/monitoring/resourcemonitor.hpp>
#include <aos/common/tools/error.hpp>
#include <aos/sm/launcher/config.hpp>
#include <aos/sm/layermanager.hpp>
#include <aos/sm/servicemanager.hpp>

#include <common/iamclient/publicservicehandler.hpp>
#include <common/logprovider/config.hpp>
#include <common/utils/time.hpp>
#include <sm/smclient/config.hpp>

Expand Down Expand Up @@ -50,21 +50,21 @@ struct MigrationConfig {
* Config instance.
*/
struct Config {
common::iamclient::Config mIAMClientConfig;
sm::layermanager::Config mLayerManagerConfig;
sm::servicemanager::Config mServiceManagerConfig;
sm::launcher::Config mLauncherConfig;
smclient::Config mSMClientConfig;
std::string mCertStorage;
std::string mIAMProtectedServerURL;
std::string mWorkingDir;
uint32_t mServicesPartLimit;
uint32_t mLayersPartLimit;
std::string mNodeConfigFile;
monitoring::Config mMonitoring;
common::logprovider::Config mLogging;
JournalAlertsConfig mJournalAlerts;
MigrationConfig mMigration;
common::iamclient::Config mIAMClientConfig;
sm::layermanager::Config mLayerManagerConfig;
sm::servicemanager::Config mServiceManagerConfig;
sm::launcher::Config mLauncherConfig;
smclient::Config mSMClientConfig;
std::string mCertStorage;
std::string mIAMProtectedServerURL;
std::string mWorkingDir;
uint32_t mServicesPartLimit;
uint32_t mLayersPartLimit;
std::string mNodeConfigFile;
monitoring::Config mMonitoring;
logprovider::Config mLogging;
JournalAlertsConfig mJournalAlerts;
MigrationConfig mMigration;
};

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/sm/logprovider/logprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace aos::sm::logprovider {
* Public
**********************************************************************************************************************/

Error LogProvider::Init(const common::logprovider::Config& config, InstanceIDProviderItf& instanceProvider)
Error LogProvider::Init(const aos::logprovider::Config& config, InstanceIDProviderItf& instanceProvider)
{
LOG_DBG() << "Init log provider";

Expand Down
8 changes: 4 additions & 4 deletions src/sm/logprovider/logprovider.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class LogProvider : public LogProviderItf {
* @param config log provider config.
* @return Error.
*/
Error Init(const common::logprovider::Config& config, InstanceIDProviderItf& instanceProvider);
Error Init(const aos::logprovider::Config& config, InstanceIDProviderItf& instanceProvider);

/**
* Starts requests processing thread.
Expand Down Expand Up @@ -158,9 +158,9 @@ class LogProvider : public LogProviderItf {
std::string GetUnitNameFromLog(const utils::JournalEntry& entry);
std::string MakeUnitNameFromInstanceID(const std::string& instanceID);

InstanceIDProviderItf* mInstanceProvider = nullptr;
common::logprovider::Config mConfig = {};
LogObserverItf* mLogReceiver = nullptr;
InstanceIDProviderItf* mInstanceProvider = nullptr;
aos::logprovider::Config mConfig = {};
LogObserverItf* mLogReceiver = nullptr;

std::thread mWorkerThread;
std::queue<GetLogRequest> mLogRequests;
Expand Down
2 changes: 1 addition & 1 deletion src/sm/logprovider/tests/logprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class LogProviderTest : public Test {
{
aos::test::InitLog();

auto config = common::logprovider::Config {200, 10};
auto config = aos::logprovider::Config {200, 10};

mLogProvider.Init(config, mInstanceIDProvider);
mLogProvider.Subscribe(mLogObserver);
Expand Down
Loading