Add Razor language server telemetry to C# DevKit #9283

allisonchou · 2023-09-14T00:57:58Z

vscode-csharp PR: dotnet/vscode-csharp#6371

Adds Razor server telemetry to C# DevKit. The flow is as follows:

This PR adds a new project, Microsoft.VisualStudio.DevKit.Razor, which contains our VS telemetry logic.
The above project is published to our CDN (similar to how we publish rzls today).
On the vscode-csharp side, the new bits are downloaded only if the user has C# DevKit installed. The bits are passed back into our language server so that the server has a functional telemetry reporter.

src/Razor/src/Microsoft.VisualStudio.Telemetry.Razor/TelemetryHelpers.cs

allisonchou · 2023-09-15T01:02:57Z

eng/Publishing.props

@@ -8,8 +8,8 @@

  <ItemGroup>
    <!-- Prepare for _UpdatePublishItems target. -->
-    <_ItemsToPublish Include="$(ArtifactsPackagesDir)**\*.tgz" Condition="'$(OS)' == 'Windows_NT'" />


This is leftover from O# and is no longer needed

allisonchou · 2023-09-15T01:03:39Z

eng/AfterSigning.targets

@@ -41,4 +41,35 @@
    <!-- Build a .zip file from each platform's directory and write it to 'artifacts' -->
    <ZipDirectory SourceDirectory="%(LanguageServiceBinary.SourceDir)" DestinationFile="%(LanguageServiceBinary.ZipFile)" />
  </Target>
+
+  <Target Name="_ZipDevKitTelemetryBinaries" AfterTargets="_ZipLanguageServerBinaries" Condition="'$(ArcadeBuildFromSource)' != 'true'">


We zip the files to publish to the CDN so we can consume the telemetry binaries on the vscode-csharp side.

allisonchou · 2023-09-15T01:19:53Z

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/AssemblyLoadContextWrapper.cs

@@ -0,0 +1,176 @@
+// Copyright (c) .NET Foundation. All rights reserved.


This class is almost entirely taken from Roslyn with a few modifications to make it work for Razor

allisonchou · 2023-09-15T01:20:13Z

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/CustomExportAssemblyLoader.cs

@@ -0,0 +1,96 @@
+// Copyright (c) .NET Foundation. All rights reserved.


This class is almost entirely taken from Roslyn with a few modifications to make it work for Razor

allisonchou · 2023-09-15T01:20:53Z

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/ExportProviderBuilder.cs

@@ -0,0 +1,72 @@
+// Copyright (c) .NET Foundation. All rights reserved.


This class is almost entirely taken from Roslyn with a few modifications to make it work for Razor

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/DevKitTelemetryReporter.cs

allisonchou · 2023-09-15T01:26:54Z

src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Telemetry/TelemetryHelpers.cs

+using System.Diagnostics;
+using Microsoft.VisualStudio.Telemetry;
+
+namespace Microsoft.AspNetCore.Razor.Telemetry;


These were classes previously in TelemetryReporter that I refactored out so they could be used by both VSTelemetryReporter and DevKitTelemetryReporter

src/Razor/src/rzls/Program.cs

davidwengier

I don't have a lot of context, but this makes sense to me. Well, except for the MEF and ALC stuff :)

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/DevKitTelemetryReporter.cs

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj

Razor.sln

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/AssemblyLoadContextWrapper.cs

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/ExportProviderBuilder.cs

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/DevKitTelemetryReporter.cs

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj

src/Razor/src/rzls/Program.cs

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Exports/AssemblyLoadContextWrapper.cs

allisonchou · 2023-09-20T08:20:04Z

src/Razor/src/Microsoft.VisualStudio.Editor.Razor/TelemetryReporter.cs

@@ -1,318 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.


This class became VSTelemetryReporter, and mutual logic between it and DevKitTelemetryReporter was moved to an abstract class called TelemetryReporter

ryzngard · 2023-09-22T18:31:19Z

src/Razor/src/Microsoft.VisualStudio.Editor.Razor/Telemetry/VSTelemetryReporter.cs

