From 3cdf99b8c559f673d22c26de6cb19adb2723092d Mon Sep 17 00:00:00 2001 From: sachintaMSFT <80828309+sachintaMSFT@users.noreply.github.com> Date: Mon, 14 Mar 2022 19:54:06 -0700 Subject: [PATCH] User/sachinta/add microsoft internal telemetry nuget package config (#2260) * Add Microsoft Internal Telemetry Nuget Packages Config file * Remove unecessary inclusion of MicrosoftTelemetry.h public stub while wil\traceloggingconfig.h is already included Co-authored-by: Santosh Chintalapati --- installer/dev/Telemetry/MicrosoftTelemetry.h | 87 ------------------- installer/dev/Telemetry/packages.config | 4 + .../dev/WindowsAppRuntimeInstall.vcxproj | 1 - .../WindowsAppRuntimeInstall.vcxproj.filters | 6 -- installer/dev/tracelogging.h | 5 +- 5 files changed, 6 insertions(+), 97 deletions(-) delete mode 100644 installer/dev/Telemetry/MicrosoftTelemetry.h create mode 100644 installer/dev/Telemetry/packages.config diff --git a/installer/dev/Telemetry/MicrosoftTelemetry.h b/installer/dev/Telemetry/MicrosoftTelemetry.h deleted file mode 100644 index 7752516fb8..0000000000 --- a/installer/dev/Telemetry/MicrosoftTelemetry.h +++ /dev/null @@ -1,87 +0,0 @@ -/* ++ - -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the MIT License. See LICENSE in the project root for license information. - -Module Name: - - MicrosoftTelemetry.h - -Abstract: - - Macro definitions used by this project's TraceLogging ETW providers: - - - Configuration macros that select the ETW Provider Groups to be used by - this project. - - Constants for tags that are commonly used in Microsoft's - TraceLogging-based ETW. - - Different versions of this file use different definitions for the - TraceLoggingOption configuration macros. The definitions in this file are - empty. As a result, providers using this configuration file will not join - any ETW Provider Groups and will not be given any special treatment by - group-sensitive ETW listeners. - -Environment: - - User mode or kernel mode. - ---*/ - -#pragma once - -// Configuration macro for use in TRACELOGGING_DEFINE_PROVIDER. The definition -// in this file configures the provider as a normal (non-telemetry) provider. -#define TraceLoggingOptionMicrosoftTelemetry() \ - // Empty definition for TraceLoggingOptionMicrosoftTelemetry - -// Configuration macro for use in TRACELOGGING_DEFINE_PROVIDER. The definition -// in this file configures the provider as a normal (non-telemetry) provider. -#define TraceLoggingOptionWindowsCoreTelemetry() \ - // Empty definition for TraceLoggingOptionWindowsCoreTelemetry - -// Event privacy tags. Use the PDT macro values for the tag parameter, e.g.: -// TraceLoggingWrite(..., -// TelemetryPrivacyDataTag(PDT_BrowsingHistory | PDT_ProductAndServiceUsage), -// ...); -#define TelemetryPrivacyDataTag(tag) TraceLoggingUInt64((tag), "PartA_PrivTags") -#define PDT_BrowsingHistory 0x0000000000000002u -#define PDT_DeviceConnectivityAndConfiguration 0x0000000000000800u -#define PDT_InkingTypingAndSpeechUtterance 0x0000000000020000u -#define PDT_ProductAndServicePerformance 0x0000000001000000u -#define PDT_ProductAndServiceUsage 0x0000000002000000u -#define PDT_SoftwareSetupAndInventory 0x0000000080000000u - -// Event categories specified via keywords, e.g.: -// TraceLoggingWrite(..., -// TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES), -// ...); -#define MICROSOFT_KEYWORD_CRITICAL_DATA 0x0000800000000000 // Bit 47 -#define MICROSOFT_KEYWORD_MEASURES 0x0000400000000000 // Bit 46 -#define MICROSOFT_KEYWORD_TELEMETRY 0x0000200000000000 // Bit 45 -#define MICROSOFT_KEYWORD_RESERVED_44 0x0000100000000000 // Bit 44 (reserved for future assignment) - -// Event categories specified via event tags, e.g.: -// TraceLoggingWrite(..., -// TraceLoggingEventTag(MICROSOFT_EVENTTAG_REALTIME_LATENCY), -// ...); -#define MICROSOFT_EVENTTAG_DROP_USER_IDS 0x00008000 -#define MICROSOFT_EVENTTAG_AGGREGATE 0x00010000 -#define MICROSOFT_EVENTTAG_DROP_PII_EXCEPT_IP 0x00020000 -#define MICROSOFT_EVENTTAG_COSTDEFERRED_LATENCY 0x00040000 -#define MICROSOFT_EVENTTAG_CORE_DATA 0x00080000 -#define MICROSOFT_EVENTTAG_INJECT_XTOKEN 0x00100000 -#define MICROSOFT_EVENTTAG_REALTIME_LATENCY 0x00200000 -#define MICROSOFT_EVENTTAG_NORMAL_LATENCY 0x00400000 -#define MICROSOFT_EVENTTAG_CRITICAL_PERSISTENCE 0x00800000 -#define MICROSOFT_EVENTTAG_NORMAL_PERSISTENCE 0x01000000 -#define MICROSOFT_EVENTTAG_DROP_PII 0x02000000 -#define MICROSOFT_EVENTTAG_HASH_PII 0x04000000 -#define MICROSOFT_EVENTTAG_MARK_PII 0x08000000 - -// Field categories specified via field tags, e.g.: -// TraceLoggingWrite(..., -// TraceLoggingString(szUser, "UserName", "User's name", MICROSOFT_FIELDTAG_HASH_PII), -// ...); -#define MICROSOFT_FIELDTAG_DROP_PII 0x04000000 -#define MICROSOFT_FIELDTAG_HASH_PII 0x08000000 diff --git a/installer/dev/Telemetry/packages.config b/installer/dev/Telemetry/packages.config new file mode 100644 index 0000000000..69ab010509 --- /dev/null +++ b/installer/dev/Telemetry/packages.config @@ -0,0 +1,4 @@ + + + + diff --git a/installer/dev/WindowsAppRuntimeInstall.vcxproj b/installer/dev/WindowsAppRuntimeInstall.vcxproj index fb4e31a34b..933b093223 100644 --- a/installer/dev/WindowsAppRuntimeInstall.vcxproj +++ b/installer/dev/WindowsAppRuntimeInstall.vcxproj @@ -125,7 +125,6 @@ - diff --git a/installer/dev/WindowsAppRuntimeInstall.vcxproj.filters b/installer/dev/WindowsAppRuntimeInstall.vcxproj.filters index fa6767f1d7..90a0c9702f 100644 --- a/installer/dev/WindowsAppRuntimeInstall.vcxproj.filters +++ b/installer/dev/WindowsAppRuntimeInstall.vcxproj.filters @@ -13,9 +13,6 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {b76b8242-38f7-4b64-9dd2-8babf6555ed0} - @@ -45,9 +42,6 @@ Header Files - - Telemetry - Do Not Modify - diff --git a/installer/dev/tracelogging.h b/installer/dev/tracelogging.h index bfc60c611a..98872242bd 100644 --- a/installer/dev/tracelogging.h +++ b/installer/dev/tracelogging.h @@ -4,10 +4,9 @@ #pragma once #include "pch.h" -#include "MicrosoftTelemetry.h" -#if __has_include() -#include +#if __has_include("WindowsAppSDK-VersionInfo.h") +#include "WindowsAppSDK-VersionInfo.h" #endif #if defined(__WINDOWSAPPSDK_VERSIONINFO_H__)