Deprecation message for legacy telemetry

src/Hosting.Services/HostBuilderExtensions.cs

@@ -62,15 +62,7 @@ public static IServiceCollection AddOmexServiceFabricDependencies<TContext>(this
 			collection.TryAddSingleton<IServiceContext, OmexServiceFabricContext>();
 			collection.TryAddSingleton<IExecutionContext, ServiceFabricExecutionContext>();
 
-			collection.AddLogging();
-
-			collection.TryAddTransient<IServiceContext, EmptyServiceContext>();
-			collection.TryAddTransient<IExecutionContext, BaseExecutionContext>();
-			collection.TryAddTransient<IExternalScopeProvider, LoggerExternalScopeProvider>();
-
-#pragma warning disable OMEX188 // This method also adds Legacy OmexLogger and ActivityEventSender which are deprecated. They are pending for removal by 1 July 2024. Consider adding a different telemetry solution. DiagnosticId = "OMEX188"
 			return collection.AddOmexServices();
-#pragma warning restore OMEX188 // This method also adds Legacy OmexLogger and ActivityEventSender which are deprecated. They are pending for removal by 1 July 2024. Consider adding a different telemetry solution. DiagnosticId = "OMEX188"
 		}
 
 		private static IHost BuildServiceFabricService<TRunner, TService, TContext>(
@@ -97,13 +89,12 @@ private static IHost BuildServiceFabricService<TRunner, TService, TContext>(
 				IHost host = builder
 					.ConfigureServices((context, collection) =>
 					{
-						collection.AddOmexServiceFabricDependencies<TContext>();
-
 						collection
 							.Configure<ServiceRegistratorOptions>(options =>
 							{
 								options.ServiceTypeName = serviceName;
 							})
+							.AddOmexServiceFabricDependencies<TContext>()
 							.AddSingleton<IOmexServiceRegistrator, TRunner>()
 							.AddHostedService<OmexHostedService>();
 					})

src/Hosting/Certificates/InitializationCertificateReader.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.Omex.Extensions.Logging;
 
 namespace Microsoft.Omex.Extensions.Hosting.Certificates
@@ -16,8 +17,8 @@ public static class InitializationCertificateReader
 		/// <summary>
 		/// Instance of CertificateReader
 		/// </summary>
-#pragma warning disable OMEX188 // InitializationLogger using OmexLogger is obsolete and is pending for removal by 1 July 2024. DiagnosticId = "OMEX188"
+#pragma warning disable OMEX188 // InitializationLogger using OmexLogger is obsolete and is pending for removal by 1 July 2024.
 		public static ICertificateReader Instance { get; } = new CertificateReader(new CertificateStore(), InitializationLogger.Instance);
-#pragma warning restore OMEX188 // InitializationLogger using OmexLogger is obsolete and is pending for removal by 1 July 2024. DiagnosticId = "OMEX188"
+#pragma warning restore OMEX188 // InitializationLogger using OmexLogger is obsolete and is pending for removal by 1 July 2024.
 	}
 }

src/Hosting/ServiceCollectionExtensions.cs

@@ -18,18 +18,18 @@ public static class ServiceCollectionExtensions
 		/// <summary>
 		/// Add Omex Logging and ActivitySource dependencies
 		/// </summary>
-		[Obsolete($"Please do not use {nameof(AddOmexServices)} if you just want to use Legacy OmexLogger and ActivityEventSender because they are deprecated. Consider using a different telemetry solution. This method is pending for removal by 1 July 2024.", DiagnosticId = "OMEX188")]
 		public static IHostBuilder AddOmexServices(this IHostBuilder builder) =>
 			builder
 				.ConfigureServices((context, collection) => collection.AddOmexServices());
 
 		/// <summary>
 		/// Add Omex Logging and ActivitySource dependencies
 		/// </summary>
-		[Obsolete($"Please do not use {nameof(AddOmexServices)} if you just want to use Legacy OmexLogger and ActivityEventSender because they are deprecated. Consider using a different telemetry solution. This method is pending for removal by 1 July 2024.", DiagnosticId = "OMEX188")]
 		public static IServiceCollection AddOmexServices(this IServiceCollection collection) =>
