Skip to content

#13615 Read cloud config files, do not store in preferences #13616

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
magnesj merged 1 commit into from
Feb 13, 2026
Merged

#13615 Read cloud config files, do not store in preferences #13616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions ApplicationLibCode/Application/RiaApplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"
#include "RiaOpenMPTools.h"
#include "RiaOpenTelemetryManager.h"
#include "RiaPlotWindowRedrawScheduler.h"
#include "RiaPreferences.h"
#include "RiaPreferencesOsdu.h"
Expand Down Expand Up @@ -1454,9 +1453,6 @@ void RiaApplication::applyPreferences()

caf::ProgressInfoStatic::setEnabled( RiaPreferencesSystem::current()->showProgressBar() );

// Reinitialize OpenTelemetry based on current preferences
RiaOpenTelemetryManager::instance().reinitialize();

if ( m_preferencesFileName.isEmpty() )
{
m_preferences->writePreferencesToApplicationStore();
Expand Down
35 changes: 19 additions & 16 deletions ApplicationLibCode/Application/RiaPreferencesOpenTelemetry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ void RiaPreferencesOpenTelemetry::LoggingStateType::setUp()
{
addItem( RiaPreferencesOpenTelemetry::LoggingState::DISABLED, "DISABLED", "Disabled" );
addItem( RiaPreferencesOpenTelemetry::LoggingState::DEFAULT, "DEFAULT", "Default" );
addItem( RiaPreferencesOpenTelemetry::LoggingState::ALL, "ALL", "All" );
setDefault( RiaPreferencesOpenTelemetry::LoggingState::DEFAULT );
}
} // namespace caf
Expand All @@ -46,7 +45,8 @@ RiaPreferencesOpenTelemetry::RiaPreferencesOpenTelemetry()
{
CAF_PDM_InitObject( "OpenTelemetry Configuration", "", "", "Configuration for OpenTelemetry crash reporting and telemetry" );

CAF_PDM_InitField( &m_loggingState, "loggingState", LoggingStateType( LoggingState::DISABLED ), "Logging State" );
CAF_PDM_InitField( &m_configFile, "configFile", QString( "No config file detected" ), "Config File" );
CAF_PDM_InitField( &m_loggingState, "loggingState_v1", LoggingStateType( LoggingState::DEFAULT ), "Logging State" );
CAF_PDM_InitField( &m_connectionString, "connectionString", QString(), "Azure Connection String" );
m_connectionString.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );

Expand All @@ -56,13 +56,8 @@ RiaPreferencesOpenTelemetry::RiaPreferencesOpenTelemetry()
CAF_PDM_InitField( &m_memoryThresholdMb, "memoryThresholdMb", 50, "Memory Threshold (MB)" );
CAF_PDM_InitField( &m_samplingRate, "samplingRate", 1.0, "Sampling Rate" );
CAF_PDM_InitField( &m_connectionTimeoutMs, "connectionTimeoutMs", 10000, "Connection Timeout (ms)" );
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaPreferencesOpenTelemetry::~RiaPreferencesOpenTelemetry()
{
setFieldStates();
}

