Add telemetry off-switch to amc_server.xml

ACT/LibMC.xml

@@ -740,6 +740,7 @@
 		<error name="MISSINGSESSIONVARIABLENAME" code="715" description="Missing session variable name." />
 		<error name="MISSINGSESSIONVARIABLETYPE" code="716" description="Missing session variable type." />
 		<error name="INVALIDSESSIONREFERENCE" code="717" description="Invalid session reference in UI expression." />
+		<error name="INVALIDTELEMETRYSETTING" code="718" description="Invalid telemetry setting." />
 
 
 

ACT/LibMCData.xml

@@ -452,6 +452,7 @@
 
 		<error name="JOBNAMETOOLONG" code="451" description="Job name exceeds maximum allowed length" />
 		<error name="STRINGPARAMETERTOOLONG" code="452" description="String parameter exceeds maximum allowed length" />
+		<error name="TELEMETRYSETTINGAFTERINITIALISATION" code="453" description="Telemetry setting changed after database initialisation" />
 
 	</errors>
 
@@ -2291,8 +2292,16 @@
 			<param name="ConnectionString" type="string" pass="in" description="Connection string." />				
 		</method>
 
+		<method name="SetTelemetryEnabled" description="enables or disables telemetry recording. Must be called before InitialiseDatabase.">
+			<param name="TelemetryEnabled" type="bool" pass="in" description="Flag if telemetry recording shall be enabled." />
+		</method>
+
+		<method name="GetTelemetryEnabled" description="returns if telemetry recording is enabled.">
+			<param name="TelemetryEnabled" type="bool" pass="return" description="Flag if telemetry recording is enabled." />
+		</method>
+
 		<method name="GetDataModelVersion" description="returns the linear data model version.">
-			<param name="Version" type="uint32" pass="return" description="Data model version." />	
+			<param name="Version" type="uint32" pass="return" description="Data model version." />
 		</method>
 
 		<method name="GetInstallationInformation" description="DEPRECIATED. Only used for backwards compatibility. NEVER USE because of thread safety issues.. Use GetInstallationInformationObject instead.">

Framework/HeadersCore/CppDynamic/libmc_dynamic.hpp

@@ -809,6 +809,7 @@ class ELibMCException : public std::exception {
 			case LIBMC_ERROR_MISSINGSESSIONVARIABLENAME: return "MISSINGSESSIONVARIABLENAME";
 			case LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE: return "MISSINGSESSIONVARIABLETYPE";
 			case LIBMC_ERROR_INVALIDSESSIONREFERENCE: return "INVALIDSESSIONREFERENCE";
+			case LIBMC_ERROR_INVALIDTELEMETRYSETTING: return "INVALIDTELEMETRYSETTING";
 		}
 		return "UNKNOWN";
 	}
@@ -1452,6 +1453,7 @@ class ELibMCException : public std::exception {
 			case LIBMC_ERROR_MISSINGSESSIONVARIABLENAME: return "Missing session variable name.";
 			case LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE: return "Missing session variable type.";
 			case LIBMC_ERROR_INVALIDSESSIONREFERENCE: return "Invalid session reference in UI expression.";
+			case LIBMC_ERROR_INVALIDTELEMETRYSETTING: return "Invalid telemetry setting.";
 		}
 		return "unknown error";
 	}

Framework/HeadersCore/CppDynamic/libmc_types.hpp

@@ -731,6 +731,7 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_MISSINGSESSIONVARIABLENAME 715 /** Missing session variable name. */
 #define LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE 716 /** Missing session variable type. */
 #define LIBMC_ERROR_INVALIDSESSIONREFERENCE 717 /** Invalid session reference in UI expression. */
+#define LIBMC_ERROR_INVALIDTELEMETRYSETTING 718 /** Invalid telemetry setting. */
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -1374,6 +1375,7 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_MISSINGSESSIONVARIABLENAME: return "Missing session variable name.";
     case LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE: return "Missing session variable type.";
     case LIBMC_ERROR_INVALIDSESSIONREFERENCE: return "Invalid session reference in UI expression.";
+    case LIBMC_ERROR_INVALIDTELEMETRYSETTING: return "Invalid telemetry setting.";
     default: return "unknown error";
   }
 }

Framework/HeadersCore/CppDynamic/libmcdata_dynamic.h

@@ -3420,6 +3420,24 @@ typedef LibMCDataResult (*PLibMCDataInstallationInformation_GetBaseTempDirectory
 */
 typedef LibMCDataResult (*PLibMCDataDataModel_InitialiseDatabasePtr) (LibMCData_DataModel pDataModel, const char * pDataDirectory, LibMCData::eDataBaseType eDataBaseType, const char * pConnectionString);
 
+/**
+* enables or disables telemetry recording. Must be called before InitialiseDatabase.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[in] bTelemetryEnabled - Flag if telemetry recording shall be enabled.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_SetTelemetryEnabledPtr) (LibMCData_DataModel pDataModel, bool bTelemetryEnabled);
+
+/**
+* returns if telemetry recording is enabled.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pTelemetryEnabled - Flag if telemetry recording is enabled.
+* @return error code or 0 (success)
+*/
+typedef LibMCDataResult (*PLibMCDataDataModel_GetTelemetryEnabledPtr) (LibMCData_DataModel pDataModel, bool * pTelemetryEnabled);
+
 /**
 * returns the linear data model version.
 *
@@ -4021,6 +4039,8 @@ typedef struct {
 	PLibMCDataInstallationInformation_GetInstallationSecretPtr m_InstallationInformation_GetInstallationSecret;
 	PLibMCDataInstallationInformation_GetBaseTempDirectoryPtr m_InstallationInformation_GetBaseTempDirectory;
 	PLibMCDataDataModel_InitialiseDatabasePtr m_DataModel_InitialiseDatabase;
+	PLibMCDataDataModel_SetTelemetryEnabledPtr m_DataModel_SetTelemetryEnabled;
+	PLibMCDataDataModel_GetTelemetryEnabledPtr m_DataModel_GetTelemetryEnabled;
 	PLibMCDataDataModel_GetDataModelVersionPtr m_DataModel_GetDataModelVersion;
 	PLibMCDataDataModel_GetInstallationInformationPtr m_DataModel_GetInstallationInformation;
 	PLibMCDataDataModel_GetInstallationInformationObjectPtr m_DataModel_GetInstallationInformationObject;

Framework/HeadersCore/CppDynamic/libmcdata_dynamic.hpp

@@ -690,6 +690,7 @@ class ELibMCDataException : public std::exception {
 			case LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND: return "TELEMETRYCHANNELNOTFOUND";
 			case LIBMCDATA_ERROR_JOBNAMETOOLONG: return "JOBNAMETOOLONG";
 			case LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG: return "STRINGPARAMETERTOOLONG";
+			case LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION: return "TELEMETRYSETTINGAFTERINITIALISATION";
 		}
 		return "UNKNOWN";
 	}
@@ -1079,6 +1080,7 @@ class ELibMCDataException : public std::exception {
 			case LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND: return "Telemetry channel not found.";
 			case LIBMCDATA_ERROR_JOBNAMETOOLONG: return "Job name exceeds maximum allowed length";
 			case LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG: return "String parameter exceeds maximum allowed length";
+			case LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION: return "Telemetry setting changed after database initialisation";
 		}
 		return "unknown error";
 	}
@@ -2197,6 +2199,8 @@ class CDataModel : public CBase {
 	}
 
 	inline void InitialiseDatabase(const std::string & sDataDirectory, const eDataBaseType eDataBaseType, const std::string & sConnectionString);
+	inline void SetTelemetryEnabled(const bool bTelemetryEnabled);
+	inline bool GetTelemetryEnabled();
 	inline LibMCData_uint32 GetDataModelVersion();
 	inline void GetInstallationInformation(std::string & sDEPRECIATEDInstallationUUID, std::string & sDEPRECIATEDInstallationSecret);
 	inline PInstallationInformation GetInstallationInformationObject();
@@ -2616,6 +2620,8 @@ class CDataModel : public CBase {
 		pWrapperTable->m_InstallationInformation_GetInstallationSecret = nullptr;
 		pWrapperTable->m_InstallationInformation_GetBaseTempDirectory = nullptr;
 		pWrapperTable->m_DataModel_InitialiseDatabase = nullptr;
+		pWrapperTable->m_DataModel_SetTelemetryEnabled = nullptr;
+		pWrapperTable->m_DataModel_GetTelemetryEnabled = nullptr;
 		pWrapperTable->m_DataModel_GetDataModelVersion = nullptr;
 		pWrapperTable->m_DataModel_GetInstallationInformation = nullptr;
 		pWrapperTable->m_DataModel_GetInstallationInformationObject = nullptr;
@@ -5361,6 +5367,24 @@ class CDataModel : public CBase {
 		if (pWrapperTable->m_DataModel_InitialiseDatabase == nullptr)
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 
+		#ifdef _WIN32
+		pWrapperTable->m_DataModel_SetTelemetryEnabled = (PLibMCDataDataModel_SetTelemetryEnabledPtr) GetProcAddress(hLibrary, "libmcdata_datamodel_settelemetryenabled");
+		#else // _WIN32
+		pWrapperTable->m_DataModel_SetTelemetryEnabled = (PLibMCDataDataModel_SetTelemetryEnabledPtr) dlsym(hLibrary, "libmcdata_datamodel_settelemetryenabled");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DataModel_SetTelemetryEnabled == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+
+		#ifdef _WIN32
+		pWrapperTable->m_DataModel_GetTelemetryEnabled = (PLibMCDataDataModel_GetTelemetryEnabledPtr) GetProcAddress(hLibrary, "libmcdata_datamodel_gettelemetryenabled");
+		#else // _WIN32
+		pWrapperTable->m_DataModel_GetTelemetryEnabled = (PLibMCDataDataModel_GetTelemetryEnabledPtr) dlsym(hLibrary, "libmcdata_datamodel_gettelemetryenabled");
+		dlerror();
+		#endif // _WIN32
+		if (pWrapperTable->m_DataModel_GetTelemetryEnabled == nullptr)
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+
 		#ifdef _WIN32
 		pWrapperTable->m_DataModel_GetDataModelVersion = (PLibMCDataDataModel_GetDataModelVersionPtr) GetProcAddress(hLibrary, "libmcdata_datamodel_getdatamodelversion");
 		#else // _WIN32
@@ -6840,6 +6864,14 @@ class CDataModel : public CBase {
 		if ( (eLookupError != 0) || (pWrapperTable->m_DataModel_InitialiseDatabase == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
 
+		eLookupError = (*pLookup)("libmcdata_datamodel_settelemetryenabled", (void**)&(pWrapperTable->m_DataModel_SetTelemetryEnabled));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DataModel_SetTelemetryEnabled == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+
+		eLookupError = (*pLookup)("libmcdata_datamodel_gettelemetryenabled", (void**)&(pWrapperTable->m_DataModel_GetTelemetryEnabled));
+		if ( (eLookupError != 0) || (pWrapperTable->m_DataModel_GetTelemetryEnabled == nullptr) )
+			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
+
 		eLookupError = (*pLookup)("libmcdata_datamodel_getdatamodelversion", (void**)&(pWrapperTable->m_DataModel_GetDataModelVersion));
 		if ( (eLookupError != 0) || (pWrapperTable->m_DataModel_GetDataModelVersion == nullptr) )
 			return LIBMCDATA_ERROR_COULDNOTFINDLIBRARYEXPORT;
@@ -11348,6 +11380,27 @@ class CDataModel : public CBase {
 		CheckError(m_pWrapper->m_WrapperTable.m_DataModel_InitialiseDatabase(m_pHandle, sDataDirectory.c_str(), eDataBaseType, sConnectionString.c_str()));
 	}
 
+	/**
+	* CDataModel::SetTelemetryEnabled - enables or disables telemetry recording. Must be called before InitialiseDatabase.
+	* @param[in] bTelemetryEnabled - Flag if telemetry recording shall be enabled.
+	*/
+	void CDataModel::SetTelemetryEnabled(const bool bTelemetryEnabled)
+	{
+		CheckError(m_pWrapper->m_WrapperTable.m_DataModel_SetTelemetryEnabled(m_pHandle, bTelemetryEnabled));
+	}
+
+	/**
+	* CDataModel::GetTelemetryEnabled - returns if telemetry recording is enabled.
+	* @return Flag if telemetry recording is enabled.
+	*/
+	bool CDataModel::GetTelemetryEnabled()
+	{
+		bool resultTelemetryEnabled = 0;
+		CheckError(m_pWrapper->m_WrapperTable.m_DataModel_GetTelemetryEnabled(m_pHandle, &resultTelemetryEnabled));
+
+		return resultTelemetryEnabled;
+	}
+
 	/**
 	* CDataModel::GetDataModelVersion - returns the linear data model version.
 	* @return Data model version.

Framework/HeadersCore/CppDynamic/libmcdata_types.hpp

@@ -477,6 +477,7 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND 450 /** Telemetry channel not found. */
 #define LIBMCDATA_ERROR_JOBNAMETOOLONG 451 /** Job name exceeds maximum allowed length */
 #define LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG 452 /** String parameter exceeds maximum allowed length */
+#define LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION 453 /** Telemetry setting changed after database initialisation */
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -866,6 +867,7 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND: return "Telemetry channel not found.";
     case LIBMCDATA_ERROR_JOBNAMETOOLONG: return "Job name exceeds maximum allowed length";
     case LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG: return "String parameter exceeds maximum allowed length";
+    case LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION: return "Telemetry setting changed after database initialisation";
     default: return "unknown error";
   }
 }

