Skip to content
This repository was archived by the owner on Jun 11, 2026. It is now read-only.

[DS] Improve Diagnostic Source instrumentation #212

Merged
serkantkaraca merged 5 commits into from
Nov 14, 2017
Merged

[DS] Improve Diagnostic Source instrumentation #212

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c531a7
[DS] Improve Diagnostic Source instrumentation
TomMilos Nov 9, 2017
a7770ba
[DS] Added back several tags
TomMilos Nov 9, 2017
6523fcc
[DS] Added Diagnostic instrumentation tests
TomMilos Nov 11, 2017
1fc4451
[DS] Standardized event payload properties
TomMilos Nov 11, 2017
4335e4e
[DS] Properly dispose Diagnostics tests
TomMilos Nov 13, 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
45 changes: 10 additions & 35 deletions src/Microsoft.Azure.EventHubs/EventHubsDiagnosticSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ internal static Activity StartSendActivity(string clientId, EventHubsConnectionS

Activity activity = new Activity(SendActivityName);

// extract activity tags from input
activity.AddTag("component", "Microsoft.Azure.EventHubs");
activity.AddTag("span.kind", "producer");
activity.AddTag("operation.name", $"Send");
activity.AddTag("operation.data", $"{csb.EntityPath}/{partitionKey}");
activity.AddTag("peer.service", "Azure Event Hub");
activity.AddTag("peer.hostname", csb.Endpoint.OriginalString);
activity.AddTag("peer.hostname", csb.Endpoint.Host);
activity.AddTag("eh.event_hub_name", csb.EntityPath);
activity.AddTag("eh.partition_key", partitionKey);
activity.AddTag("eh.event_count", count.ToString());
Expand All @@ -61,7 +55,7 @@ internal static Activity StartSendActivity(string clientId, EventHubsConnectionS
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
EventDatas = eventDatas
});
Expand All @@ -76,8 +70,6 @@ internal static Activity StartSendActivity(string clientId, EventHubsConnectionS

internal static void FailSendActivity(Activity activity, EventHubsConnectionStringBuilder csb, string partitionKey, IEnumerable<EventData> eventDatas, Exception ex)
{
// TODO consider enriching activity with data from exception

if (!DiagnosticListener.IsEnabled() || !DiagnosticListener.IsEnabled(SendActivityExceptionName))
{
return;
Expand All @@ -87,7 +79,7 @@ internal static void FailSendActivity(Activity activity, EventHubsConnectionStri
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
EventDatas = eventDatas,
Exception = ex
Expand All @@ -101,20 +93,14 @@ internal static void StopSendActivity(Activity activity, EventHubsConnectionStri
return;
}

// stop activity
if (sendTask != null && sendTask.Status != TaskStatus.RanToCompletion)
{
activity.AddTag("error", "true");
}

DiagnosticListener.StopActivity(activity,
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
EventDatas = eventDatas,
TaskStatus = sendTask?.Status
Status = sendTask?.Status
});
}

Expand All @@ -135,12 +121,7 @@ internal static Activity StartReceiveActivity(string clientId, EventHubsConnecti
Activity activity = new Activity(ReceiveActivityName);

// extract activity tags from input
activity.AddTag("component", "Microsoft.Azure.EventHubs");
activity.AddTag("span.kind", "consumer");
activity.AddTag("operation.name", $"Receive");
activity.AddTag("operation.data", $"{consumerGroup}: {csb.EntityPath}/{partitionKey}");
activity.AddTag("peer.service", "Azure Event Hub");
activity.AddTag("peer.hostname", csb.Endpoint.OriginalString);
activity.AddTag("peer.hostname", csb.Endpoint.Host);
activity.AddTag("eh.event_hub_name", csb.EntityPath);
activity.AddTag("eh.partition_key", partitionKey);
activity.AddTag("eh.consumer_group", consumerGroup);
Expand All @@ -155,7 +136,7 @@ internal static Activity StartReceiveActivity(string clientId, EventHubsConnecti
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
ConsumerGroup = consumerGroup
});
Expand All @@ -181,7 +162,7 @@ internal static void FailReceiveActivity(Activity activity, EventHubsConnectionS
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
ConsumerGroup = consumerGroup,
Exception = ex
Expand All @@ -195,23 +176,17 @@ internal static void StopReceiveActivity(Activity activity, EventHubsConnectionS
return;
}

// stop activity
if (receiveTask != null && receiveTask.Status != TaskStatus.RanToCompletion)
{
activity.AddTag("error", "true");
}

activity.AddTag("eh.event_count", (events?.Count ?? 0).ToString());

DiagnosticListener.StopActivity(activity,
new
{
Endpoint = csb.Endpoint,
EntityPath = csb.EntityPath,
Entity = csb.EntityPath,
PartitionKey = partitionKey,
ConsumerGroup = consumerGroup,
EventDatas = events,
TaskStatus = receiveTask?.Status
Status = receiveTask?.Status
});
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/Microsoft.Azure.EventHubs/PartitionSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ namespace Microsoft.Azure.EventHubs
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;

/// <summary>
Expand Down Expand Up @@ -111,18 +112,24 @@ public async Task SendAsync(IEnumerable<EventData> eventDatas)

int count = EventDataSender.ValidateEvents(eventDatas, this.PartitionId, null);
EventHubsEventSource.Log.EventSendStart(this.ClientId, count, null);
Activity activity = EventHubsDiagnosticSource.StartSendActivity(this.ClientId, this.EventHubClient.ConnectionStringBuilder, this.PartitionId, eventDatas, count);

Task sendTask = null;
try
{
await this.InnerSender.SendAsync(eventDatas, null).ConfigureAwait(false);
sendTask = this.InnerSender.SendAsync(eventDatas, null);
await sendTask.ConfigureAwait(false);
}
catch (Exception exception)
{
EventHubsEventSource.Log.EventSendException(this.ClientId, exception.ToString());
EventHubsDiagnosticSource.FailSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, this.PartitionId, eventDatas, exception);
throw;
}
finally
{
EventHubsEventSource.Log.EventSendStop(this.ClientId);
EventHubsDiagnosticSource.StopSendActivity(activity, this.EventHubClient.ConnectionStringBuilder, this.PartitionId, eventDatas, sendTask);
}
}

Expand Down
Loading