OSS clean-up:

- rename ARIA SDK to MAT / 1DS
- add MIT license to public headers

Author: maxgolov

Solutions/net40/dllmain.cpp

@@ -23,8 +23,8 @@ HRESULT __stdcall DllCanUnloadNow(void)
 void LockInMemory()
 {
 #ifndef _WINRT_DLL
-    HMODULE ariaModule;
-    ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &ariaModule);
+    HMODULE mstelModule;
+    ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &mstelModule);
 #endif
 }
 

azure-pipelines.yml

@@ -1,7 +1,7 @@
 resources:
 - repo: self
 queue:
-  name: aria-sdk-cpp
+  name: mstel-sdk-cpp
 steps:
 
 - task: CmdLine@1

docs/PAL.md

@@ -11,7 +11,7 @@ Platform Abstraction Layer
 
 #### Lifetime
 
--   The whole ARIA client library must be initialized by the application
+-   The whole 1DS client library must be initialized by the application
     before the first call to any of its other API methods, and shut down
     after no more API calls can be performed.
 -   The PAL has similar lifetime scope -- `PAL::initialize()` will be

docs/cpp-start-macosx.md

@@ -87,5 +87,5 @@ logging system by adding the following statements to your main() function.
 *You're done! You can now compile and run your app, and it will send a telemetry event.*
 
 
- _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under Aria.SDK.Cpp/examples_
+ _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under `examples`_
 

docs/cppDoxygenConfig

@@ -2060,10 +2060,9 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = _WIN32														\
-                        ARIASDK_LIBABI=													\
-			ARIASDK_NS_BEGIN=Microsoft { namespace Applications { namespace Events						\
-			ARIASDK_NS_END=}}												\
-			ARIASDK_NS=Microsoft::Applications::Events									\
+                        MATSDK_LIBABI=													\
+			MAT_NS_BEGIN=Microsoft { namespace Applications { namespace Events						\
+			MAT_NS_END=}}													\
 			MAT=Microsoft::Applications::Events										\
 			PAL_NS_BEGIN=Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction		\
 			PAL_NS_END=}}}													\

examples/c/SampleC-Guest/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MATSDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MATSDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/c/SampleC-Guest/demo.c

@@ -25,12 +25,12 @@ void test_c_api_guest()
         "\"maxTeardownUploadTimeInSec\":5,"           // Allow up to 5 seconds for upload
         "\"hostMode\":false,"                         // Explicitly declare yourself as guest
         "\"minimumTraceLevel\":0,"                    // Debug printout level
-        "\"sdkmode\":0"                               // Aria direct-upload mode
+        "\"sdkmode\":0"                               // 1DS direct-upload mode
     "}";
 
     // Attemppt to load an alternate impl if available
 #ifdef _WIN32
-    evt_load((evt_handle_t)LoadLibrary(L"MsoAriaNext.dll"));
+    evt_load((evt_handle_t)LoadLibrary(L"ClientTelemetry2.dll"));
 #endif
 
     evt_handle_t handle = evt_open(config);

examples/cpp/EventSender/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/MacProxy/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/SampleCpp/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/SampleCpp/LogManagerA.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleA : public ILogConfiguration {};
     class LogManagerA : public LogManagerBase<ModuleA> {};
     DEFINE_LOGMANAGER(LogManagerA, ModuleA);
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCpp/LogManagerB.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleB : public ILogConfiguration {};
     class LogManagerB : public LogManagerBase<ModuleB> {};
     DEFINE_LOGMANAGER(LogManagerB, ModuleB);
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/LogManagerA.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleA : public ILogConfiguration {};
     class LogManagerA : public LogManagerBase<ModuleA> {};
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/LogManagerB.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleB : public ILogConfiguration {};
     class LogManagerB : public LogManagerBase<ModuleB> {};
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/main.cpp

@@ -10,10 +10,10 @@ using namespace MAT;
 // Define two instances for different LogManagers: A and B
 // This is how it's done with LOGMANAGER_INSTANCE macro to define the
 // default LogManager instance
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     DEFINE_LOGMANAGER(LogManagerB, ModuleB);
     DEFINE_LOGMANAGER(LogManagerA, ModuleA);
-} ARIASDK_NS_END
+} MAT_NS_END
 
 void twoModules_LogManagerTest() 
 {

examples/cpp/SampleCppMini/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/aria)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/objc/cocoa-app/CMakeLists.txt

@@ -17,7 +17,7 @@ find_package (Threads)
 
 set(MATSDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MATSDK_INCLUDE} )
 
 # Prefer linking to more recent local sqlite3

lib/CMakeLists.txt