+
+    public override void InitializeSession(string telemetryLevel, string? sessionId, bool isDefaultSession)
+    {
+        // We don't need to do anything here. We're using the default session


We should probably throw it at least assert this isn't called

allisonchou added 7 commits September 13, 2023 12:42

Preliminary implementation

8fff249

Fix zip logic

4f27d6b

Refactoring

2979b0f

Cleanup

20648fa

Fix CI

ab07ef6

Fix CI error

ba134b6

Publish to right place

6b210c5

davidwengier reviewed Sep 14, 2023

View reviewed changes

src/Razor/src/Microsoft.VisualStudio.Telemetry.Razor/TelemetryHelpers.cs Outdated Show resolved Hide resolved

allisonchou added 5 commits September 14, 2023 03:33

Fix publish

15b15a7

Add comment

26c7a44

Delete added project and link files instead

b34149d

Move around file

152f9a6

Cleanup

b973f90

allisonchou commented Sep 15, 2023

View reviewed changes

src/Razor/src/rzls/Program.cs Outdated Show resolved Hide resolved

allisonchou mentioned this pull request Sep 15, 2023

Add Razor server telemetry to C# DevKit dotnet/vscode-csharp#6371

Merged

allisonchou changed the title ~~[draft] add devkit telemetry~~ Add Razor language server telemetry to C# DevKit Sep 15, 2023

allisonchou marked this pull request as ready for review September 15, 2023 01:39

allisonchou requested review from a team as code owners September 15, 2023 01:39

Expose internal

deafe45

allisonchou requested review from ryzngard and davidwengier September 15, 2023 01:46

davidwengier approved these changes Sep 15, 2023

View reviewed changes

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/DevKitTelemetryReporter.cs Outdated Show resolved Hide resolved

src/Razor/src/Microsoft.VisualStudio.DevKit.Razor/Microsoft.VisualStudio.DevKit.Razor.csproj Outdated Show resolved Hide resolved

jjonescz reviewed Sep 15, 2023

View reviewed changes

Razor.sln Show resolved Hide resolved

ryzngard reviewed Sep 18, 2023

View reviewed changes

allisonchou added 2 commits September 18, 2023 17:39

First bit of review feedback

72d8660

Refactor

7008562

allisonchou commented Sep 20, 2023

View reviewed changes

Update Razor telemetry version

d2a92ec

Resolve merge conflicts

97f3eac

allisonchou requested a review from ryzngard September 22, 2023 18:07

ryzngard reviewed Sep 22, 2023

View reviewed changes

ryzngard approved these changes Sep 22, 2023

View reviewed changes

allisonchou added 2 commits September 22, 2023 12:00

Address feedback

7ecd04d

Fix merge conflicts

bd16099

allisonchou enabled auto-merge (squash) September 22, 2023 20:28

allisonchou merged commit 9ff3387 into main Sep 22, 2023
12 checks passed

allisonchou deleted the dev/allichou/AddTelemetryDevKit branch September 22, 2023 22:01

ghost added this to the Next milestone Sep 22, 2023

Cosifne modified the milestones: Next, 17.8 P3 Sep 25, 2023

allisonchou mentioned this pull request Sep 26, 2023

[Automated] PRs inserted in VS build main-34126.111 #9325

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Razor language server telemetry to C# DevKit #9283

Add Razor language server telemetry to C# DevKit #9283

allisonchou commented Sep 14, 2023 •

edited

Loading

allisonchou Sep 15, 2023

allisonchou Sep 15, 2023

allisonchou Sep 15, 2023

allisonchou Sep 15, 2023

allisonchou Sep 15, 2023

allisonchou Sep 15, 2023 •

edited

Loading

davidwengier left a comment

allisonchou Sep 20, 2023

ryzngard Sep 22, 2023

		@@ -0,0 +1,176 @@
		// Copyright (c) .NET Foundation. All rights reserved.

		@@ -0,0 +1,96 @@
		// Copyright (c) .NET Foundation. All rights reserved.

		@@ -0,0 +1,72 @@
		// Copyright (c) .NET Foundation. All rights reserved.

		@@ -1,318 +0,0 @@
		// Copyright (c) .NET Foundation. All rights reserved.

Add Razor language server telemetry to C# DevKit #9283

Add Razor language server telemetry to C# DevKit #9283

Conversation

allisonchou commented Sep 14, 2023 • edited Loading

allisonchou Sep 15, 2023

Choose a reason for hiding this comment

allisonchou Sep 15, 2023

Choose a reason for hiding this comment

allisonchou Sep 15, 2023

Choose a reason for hiding this comment

allisonchou Sep 15, 2023

Choose a reason for hiding this comment

allisonchou Sep 15, 2023

Choose a reason for hiding this comment

allisonchou Sep 15, 2023 • edited Loading

Choose a reason for hiding this comment

davidwengier left a comment

Choose a reason for hiding this comment

allisonchou Sep 20, 2023

Choose a reason for hiding this comment

ryzngard Sep 22, 2023

Choose a reason for hiding this comment

allisonchou commented Sep 14, 2023 •

edited

Loading

allisonchou Sep 15, 2023 •

edited

Loading