Skip to content

Commit 1af438c

Browse files
committed
Fix test failures
1 parent 98a7800 commit 1af438c

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src/TraceEvent/EventPipe/EventPipeEventSource.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,11 @@ private DynamicTraceEventData.PayloadFetchClassInfo CheckForWellKnownEventFields
521521
if (eventMetaDataHeader.ProviderName == "Microsoft-Diagnostics-DiagnosticSource")
522522
{
523523
string eventName = eventMetaDataHeader.EventName;
524+
if (eventMetaDataHeader.Opcode == (int)TraceEventOpcode.Start || eventMetaDataHeader.Opcode == (int)TraceEventOpcode.Stop)
525+
{
526+
eventName = eventName + ((TraceEventOpcode)eventMetaDataHeader.Opcode).ToString();
527+
}
528+
524529
if (eventName == "Event" ||
525530
eventName == "Activity1Start" ||
526531
eventName == "Activity1Stop" ||

src/TraceEvent/TraceEvent.Tests/inputs/eventpipe-dotnetcore2.0-linux-objver1.netperf.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Microsoft-Windows-DotNETRuntimeRundown/Loader/DomainModuleDCStop, 148, <Event MS
4545
Microsoft-Windows-DotNETRuntimeRundown/Loader/ModuleDCStop, 149, <Event MSec= "28101.3208" PID= "0" PName= "" TID="166386" EventName="Loader/ModuleDCStop" ModuleID="0x00007FB2454D3C18" AssemblyID="0x02391490" ModuleFlags="Manifest" ModuleILPath="/home/nate/DotNetCoreProfiler/samples/mvc/bin/Debug/netcoreapp2.0/mvc.dll" ModuleNativePath="" ManagedPdbSignature="439d7f24-9f20-4b61-a0ae-50fb842e9c20" ManagedPdbAge="1" ManagedPdbBuildPath="/home/nate/DotNetCoreProfiler/samples/mvc/obj/Debug/netcoreapp2.0/mvc.pdb"/>
4646
Microsoft-Windows-DotNETRuntimeRundown/Method/DCStopComplete, 1, <Event MSec= "30686.3881" PID= "0" PName= "" TID="166386" EventName="Method/DCStopComplete" ClrInstanceID="0"/>
4747
Microsoft-Windows-DotNETRuntimeRundown/Method/DCStopInit, 1, <Event MSec= "27765.9477" PID= "0" PName= "" TID="166386" EventName="Method/DCStopInit" ClrInstanceID="0"/>
48-
Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)/RequestStart/Start, 51, <Event MSec= "6055.0726" PID= "0" PName= "" TID="166386" ActivityID="00000011000000000000000060109f59" EventName="RequestStart/Start" ProviderName="Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)" url="/"/>
49-
Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)/RequestStop/Stop, 51, <Event MSec= "81.6991" PID= "0" PName= "" TID="166381" EventName="RequestStop/Stop" ProviderName="Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)"/>
48+
Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)/Request/Start, 51, <Event MSec= "6055.0726" PID= "0" PName= "" TID="166386" ActivityID="00000011000000000000000060109f59" EventName="Request/Start" ProviderName="Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)" url="/"/>
49+
Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)/Request/Stop, 51, <Event MSec= "81.6991" PID= "0" PName= "" TID="166381" EventName="Request/Stop" ProviderName="Provider(f150d8fb-960c-5e38-a69d-49bae6f97289)"/>
5050
System.Threading.Tasks.TplEventSource/AwaitTaskContinuationScheduled/Send, 7, <Event MSec= "87.0745" PID= "0" PName= "" TID="166381" EventName="AwaitTaskContinuationScheduled/Send" OriginatingTaskSchedulerID="1" OriginatingTaskID="3" ContinuationId="4"/>
5151
System.Threading.Tasks.TplEventSource/TaskExecute/Start, 198, <Event MSec= "6056.3766" PID= "0" PName= "" TID="166383" EventName="TaskExecute/Start" OriginatingTaskSchedulerID="1" OriginatingTaskID="0" TaskID="17"/>
5252
System.Threading.Tasks.TplEventSource/TaskExecute/Stop, 197, <Event MSec= "6056.4608" PID= "0" PName= "" TID="166383" EventName="TaskExecute/Stop" OriginatingTaskSchedulerID="1" OriginatingTaskID="0" TaskID="17" IsExceptional="False"/>

src/TraceEvent/TraceEvent.Tests/inputs/eventpipe-dotnetcore2.0-linux-objver2.netperf.baseline.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ System.Threading.Tasks.TplEventSource/TaskScheduled/Send, 82, <Event MSec= "447
2828
System.Threading.Tasks.TplEventSource/TaskWait/Send, 106, <Event MSec= "4446.0311" PID= "0" PName= "" TID="12701" EventName="TaskWait/Send" OriginatingTaskSchedulerID="1" OriginatingTaskID="0" TaskID="3" Behavior="Asynchronous" ContinueWithTaskID="0"/>
2929
System.Threading.Tasks.TplEventSource/TaskWait/Stop, 96, <Event MSec= "4534.8792" PID= "0" PName= "" TID="12824" EventName="TaskWait/Stop" OriginatingTaskSchedulerID="1" OriginatingTaskID="0" TaskID="13"/>
3030
System.Threading.Tasks.TplEventSource/TaskWaitContinuationComplete, 96, <Event MSec= "4535.1539" PID= "0" PName= "" TID="12824" EventName="TaskWaitContinuationComplete" TaskID="17"/>
31-
TestEventSource/RequestStart/Start, 28, <Event MSec= "4479.3677" PID= "0" PName= "" TID="12815" ActivityID="0000001100000000000000003da89d59" EventName="RequestStart/Start" ProviderName="TestEventSource" url="/"/>
32-
TestEventSource/RequestStop/Stop, 28, <Event MSec= "159.4038" PID= "0" PName= "" TID="12691" EventName="RequestStop/Stop" ProviderName="TestEventSource"/>
31+
TestEventSource/Request/Start, 28, <Event MSec= "4479.3677" PID= "0" PName= "" TID="12815" ActivityID="0000001100000000000000003da89d59" EventName="Request/Start" ProviderName="TestEventSource" url="/"/>
32+
TestEventSource/Request/Stop, 28, <Event MSec= "159.4038" PID= "0" PName= "" TID="12691" EventName="Request/Stop" ProviderName="TestEventSource"/>

0 commit comments

Comments
 (0)