From 1b7a14a916e7d888a2c65a7612a6411dea736220 Mon Sep 17 00:00:00 2001 From: sachintaMSFT <80828309+sachintaMSFT@users.noreply.github.com> Date: Thu, 4 Aug 2022 14:15:00 -0700 Subject: [PATCH] User/sachinta/fix deployment manager telemetry (#2802) * Fix DeploymentManager Initialize Activity's incorrect event name * Fix DeploymentManager Initialize Activity lifetime Co-authored-by: Santosh Chintalapati --- dev/Deployment/DeploymentManager.cpp | 17 +++++++++-------- dev/Deployment/DeploymentTraceLogging.h | 5 ++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp index 675bc181cb..40b323ead4 100644 --- a/dev/Deployment/DeploymentManager.cpp +++ b/dev/Deployment/DeploymentManager.cpp @@ -46,10 +46,10 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentResult DeploymentManager::Initialize() { - ::WindowsAppRuntime::Deployment::Activity::Context::Get().GetActivity().Start(false, - Security::IntegrityLevel::IsElevated(), - AppModel::Identity::IsPackagedProcess(), - Security::IntegrityLevel::GetIntegrityLevel()); + ::WindowsAppRuntime::Deployment::Activity::Context::Get().SetActivity(WindowsAppRuntimeDeployment_TraceLogger::Initialize::Start(false, + Security::IntegrityLevel::IsElevated(), + AppModel::Identity::IsPackagedProcess(), + Security::IntegrityLevel::GetIntegrityLevel())); FAIL_FAST_HR_IF(HRESULT_FROM_WIN32(APPMODEL_ERROR_NO_PACKAGE), !AppModel::Identity::IsPackagedProcess()); return Initialize(GetCurrentFrameworkPackageFullName()); @@ -57,10 +57,11 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentResult DeploymentManager::Initialize(winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentInitializeOptions const& deploymentInitializeOptions) { - ::WindowsAppRuntime::Deployment::Activity::Context::Get().GetActivity().Start(deploymentInitializeOptions.ForceDeployment(), - Security::IntegrityLevel::IsElevated(), - AppModel::Identity::IsPackagedProcess(), - Security::IntegrityLevel::GetIntegrityLevel()); + ::WindowsAppRuntime::Deployment::Activity::Context::Get().SetActivity(WindowsAppRuntimeDeployment_TraceLogger::Initialize::Start( + deploymentInitializeOptions.ForceDeployment(), + Security::IntegrityLevel::IsElevated(), + AppModel::Identity::IsPackagedProcess(), + Security::IntegrityLevel::GetIntegrityLevel())); FAIL_FAST_HR_IF(HRESULT_FROM_WIN32(APPMODEL_ERROR_NO_PACKAGE), !AppModel::Identity::IsPackagedProcess()); return Initialize(GetCurrentFrameworkPackageFullName(), deploymentInitializeOptions); diff --git a/dev/Deployment/DeploymentTraceLogging.h b/dev/Deployment/DeploymentTraceLogging.h index 20bfedce76..4b38d1674a 100644 --- a/dev/Deployment/DeploymentTraceLogging.h +++ b/dev/Deployment/DeploymentTraceLogging.h @@ -73,10 +73,9 @@ class WindowsAppRuntimeDeployment_TraceLogger final : public wil::TraceLoggingPr } else { - TraceLoggingClassWriteStop(Install, + TraceLoggingClassWriteStop(Initialize, _GENERIC_PARTB_FIELDS_ENABLED, - TraceLoggingValue(preInitializeStatus, "preInitializeStatus"), - TraceLoggingValue(isFullTrustPackage, "isFullTrustPackage")); + TraceLoggingValue(preInitializeStatus, "preInitializeStatus")); } } END_ACTIVITY_CLASS();