//--------------------------------------------------------------------------------------------------
Expand All @@ -76,8 +71,10 @@ RiaPreferencesOpenTelemetry* RiaPreferencesOpenTelemetry::current()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesOpenTelemetry::setData( const std::map<QString, QString>& keyValuePairs )
void RiaPreferencesOpenTelemetry::setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile )
{
m_configFile = configFile;

for ( const auto& [key, value] : keyValuePairs )
{
if ( key == "connection_string" )
Expand Down Expand Up @@ -118,7 +115,7 @@ void RiaPreferencesOpenTelemetry::setData( const std::map<QString, QString>& key
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesOpenTelemetry::setFieldsReadOnly()
void RiaPreferencesOpenTelemetry::setFieldStates()
{
std::vector<caf::PdmFieldHandle*> fields = this->fields();
for ( auto field : fields )
Expand All @@ -127,6 +124,7 @@ void RiaPreferencesOpenTelemetry::setFieldsReadOnly()
if ( field != &m_loggingState )
{
field->uiCapability()->setUiReadOnly( true );
field->xmlCapability()->disableIO();
}
}
}
Expand All @@ -141,13 +139,18 @@ void RiaPreferencesOpenTelemetry::defineUiOrdering( QString uiConfigName, caf::P
// Only show configuration fields if not disabled
if ( m_loggingState() != LoggingState::DISABLED )
{
uiOrdering.add( &m_configFile );
uiOrdering.add( &m_connectionString );
uiOrdering.add( &m_batchTimeoutMs );
uiOrdering.add( &m_maxBatchSize );
uiOrdering.add( &m_maxQueueSize );
uiOrdering.add( &m_memoryThresholdMb );
uiOrdering.add( &m_samplingRate );
uiOrdering.add( &m_connectionTimeoutMs );

auto group = uiOrdering.addNewGroup( "Configuration" );
group->setCollapsedByDefault();

group->add( &m_batchTimeoutMs );
group->add( &m_maxBatchSize );
group->add( &m_maxQueueSize );
group->add( &m_memoryThresholdMb );
group->add( &m_samplingRate );
group->add( &m_connectionTimeoutMs );
}
uiOrdering.skipRemainingFields();
}
Expand Down
11 changes: 6 additions & 5 deletions ApplicationLibCode/Application/RiaPreferencesOpenTelemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,15 @@ class RiaPreferencesOpenTelemetry : public caf::PdmObject
enum class LoggingState
{
DISABLED,
DEFAULT,
ALL
DEFAULT
};
using LoggingStateType = caf::AppEnum<LoggingState>;

RiaPreferencesOpenTelemetry();
~RiaPreferencesOpenTelemetry() override;

static RiaPreferencesOpenTelemetry* current();

void setData( const std::map<QString, QString>& keyValuePairs );
void setFieldsReadOnly();
void setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile );

// Service name and version are hardcoded, not configurable
QString serviceName() const;
Expand All @@ -72,6 +69,10 @@ class RiaPreferencesOpenTelemetry : public caf::PdmObject
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

private:
void setFieldStates();

private:
caf::PdmField<QString> m_configFile;
caf::PdmField<LoggingStateType> m_loggingState;
caf::PdmField<QString> m_connectionString;
caf::PdmField<int> m_batchTimeoutMs;
Expand Down
20 changes: 13 additions & 7 deletions ApplicationLibCode/Application/RiaPreferencesOsdu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesOsdu, "RiaPreferencesOsdu" );
//--------------------------------------------------------------------------------------------------
RiaPreferencesOsdu::RiaPreferencesOsdu()
{
CAF_PDM_InitField( &m_configFile, "configFile", QString( "No config file detected" ), "Config File" );
CAF_PDM_InitFieldNoDefault( &m_server, "server", "Server" );
CAF_PDM_InitFieldNoDefault( &m_dataPartitionId, "dataPartitionId", "Data Partition Id" );
CAF_PDM_InitFieldNoDefault( &m_authority, "authority", "Authority" );
CAF_PDM_InitFieldNoDefault( &m_scopes, "scopes", "Scopes" );
CAF_PDM_InitFieldNoDefault( &m_clientId, "clientId", "Client Id" );

setFieldStates();
}

