Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions PerfView.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.32821.20
# Visual Studio Version 18
VisualStudioVersion = 18.6.11620.235 main
MinimumVisualStudioVersion = 15.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfView", "src\PerfView\PerfView.csproj", "{6BAC7496-6953-41B8-9042-AAE45405A095}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -397,6 +397,18 @@ Global
{F266BD46-34EE-4EEB-8B21-6059F4DFC51F}.Release|x64.Build.0 = Release|Any CPU
{F266BD46-34EE-4EEB-8B21-6059F4DFC51F}.Release|x86.ActiveCfg = Release|Any CPU
{F266BD46-34EE-4EEB-8B21-6059F4DFC51F}.Release|x86.Build.0 = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|x64.ActiveCfg = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|x64.Build.0 = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|x86.ActiveCfg = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Debug|x86.Build.0 = Debug|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|Any CPU.Build.0 = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|x64.ActiveCfg = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|x64.Build.0 = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|x86.ActiveCfg = Release|Any CPU
{2EC430A3-1B65-4628-B2F2-8DBEB4C03132}.Release|x86.Build.0 = Release|Any CPU
{DE35BED9-0E03-4DAC-A003-1ACBBF816973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DE35BED9-0E03-4DAC-A003-1ACBBF816973}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE35BED9-0E03-4DAC-A003-1ACBBF816973}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -437,8 +449,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F85A2A3-E0DF-4826-9BBA-4DFFA0F17150}
EndGlobalSection
Expand Down
2 changes: 1 addition & 1 deletion src/TraceEvent/Computers/StartStopActivityComputer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public StartStopActivityComputer(TraceLogEventSource source, ActivityComputer ta
// TODO FIX NOW, I have never run these! Get some data to test against.
WCFParser.ClientOperationPrepared += delegate (Multidata22TemplateHATraceData data)
{
string extraInformation = "/Action=" + data.ServiceAction + "/URL=" + data.Destination;
string extraInformation = "/Action=" + data.SoapAction + "/URL=" + data.Destination;
OnStart(data, extraInformation, null, null, GetActiveStartStopActivityTable(data.ActivityID, data.ProcessID), "ClientOperation");
};
WCFParser.ServiceChannelCallStop += delegate (Multidata22TemplateHATraceData data)
Expand Down
5 changes: 5 additions & 0 deletions src/TraceEvent/EventPipe/EventPipeMetadata.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.Diagnostics.Tracing.EventPipe;
using Microsoft.Diagnostics.Tracing.Parsers;
using Microsoft.Diagnostics.Tracing.Parsers.ApplicationServer;
using Microsoft.Diagnostics.Tracing.Parsers.Clr;
using Microsoft.Diagnostics.Tracing.Session;
using System;
Expand Down Expand Up @@ -868,6 +869,10 @@ public static Guid GetProviderGuidFromProviderName(string name)
{
return FrameworkEventSourceTraceEventParser.ProviderGuid;
}
else if (name == ApplicationServerTraceEventParser.ProviderName)
{
return ApplicationServerTraceEventParser.ProviderGuid;
}
#if SUPPORT_V1_V2
else if (name == SampleProfilerTraceEventParser.ProviderName)
{
Expand Down
260 changes: 242 additions & 18 deletions src/TraceEvent/Parsers/ApplicationServerTraceEventParser.cs

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading