From 14aa988e4f4cc1aa3ea435fd7a9cb0906a4d1ff3 Mon Sep 17 00:00:00 2001
From: Matt Cooley <matt@mattcooley.net>
Date: Fri, 1 Feb 2019 18:11:51 -0800
Subject: [PATCH] Don't send AppLifecycle telemetry unless SEND_TELEMETRY is
 defined

---
 src/Calculator/Calculator.vcxproj            |  5 +++++
 src/Calculator/Common/AppLifecycleLogger.cpp | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/Calculator/Calculator.vcxproj b/src/Calculator/Calculator.vcxproj
index cfa37198..1a4e4928 100644
--- a/src/Calculator/Calculator.vcxproj
+++ b/src/Calculator/Calculator.vcxproj
@@ -204,6 +204,11 @@
       <AdditionalDependencies>WindowsApp.lib;$(VC_ReferencesPath_VC_x64)\pgort.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(IsStoreBuild)' == 'True'">
+    <ClCompile>
+      <AdditionalOptions>/DSEND_TELEMETRY %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <PropertyGroup>
     <AppVersion Condition="'$(AppVersion)' == ''">0.0.0.0</AppVersion>
   </PropertyGroup>
diff --git a/src/Calculator/Common/AppLifecycleLogger.cpp b/src/Calculator/Common/AppLifecycleLogger.cpp
index 5bc22094..342cc19e 100644
--- a/src/Calculator/Common/AppLifecycleLogger.cpp
+++ b/src/Calculator/Common/AppLifecycleLogger.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 #include "pch.h"
@@ -15,12 +15,21 @@ using namespace winrt::Windows::UI::ViewManagement;
 
 namespace CalculatorApp
 {
+
+#ifdef SEND_TELEMETRY
     // c.f. WINEVENT_KEYWORD_RESERVED_63-56 0xFF00000000000000 // Bits 63-56 - channel keywords
     // c.f. WINEVENT_KEYWORD_*              0x00FF000000000000 // Bits 55-48 - system-reserved keywords
     constexpr int64_t MICROSOFT_KEYWORD_CRITICAL_DATA = 0x0000800000000000; // Bit 47
-    constexpr int64_t MICROSOFT_KEYWORD_MEASURES      = 0x0000400000000000; // Bit 46
-    constexpr int64_t MICROSOFT_KEYWORD_TELEMETRY     = 0x0000200000000000; // Bit 45
-    constexpr int64_t MICROSOFT_KEYWORD_RESERVED_44   = 0x0000100000000000; // Bit 44 (reserved for future assignment)
+    constexpr int64_t MICROSOFT_KEYWORD_MEASURES = 0x0000400000000000; // Bit 46
+    constexpr int64_t MICROSOFT_KEYWORD_TELEMETRY = 0x0000200000000000; // Bit 45
+    constexpr int64_t MICROSOFT_KEYWORD_RESERVED_44 = 0x0000100000000000; // Bit 44 (reserved for future assignment)
+#else
+    // define all Keyword options as 0 when we do not want to upload app telemetry
+    constexpr int64_t MICROSOFT_KEYWORD_CRITICAL_DATA = 0;
+    constexpr int64_t MICROSOFT_KEYWORD_MEASURES = 0;
+    constexpr int64_t MICROSOFT_KEYWORD_TELEMETRY = 0;
+    constexpr int64_t MICROSOFT_KEYWORD_RESERVED_44 = 0;
+#endif
 
 #pragma region TraceLogger setup and cleanup