Fix telemetry in Repl Window and PR feedback

Paul van Brenk · Paul van Brenk · commit 1b44714e0b91 · 2017-06-23T10:43:18.000-07:00
diff --git a/Common/Product/ReplWindow/Repl/ReplWindow.cs b/Common/Product/ReplWindow/Repl/ReplWindow.cs
@@ -21,6 +21,7 @@
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft.VisualStudio.Telemetry;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Classification;
 using Microsoft.VisualStudio.Text.Editor;
@@ -181,6 +182,15 @@ public ReplWindow(IComponentModel/*!*/ model, IReplEvaluator/*!*/ evaluator, ICo
 
         #region Initialization
 
+        protected override void Initialize()
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+            base.Initialize();
+
+            //ensure Telemetry is initialized
+            var defaultSession = TelemetryService.DefaultSession;
+        }
+
         protected override void OnCreate()
         {
             CreateTextViewHost();
diff --git a/Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj b/Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj
@@ -42,7 +42,27 @@
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.0.262-masterA5CACE98\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.3.795-master67D3E818\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.0.73-master6E8F6515\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
diff --git a/Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs b/Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs
@@ -10,7 +10,6 @@
 [assembly: AssemblyConfiguration("")]
 
 [assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.InteractiveWindow", CodeBase = "Microsoft.NodejsTools.InteractiveWindow.dll", Version = "1.0.0.0")]
-[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
 [assembly: InternalsVisibleTo("TestUtilities.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("ReplWindowUITests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Nodejs.Tests.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/Nodejs/Product/InteractiveWindow/packages.config b/Nodejs/Product/InteractiveWindow/packages.config
@@ -1,4 +1,9 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MicroBuild.Core" version="0.2.0" targetFramework="net46" developmentDependency="true" />
+  <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.RemoteControl" version="14.0.262-masterA5CACE98" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Telemetry" version="15.3.795-master67D3E818" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities.Internal" version="14.0.73-master6E8F6515" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
 </packages>
diff --git a/Nodejs/Product/Nodejs/Nodejs.csproj b/Nodejs/Product/Nodejs/Nodejs.csproj
@@ -49,11 +49,11 @@
       <Language>JavaScript</Language>
       <VSIXSubpath>ItemTemplates</VSIXSubpath>
     </ZipItem>
-    <VSTemplate>
+    <!--<VSTemplate>
       <Language>JavaScript</Language>
       <Culture>1033</Culture>
       <OutputSubPath>Node.js</OutputSubPath>
-    </VSTemplate>
+    </VSTemplate>-->
   </ItemDefinitionGroup>
   <ItemGroup>
     <Reference Include="Microsoft.ApplicationInsights, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -648,7 +648,6 @@
     <ZipItem Include="Templates\Files\TypeScriptTapeUnitTest\UnitTest.ts" />
     <ZipItem Include="Templates\Files\TypeScriptTsConfig\tsconfig.json" />
     <ZipItem Include="Templates\Files\TypeScriptTsConfig\tsconfig.vstemplate" />
-    <None Include="app.config" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express-serve-static-core.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\express.typings.json" />
     <TypeScriptProject Include="ProjectTemplates\TypeScriptExpressApp\serve-static.typings.json" />
@@ -808,7 +807,6 @@
     <ZipItem Include="Templates\Files\TypeScriptUnitTest\UnitTest.vstemplate">
       <SubType>Designer</SubType>
     </ZipItem>
-    <None Include="Theme\Microsoft.NodejsTools.theme.v14.0.pkgdef" />
     <None Include="Theme\Microsoft.NodejsTools.theme.v15.0.pkgdef" />
     <Resource Include="version.txt" />
     <Content Include="VSTemplateStore.pkgdef">
@@ -1042,9 +1040,6 @@
     <RegisterWithCodebase>true</RegisterWithCodebase>
   </PropertyGroup>
   <PropertyGroup>
-    <!--<IsProductComponent>true</IsProductComponent>
-    <ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
-    <ExtensionInstallationFolder>Microsoft\NodeJsTools\NodeJsTools</ExtensionInstallationFolder>-->
     <CreateVsixContainer>false</CreateVsixContainer>
     <CopyVsixExtensionFiles>false</CopyVsixExtensionFiles>
   </PropertyGroup>
diff --git a/Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs b/Nodejs/Product/Nodejs/Properties/AssemblyInfo.cs
@@ -16,7 +16,6 @@
 
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
-[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
 [assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools", CodeBase = "Microsoft.NodejsTools.dll", Version = "1.0.0.0")]
 [assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.Npm", CodeBase = "Microsoft.NodejsTools.Npm.dll", Version = "1.0.0.0")]
 [assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.PressAnyKey", CodeBase = "Microsoft.NodejsTools.PressAnyKey.exe", Version = "1.0.0.0")]
diff --git a/Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs b/Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs
@@ -2,29 +2,25 @@
 
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Telemetry;
+using static Microsoft.NodejsTools.Telemetry.TelemetryEvents;
+using static Microsoft.NodejsTools.Telemetry.TelemetryProperties;
 
 namespace Microsoft.NodejsTools.Telemetry
 {
-    using System;
-    using static TelemetryEvents;
-    using static TelemetryProperties;
-
     /// <summary>
     /// Extensions for logging telemetry events.
     /// </summary>
     internal static class TelemetryHelper
     {
-        private static TelemetrySession defaultSession;
-
         public static void Initialize()
         {
             ThreadHelper.ThrowIfNotOnUIThread();
-            defaultSession = TelemetryService.DefaultSession;
+            var defaultSession = TelemetryService.DefaultSession;
         }
 
         public static void LogProjectImported()
         {
-            defaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);
+            TelemetryService.DefaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);
         }
 
         public static void LogDebuggingStarted(string debuggerName, string nodeVersion, bool isProject = true)
@@ -34,27 +30,27 @@ public static void LogDebuggingStarted(string debuggerName, string nodeVersion,
             userTask.Properties[NodeVersion] = nodeVersion;
             userTask.Properties[IsProject] = isProject;
 
-            defaultSession.PostEvent(userTask);
+            TelemetryService.DefaultSession.PostEvent(userTask);
         }
 
         public static void LogSearchNpm()
         {
-            defaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);
+            TelemetryService.DefaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);
         }
 
         public static void LogInstallNpmPackage()
         {
-            defaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);
+            TelemetryService.DefaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);
         }
 
         public static void LogUnInstallNpmPackage()
         {
-            defaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);
+            TelemetryService.DefaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);
         }
 
         public static void LogReplUse()
         {
-            defaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);
+            TelemetryService.DefaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);
         }
     }
 }