Framework/InterfacesCore/libmc_types.hpp

@@ -731,6 +731,7 @@ typedef void * LibMC_pvoid;
 #define LIBMC_ERROR_MISSINGSESSIONVARIABLENAME 715 /** Missing session variable name. */
 #define LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE 716 /** Missing session variable type. */
 #define LIBMC_ERROR_INVALIDSESSIONREFERENCE 717 /** Invalid session reference in UI expression. */
+#define LIBMC_ERROR_INVALIDTELEMETRYSETTING 718 /** Invalid telemetry setting. */
 
 /*************************************************************************************************************************
  Error strings for LibMC
@@ -1374,6 +1375,7 @@ inline const char * LIBMC_GETERRORSTRING (LibMCResult nErrorCode) {
     case LIBMC_ERROR_MISSINGSESSIONVARIABLENAME: return "Missing session variable name.";
     case LIBMC_ERROR_MISSINGSESSIONVARIABLETYPE: return "Missing session variable type.";
     case LIBMC_ERROR_INVALIDSESSIONREFERENCE: return "Invalid session reference in UI expression.";
+    case LIBMC_ERROR_INVALIDTELEMETRYSETTING: return "Invalid telemetry setting.";
     default: return "unknown error";
   }
 }

Framework/InterfacesCore/libmcdata_abi.hpp

@@ -3433,6 +3433,24 @@ LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_installationinformation_getbasetemp
 */
 LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_datamodel_initialisedatabase(LibMCData_DataModel pDataModel, const char * pDataDirectory, LibMCData::eDataBaseType eDataBaseType, const char * pConnectionString);
 
