Convert global loggers to Thread local loggers

.github/actions/spelling/expect.txt

@@ -9,6 +9,7 @@ AICLIC
 ajor
 amrutha
 anonymized
+ANSISTRING
 APARTMENTTHREADED
 apfn
 apiset
@@ -51,9 +52,11 @@ certmgr
 certs
 Cfg
 cgmanifest
+cguid
 chcp
 ci
 cinq
+Cj
 CLIE
 cloudapp
 CLSID
@@ -84,6 +87,7 @@ enr
 enums
 EQU
 ERANGE
+errcode
 errno
 etest
 execustom
@@ -259,6 +263,7 @@ srs
 Standalone
 startswith
 streambuf
+strlen
 strtoull
 subdir
 subkey
@@ -272,6 +277,7 @@ temppath
 testexampleinstaller
 thiscouldbeapc
 threehundred
+Tlg
 tombstoned
 transitioning
 UCase

src/AppInstallerCLICore/COMContext.cpp

@@ -32,4 +32,23 @@ namespace AppInstaller
         m_executionStage = executionStage;
         m_comProgressCallback(ReportType::ExecutionPhaseUpdate, 0, 0, ProgressType::None, m_executionStage);
     }
-}
+
+    void COMContext::SetLoggers(std::string telemetryCorelationJson, std::string comCaller)
+    {
+        SetThreadGlobalsActive();
+
+        Logging::Log().SetLevel(Logging::Level::Verbose);
+        Logging::AddTraceLogger();
+
+#ifdef _DEBUG
+        // Log to file for COM API calls only when debugging in visual studio
+        Logging::AddFileLogger();
+        Logging::BeginLogFileCleanup();
+#endif
+
+        Logging::EnableWilFailureTelemetry();
+        Logging::Telemetry().SetTelemetryCorelationJson(telemetryCorelationJson);
+        Logging::Telemetry().SetCOMCaller(comCaller);
+        Logging::Telemetry().LogStartup(true);
+    }
+}

src/AppInstallerCLICore/COMContext.h

@@ -56,12 +56,17 @@ namespace AppInstaller
         //Execution::Context
         void SetExecutionStage(CLI::Workflow::ExecutionStage executionPhase, bool);
 
+        // Set Progress Callback function
         void SetProgressCallbackFunction(ProgressCallBackFunction&& f)
         {
             m_comProgressCallback = std::move(f);
         }
 
     private:
+
+        // Set diagnostic and telemetry loggers
+        void SetLoggers(std::string telemetryCorelationJson, std::string comCaller);
+
         CLI::Workflow::ExecutionStage m_executionStage = CLI::Workflow::ExecutionStage::Initial;
         ProgressCallBackFunction m_comProgressCallback;
     };

src/AppInstallerCLICore/Core.cpp

@@ -46,10 +46,17 @@ namespace AppInstaller::CLI
     {
         init_apartment();
 
+        Execution::Context context{ std::cout, std::cin };
+        context.EnableCtrlHandler();
+
         // Enable all logging for this phase; we will update once we have the arguments
+        context.SetThreadGlobalsActive();
+
         Logging::Log().EnableChannel(Logging::Channel::All);
         Logging::Log().SetLevel(Logging::Level::Verbose);
         Logging::AddFileLogger();
+
+        Logging::AddTraceLogger();
         Logging::EnableWilFailureTelemetry();
 
         // Set output to UTF8
@@ -60,9 +67,6 @@ namespace AppInstaller::CLI
         // Initiate the background cleanup of the log file location.
         Logging::BeginLogFileCleanup();
 
-        Execution::Context context{ std::cout, std::cin };
-        context.EnableCtrlHandler();
-
         context << Workflow::ReportExecutionStage(Workflow::ExecutionStage::ParseArgs);
 
         // Convert incoming wide char args to UTF8

src/AppInstallerCLICore/ExecutionContext.cpp

@@ -140,4 +140,9 @@ namespace AppInstaller::CLI::Execution
 
         m_executionStage = stage;
     }
+
+    void Context::SetThreadGlobalsActive()
+    {
+        m_threadGlobals.SetForCurrentThread();
+    }
 }

src/AppInstallerCLICore/ExecutionContext.h

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 #pragma once
-#include <AppInstallerLogging.h>
+#include <ThreadGlobals.h>
 #include "ExecutionReporter.h"
 #include "ExecutionArgs.h"
 #include "ExecutionContextData.h"
@@ -101,6 +101,9 @@ namespace AppInstaller::CLI::Execution
         }
 
         virtual void SetExecutionStage(Workflow::ExecutionStage stage, bool);
+
+        // Set Globals for Current Thread
+        void SetThreadGlobalsActive();
 
 #ifndef AICLI_DISABLE_TEST_HOOKS
         // Enable tests to override behavior
@@ -114,5 +117,6 @@ namespace AppInstaller::CLI::Execution
         size_t m_CtrlSignalCount = 0;
         ContextFlag m_flags = ContextFlag::None;
         Workflow::ExecutionStage m_executionStage = Workflow::ExecutionStage::Initial;
+        AppInstaller::ThreadLocalStorage::ThreadGlobals m_threadGlobals;
     };
 }

src/AppInstallerCLITests/ActivateThreadGlobals.cpp

@@ -0,0 +1,17 @@
+#include "pch.h"
+#include "Public/ThreadGlobals.h"
+
+namespace AppInstaller::ThreadLocalStorage
+{
+    ThreadGlobals* ThreadGlobals::ActivateThreadGlobals(AppInstaller::ThreadLocalStorage::ThreadGlobals* pThreadGlobals)
+    {
+        static AppInstaller::ThreadLocalStorage::ThreadGlobals* t_pThreadGlobals = nullptr;
+
+        if (pThreadGlobals)
+        {
+            t_pThreadGlobals = pThreadGlobals;
+        }
+
+        return t_pThreadGlobals;
+    }
+}

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj

@@ -182,6 +182,7 @@
     <ClInclude Include="TestSource.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ActivateThreadGlobals.cpp" />
     <ClCompile Include="ARPChanges.cpp" />
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="Completion.cpp" />