diff --git a/Nodejs/Product/Nodejs/Theme/Microsoft.NodejsTools.theme.v14.0.pkgdef b/Nodejs/Product/Nodejs/Theme/Microsoft.NodejsTools.theme.v14.0.pkgdef
diff --git a/Nodejs/Product/Nodejs/app.config b/Nodejs/Product/Nodejs/app.config
diff --git a/Nodejs/Product/Npm/Properties/AssemblyInfo.cs b/Nodejs/Product/Npm/Properties/AssemblyInfo.cs
@@ -16,7 +16,6 @@
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("38de5856-defe-4dac-ab7b-43e5a733cfe5")]
 
diff --git a/Nodejs/Product/PressAnyKey/App.config b/Nodejs/Product/PressAnyKey/App.config
diff --git a/Nodejs/Product/PressAnyKey/PressAnyKey.csproj b/Nodejs/Product/PressAnyKey/PressAnyKey.csproj
@@ -46,7 +46,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs b/Nodejs/Product/ProjectWizard/Properties/AssemblyInfo.cs
@@ -18,4 +18,3 @@
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("dfdf8c10-b0c5-43d5-8ab6-833523131644")]
-[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.Satellite)]
diff --git a/Nodejs/Product/TestAdapterVsix/Properties/AssemblyInfo.cs b/Nodejs/Product/TestAdapterVsix/Properties/AssemblyInfo.cs
diff --git a/Nodejs/Tests/Core/NodejsTests.csproj b/Nodejs/Tests/Core/NodejsTests.csproj
@@ -176,11 +176,9 @@
     <EmbeddedResource Include="ruleFormattingTests.json" />
   </ItemGroup>
   <Import Project="..\TestProjectAfter.settings" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
   </Target>
 </Project>
