Azure File share integration

src/Elastic.Apm.Azure.Storage/AzureBlobStorageDiagnosticListener.cs

@@ -119,9 +119,7 @@ private void OnStart(KeyValuePair<string, object> kv, string action)
 			var urlTag = activity.Tags.FirstOrDefault(t => t.Key == "url").Value;
 			var blobUrl = new BlobUrl(urlTag);
 
-			var spanName = blobUrl.BlobName is null
-				? $"{AzureBlobStorage.SpanName} {action} {blobUrl.ContainerName}"
-				: $"{AzureBlobStorage.SpanName} {action} {blobUrl.ContainerName}/{blobUrl.BlobName}";
+			var spanName = $"{AzureBlobStorage.SpanName} {action} {blobUrl.ResourceName}";
 
 			var span = currentSegment.StartSpan(spanName, AzureBlobStorage.Type, AzureBlobStorage.SubType, action);
 			span.Context.Destination = new Destination
@@ -130,9 +128,7 @@ private void OnStart(KeyValuePair<string, object> kv, string action)
 				Service = new Destination.DestinationService
 				{
 					Name = AzureBlobStorage.SubType,
-					Resource = blobUrl.BlobName is null
-						? $"{AzureBlobStorage.SubType}/{blobUrl.ContainerName}"
-						: $"{AzureBlobStorage.SubType}/{blobUrl.ContainerName}/{blobUrl.BlobName}",
+					Resource = $"{AzureBlobStorage.SubType}/{blobUrl.ResourceName}",
 					Type = AzureBlobStorage.Type
 				}
 			};
@@ -199,19 +195,10 @@ public BlobUrl(string url)
 				var builder = new UriBuilder(url);
 
 				FullyQualifiedNamespace = builder.Uri.GetLeftPart(UriPartial.Authority) + "/";
-
-				ContainerName = builder.Uri.Segments.Length > 1
-					? builder.Uri.Segments[1].TrimEnd('/')
-					: null;
-
-				BlobName = builder.Uri.Segments.Length > 2
-					? builder.Uri.Segments[2].TrimEnd('/')
-					: null;
+				ResourceName = builder.Uri.AbsolutePath.TrimStart('/');
 			}
 
-			public string ContainerName { get; }
-
-			public string BlobName { get; }
+			public string ResourceName { get; }
 
 			public string FullyQualifiedNamespace { get; }
 		}

src/Elastic.Apm.Azure.Storage/AzureFileShareStorageDiagnosticListener.cs

