Add binary version to telemetry event (#2061)

microsoft · Mar 4, 2020 · 6b40323 · 6b40323
1 parent f9db2fa
commit 6b40323
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/dev/Telemetry/RuntimeProfiler.cpp b/dev/Telemetry/RuntimeProfiler.cpp
@@ -11,6 +11,9 @@
 #define DEFINE_PROFILEGROUP(name, group, size) \
     CMethodProfileGroup<size>        name(group)
 
+// defined in dllmain.cpp with values from version.h
+extern const char *g_BinaryVersion;
+
 namespace RuntimeProfiler {
 
     void UninitializeRuntimeProfiler();
@@ -161,7 +164,8 @@ namespace RuntimeProfiler {
             TraceLoggingWrite(  
                 g_hTelemetryProvider,  
                 "RuntimeProfiler",
-                TraceLoggingDescription("XAML methods that have been called."),  
+                TraceLoggingDescription("XAML methods that have been called."),
+                TraceLoggingString(g_BinaryVersion, "BinaryVersion"),
                 TraceLoggingWideString(OutputBuffer, "ApiCounts"),
                 TraceLoggingUInt32(((UINT32)m_group), "ProfileGroupId"),
                 TraceLoggingUInt32(((UINT32)cMethods),"TotalCount"),

diff --git a/dev/dll/dllmain.cpp b/dev/dll/dllmain.cpp
@@ -4,9 +4,13 @@
 #include "pch.h"
 #include "common.h"
 #include "TraceLogging.h"
+#include "version.h"
 
 HINSTANCE g_hInstance = nullptr;
 
+// Version string to send on telemetry events, this is the version string that is used in the version resource
+const char *g_BinaryVersion = (const char *)(VER_FILE_VERSION_STR);
+
 STDAPI_(void) SendTelemetryOnSuspend();
 
 STDAPI_(BOOL) DllMain(_In_ HINSTANCE hInstance, _In_ DWORD reason, _In_opt_ void *)