From 1e2a57c832bc192f62f252cb81d8b13be5ce4d7c Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 15 Sep 2023 11:50:38 -0700 Subject: [PATCH 1/4] swap EventIds --- src/WebJobs.Extensions.DurableTask/EtwEventSource.cs | 8 ++++---- .../WebJobs.Extensions.DurableTask.csproj | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs index 77f9bb0e4..9fd42fd57 100644 --- a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs +++ b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs @@ -159,7 +159,7 @@ public void TimerExpired( this.WriteEvent(209, TaskHub, AppName, SlotName, FunctionName, InstanceId, Reason, FunctionType, ExtensionVersion, IsReplay); } - [Event(210, Level = EventLevel.Informational, Version = 3)] + [Event(233, Level = EventLevel.Informational, Version = 3)] public void EventGridNotificationCompleted( string TaskHub, string AppName, @@ -178,7 +178,7 @@ public void EventGridNotificationCompleted( this.WriteEvent(210, TaskHub, AppName, SlotName, FunctionName, FunctionState, InstanceId, Details, StatusCode, Reason, FunctionType, ExtensionVersion, IsReplay, LatencyMs); } - [Event(211, Level = EventLevel.Error, Version = 3)] + [Event(234, Level = EventLevel.Error, Version = 3)] public void EventGridNotificationFailed( string TaskHub, string AppName, @@ -514,7 +514,7 @@ public void ResumingOrchestration( this.WriteEvent(232, TaskHub, AppName, SlotName, FunctionName, InstanceId, Reason, FunctionType, ExtensionVersion, IsReplay); } - [Event(233, Level = EventLevel.Informational, Version = 4)] + [Event(210, Level = EventLevel.Informational, Version = 4)] public void EntityBatchCompleted( string TaskHub, string AppName, @@ -539,7 +539,7 @@ public void EntityBatchCompleted( this.WriteEvent(233, TaskHub, AppName, SlotName, FunctionName, InstanceId, EventsReceived, OperationsInBatch, OperationsExecuted, OutOfOrderMessages, QueuedMessages, UserStateSize, Sources, Destinations, LockedBy, Suspended, TraceFlags, FunctionType, ExtensionVersion, IsReplay); } - [Event(234, Level = EventLevel.Error, Version = 4)] + [Event(211, Level = EventLevel.Error, Version = 4)] public void EntityBatchFailed( string TaskHub, string AppName, diff --git a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj index 8ee4cb106..1163cd040 100644 --- a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj +++ b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj @@ -6,8 +6,8 @@ Microsoft.Azure.WebJobs.Extensions.DurableTask 2 11 - 3 - $(MajorVersion).$(MinorVersion).$(PatchVersion) + 4 + $(MajorVersion).$(MinorVersion).$(PatchVersion)-entity-logs-1 $(MajorVersion).$(MinorVersion).$(PatchVersion) $(MajorVersion).0.0.0 Microsoft Corporation From e15c4fac7276ef48bf60f9000238a99451bbcfe7 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 15 Sep 2023 13:36:12 -0700 Subject: [PATCH 2/4] change EventId in WriteEvent --- src/WebJobs.Extensions.DurableTask/EtwEventSource.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs index 9fd42fd57..79fe0d30d 100644 --- a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs +++ b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs @@ -536,7 +536,7 @@ public void EntityBatchCompleted( string ExtensionVersion, bool IsReplay) { - this.WriteEvent(233, TaskHub, AppName, SlotName, FunctionName, InstanceId, EventsReceived, OperationsInBatch, OperationsExecuted, OutOfOrderMessages, QueuedMessages, UserStateSize, Sources, Destinations, LockedBy, Suspended, TraceFlags, FunctionType, ExtensionVersion, IsReplay); + this.WriteEvent(210, TaskHub, AppName, SlotName, FunctionName, InstanceId, EventsReceived, OperationsInBatch, OperationsExecuted, OutOfOrderMessages, QueuedMessages, UserStateSize, Sources, Destinations, LockedBy, Suspended, TraceFlags, FunctionType, ExtensionVersion, IsReplay); } [Event(211, Level = EventLevel.Error, Version = 4)] @@ -551,7 +551,7 @@ public void EntityBatchFailed( string FunctionType, string ExtensionVersion) { - this.WriteEvent(234, TaskHub, AppName, SlotName, FunctionName, InstanceId, TraceFlags, Details, FunctionType, ExtensionVersion); + this.WriteEvent(211, TaskHub, AppName, SlotName, FunctionName, InstanceId, TraceFlags, Details, FunctionType, ExtensionVersion); } #pragma warning restore SA1313 // Parameter names should begin with lower-case letter From ac03a3c349177c7f6a44d062dfd79db124ec91e9 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 15 Sep 2023 13:36:47 -0700 Subject: [PATCH 3/4] apply changes to EventGrid --- src/WebJobs.Extensions.DurableTask/EtwEventSource.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs index 79fe0d30d..6362b5848 100644 --- a/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs +++ b/src/WebJobs.Extensions.DurableTask/EtwEventSource.cs @@ -175,7 +175,7 @@ public void EventGridNotificationCompleted( bool IsReplay, long LatencyMs) { - this.WriteEvent(210, TaskHub, AppName, SlotName, FunctionName, FunctionState, InstanceId, Details, StatusCode, Reason, FunctionType, ExtensionVersion, IsReplay, LatencyMs); + this.WriteEvent(233, TaskHub, AppName, SlotName, FunctionName, FunctionState, InstanceId, Details, StatusCode, Reason, FunctionType, ExtensionVersion, IsReplay, LatencyMs); } [Event(234, Level = EventLevel.Error, Version = 3)] @@ -194,7 +194,7 @@ public void EventGridNotificationFailed( bool IsReplay, long LatencyMs) { - this.WriteEvent(211, TaskHub, AppName, SlotName, FunctionName, FunctionState, InstanceId, Details, StatusCode, Reason, FunctionType, ExtensionVersion, IsReplay, LatencyMs); + this.WriteEvent(234, TaskHub, AppName, SlotName, FunctionName, FunctionState, InstanceId, Details, StatusCode, Reason, FunctionType, ExtensionVersion, IsReplay, LatencyMs); } [Event(212, Level = EventLevel.Error)] From 23d404772f358ddec4b93498e5d2e3e7e4b3614a Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 15 Sep 2023 13:38:42 -0700 Subject: [PATCH 4/4] Rev version --- .../WebJobs.Extensions.DurableTask.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj index 1163cd040..9550af31f 100644 --- a/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj +++ b/src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj @@ -7,7 +7,7 @@ 2 11 4 - $(MajorVersion).$(MinorVersion).$(PatchVersion)-entity-logs-1 + $(MajorVersion).$(MinorVersion).$(PatchVersion)-entity-logs-2 $(MajorVersion).$(MinorVersion).$(PatchVersion) $(MajorVersion).0.0.0 Microsoft Corporation