From 09146cc8f837e17fd9e3fbfa1552603205727257 Mon Sep 17 00:00:00 2001
From: Long <dothanhl@microsoft.com>
Date: Sat, 27 May 2023 17:44:49 +0100
Subject: [PATCH] Disable omex logger

---
 src/Hosting.Services/HostBuilderExtensions.cs | 33 ++++++++++++++-----
 src/Hosting/ServiceCollectionExtensions.cs    | 25 ++++++++++----
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/Hosting.Services/HostBuilderExtensions.cs b/src/Hosting.Services/HostBuilderExtensions.cs
index 9990d5444..8e76f1657 100644
--- a/src/Hosting.Services/HostBuilderExtensions.cs
+++ b/src/Hosting.Services/HostBuilderExtensions.cs
@@ -23,25 +23,41 @@ public static class HostBuilderExtensions
 		/// <summary>
 		/// Configures host to run service fabric stateless service with initialized Omex dependencies
 		/// </summary>
+		/// <param name="builder">Host builder</param>
+		/// <param name="serviceName"> Service name</param>
+		/// <param name="builderAction">Action to configure Service fabric Host</param>
+		/// <param name="disableOmexLogging">Disable OmexLogger if you want to use your custom logger, eg: OpenTelemetry</param>
+		/// <returns>Host builder</returns>
 		public static IHost BuildStatelessService(
 			this IHostBuilder builder,
 			string serviceName,
-			Action<ServiceFabricHostBuilder<OmexStatelessService, StatelessServiceContext>> builderAction) =>
-				builder.BuildServiceFabricService<OmexStatelessServiceRegistrator, OmexStatelessService, StatelessServiceContext>(serviceName, builderAction);
+			Action<ServiceFabricHostBuilder<OmexStatelessService, StatelessServiceContext>> builderAction,
+			bool disableOmexLogging = false) =>
+				builder.BuildServiceFabricService<OmexStatelessServiceRegistrator, OmexStatelessService, StatelessServiceContext>(serviceName, builderAction, disableOmexLogging);
 
 		/// <summary>
 		/// Configures host to run service fabric stateful service with initialized Omex dependencies
 		/// </summary>
+		/// <param name="builder">Host builder</param>
+		/// <param name="serviceName"> Service name</param>
+		/// <param name="builderAction">Action to configure Service fabric Host</param>
+		/// <param name="disableOmexLogging">Disable OmexLogger if you want to use your custom logger, eg: OpenTelemetry</param>
+		/// <returns>Host builder</returns>
 		public static IHost BuildStatefulService(
 			this IHostBuilder builder,
 			string serviceName,
-			Action<ServiceFabricHostBuilder<OmexStatefulService, StatefulServiceContext>> builderAction) =>
-				builder.BuildServiceFabricService<OmexStatefulServiceRegistrator, OmexStatefulService, StatefulServiceContext>(serviceName, builderAction);
+			Action<ServiceFabricHostBuilder<OmexStatefulService, StatefulServiceContext>> builderAction,
+			bool disableOmexLogging = false) =>
+				builder.BuildServiceFabricService<OmexStatefulServiceRegistrator, OmexStatefulService, StatefulServiceContext>(serviceName, builderAction, disableOmexLogging);
 
 		/// <summary>
 		/// Registering Dependency Injection classes that will provide Service Fabric specific information for logging
 		/// </summary>
-		public static IServiceCollection AddOmexServiceFabricDependencies<TContext>(this IServiceCollection collection)
+		/// <param name="collection">Service collection for DI</param>
+		/// <param name="disableOmexLogging">Disable OmexLogger if you want to use your custom logger, eg: OpenTelemetry</param>
+		/// <returns>Service collection for DI after adding Service Fabric specific information for logging</returns>
+		public static IServiceCollection AddOmexServiceFabricDependencies<TContext>(this IServiceCollection collection,
+			bool disableOmexLogging = false)
 			where TContext : ServiceContext
 		{
 			bool isStatefulService = typeof(StatefulServiceContext).IsAssignableFrom(typeof(TContext));
@@ -60,13 +76,14 @@ public static IServiceCollection AddOmexServiceFabricDependencies<TContext>(this
 
 			collection.TryAddSingleton<IServiceContext, OmexServiceFabricContext>();
 			collection.TryAddSingleton<IExecutionContext, ServiceFabricExecutionContext>();
-			return collection.AddOmexServices();
+			return collection.AddOmexServices(disableOmexLogging);
 		}
 
 		private static IHost BuildServiceFabricService<TRunner, TService, TContext>(
 			this IHostBuilder builder,
 			string serviceName,
-			Action<ServiceFabricHostBuilder<TService, TContext>> builderAction)
+			Action<ServiceFabricHostBuilder<TService, TContext>> builderAction,
+			bool disableOmexLogging = false)
 				where TRunner : OmexServiceRegistrator<TService, TContext>
 				where TService : IServiceFabricService<TContext>
 				where TContext : ServiceContext
@@ -92,7 +109,7 @@ private static IHost BuildServiceFabricService<TRunner, TService, TContext>(
 							{
 								options.ServiceTypeName = serviceName;
 							})
-							.AddOmexServiceFabricDependencies<TContext>()
+							.AddOmexServiceFabricDependencies<TContext>(disableOmexLogging)
 							.AddSingleton<IOmexServiceRegistrator, TRunner>()
 							.AddHostedService<OmexHostedService>();
 					})
diff --git a/src/Hosting/ServiceCollectionExtensions.cs b/src/Hosting/ServiceCollectionExtensions.cs
index 44e1d8cb2..3f9c3fdad 100644
--- a/src/Hosting/ServiceCollectionExtensions.cs
+++ b/src/Hosting/ServiceCollectionExtensions.cs
@@ -16,18 +16,31 @@ public static class ServiceCollectionExtensions
 	{
 		/// <summary>
 		/// Add Omex Logging and ActivitySource dependencies
+		/// <param name="builder">Host builder</param>
+		/// <param name="disableOmexLogging">Disable OmexLogger if you want to use your custom logger, eg: OpenTelemetry</param>
 		/// </summary>
-		public static IHostBuilder AddOmexServices(this IHostBuilder builder) =>
+		/// <returns>Host Builder</returns>
+		public static IHostBuilder AddOmexServices(this IHostBuilder builder, bool disableOmexLogging = false) =>
 			builder
-				.ConfigureServices((context, collection) => collection.AddOmexServices());
+				.ConfigureServices((context, collection) => collection.AddOmexServices(disableOmexLogging));
 
 		/// <summary>
 		/// Add Omex Logging and ActivitySource dependencies
 		/// </summary>
-		public static IServiceCollection AddOmexServices(this IServiceCollection collection) =>
-			collection
-				.AddOmexLogging()
-				.AddOmexActivitySource();
+		/// <param name="collection">Service Collection for DI</param>
+		/// <param name="disableOmexLogging">Disable OmexLogger if you want to use your custom logger, eg: OpenTelemetry</param>
+		/// <returns>Service Collection</returns>
+		public static IServiceCollection AddOmexServices(this IServiceCollection collection, bool disableOmexLogging = false)
+		{
+			collection.AddOmexActivitySource();
+
+			if (!disableOmexLogging)
+			{
+				collection.AddOmexLogging();
+			}
+
+			return collection;
+		}
 
 		/// <summary>
 		/// Add Omex Logging and ActivitySource dependencies