+/**
+* enables or disables telemetry recording. Must be called before InitialiseDatabase.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[in] bTelemetryEnabled - Flag if telemetry recording shall be enabled.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_datamodel_settelemetryenabled(LibMCData_DataModel pDataModel, bool bTelemetryEnabled);
+
+/**
+* returns if telemetry recording is enabled.
+*
+* @param[in] pDataModel - DataModel instance.
+* @param[out] pTelemetryEnabled - Flag if telemetry recording is enabled.
+* @return error code or 0 (success)
+*/
+LIBMCDATA_DECLSPEC LibMCDataResult libmcdata_datamodel_gettelemetryenabled(LibMCData_DataModel pDataModel, bool * pTelemetryEnabled);
+
 /**
 * returns the linear data model version.
 *

Framework/InterfacesCore/libmcdata_interfaces.hpp

@@ -2854,6 +2854,18 @@ class IDataModel : public virtual IBase {
 	*/
 	virtual void InitialiseDatabase(const std::string & sDataDirectory, const LibMCData::eDataBaseType eDataBaseType, const std::string & sConnectionString) = 0;
 
+	/**
+	* IDataModel::SetTelemetryEnabled - enables or disables telemetry recording. Must be called before InitialiseDatabase.
+	* @param[in] bTelemetryEnabled - Flag if telemetry recording shall be enabled.
+	*/
+	virtual void SetTelemetryEnabled(const bool bTelemetryEnabled) = 0;
+
+	/**
+	* IDataModel::GetTelemetryEnabled - returns if telemetry recording is enabled.
+	* @return Flag if telemetry recording is enabled.
+	*/
+	virtual bool GetTelemetryEnabled() = 0;
+
 	/**
 	* IDataModel::GetDataModelVersion - returns the linear data model version.
 	* @return Data model version.

Framework/InterfacesCore/libmcdata_interfacewrapper.cpp

@@ -10938,6 +10938,56 @@ LibMCDataResult libmcdata_datamodel_initialisedatabase(LibMCData_DataModel pData
 	}
 }
 
+LibMCDataResult libmcdata_datamodel_settelemetryenabled(LibMCData_DataModel pDataModel, bool bTelemetryEnabled)
+{
+	IBase* pIBaseClass = (IBase *)pDataModel;
+
+	try {
+		IDataModel* pIDataModel = dynamic_cast<IDataModel*>(pIBaseClass);
+		if (!pIDataModel)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+
+		pIDataModel->SetTelemetryEnabled(bTelemetryEnabled);
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
+LibMCDataResult libmcdata_datamodel_gettelemetryenabled(LibMCData_DataModel pDataModel, bool * pTelemetryEnabled)
+{
+	IBase* pIBaseClass = (IBase *)pDataModel;
+
+	try {
+		if (pTelemetryEnabled == nullptr)
+			throw ELibMCDataInterfaceException (LIBMCDATA_ERROR_INVALIDPARAM);
+		IDataModel* pIDataModel = dynamic_cast<IDataModel*>(pIBaseClass);
+		if (!pIDataModel)
+			throw ELibMCDataInterfaceException(LIBMCDATA_ERROR_INVALIDCAST);
+
+		*pTelemetryEnabled = pIDataModel->GetTelemetryEnabled();
+
+		return LIBMCDATA_SUCCESS;
+	}
+	catch (ELibMCDataInterfaceException & Exception) {
+		return handleLibMCDataException(pIBaseClass, Exception);
+	}
+	catch (std::exception & StdException) {
+		return handleStdException(pIBaseClass, StdException);
+	}
+	catch (...) {
+		return handleUnhandledException(pIBaseClass);
+	}
+}
+
 LibMCDataResult libmcdata_datamodel_getdatamodelversion(LibMCData_DataModel pDataModel, LibMCData_uint32 * pVersion)
 {
 	IBase* pIBaseClass = (IBase *)pDataModel;
@@ -12307,6 +12357,10 @@ LibMCDataResult LibMCData::Impl::LibMCData_GetProcAddress (const char * pProcNam
 		*ppProcAddress = (void*) &libmcdata_installationinformation_getbasetempdirectory;
 	if (sProcName == "libmcdata_datamodel_initialisedatabase") 
 		*ppProcAddress = (void*) &libmcdata_datamodel_initialisedatabase;
+	if (sProcName == "libmcdata_datamodel_settelemetryenabled") 
+		*ppProcAddress = (void*) &libmcdata_datamodel_settelemetryenabled;
+	if (sProcName == "libmcdata_datamodel_gettelemetryenabled") 
+		*ppProcAddress = (void*) &libmcdata_datamodel_gettelemetryenabled;
 	if (sProcName == "libmcdata_datamodel_getdatamodelversion") 
 		*ppProcAddress = (void*) &libmcdata_datamodel_getdatamodelversion;
 	if (sProcName == "libmcdata_datamodel_getinstallationinformation") 

Framework/InterfacesCore/libmcdata_types.hpp

@@ -477,6 +477,7 @@ typedef void * LibMCData_pvoid;
 #define LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND 450 /** Telemetry channel not found. */
 #define LIBMCDATA_ERROR_JOBNAMETOOLONG 451 /** Job name exceeds maximum allowed length */
 #define LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG 452 /** String parameter exceeds maximum allowed length */