//--------------------------------------------------------------------------------------------------
Expand All @@ -46,8 +49,10 @@ RiaPreferencesOsdu* RiaPreferencesOsdu::current()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesOsdu::setData( const std::map<QString, QString>& keyValuePairs )
void RiaPreferencesOsdu::setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile )
{
m_configFile = configFile;

for ( const auto& [key, value] : keyValuePairs )
{
if ( key == "server" )
Expand Down Expand Up @@ -76,13 +81,14 @@ void RiaPreferencesOsdu::setData( const std::map<QString, QString>& keyValuePair
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesOsdu::setFieldsReadOnly()
void RiaPreferencesOsdu::setFieldStates()
{
m_server.uiCapability()->setUiReadOnly( true );
m_dataPartitionId.uiCapability()->setUiReadOnly( true );
m_authority.uiCapability()->setUiReadOnly( true );
m_scopes.uiCapability()->setUiReadOnly( true );
m_clientId.uiCapability()->setUiReadOnly( true );
std::vector<caf::PdmFieldHandle*> fields = this->fields();
for ( auto field : fields )
{
field->uiCapability()->setUiReadOnly( true );
field->xmlCapability()->disableIO();
}
}

//--------------------------------------------------------------------------------------------------
Expand Down
7 changes: 5 additions & 2 deletions ApplicationLibCode/Application/RiaPreferencesOsdu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ class RiaPreferencesOsdu : public caf::PdmObject

static RiaPreferencesOsdu* current();

void setData( const std::map<QString, QString>& keyValuePairs );
void setFieldsReadOnly();
void setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile );

QString server() const;
QString dataPartitionId() const;
Expand All @@ -43,6 +42,10 @@ class RiaPreferencesOsdu : public caf::PdmObject
QString clientId() const;

private:
void setFieldStates();

private:
caf::PdmField<QString> m_configFile;
caf::PdmField<QString> m_server;
caf::PdmField<QString> m_dataPartitionId;
caf::PdmField<QString> m_authority;
Expand Down
19 changes: 13 additions & 6 deletions ApplicationLibCode/Application/RiaPreferencesSumo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesSumo, "RiaPreferencesSumo" );
//--------------------------------------------------------------------------------------------------
RiaPreferencesSumo::RiaPreferencesSumo()
{
CAF_PDM_InitField( &m_configFile, "configFile", QString( "No config file detected" ), "Config File" );
CAF_PDM_InitFieldNoDefault( &m_server, "server", "Server" );
CAF_PDM_InitFieldNoDefault( &m_authority, "authority", "Authority" );
CAF_PDM_InitFieldNoDefault( &m_scopes, "scopes", "Scopes" );
CAF_PDM_InitFieldNoDefault( &m_clientId, "clientId", "Client Id" );

setFieldStates();
}

//--------------------------------------------------------------------------------------------------
Expand All @@ -45,8 +48,10 @@ RiaPreferencesSumo* RiaPreferencesSumo::current()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesSumo::setData( const std::map<QString, QString>& keyValuePairs )
void RiaPreferencesSumo::setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile )
{
m_configFile = configFile;

for ( const auto& [key, value] : keyValuePairs )
{
if ( key == "server" )
Expand All @@ -71,12 +76,14 @@ void RiaPreferencesSumo::setData( const std::map<QString, QString>& keyValuePair
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaPreferencesSumo::setFieldsReadOnly()
void RiaPreferencesSumo::setFieldStates()
{
m_server.uiCapability()->setUiReadOnly( true );
m_authority.uiCapability()->setUiReadOnly( true );
m_scopes.uiCapability()->setUiReadOnly( true );
m_clientId.uiCapability()->setUiReadOnly( true );
std::vector<caf::PdmFieldHandle*> fields = this->fields();
for ( auto field : fields )
{
field->uiCapability()->setUiReadOnly( true );
field->xmlCapability()->disableIO();
}
}

//--------------------------------------------------------------------------------------------------
Expand Down
7 changes: 5 additions & 2 deletions ApplicationLibCode/Application/RiaPreferencesSumo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@ class RiaPreferencesSumo : public caf::PdmObject

static RiaPreferencesSumo* current();

void setData( const std::map<QString, QString>& keyValuePairs );
void setFieldsReadOnly();
void setData( const std::map<QString, QString>& keyValuePairs, const QString& configFile );

QString server() const;
QString authority() const;
QString scopes() const;
QString clientId() const;

private:
void setFieldStates();

private:
caf::PdmField<QString> m_configFile;
caf::PdmField<QString> m_server;
caf::PdmField<QString> m_authority;
caf::PdmField<QString> m_scopes;
Expand Down
9 changes: 3 additions & 6 deletions ApplicationLibCode/Application/Tools/Cloud/RiaConnectorTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ void RiaConnectorTools::readCloudConfigFiles( RiaPreferences* preferences )
if ( !keyValuePairs.empty() )
{
RiaLogging::debug( QString( "Imported OSDU configuration from : '%1'" ).arg( filePath ) );
preferences->osduPreferences()->setData( keyValuePairs );
preferences->osduPreferences()->setFieldsReadOnly();
preferences->osduPreferences()->setData( keyValuePairs, filePath );
break;
}
}
Expand All @@ -193,8 +192,7 @@ void RiaConnectorTools::readCloudConfigFiles( RiaPreferences* preferences )
if ( !keyValuePairs.empty() )
{
RiaLogging::debug( QString( "Imported SUMO configuration from : '%1'" ).arg( filePath ) );
preferences->sumoPreferences()->setData( keyValuePairs );
preferences->sumoPreferences()->setFieldsReadOnly();
preferences->sumoPreferences()->setData( keyValuePairs, filePath );
break;
}
}
Expand All @@ -206,8 +204,7 @@ void RiaConnectorTools::readCloudConfigFiles( RiaPreferences* preferences )
if ( !keyValuePairs.empty() )
{
RiaLogging::debug( QString( "Imported OpenTelemetry configuration from : '%1'" ).arg( filePath ) );
RiaPreferencesOpenTelemetry::current()->setData( keyValuePairs );
RiaPreferencesOpenTelemetry::current()->setFieldsReadOnly();
RiaPreferencesOpenTelemetry::current()->setData( keyValuePairs, filePath );
break;
}
}
Expand Down