Skip to content

[EventGrid] Moving from ActivityExtensions to System.Diagnostics.DiagnosticSource #37597

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.

Sign up for GitHub

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

Merged
m-redding merged 1 commit into from
Jul 14, 2023
Merged

[EventGrid] Moving from ActivityExtensions to System.Diagnostics.DiagnosticSource #37597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/CloudEventRequestContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ private void EnsureSerialized()
string currentActivityId = null;
string traceState = null;
Activity currentActivity = Activity.Current;
if (currentActivity != null && currentActivity.IsW3CFormat())
if (currentActivity != null && (currentActivity.IdFormat == ActivityIdFormat.W3C))
{
currentActivityId = currentActivity.Id;
traceState = currentActivity.GetTraceState();
traceState = currentActivity.TraceStateString;
}

foreach (CloudEvent cloudEvent in _cloudEvents)
Expand Down
6 changes: 3 additions & 3 deletions sdk/eventgrid/Azure.Messaging.EventGrid/tests/CloudEventTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public async Task SetsTraceParentExtension(bool inclTraceparent, bool inclTraces

// simulating some other activity already being started before doing operations with the client
var activity = new Activity("ParentEvent");
activity.SetW3CFormat();
activity.SetIdFormat(ActivityIdFormat.W3C);
activity.Start();
activity.TraceStateString = "tracestatevalue";
List<CloudEvent> eventsList = new List<CloudEvent>();
Expand Down Expand Up @@ -135,7 +135,7 @@ public async Task DoesNotSetTraceParentExtensionWhenTracingIsDisabled()

// simulating some other activity already being started before doing operations with the client
var activity = new Activity("ParentEvent");
activity.SetW3CFormat();
activity.SetIdFormat(ActivityIdFormat.W3C);
activity.Start();

CloudEvent cloudEvent = new CloudEvent(
Expand Down Expand Up @@ -195,7 +195,7 @@ public async Task SetsTraceParentExtensionRetries(bool inclTraceparent, bool inc

// simulating some other activity already being started before doing operations with the client
var activity = new Activity("ParentEvent");
activity.SetW3CFormat();
activity.SetIdFormat(ActivityIdFormat.W3C);
activity.Start();
activity.TraceStateString = "tracestatevalue";
List<CloudEvent> eventsList = new List<CloudEvent>();
Expand Down
4 changes: 2 additions & 2 deletions ...zure.Messaging.EventGrid.CloudNativeCloudEvents/src/EventGridPublisherClientExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ private static async Task<Response> SendCloudEventsInternalAsync(
string activityId = null;
string traceState = null;
Activity currentActivity = Activity.Current;
if (currentActivity != null && currentActivity.IsW3CFormat())
if (currentActivity != null && (currentActivity.IdFormat == ActivityIdFormat.W3C))
{
activityId = currentActivity.Id;
traceState = currentActivity.GetTraceState();
traceState = currentActivity.TraceStateString;
}

using var stream = new MemoryStream();
Expand Down
2 changes: 1 addition & 1 deletion ...tgrid/Microsoft.Azure.Messaging.EventGrid.CloudNativeCloudEvents/tests/CloudEventTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task SetsTraceParentExtension(bool inclTraceparent, bool inclTraces
new AzureKeyCredential("fakeKey"),
options);
var activity = new Activity($"{nameof(EventGridPublisherClient)}.{nameof(EventGridPublisherClient.SendEvents)}");
activity.SetW3CFormat();
activity.SetIdFormat(ActivityIdFormat.W3C);
activity.Start();
List<CloudEvent> inputEvents = new List<CloudEvent>();
for (int i = 0; i < 10; i++)
Expand Down