This source links a couple files into devkit that use VSTelemetry to …

…enable our TelemetryLogger API. Additionally, it adds a TelemetryLogger.Create call into VSCodeTelemetryLogger to actually create the TelemetryLogProvider
dotnet · Jan 20, 2024 · 5293a74 · 5293a74
1 parent db94f71
commit 5293a74
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 8 deletions.
diff --git a/.../Def/Telemetry/AggregatingTelemetryLog.cs → ...lemetry/Shared/AggregatingTelemetryLog.cs b/.../Def/Telemetry/AggregatingTelemetryLog.cs → ...lemetry/Shared/AggregatingTelemetryLog.cs
diff --git a/...lemetry/AggregatingTelemetryLogManager.cs → .../Shared/AggregatingTelemetryLogManager.cs b/...lemetry/AggregatingTelemetryLogManager.cs → .../Shared/AggregatingTelemetryLogManager.cs
diff --git a/...ore/Def/Telemetry/TelemetryLogProvider.cs → .../Telemetry/Shared/TelemetryLogProvider.cs b/...ore/Def/Telemetry/TelemetryLogProvider.cs → .../Telemetry/Shared/TelemetryLogProvider.cs
diff --git a/...dio/Core/Def/Telemetry/TelemetryLogger.cs → ...e/Def/Telemetry/Shared/TelemetryLogger.cs b/...dio/Core/Def/Telemetry/TelemetryLogger.cs → ...e/Def/Telemetry/Shared/TelemetryLogger.cs
diff --git a/...Def/Telemetry/VisualStudioTelemetryLog.cs → ...emetry/Shared/VisualStudioTelemetryLog.cs b/...Def/Telemetry/VisualStudioTelemetryLog.cs → ...emetry/Shared/VisualStudioTelemetryLog.cs
diff --git a/...emetry/VisualStudioTelemetryLogManager.cs → ...Shared/VisualStudioTelemetryLogManager.cs b/...emetry/VisualStudioTelemetryLogManager.cs → ...Shared/VisualStudioTelemetryLogManager.cs
diff --git a/src/VisualStudio/DevKit/Impl/Logging/VSCodeTelemetryLogger.cs b/src/VisualStudio/DevKit/Impl/Logging/VSCodeTelemetryLogger.cs
@@ -11,6 +11,8 @@
 using System.Threading;
 using Microsoft.CodeAnalysis.Contracts.Telemetry;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Shared.TestHooks;
+using Microsoft.CodeAnalysis.Telemetry;
 using Microsoft.VisualStudio.Telemetry;
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Logging;
@@ -19,15 +21,18 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Logging;
 internal sealed class VSCodeTelemetryLogger : ITelemetryReporter
 {
     private TelemetrySession? _telemetrySession;
+    private readonly IAsynchronousOperationListenerProvider _asyncListenerProvider;
+
     private const string CollectorApiKey = "0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255";
     private static int _dumpsSubmitted = 0;
 
     private static readonly ConcurrentDictionary<int, object> _pendingScopes = new(concurrencyLevel: 2, capacity: 10);
 
     [ImportingConstructor]
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public VSCodeTelemetryLogger()
+    public VSCodeTelemetryLogger(IAsynchronousOperationListenerProvider asyncListenerProvider)
     {
+        _asyncListenerProvider = asyncListenerProvider;
     }
 
     public void InitializeSession(string telemetryLevel, string? sessionId, bool isDefaultSession)
@@ -46,6 +51,8 @@ public void InitializeSession(string telemetryLevel, string? sessionId, bool isD
         session.RegisterForReliabilityEvent();
 
         _telemetrySession = session;
+
+        TelemetryLogger.Create(_telemetrySession, logDelta: false, _asyncListenerProvider);
     }
 
     public void Log(string name, List<KeyValuePair<string, object?>> properties)

diff --git a/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj b/src/VisualStudio/DevKit/Impl/Microsoft.VisualStudio.LanguageServices.DevKit.csproj
@@ -17,6 +17,7 @@
   <ItemGroup>
     <Compile Include="..\..\..\EditorFeatures\Core\EditAndContinue\Contracts\ContractWrappers.cs" Link="EditAndContinue\ContractWrappers.cs" />
     <Compile Include="..\..\..\EditorFeatures\Core\EditAndContinue\Contracts\ManagedHotReloadServiceBridge.cs" Link="EditAndContinue\ManagedHotReloadServiceBridge.cs" />
+    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\Shared\*.cs" LinkBase="Logging" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj
@@ -39,13 +39,7 @@
     <Compile Include="..\..\..\VisualStudio\Core\Def\Storage\ProjectContainerKeyCache.cs" Link="Host\Storage\ProjectContainerKeyCache.cs" />
     <Compile Include="..\..\..\VisualStudio\Core\Def\Storage\FileDownloader.cs" Link="Host\Storage\FileDownloader.cs" />
     <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\AbstractWorkspaceTelemetryService.cs" Link="Services\ProcessTelemetry\AbstractWorkspaceTelemetryService.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\AggregatingTelemetryLog.cs" Link="Services\ProcessTelemetry\AggregatingTelemetryLog.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\AggregatingTelemetryLogManager.cs" Link="Services\ProcessTelemetry\AggregatingTelemetryLogManager.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\TelemetryLogger.cs" Link="Services\ProcessTelemetry\TelemetryLogger.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\TelemetryLogProvider.cs" Link="Services\ProcessTelemetry\TelemetryLogProvider.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\TimedTelemetryLogBlock.cs" Link="Services\ProcessTelemetry\TimedTelemetryLogBlock.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\VisualStudioTelemetryLog.cs" Link="Services\ProcessTelemetry\VisualStudioTelemetryLog.cs" />
-    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\VisualStudioTelemetryLogManager.cs" Link="Services\ProcessTelemetry\VisualStudioTelemetryLogManager.cs" />
+    <Compile Include="..\..\..\VisualStudio\Core\Def\Telemetry\Shared\*.cs" LinkBase="Services\ProcessTelemetry" />
   </ItemGroup>
   <ItemGroup>
     <RestrictedInternalsVisibleTo Include="Microsoft.CodeAnalysis.LiveUnitTesting.BuildManager" Partner="UnitTesting" Key="$(UnitTestingKey)" />