@@ -138,7 +138,7 @@ elseif(PAL_IMPLEMENTATION STREQUAL "WIN32")
 # Win32 Desktop for now.
 # TODO: define a separate PAL for Win10 cmake build
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../zlib ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite)
-add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DARIASDK_PLATFORM_WINDOWS=1 -DARIASDK_SHARED_LIB=1 -D_ARIA_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7)
+add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DMATSDK_PLATFORM_WINDOWS=1 -DMATSDK_SHARED_LIB=1 -D_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7)
 remove_definitions(-D_MBCS)
   list(APPEND SRCS
     http/HttpClient_WinInet.cpp

lib/api/AllowedLevelsCollection.cpp

@@ -2,7 +2,7 @@
 
 #include "AllowedLevelsCollection.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     AllowedLevelsCollection::AllowedLevelsCollection(std::initializer_list<uint8_t>&& allowedLevels) noexcept
         : m_allowedLevels(allowedLevels)
@@ -32,4 +32,4 @@ namespace ARIASDK_NS_BEGIN
         m_allowedLevels = levels;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/AllowedLevelsCollection.hpp

@@ -10,7 +10,7 @@
 #include "Version.hpp"
 #include "ctmacros.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     class AllowedLevelsCollection
@@ -30,6 +30,6 @@ namespace ARIASDK_NS_BEGIN
         std::vector<uint8_t> m_allowedLevels;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // ALLOWEDLEVELSCOLLECTION_HPP

lib/api/AuthTokensController.cpp

@@ -4,7 +4,7 @@
 #include "ILogManager.hpp"
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     MATSDK_LOG_INST_COMPONENT_CLASS(AuthTokensController, "EventsSDK.AuthTokensController", "Events telemetry client - AuthTokensController class");
 
@@ -73,4 +73,4 @@ namespace ARIASDK_NS_BEGIN {
         return m_userTokens;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/AuthTokensController.hpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 // *INDENT-OFF*
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// This class is used to manage the Auth Tokens
@@ -78,6 +78,6 @@ namespace ARIASDK_NS_BEGIN
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/ContextFieldsProvider.cpp

@@ -6,7 +6,7 @@
 
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     ContextFieldsProvider::ContextFieldsProvider()
@@ -463,4 +463,4 @@ namespace ARIASDK_NS_BEGIN
         return m_customContextFields;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/ContextFieldsProvider.hpp

@@ -12,7 +12,7 @@
 #include <string>
 #include <cassert>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // TODO: [MG] - A/B EXP code has to be refactored into separate module
 
@@ -53,5 +53,5 @@ namespace ARIASDK_NS_BEGIN
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/api/CorrelationVector.cpp

@@ -9,7 +9,7 @@ using std::string;
 using std::mutex;
 using std::vector;
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // Note: CV spec reserves the last character for the "!" suffix identifying sealed values.
     // This effectively means we have one less character to use.
@@ -313,4 +313,4 @@ namespace ARIASDK_NS_BEGIN
         return true;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/DataViewerCollection.cpp

@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <mutex>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     MATSDK_LOG_INST_COMPONENT_CLASS(DataViewerCollection, "EventsSDK.DataViewerCollection", "Microsoft Telemetry Client - DataViewerCollection class");
 
@@ -108,4 +108,4 @@ namespace ARIASDK_NS_BEGIN {
 
         return nullptr;
     }
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/DataViewerCollection.hpp

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class DataViewerCollection : public IDataViewerCollection
     {
@@ -39,6 +39,6 @@ namespace ARIASDK_NS_BEGIN {
         std::vector<std::shared_ptr<IDataViewer>> m_dataViewerCollection;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/ILogConfiguration.cpp

@@ -1,6 +1,6 @@
 #include "ILogConfiguration.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     ILogConfiguration::ILogConfiguration(const std::initializer_list<std::pair<const std::string, Variant>>& initList)
         : m_configs(initList) { }
@@ -35,4 +35,4 @@ namespace ARIASDK_NS_BEGIN
         return m_configs;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/IRuntimeConfig.hpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <map>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     ///@cond INTERNAL_DOCS
 
@@ -188,5 +188,5 @@ namespace ARIASDK_NS_BEGIN
 
     /// @endcond
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/api/LogConfiguration.cpp

@@ -6,7 +6,7 @@
 using json = nlohmann::json;
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     static ILogConfiguration currentConfig {
         { CFG_INT_TRACE_LEVEL_MIN,          ACTTraceLevel::ACTTraceLevel_Error },
@@ -118,4 +118,4 @@ namespace ARIASDK_NS_BEGIN {
         return result;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/LogManager.cpp

@@ -8,7 +8,7 @@
 
 using namespace std;
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class ModuleConfig : ILogConfiguration
     {
@@ -20,6 +20,6 @@ namespace ARIASDK_NS_BEGIN {
 
 DEFINE_LOGMANAGER(LogManager, ModuleConfig);
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif