Add Azure Service Bus to NetCoreAll

elastic · Mar 25, 2021 · 995f266 · 995f266
1 parent 1cfac4e
commit 995f266
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/src/Elastic.Apm.NetCoreAll/ApmMiddlewareExtension.cs b/src/Elastic.Apm.NetCoreAll/ApmMiddlewareExtension.cs
@@ -2,6 +2,7 @@
 // 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 Elastic.Apm.Azure.ServiceBus;
 using Elastic.Apm.DiagnosticSource;
 using Elastic.Apm.Elasticsearch;
 using Elastic.Apm.EntityFrameworkCore;
@@ -15,8 +16,14 @@ namespace Elastic.Apm.NetCoreAll
 	public static class ApmMiddlewareExtension
 	{
 		/// <summary>
-		/// Adds the Elastic APM Middleware to the ASP.NET Core pipeline and enables <see cref="HttpDiagnosticsSubscriber" />,
-		/// <see cref="EfCoreDiagnosticsSubscriber" />, and <see cref="SqlClientDiagnosticSubscriber"/>.
+		/// Adds the Elastic APM Middleware to the ASP.NET Core pipeline and enables
+		/// <see cref="HttpDiagnosticsSubscriber" />,
+		/// <see cref="EfCoreDiagnosticsSubscriber" />,
+		/// <see cref="SqlClientDiagnosticSubscriber"/>,
+		/// <see cref="ElasticsearchDiagnosticsSubscriber"/>.
+		/// <see cref="GrpcClientDiagnosticSubscriber"/>,
+		/// <see cref="AzureMessagingServiceBusDiagnosticsSubscriber"/>,
+		/// and <see cref="MicrosoftAzureServiceBusDiagnosticsSubscriber"/>
 		/// This method turns on ASP.NET Core monitoring with every other related monitoring components, for example the agent
 		/// will also automatically trace outgoing HTTP requests and database statements.
 		/// </summary>
@@ -31,7 +38,13 @@ public static IApplicationBuilder UseAllElasticApm(
 			this IApplicationBuilder builder,
 			IConfiguration configuration = null
 		) => AspNetCore.ApmMiddlewareExtension
-			.UseElasticApm(builder, configuration, new HttpDiagnosticsSubscriber(), new EfCoreDiagnosticsSubscriber(),
-				new SqlClientDiagnosticSubscriber(), new ElasticsearchDiagnosticsSubscriber(), new GrpcClientDiagnosticSubscriber());
+			.UseElasticApm(builder, configuration,
+				new HttpDiagnosticsSubscriber(),
+				new EfCoreDiagnosticsSubscriber(),
+				new SqlClientDiagnosticSubscriber(),
+				new ElasticsearchDiagnosticsSubscriber(),
+				new GrpcClientDiagnosticSubscriber(),
+				new AzureMessagingServiceBusDiagnosticsSubscriber(),
+				new MicrosoftAzureServiceBusDiagnosticsSubscriber());
 	}
 }
diff --git a/src/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj b/src/Elastic.Apm.NetCoreAll/Elastic.Apm.NetCoreAll.csproj
@@ -13,6 +13,7 @@
     <ProjectReference Include="..\Elastic.Apm.EntityFrameworkCore\Elastic.Apm.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\Elastic.Apm.GrpcClient\Elastic.Apm.GrpcClient.csproj" />
     <ProjectReference Include="..\Elastic.Apm.SqlClient\Elastic.Apm.SqlClient.csproj" />
+    <ProjectReference Include="..\Elastic.Apm.Azure.ServiceBus\Elastic.Apm.Azure.ServiceBus.csproj" />
     <ProjectReference Include="..\Elastic.Apm\Elastic.Apm.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Elastic.Apm.NetCoreAll/HostBuilderExtensions.cs b/src/Elastic.Apm.NetCoreAll/HostBuilderExtensions.cs
@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Apm.AspNetCore.DiagnosticListener;
+using Elastic.Apm.Azure.ServiceBus;
 using Elastic.Apm.DiagnosticSource;
 using Elastic.Apm.Elasticsearch;
 using Elastic.Apm.EntityFrameworkCore;
@@ -17,15 +18,25 @@ namespace Elastic.Apm.NetCoreAll
 	public static class HostBuilderExtensions
 	{
 		/// <summary>
-		/// Register Elastic APM .NET Agent with components in the container and enables <see cref="HttpDiagnosticsSubscriber" />,
-		/// <see cref="EfCoreDiagnosticsSubscriber" />, and <see cref="SqlClientDiagnosticSubscriber"/>.
+		/// Register Elastic APM .NET Agent with components in the container and enables
+		/// <see cref="HttpDiagnosticsSubscriber" />,
+		/// <see cref="AspNetCoreDiagnosticSubscriber" />,
+		/// <see cref="EfCoreDiagnosticsSubscriber" />,
+		/// <see cref="SqlClientDiagnosticSubscriber"/>,
+		/// <see cref="ElasticsearchDiagnosticsSubscriber"/>.
+		/// <see cref="GrpcClientDiagnosticSubscriber"/>,
+		/// <see cref="AzureMessagingServiceBusDiagnosticsSubscriber"/>,
+		/// and <see cref="MicrosoftAzureServiceBusDiagnosticsSubscriber"/>
 		/// </summary>
 		/// <param name="builder">Builder.</param>
-		public static IHostBuilder UseAllElasticApm(this IHostBuilder builder) => builder.UseElasticApm(new HttpDiagnosticsSubscriber(),
+		public static IHostBuilder UseAllElasticApm(this IHostBuilder builder) => builder.UseElasticApm(
+			new HttpDiagnosticsSubscriber(),
 			new AspNetCoreDiagnosticSubscriber(),
 			new EfCoreDiagnosticsSubscriber(),
 			new SqlClientDiagnosticSubscriber(),
 			new ElasticsearchDiagnosticsSubscriber(),
-			new GrpcClientDiagnosticSubscriber());
+			new GrpcClientDiagnosticSubscriber(),
+			new AzureMessagingServiceBusDiagnosticsSubscriber(),
+			new MicrosoftAzureServiceBusDiagnosticsSubscriber());
 	}
 }