Report telemetry through Roslyn

Author: davidwengier

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/TelemetryReporterWrapper.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.VisualStudioCode.RazorExtension.Services;
+
+[Shared]
+[ExportRazorStatelessLspService(typeof(RazorTelemetryReporter))]
+internal sealed class TelemetryReporterWrapper : RazorTelemetryReporter
+{
+    [ImportingConstructor]
+    public TelemetryReporterWrapper(VSCodeTelemetryReporter telemetryReporter)
+    {
+        telemetryReporter.SetTelemetryReporter(this);
+    }
+
+    internal void Report(string name, IDictionary<string, object?> properties)
+    {
+        base.ReportEvent(name, properties.ToList());
+    }
+}

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/VSCodeTelemetryReporter.cs

@@ -1,61 +1,37 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Composition;
 using Microsoft.CodeAnalysis.Razor.Telemetry;
+using Microsoft.VisualStudio.Razor.Telemetry;
+using Microsoft.VisualStudio.Telemetry;
 
 namespace Microsoft.VisualStudioCode.RazorExtension.Services;
 
-// TODO:
-
 [Shared]
+[Export(typeof(VSCodeTelemetryReporter))]
 [Export(typeof(ITelemetryReporter))]
-internal class VSCodeTelemetryReporter : ITelemetryReporter
+internal sealed class VSCodeTelemetryReporter : TelemetryReporter
 {
-    public TelemetryScope BeginBlock(string name, Severity severity, TimeSpan minTimeToReport)
-        => TelemetryScope.Null;
-
-    public TelemetryScope BeginBlock(string name, Severity severity, TimeSpan minTimeToReport, Property property)
-        => TelemetryScope.Null;
-
-    public TelemetryScope BeginBlock(string name, Severity severity, TimeSpan minTimeToReport, Property property1, Property property2)
-        => TelemetryScope.Null;
-
-    public TelemetryScope BeginBlock(string name, Severity severity, TimeSpan minTimeToReport, Property property1, Property property2, Property property3)
-        => TelemetryScope.Null;
-
-    public TelemetryScope BeginBlock(string name, Severity severity, TimeSpan minTimeToReport, params ReadOnlySpan<Property> properties)
-        => TelemetryScope.Null;
-
-    public void ReportEvent(string name, Severity severity)
-    {
-    }
+    private TelemetryReporterWrapper? _reporter;
 
-    public void ReportEvent(string name, Severity severity, Property property)
-    {
-    }
-
-    public void ReportEvent(string name, Severity severity, Property property1, Property property2)
-    {
-    }
+    public override bool IsEnabled => true;
 
-    public void ReportEvent(string name, Severity severity, Property property1, Property property2, Property property3)
+    internal void SetTelemetryReporter(TelemetryReporterWrapper reporter)
     {
+        _reporter = reporter;
     }
 
-    public void ReportEvent(string name, Severity severity, params ReadOnlySpan<Property> properties)
-    {
-    }
+    // We override any method in the base class that does actual telemetry reporting, and redirect it
+    // through our wrapper, to the Roslyn reporter.
 
-    public void ReportFault(Exception exception, string? message, params object?[] @params)
+    protected override void Report(TelemetryEvent telemetryEvent)
     {
+        _reporter?.Report(telemetryEvent.Name, telemetryEvent.Properties);
     }
 
-    public TelemetryScope TrackLspRequest(string lspMethodName, string lspServerName, TimeSpan minTimeToReport, Guid correlationId)
-        => TelemetryScope.Null;
-
-    public void ReportRequestTiming(string name, string? language, TimeSpan queuedDuration, TimeSpan requestDuration, TelemetryResult result)
+    public override void ReportMetric(AggregatingTelemetryLog.TelemetryInstrumentEvent metricEvent)
     {
+        _reporter?.Report(metricEvent.Event.Name, metricEvent.Event.Properties);
     }
 }