@@ -0,0 +1,187 @@
+// Licensed to Elasticsearch B.V under
+// one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Elastic.Apm.Api;
+using Elastic.Apm.DiagnosticListeners;
+using Elastic.Apm.Logging;
+
+namespace Elastic.Apm.Azure.Storage
+{
+	internal static class AzureFileStorage
+	{
+		internal const string SpanName = "AzureFile";
+		internal const string SubType = "azurefile";
+		internal const string Type = "storage";
+	}
+
+	/// <summary>
+	/// Creates transactions and spans for Azure File Share Storage diagnostic events from Azure.Storage.Files.Shares
+	/// </summary>
+	public class AzureFileShareStorageDiagnosticListener : DiagnosticListenerBase
+	{
+		private readonly ConcurrentDictionary<string, IExecutionSegment> _processingSegments =
+			new ConcurrentDictionary<string, IExecutionSegment>();
+
+		public AzureFileShareStorageDiagnosticListener(IApmAgent agent) : base(agent) { }
+
+		public override string Name { get; } = "Azure.Storage.Files.Shares";
+
+		protected override void HandleOnNext(KeyValuePair<string, object> kv)
+		{
+			Logger.Trace()?.Log("Called with key: `{DiagnosticEventKey}'", kv.Key);
+
+			if (string.IsNullOrEmpty(kv.Key))
+			{
+				Logger.Trace()?.Log($"Key is {(kv.Key == null ? "null" : "an empty string")} - exiting");
+				return;
+			}
+
+			switch (kv.Key)
+			{
+				case "ShareClient.Create.Start":
+				case "ShareDirectoryClient.Create.Start":
+				case "ShareFileClient.Create.Start":
+					OnStart(kv, "Create");
+					break;
+				case "ShareClient.Delete.Start":
+				case "ShareDirectoryClient.Delete.Start":
+				case "ShareFileClient.Delete.Start":
+					OnStart(kv, "Delete");
+					break;
+				case "ShareFileClient.UploadRange.Start":
+				case "ShareFileClient.Upload.Start":
+					OnStart(kv, "Upload");
+					break;
+				case "ShareClient.Create.Stop":
+				case "ShareClient.Delete.Stop":
+				case "ShareDirectoryClient.Create.Stop":
+				case "ShareDirectoryClient.Delete.Stop":
+				case "ShareFileClient.Create.Stop":
+				case "ShareFileClient.Delete.Stop":
+				case "ShareFileClient.UploadRange.Stop":
+					OnStop();
+					break;
+				case "ShareClient.Create.Exception":
+				case "ShareClient.Delete.Exception":
+				case "ShareDirectoryClient.Create.Exception":
+				case "ShareDirectoryClient.Delete.Exception":
+				case "ShareFileClient.Create.Exception":
+				case "ShareFileClient.Delete.Exception":
+				case "ShareFileClient.UploadRange.Exception":
+					OnException(kv);
+					break;
+				default:
+					Logger.Trace()?.Log("`{DiagnosticEventKey}' key is not a traced diagnostic event", kv.Key);
+					break;
+			}
+		}
+
+		private void OnStart(KeyValuePair<string, object> kv, string action)
+		{
+			var currentSegment = ApmAgent.GetCurrentExecutionSegment();
+			if (currentSegment is null)
+			{
+				Logger.Trace()?.Log("No current transaction or span - exiting");
+				return;
+			}
+
+			if (!(kv.Value is Activity activity))
+			{
+				Logger.Trace()?.Log("Value is not an activity - exiting");
+				return;
+			}
+
+			var urlTag = activity.Tags.FirstOrDefault(t => t.Key == "url").Value;
+			var fileShareUrl = new FileShareUrl(urlTag);
+			var spanName = $"{AzureFileStorage.SpanName} {action} {fileShareUrl.ResourceName}";
+
+			var span = currentSegment.StartSpan(spanName, AzureFileStorage.Type, AzureFileStorage.SubType, action);
+			span.Context.Destination = new Destination
+			{
+				Address = fileShareUrl.FullyQualifiedNamespace,
+				Service = new Destination.DestinationService
+				{
+					Name = AzureFileStorage.SubType,
+					Resource = $"{AzureFileStorage.SubType}/{fileShareUrl.ResourceName}",
+					Type = AzureFileStorage.Type
+				}
+			};
+
+			if (!_processingSegments.TryAdd(activity.Id, span))
+			{
+				Logger.Trace()?.Log(
+					"Could not add {Action} span {SpanId} for activity {ActivityId} to tracked spans",
+					action,
+					span.Id,
+					activity.Id);
+			}
+		}
+
+		private void OnStop()
+		{
+			var activity = Activity.Current;
+			if (activity is null)
+			{
+				Logger.Trace()?.Log("Current activity is null - exiting");
+				return;
+			}
+
+			if (!_processingSegments.TryRemove(activity.Id, out var segment))
+			{
+				Logger.Trace()?.Log(
+					"Could not find segment for activity {ActivityId} in tracked segments",
+					activity.Id);
+				return;
+			}
+
+			segment.Outcome = Outcome.Success;
+			segment.End();
+		}
+
+		private void OnException(KeyValuePair<string, object> kv)
+		{
+			var activity = Activity.Current;
+			if (activity is null)
+			{
+				Logger.Trace()?.Log("Current activity is null - exiting");
+				return;
+			}
+
+			if (!_processingSegments.TryRemove(activity.Id, out var segment))
+			{
+				Logger.Trace()?.Log(
+					"Could not find segment for activity {ActivityId} in tracked segments",
+					activity.Id);
+				return;
+			}
+
+			if (kv.Value is Exception e)
+				segment.CaptureException(e);
+
+			segment.Outcome = Outcome.Failure;
+			segment.End();
+		}
+
+		private class FileShareUrl
+		{
+			public FileShareUrl(string url)
+			{
+				var builder = new UriBuilder(url);
+
+				FullyQualifiedNamespace = builder.Uri.GetLeftPart(UriPartial.Authority) + "/";
+				ResourceName = builder.Uri.AbsolutePath.TrimStart('/');
+			}
+
+			public string ResourceName { get; }
+
+			public string FullyQualifiedNamespace { get; }
+		}
+	}
+}

src/Elastic.Apm.Azure.Storage/AzureFileShareStorageDiagnosticsSubscriber.cs

@@ -0,0 +1,34 @@
+// Licensed to Elasticsearch B.V under
+// one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
+using System.Diagnostics;
+using Elastic.Apm.DiagnosticSource;
+
+namespace Elastic.Apm.Azure.Storage
+{
+	/// <summary>
+	/// Subscribes to diagnostic source events from Azure.Storage.Files.Shares
+	/// </summary>
+	public class AzureFileShareStorageDiagnosticsSubscriber : IDiagnosticsSubscriber
+	{
+		/// <summary>
+		/// Subscribes diagnostic source events.
+		/// </summary>
+		public IDisposable Subscribe(IApmAgent agent)
+		{
+			var retVal = new CompositeDisposable();
+
+			var initializer = new DiagnosticInitializer(agent.Logger, new[] { new AzureFileShareStorageDiagnosticListener(agent) });
+			retVal.Add(initializer);
+
+			retVal.Add(DiagnosticListener
+				.AllListeners
+				.Subscribe(initializer));
+
+			return retVal;
+		}
+	}
+}