+#pragma warning disable OMEX188 // OmexLogger and OmexLogEventSource are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.
 			collection
 				.AddOmexLogging()
+#pragma warning restore OMEX188 // OmexLogger and OmexLogEventSource are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.
 				.AddOmexActivitySource();
 
 		/// <summary>

src/Logging/InitializationLogger.cs

@@ -56,7 +56,6 @@ public static void LogInitializationSucceed(string serviceNameForLogging, string
 		/// <param name="serviceNameForLogging">Service name for logging</param>
 		/// <param name="ex">Exception to log</param>
 		/// <param name="message">Message to log</param>
-		[Obsolete("InitializationLogger using OmexLogger is obsolete and is pending for removal by 1 July 2024.", DiagnosticId = "OMEX188")]
 		public static void LogInitializationFail(string serviceNameForLogging,  Exception? ex = null, string message = "")
 		{
 			ServiceInitializationEventSource.Instance.LogHostFailed(ex?.ToString() ?? string.Empty, serviceNameForLogging, message);

src/Logging/Internal/EventSource/EmptyServiceContext.cs

@@ -8,16 +8,10 @@ namespace Microsoft.Omex.Extensions.Logging
 	/// <summary>
 	/// IServiceContext without any information
 	/// </summary>
-	public class EmptyServiceContext : IServiceContext
+	internal class EmptyServiceContext : IServiceContext
 	{
-		/// <summary>
-		/// PartitionId
-		/// </summary>
 		public Guid PartitionId => Guid.Empty;
 
-		/// <summary>
-		/// ReplicaOrInstanceId
-		/// </summary>
 		public long ReplicaOrInstanceId => 0;
 	}
 }

src/Logging/Internal/EventSource/OmexLogEventSender.cs

@@ -11,6 +11,7 @@
 
 namespace Microsoft.Omex.Extensions.Logging
 {
+	[Obsolete($"{nameof(OmexLogEventSender)} is obsolete and pending for removal by 1 July 2024.", DiagnosticId = "OMEX188")]
 	internal sealed class OmexLogEventSender : ILogEventSender
 	{
 		static OmexLogEventSender()

src/Logging/Internal/EventSource/OmexLogEventSource.cs

@@ -8,6 +8,7 @@
 namespace Microsoft.Omex.Extensions.Logging
 {
 	// Renamed from Microsoft-OMEX-Logs to avoid conflict with sources in other libraries
+	[Obsolete($"{nameof(OmexLogEventSource)} is obsolete and pending for removal by 1 July 2024.", DiagnosticId = "OMEX188")]
 	[EventSource(Name = "Microsoft-OMEX-Logs-Ext")]
 	internal sealed class OmexLogEventSource : EventSource
 	{

src/Logging/ServiceCollectionExtensions.cs

@@ -31,7 +31,7 @@ public static IServiceCollection AddOmexServiceContext<TServiceContext>(this ISe
 		/// Adds Omex event logger to the factory
 		/// </summary>
 		/// <param name="builder">The extension method argument</param>
-		[Obsolete($"{nameof(OmexLogger)} and {nameof(OmexLogEventSource)} are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.", DiagnosticId = "OMEX188")]
+		[Obsolete("OmexLogger and OmexLogEventSource are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.", DiagnosticId = "OMEX188")]
 		public static ILoggingBuilder AddOmexLogging(this ILoggingBuilder builder)
 		{
 			builder.AddConfiguration();
@@ -44,7 +44,7 @@ public static ILoggingBuilder AddOmexLogging(this ILoggingBuilder builder)
 		/// </summary>
 		/// <param name="serviceCollection">The extension method argument</param>
 		/// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained</returns>
-		[Obsolete($"{nameof(OmexLogger)} and {nameof(OmexLogEventSource)} are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.", DiagnosticId = "OMEX188")]
+		[Obsolete("OmexLogger and OmexLogEventSource are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.", DiagnosticId = "OMEX188")]
 		public static IServiceCollection AddOmexLogging(this IServiceCollection serviceCollection)
 		{
 			serviceCollection.AddLogging();
@@ -53,20 +53,14 @@ public static IServiceCollection AddOmexLogging(this IServiceCollection serviceC
 			serviceCollection.TryAddTransient<IExecutionContext, BaseExecutionContext>();
 			serviceCollection.TryAddTransient<IExternalScopeProvider, LoggerExternalScopeProvider>();
 
-			AddOmexLegacyLogging(serviceCollection);
-
-			return serviceCollection;
-		}
-
-		[Obsolete($"{nameof(OmexLogger)} and {nameof(OmexLogEventSource)} are obsolete and pending for removal by 1 July 2024. Please consider using a different Logger.", DiagnosticId = "OMEX188")]
-		private static void AddOmexLegacyLogging(IServiceCollection serviceCollection)
-		{
 			serviceCollection.TryAddSingleton(_ => OmexLogEventSource.Instance);
 			serviceCollection.TryAddSingleton<ILogEventReplayer, OmexLogEventReplayer>();
 			serviceCollection.TryAddSingleton<ILogEventSender, OmexLogEventSender>();
 
 			serviceCollection.TryAddEnumerable(ServiceDescriptor.Transient<IActivityStopObserver, ReplayableActivityStopObserver>());
 			serviceCollection.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider, OmexLoggerProvider>());
+
+			return serviceCollection;
 		}
 	}
 }

src/ServiceFabricGuest.Abstractions/ServiceFabricClientFactory.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
 using Microsoft.Extensions.Options;
 using Microsoft.Omex.Extensions.Hosting.Certificates;
 
@@ -18,6 +19,8 @@ public class ServiceFabricClientFactory
 		/// Creates service fabric client wrapper instance and returns it.
 		/// </summary>
 		public static IServiceFabricClientWrapper Create(ServiceFabricRestClientOptions options) =>
+#pragma warning disable OMEX188 // InitializationCertificateReader using OmexLogger is obsolete. DiagnosticId = "OMEX188"
 			new ServiceFabricClientWrapper(Options.Create(options), InitializationCertificateReader.Instance);
+#pragma warning restore OMEX188 // InitializationCertificateReader using OmexLogger is obsolete. DiagnosticId = "OMEX188"
 	}
 }

tests/Hosting.Services.UnitTests/HostBuilderExtensionsTests.cs

@@ -29,10 +29,8 @@ public void AddOmexServiceFabricDependencies_TypesRegistered(Type typeToResolve,
 		{
 			void CheckTypeRegistration<TContext>() where TContext : ServiceContext
 			{
-#pragma warning disable CS0618 // AddOmexServiceFabricDependencies also adds Legacy OmexLogger and ActivityEventSender and they are deprecated. This legacy telemetry is pending for removal by 1 July 2024. Consider adding a different telemetry solution. DiagnosticId = "OMEX188"
 				object? obj = new ServiceCollection()
 					.AddOmexServiceFabricDependencies<TContext>()
-#pragma warning restore CS0618 // AddOmexServiceFabricDependencies also adds Legacy OmexLogger and ActivityEventSender and they are deprecated. This legacy telemetry is pending for removal by 1 July 2024. Consider adding a different telemetry solution. DiagnosticId = "OMEX188"
 					.AddSingleton(new Mock<IHostEnvironment>().Object)
 					.BuildServiceProvider()
 					.GetService(typeToResolve);

tests/Hosting.UnitTests/HostBuilderExtensionsTests.cs

@@ -19,7 +19,6 @@ public class HostBuilderExtensionsTests
 		[DataTestMethod]
 		[DataRow(typeof(ILogger<HostBuilderExtensionsTests>))]
 		[DataRow(typeof(ActivitySource))]
-		[Obsolete("AddOmexServices is Obsolete and pending for removal on 1 July 2024.", DiagnosticId = "OMEX188")]
 		public void AddOmexServices_TypesRegistered(Type type)
 		{
 			object? collectionObj = new ServiceCollection()