Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[For private package] Add Entity Telemetry in exchange of EventGridNotification logs #2587

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft
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
16 changes: 8 additions & 8 deletions src/WebJobs.Extensions.DurableTask/EtwEventSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would set version to 5 here since the previous version of event 233 was 4.

[Event(233, Level = EventLevel.Informational, Version = 3)]
public void EventGridNotificationCompleted(
string TaskHub,
string AppName,
Expand All @@ -175,10 +175,10 @@ 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(211, Level = EventLevel.Error, Version = 3)]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

similarly, use version 5 since previous version of event 234 was 4

[Event(234, Level = EventLevel.Error, Version = 3)]
public void EventGridNotificationFailed(
string TaskHub,
string AppName,
Expand All @@ -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)]
Expand Down Expand Up @@ -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,
Expand All @@ -536,10 +536,10 @@ 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(234, Level = EventLevel.Error, Version = 4)]
[Event(211, Level = EventLevel.Error, Version = 4)]
public void EntityBatchFailed(
string TaskHub,
string AppName,
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<RootNamespace>Microsoft.Azure.WebJobs.Extensions.DurableTask</RootNamespace>
<MajorVersion>2</MajorVersion>
<MinorVersion>11</MinorVersion>
<PatchVersion>3</PatchVersion>
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)</Version>
<PatchVersion>4</PatchVersion>
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)-entity-logs-2</Version>
<FileVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</FileVersion>
<AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>
<Company>Microsoft Corporation</Company>
Expand Down
Loading