diff --git a/Nodejs/Tests/NpmTests/NpmTests.csproj b/Nodejs/Tests/NpmTests/NpmTests.csproj
@@ -164,5 +164,4 @@
     </Content>
   </ItemGroup>
   <Import Project="..\TestProjectAfter.settings" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -2,29 +2,25 @@`
`2`	`2`
`3`	`3`	`using Microsoft.VisualStudio.Shell;`
`4`	`4`	`using Microsoft.VisualStudio.Telemetry;`
	`5`	`+using static Microsoft.NodejsTools.Telemetry.TelemetryEvents;`
	`6`	`+using static Microsoft.NodejsTools.Telemetry.TelemetryProperties;`
`5`	`7`
`6`	`8`	`namespace Microsoft.NodejsTools.Telemetry`
`7`	`9`	`{`
`8`		`- using System;`
`9`		`- using static TelemetryEvents;`
`10`		`- using static TelemetryProperties;`
`11`		`-`
`12`	`10`	`/// <summary>`
`13`	`11`	`/// Extensions for logging telemetry events.`
`14`	`12`	`/// </summary>`
`15`	`13`	`internal static class TelemetryHelper`
`16`	`14`	`{`
`17`		`- private static TelemetrySession defaultSession;`
`18`		`-`
`19`	`15`	`public static void Initialize()`
`20`	`16`	`{`
`21`	`17`	`ThreadHelper.ThrowIfNotOnUIThread();`
`22`		`- defaultSession = TelemetryService.DefaultSession;`
	`18`	`+ var defaultSession = TelemetryService.DefaultSession;`
`23`	`19`	`}`
`24`	`20`
`25`	`21`	`public static void LogProjectImported()`
`26`	`22`	`{`
`27`		`- defaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);`
	`23`	`+ TelemetryService.DefaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`public static void LogDebuggingStarted(string debuggerName, string nodeVersion, bool isProject = true)`
`@@ -34,27 +30,27 @@ public static void LogDebuggingStarted(string debuggerName, string nodeVersion,`
`34`	`30`	`userTask.Properties[NodeVersion] = nodeVersion;`
`35`	`31`	`userTask.Properties[IsProject] = isProject;`
`36`	`32`
`37`		`- defaultSession.PostEvent(userTask);`
	`33`	`+ TelemetryService.DefaultSession.PostEvent(userTask);`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`public static void LogSearchNpm()`
`41`	`37`	`{`
`42`		`- defaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);`
	`38`	`+ TelemetryService.DefaultSession.PostUserTask(SearchNpm, TelemetryResult.Success);`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`public static void LogInstallNpmPackage()`
`46`	`42`	`{`
`47`		`- defaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);`
	`43`	`+ TelemetryService.DefaultSession.PostUserTask(InstallNpm, TelemetryResult.Success);`
`48`	`44`	`}`
`49`	`45`
`50`	`46`	`public static void LogUnInstallNpmPackage()`
`51`	`47`	`{`
`52`		`- defaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);`
	`48`	`+ TelemetryService.DefaultSession.PostUserTask(UnInstallNpm, TelemetryResult.Success);`
`53`	`49`	`}`
`54`	`50`
`55`	`51`	`public static void LogReplUse()`
`56`	`52`	`{`
`57`		`- defaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);`
	`53`	`+ TelemetryService.DefaultSession.PostUserTask(UsedRepl, TelemetryResult.Success);`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`	`}`