diff --git a/dev/Deployment/DeploymentTraceLogging.h b/dev/Deployment/DeploymentTraceLogging.h index 9805f7073e..f8f90e79c4 100644 --- a/dev/Deployment/DeploymentTraceLogging.h +++ b/dev/Deployment/DeploymentTraceLogging.h @@ -101,4 +101,5 @@ class WindowsAppRuntimeDeployment_TraceLogger final : public wil::TraceLoggingPr TraceLoggingValue(failure.uLineNumber, "Line"),\ TraceLoggingValue(failure.pszMessage, "Message"),\ TraceLoggingValue(failure.pszModule, "Module"),\ + _GENERIC_PARTB_FIELDS_ENABLED,\ __VA_ARGS__) diff --git a/dev/Deployment/DeploymentTracelogging.cpp b/dev/Deployment/DeploymentTracelogging.cpp index 755f3d94bd..ae6a98964a 100644 --- a/dev/Deployment/DeploymentTracelogging.cpp +++ b/dev/Deployment/DeploymentTracelogging.cpp @@ -27,7 +27,6 @@ void __stdcall wilResultLoggingCallback(const wil::FailureInfo& failure) noexcep // Failure in restarting PushNotificationsLRP is non-blocking to the installer functionality WindowsAppRuntimeDeployment_WriteEventWithActivity( "RestartPushNotificationsLRPFailed", - _GENERIC_PARTB_FIELDS_ENABLED, TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance), TraceLoggingKeyword(MICROSOFT_KEYWORD_CRITICAL_DATA)); } diff --git a/dev/PackageManager/API/M.W.M.D.PackageDeploymentManager.cpp b/dev/PackageManager/API/M.W.M.D.PackageDeploymentManager.cpp index 5d37853ebb..067a9158eb 100644 --- a/dev/PackageManager/API/M.W.M.D.PackageDeploymentManager.cpp +++ b/dev/PackageManager/API/M.W.M.D.PackageDeploymentManager.cpp @@ -254,6 +254,7 @@ namespace winrt::Microsoft::Windows::Management::Deployment::implementation TraceLoggingWideString(packageSetItem.PackageFamilyName().c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(packageSetItem.ProcessorArchitectureFilter()), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); return false; @@ -351,6 +352,7 @@ namespace winrt::Microsoft::Windows::Management::Deployment::implementation TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(packageSetItem.ProcessorArchitectureFilter()), "Criteria.ArchitectureFilter"), TraceLoggingInt32(static_cast(status), "PackageReadyOrNewerAvailableStatus"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); return winrt::Microsoft::Windows::Management::Deployment::PackageReadyOrNewerAvailableStatus::NotReady; @@ -366,6 +368,7 @@ namespace winrt::Microsoft::Windows::Management::Deployment::implementation TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(packageSetItem.ProcessorArchitectureFilter()), "Criteria.ArchitectureFilter"), TraceLoggingInt32(static_cast(status), "PackageReadyOrNewerAvailableStatus"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); newerAvailable = true; diff --git a/dev/PackageManager/API/PackageDeploymentResolver.cpp b/dev/PackageManager/API/PackageDeploymentResolver.cpp index 63d7cd12fb..a9039cee7c 100644 --- a/dev/PackageManager/API/PackageDeploymentResolver.cpp +++ b/dev/PackageManager/API/PackageDeploymentResolver.cpp @@ -187,6 +187,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); if (packages) @@ -212,6 +213,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -243,6 +245,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingInt32(static_cast(candidateArchitecture), "Architecture"), TraceLoggingHexInt32(static_cast(supportedArchitectures), "SupportedArchitectures"), TraceLoggingUInt16(static_cast(nativeMachine), "NativeMachineArchitecture"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -260,6 +263,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), TraceLoggingInt32(static_cast(candidateArchitecture), "Architecture"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -278,6 +282,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -293,6 +298,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); return candidateFullName; @@ -313,6 +319,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); } @@ -325,6 +332,7 @@ winrt::hstring Microsoft::Windows::ApplicationModel::PackageDeploymentResolver:: TraceLoggingWideString(packageFamilyName.c_str(), "Criteria.PackageFamilyName"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingHexInt32(static_cast(processorArchitectureFilter), "Criteria.ArchitectureFilter"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); } diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp index 1c93ec9afe..d9e186cdd3 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.cpp @@ -904,6 +904,7 @@ void FindDDLMViaEnumeration( TraceLoggingHexUInt32(majorMinorVersion, "Criteria.MajorMinorVersion"), TraceLoggingWideString(!versionTag ? L"" : versionTag, "Criteria.VersionTag"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); int packagesScanned{}; @@ -999,6 +1000,7 @@ void FindDDLMViaEnumeration( TraceLoggingHexUInt32(majorMinorVersion, "Criteria.MajorMinorVersion"), TraceLoggingWideString(!versionTag ? L"" : versionTag, "Criteria.VersionTag"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -1017,6 +1019,7 @@ void FindDDLMViaEnumeration( TraceLoggingWideString(!versionTag ? L"" : versionTag, "Criteria.VersionTag"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingWideString(::AppModel::Identity::GetCurrentArchitectureAsString(), "CurrentArchitecture"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); continue; @@ -1032,6 +1035,7 @@ void FindDDLMViaEnumeration( TraceLoggingHexUInt32(majorMinorVersion, "Criteria.MajorMinorVersion"), TraceLoggingWideString(!versionTag ? L"" : versionTag, "Criteria.VersionTag"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); bestFitVersion = version; @@ -1055,6 +1059,7 @@ void FindDDLMViaEnumeration( TraceLoggingWideString(!versionTag ? L"" : versionTag, "Criteria.VersionTag"), TraceLoggingHexUInt64(minVersion.Version, "Criteria.MinVersion"), TraceLoggingInt32(packagesScanned, "PackagesScanned"), + _GENERIC_PARTB_FIELDS_ENABLED, TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE), TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance)); ddlmPackageFamilyName = bestFitPackageFamilyName.c_str(); diff --git a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapTracelogging.h b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapTracelogging.h index e18985d942..de6dce4f40 100644 --- a/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapTracelogging.h +++ b/dev/WindowsAppRuntime_BootstrapDLL/MddBootstrapTracelogging.h @@ -130,13 +130,10 @@ class WindowsAppRuntimeBootstrap_TraceLogger final : public wil::TraceLoggingPro _eventname_,\ _activityId_,\ nullptr,\ - _WRITE_FAILURE_INFO,\ + TraceLoggingValue(static_cast(failure.type), "Type"),\ + TraceLoggingValue(failure.hr, "HResult"),\ + TraceLoggingValue(failure.pszFile, "File"),\ + TraceLoggingValue(failure.uLineNumber,"Line"),\ + TraceLoggingValue(failure.pszModule, "Module"),\ + TraceLoggingValue(failure.pszMessage,"Message"),\ __VA_ARGS__) - -#define _WRITE_FAILURE_INFO \ - TraceLoggingValue(static_cast(failure.type), "Type"),\ - TraceLoggingValue(failure.hr, "HResult"),\ - TraceLoggingValue(failure.pszFile, "File"),\ - TraceLoggingValue(failure.uLineNumber,"Line"),\ - TraceLoggingValue(failure.pszModule, "Module"),\ - TraceLoggingValue(failure.pszMessage,"Message")