Convert global loggers to Thread local loggers

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

@@ -57,12 +57,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();
+
+        context.SetThreadGlobalsActive();
+
         // Enable all logging for this phase; we will update once we have the arguments
         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"
@@ -102,6 +102,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
@@ -115,5 +118,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/main.cpp

@@ -121,6 +121,7 @@ int main(int argc, char** argv)
     }
     Logging::Log().SetLevel(Logging::Level::Verbose);
     Logging::EnableWilFailureTelemetry();
+    AppInstaller::Logging::Telemetry().SetUserSettingsStatus();
 
     // Force all tests to run against settings inside this container.
     // This prevents test runs from trashing the users actual settings.

src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj

@@ -264,7 +264,9 @@
     <ClInclude Include="Public\AppInstallerTelemetry.h" />
     <ClInclude Include="Public\AppInstallerLogging.h" />
     <ClInclude Include="Public\AppInstallerArchitecture.h" />
+    <ClInclude Include="Public\AppInstallerTraceLogger.h" />
     <ClInclude Include="Public\AppInstallerVersions.h" />
+    <ClInclude Include="Public\ThreadGlobals.h" />
     <ClInclude Include="Public\winget\ExperimentalFeature.h" />
     <ClInclude Include="Public\winget\ExtensionCatalog.h" />
     <ClInclude Include="Public\winget\JsonSchemaValidation.h" />
@@ -323,6 +325,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)'=='Fuzzing'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="NameNormalization.cpp" />
+    <ClCompile Include="Public\TraceLogger.cpp" />
     <ClCompile Include="Regex.cpp" />
     <ClCompile Include="Registry.cpp" />
     <ClCompile Include="Runtime.cpp" />
@@ -335,6 +338,7 @@
     <ClCompile Include="Synchronization.cpp" />
     <ClCompile Include="Telemetry\TraceLogging.cpp" />
     <ClCompile Include="Architecture.cpp" />
+    <ClCompile Include="ThreadGlobals.cpp" />
     <ClCompile Include="UserSettings.cpp" />
     <ClCompile Include="Versions.cpp" />
     <ClCompile Include="Yaml.cpp" />

src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters

@@ -159,6 +159,12 @@
     <ClInclude Include="Public\winget\JsonSchemaValidation.h">
       <Filter>Public\winget</Filter>
     </ClInclude>
+    <ClInclude Include="Public\AppInstallerTraceLogger.h">
+      <Filter>Public</Filter>
+    </ClInclude>
+    <ClInclude Include="Public\ThreadGlobals.h">
+      <Filter>Public</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -269,6 +275,12 @@
     <ClCompile Include="JsonSchemaValidation.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Public\TraceLogger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThreadGlobals.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

src/AppInstallerCommonCore/AppInstallerLogging.cpp

@@ -4,10 +4,13 @@
 #include "Public/AppInstallerLogging.h"
 
 #include "Public/AppInstallerFileLogger.h"
+#include "Public/AppInstallerTraceLogger.h"
 #include "Public/AppInstallerTelemetry.h"
 #include "Public/AppInstallerDateTime.h"
 #include "Public/AppInstallerRuntime.h"
 
+#include "Public/ThreadGlobals.h"
+
 namespace AppInstaller::Logging
 {
     namespace
@@ -42,18 +45,13 @@ namespace AppInstaller::Logging
         case Channel::YAML: return "YAML";
         case Channel::Core: return "CORE";
         case Channel::Test: return "TEST";
+        case Channel::Log:  return "LOG";
         default:            return "NONE";
         }
     }
 
     size_t GetMaxChannelNameLength() { return 4; }
 
-    DiagnosticLogger& DiagnosticLogger::GetInstance()
-    {
-        static DiagnosticLogger instance;
-        return instance;
-    }
-
     void DiagnosticLogger::AddLogger(std::unique_ptr<ILogger>&& logger)
     {
         m_loggers.emplace_back(std::move(logger));
@@ -129,11 +127,21 @@ namespace AppInstaller::Logging
         }
     }
 
+    DiagnosticLogger& Log()
+    {
+        return AppInstaller::ThreadLocalStorage::ThreadGlobals::GetForCurrentThread()->GetDiagnosticLogger();
+    }
+
     void AddFileLogger(const std::filesystem::path& filePath)
     {
         Log().AddLogger(std::make_unique<FileLogger>(filePath));
     }
 
+    void AddTraceLogger()
+    {
+        Log().AddLogger(std::make_unique<TraceLogger>());
+    }
+
     void BeginLogFileCleanup()
     {
         FileLogger::BeginCleanup(Runtime::GetPathTo(Runtime::PathName::DefaultLogLocation));
@@ -143,6 +151,7 @@ namespace AppInstaller::Logging
     {
         return out << std::hex << std::setw(8) << std::setfill('0');
     }
+
 }
 
 std::ostream& operator<<(std::ostream& out, const std::chrono::system_clock::time_point& time)