+#define LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION 453 /** Telemetry setting changed after database initialisation */
 
 /*************************************************************************************************************************
  Error strings for LibMCData
@@ -866,6 +867,7 @@ inline const char * LIBMCDATA_GETERRORSTRING (LibMCDataResult nErrorCode) {
     case LIBMCDATA_ERROR_TELEMETRYCHANNELNOTFOUND: return "Telemetry channel not found.";
     case LIBMCDATA_ERROR_JOBNAMETOOLONG: return "Job name exceeds maximum allowed length";
     case LIBMCDATA_ERROR_STRINGPARAMETERTOOLONG: return "String parameter exceeds maximum allowed length";
+    case LIBMCDATA_ERROR_TELEMETRYSETTINGAFTERINITIALISATION: return "Telemetry setting changed after database initialisation";
     default: return "unknown error";
   }
 }

Implementation/Core/amc_systemstate.cpp

@@ -93,7 +93,7 @@ namespace AMC {
 
 		m_pAccessControl = std::make_shared<CAccessControl> ();
 
-		auto pTelemetryWriter = std::make_shared<CTelemetryWriter> (m_pDataModel->CreateTelemetrySession (), m_pGlobalChrono);
+		auto pTelemetryWriter = std::make_shared<CTelemetryWriter> (m_pDataModel->CreateTelemetrySession (), m_pGlobalChrono, m_pDataModel->GetTelemetryEnabled ());
 		m_pTelemetryHandler = std::make_shared<CTelemetryHandler> (pTelemetryWriter);
 
 		m_pMeshHandler = std::make_shared<CMeshHandler>();