Rename WPA Plugin and Exe to QuicTrace (microsoft#1490)

.azure/azure-pipelines.plugins.yml

@@ -38,8 +38,8 @@ stages:
     parameters:
       arch: x86
 
-- stage: build_wpa
-  displayName: Build WPA Plugin
+- stage: build_quictrace
+  displayName: Build QuicTrace
   dependsOn: []
   jobs:
-  - template: ./templates/build-config-wpa.yml
+  - template: ./templates/build-config-quictrace.yml

.azure/templates/build-config-wpa.yml → .azure/templates/build-config-quictrace.yml

@@ -1,7 +1,7 @@
 # This template contains steps to build MsQuic WPA plugin.
 
 jobs:
-- job: build_wpa
+- job: build_quictrace
   displayName: Any CPU
   pool:
     vmImage: windows-latest
@@ -11,19 +11,19 @@ jobs:
   - task: NuGetCommand@2
     displayName: Nuget Restore
     inputs:
-      restoreSolution: src\plugins\msquic.wpa.sln
+      restoreSolution: src\plugins\QuicTrace.sln
 
   - task: VSBuild@1
     continueOnError: true
     inputs:
-      solution: src\plugins\msquic.wpa.sln
+      solution: src\plugins\QuicTrace.sln
       platform: Any CPU
       configuration: Debug
 
   - task: VSBuild@1
     continueOnError: true
     inputs:
-      solution: src\plugins\msquic.wpa.sln
+      solution: src\plugins\QuicTrace.sln
       platform: Any CPU
       configuration: Release
 

docs/Diagnostics.md

@@ -32,7 +32,7 @@ netsh.exe trace convert quic.etl
 
 > **Important** - If you're using a version of MsQuic that uses an ETW manifest version more recent than the one built into the Windows image, decoding may not provide correct output. **TODO** - Provide instructions to get around this problem.
 
-You may also open the trace in Windows Performance Analyzer. See the [WPA instructions](../src/plugins/wpa/README.md) for more details.
+You may also open the trace in Windows Performance Analyzer. See the [WPA instructions](../src/plugins/trace/README.md) for more details.
 
 ### Using WPR to Collect Traces
 
@@ -99,7 +99,7 @@ clog2text_lttng -i quic.babel.txt -s clog.sidecar -o quic.log --showTimestamp --
 
 # Trace Analysis
 
-MsQuic supports a custom plugin for Windows Performance Analyzer (WPA) to detailed analysis of ETW traces. See the [WPA instructions](../src/plugins/wpa/README.md) for more details.
+MsQuic supports a custom plugin for Windows Performance Analyzer (WPA) to detailed analysis of ETW traces. See the [WPA instructions](../src/plugins/trace/README.md) for more details.
 
 # Performance Counters
 

docs/TSG.md

@@ -156,7 +156,7 @@ App Main returning status 0
 
 As you can see from the output of `secnetperf.exe` the resulting `25869 RPS` is nowhere near what it should be. The next step is to grab a performance trace to see what is going on. For these type of issues the best way to collect the traces would be to [use WPR](./Diagnostics.md#using-wpr-to-collect-traces) (with `Scheduling.Verbose` or `Performance.Verbose` profiles).
 
-Once you have the ETL, open it [in WPA using the MsQuic plugin](../src/plugins/wpa/README.md). First thing after opening, let's take a look at the QUIC Worker utilization. In the `Graph Explorer`, under `Computation`, expand `QUIC Workers` and open the one labeled `Utilization by Worker`. For the example above (server-side trace), here is what the output looks like:
+Once you have the ETL, open it [in WPA using the MsQuic plugin](../src/plugins/trace/README.md). First thing after opening, let's take a look at the QUIC Worker utilization. In the `Graph Explorer`, under `Computation`, expand `QUIC Workers` and open the one labeled `Utilization by Worker`. For the example above (server-side trace), here is what the output looks like:
 
 ![](images/rss-debug-1.png)
 

src/plugins/msquic.wpa.sln → src/plugins/QuicTrace.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicEventDataSource", "wpa\QuicEventDataSource.csproj", "{CCE5ECE9-8DCD-4E3F-8389-D48B728355DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicTraceLib", "trace\dll\QuicTraceLib.csproj", "{CCE5ECE9-8DCD-4E3F-8389-D48B728355DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicEtw", "wpacmd\QuicEtw.csproj", "{8A55FED8-CF16-4BD1-AB7B-41C9BD3E91CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuicTrace", "trace\exe\QuicTrace.csproj", "{8A55FED8-CF16-4BD1-AB7B-41C9BD3E91CC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/plugins/wpa/DataModel/ETW/QuicEtwDataReader.cs → src/plugins/trace/dll/DataModel/ETW/QuicEtwDataReader.cs

@@ -8,7 +8,7 @@
 using System.Net;
 using System.Runtime.InteropServices;
 
-namespace MsQuicTracing.DataModel.ETW
+namespace QuicTrace.DataModel.ETW
 {
     internal unsafe ref struct QuicEtwDataReader
     {

src/plugins/wpa/DataModel/ETW/QuicEtwEvent.cs → src/plugins/trace/dll/DataModel/ETW/QuicEtwEvent.cs

@@ -7,7 +7,7 @@
 using Microsoft.Diagnostics.Tracing;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel.ETW
+namespace QuicTrace.DataModel.ETW
 {
     [Flags]
     internal enum QuicEtwEventKeywords : ulong

src/plugins/wpa/DataModel/QuicConnection.cs → src/plugins/trace/dll/DataModel/QuicConnection.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public sealed class QuicConnection : IQuicObject
     {

src/plugins/wpa/DataModel/QuicData.cs → src/plugins/trace/dll/DataModel/QuicData.cs

@@ -6,7 +6,7 @@
 using System;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     [Flags]
     public enum QuicDataAvailableFlags

src/plugins/wpa/DataModel/QuicDatapath.cs → src/plugins/trace/dll/DataModel/QuicDatapath.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public sealed class QuicDatapath : IQuicObject
     {

src/plugins/wpa/DataModel/QuicEvent.cs → src/plugins/trace/dll/DataModel/QuicEvent.cs

@@ -9,7 +9,7 @@
 
 #pragma warning disable CA1305 // Specify IFormatProvider
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public enum QuicEventParseMode
     {

src/plugins/wpa/DataModel/QuicEvents.cs → src/plugins/trace/dll/DataModel/QuicEvents.cs

@@ -10,7 +10,7 @@
 #pragma warning disable CA1305 // Specify IFormatProvider
 #pragma warning disable CA1707 // Identifiers should not contain underscores
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public enum QuicApiType
     {

src/plugins/wpa/DataModel/QuicObjectSet.cs → src/plugins/trace/dll/DataModel/QuicObjectSet.cs

@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public interface IQuicObject
     {

src/plugins/wpa/DataModel/QuicState.cs → src/plugins/trace/dll/DataModel/QuicState.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public sealed class QuicState
     {

src/plugins/wpa/DataModel/QuicStream.cs → src/plugins/trace/dll/DataModel/QuicStream.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public sealed class QuicStream : IQuicObject
     {

src/plugins/wpa/DataModel/QuicWorker.cs → src/plugins/trace/dll/DataModel/QuicWorker.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.Performance.SDK;
 
-namespace MsQuicTracing.DataModel
+namespace QuicTrace.DataModel
 {
     public sealed class QuicWorker : IQuicObject
     {

src/plugins/wpa/Properties/launchSettings.json → src/plugins/trace/dll/Properties/launchSettings.json

@@ -3,7 +3,7 @@
     "WPA": {
       "commandName": "Executable",
       "executablePath": "f:\\xperf\\wpa.exe",
-      "commandLineArgs": "-addsearchdir $(SolutionDir)..\\..\\artifacts\\bin\\wpa\\$(Configuration)",
+      "commandLineArgs": "-addsearchdir $(SolutionDir)..\\..\\artifacts\\bin\\quictrace\\$(Configuration)",
       "nativeDebugging": false
     }
   }

src/plugins/wpa/QuicEtwSource.cs → src/plugins/trace/dll/QuicEtwSource.cs

@@ -8,7 +8,7 @@
 using System.Linq;
 using Microsoft.Performance.SDK.Processing;
 
-namespace MsQuicTracing
+namespace QuicTrace
 {
     /// <summary>
     /// This custom data source defines processes MsQuic ETW events.

src/plugins/wpa/QuicEventCooker.cs → src/plugins/trace/dll/QuicEventCooker.cs

@@ -11,9 +11,9 @@
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Extensibility.DataCooking;
 using Microsoft.Performance.SDK.Extensibility.DataCooking.SourceDataCooking;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing
+namespace QuicTrace
 {
     public sealed class QuicEventCooker : CookedDataReflector, ISourceDataCooker<QuicEvent, object, Guid>
     {

src/plugins/wpa/QuicEventParser.cs → src/plugins/trace/dll/QuicEventParser.cs

@@ -10,12 +10,12 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility.SourceParsing;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
-using MsQuicTracing.DataModel.ETW;
+using QuicTrace.DataModel;
+using QuicTrace.DataModel.ETW;
 
 #pragma warning disable CA1031 // Do not catch general exception types
 
-namespace MsQuicTracing
+namespace QuicTrace
 {
     public enum QuicEventSourceType
     {

src/plugins/wpa/QuicEventProcessor.cs → src/plugins/trace/dll/QuicEventProcessor.cs

@@ -8,9 +8,9 @@
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Extensibility.SourceParsing;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing
+namespace QuicTrace
 {
     public class QuicEventProcessor : CustomDataProcessorBaseWithSourceParser<QuicEvent, object, Guid>
     {

src/plugins/wpa/QuicEventDataSource.csproj → src/plugins/trace/dll/QuicTraceLib.csproj

@@ -4,7 +4,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
-    <RootNamespace>MsQuicTracing</RootNamespace>
+    <RootNamespace>QuicTrace</RootNamespace>
     <NoWarn>1701;1702;CA1036;CA1815;CA1720;CA1008;CA1711;CA1028</NoWarn>
     <Authors>Microsoft</Authors>
     <Company>Microsoft Corporation</Company>
@@ -13,7 +13,6 @@
     <RepositoryUrl>https://github.com/microsoft/msquic.git</RepositoryUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <AssemblyName>MsQuic.DataSource</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
@@ -31,6 +30,6 @@
     </None>
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="echo f | xcopy $(TargetDir)$(TargetName).dll $(SolutionDir)..\..\artifacts\bin\wpa\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)$(TargetName).pdb $(SolutionDir)..\..\artifacts\bin\wpa\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)Microsoft.Diagnostics.FastSerialization.dll $(SolutionDir)..\..\artifacts\bin\wpa\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)Microsoft.Diagnostics.Tracing.TraceEvent.dll $(SolutionDir)..\..\artifacts\bin\wpa\$(Configuration)\ /Y" />
+    <Exec Command="echo f | xcopy $(TargetDir)$(TargetName).dll $(SolutionDir)..\..\artifacts\bin\quictrace\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)$(TargetName).pdb $(SolutionDir)..\..\artifacts\bin\quictrace\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)Microsoft.Diagnostics.FastSerialization.dll $(SolutionDir)..\..\artifacts\bin\quictrace\$(Configuration)\ /Y&#xD;&#xA;echo f | xcopy $(TargetDir)Microsoft.Diagnostics.Tracing.TraceEvent.dll $(SolutionDir)..\..\artifacts\bin\quictrace\$(Configuration)\ /Y" />
   </Target>
 </Project>

src/plugins/wpa/Tables/QuicApiTable.cs → src/plugins/trace/dll/Tables/QuicApiTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicApiTable

src/plugins/wpa/Tables/QuicConnectionTable.cs → src/plugins/trace/dll/Tables/QuicConnectionTable.cs

@@ -9,9 +9,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicConnectionTable

src/plugins/wpa/Tables/QuicDataBatchingTable.cs → src/plugins/trace/dll/Tables/QuicDataBatchingTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicDataBatchingTable

src/plugins/wpa/Tables/QuicExecutionTable.cs → src/plugins/trace/dll/Tables/QuicExecutionTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicExecutionTable

src/plugins/wpa/Tables/QuicNetworkTable.cs → src/plugins/trace/dll/Tables/QuicNetworkTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicNetworkTable

src/plugins/wpa/Tables/QuicSchedulingTable.cs → src/plugins/trace/dll/Tables/QuicSchedulingTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicSchedulingTable

src/plugins/wpa/Tables/QuicStreamLifetime.cs → src/plugins/trace/dll/Tables/QuicStreamLifetime.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicStreamLifetimeTable

src/plugins/wpa/Tables/QuicTxBlockedTable.cs → src/plugins/trace/dll/Tables/QuicTxBlockedTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicTxBlockedTable

src/plugins/wpa/Tables/QuicWorkerActivityTable.cs → src/plugins/trace/dll/Tables/QuicWorkerActivityTable.cs

@@ -10,9 +10,9 @@
 using Microsoft.Performance.SDK;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.SDK.Processing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicTracing.Tables
+namespace QuicTrace.Tables
 {
     [Table]
     public sealed class QuicWorkerActivityTable

src/plugins/wpacmd/Program.cs → src/plugins/trace/exe/Program.cs

@@ -6,10 +6,9 @@
 using System;
 using Microsoft.Performance.SDK.Extensibility;
 using Microsoft.Performance.Toolkit.Engine;
-using MsQuicTracing;
-using MsQuicTracing.DataModel;
+using QuicTrace.DataModel;
 
-namespace MsQuicEtw
+namespace QuicTrace
 {
     class Program
     {