Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Add ProviderName and ProviderGuid properties to TraceTelemetry #120

Merged
karolz-ms merged 2 commits into from
Oct 31, 2017
Merged

Add ProviderName and ProviderGuid properties to TraceTelemetry #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607c417
Add ProviderName and ProviderGuid properties to TraceTelemetry from E…
ibebbs Oct 30, 2017
807e05e
Changes per comments on PR
ibebbs Oct 31, 2017
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
3 changes: 3 additions & 0 deletions src/Adapters.Tests/EventSource.Netstandard13.Tests/EventSourceTelemetryModuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,16 @@ public void ReportsAllProperties()

module.Initialize(GetTestTelemetryConfiguration());

Guid providerGuid = new Guid("497c5589-4f7f-56de-ea19-ea0604d23948");
Guid eventId = new Guid("30ba9220-89a4-41e4-987c-9e27ade44b74");
Guid activityId = new Guid("0724a028-27d7-40a9-a299-acf79ff0db94");
EventSource.SetCurrentThreadActivityId(activityId);
TestEventSource.Default.ComplexEvent(eventId);

TraceTelemetry expected = new TraceTelemetry("Blah blah", SeverityLevel.Verbose);
expected.Properties.Add("uniqueId", eventId.ToString());
expected.Properties.Add("ProviderName", TestEventSource.ProviderName);
expected.Properties.Add("ProviderGuid", providerGuid.ToString());
expected.Properties.Add("EventId", TestEventSource.ComplexEventId.ToString());
expected.Properties.Add("EventName", nameof(TestEventSource.ComplexEvent));
expected.Properties.Add("ActivityId", activityId.ToString());
Expand Down
15 changes: 14 additions & 1 deletion src/Adapters/EventSource.Netstandard13/Implementation/EventDataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ public static class EventDataExtensions
SeverityLevel.Verbose // EventLevel.Verbose == 5
};

private const string ProviderNameProperty = "ProviderName";
private const string ProviderGuidProperty = "ProviderGuid";

/// <summary>
/// Creates a TraceTelemetry out of an EventSource event.
/// </summary>
Expand Down Expand Up @@ -61,7 +64,17 @@ public static TraceTelemetry CreateTraceTelementry(this EventWrittenEventArgs ev
/// <param name="telemetry">Telemetry item to populate with properties.</param>
/// <param name="eventSourceEvent">Event to extract values from.</param>
public static TraceTelemetry PopulateStandardProperties(this TraceTelemetry telemetry, EventWrittenEventArgs eventSourceEvent)
{
{
if (!string.IsNullOrWhiteSpace(eventSourceEvent.EventSource.Name))
{
telemetry.AddProperty(ProviderNameProperty, eventSourceEvent.EventSource.Name);
}

if (eventSourceEvent.EventSource.Guid != Guid.Empty)
{
telemetry.AddProperty(ProviderGuidProperty, eventSourceEvent.EventSource.Guid.ToString());
}

telemetry.AddProperty(nameof(EventWrittenEventArgs.EventId), eventSourceEvent.EventId.ToString(CultureInfo.InvariantCulture));
telemetry.AddProperty(nameof(EventWrittenEventArgs.EventName), eventSourceEvent.EventName);
if (eventSourceEvent.ActivityId != default(Guid))
Expand Down