Refactor AzureMonitorOpenTelemetryOptions (Azure#34550)

Author: rajkumar-rangaraj

sdk/monitor/Azure.Monitor.OpenTelemetry/api/Azure.Monitor.OpenTelemetry.netstandard2.0.cs

@@ -9,10 +9,11 @@ public static partial class AzureMonitorOpenTelemetryExtensions
     public partial class AzureMonitorOpenTelemetryOptions
     {
         public AzureMonitorOpenTelemetryOptions() { }
-        public Azure.Monitor.OpenTelemetry.Exporter.AzureMonitorExporterOptions AzureMonitorExporterOptions { get { throw null; } set { } }
         public string ConnectionString { get { throw null; } set { } }
+        public bool DisableOfflineStorage { get { throw null; } set { } }
         public bool EnableLogs { get { throw null; } set { } }
         public bool EnableMetrics { get { throw null; } set { } }
         public bool EnableTraces { get { throw null; } set { } }
+        public string StorageDirectory { get { throw null; } set { } }
     }
 }

sdk/monitor/Azure.Monitor.OpenTelemetry/src/AzureMonitorOpenTelemetryImplementations.cs

@@ -76,7 +76,7 @@ internal static IServiceCollection AddAzureMonitorOpenTelemetryWithAction(IServi
                 }
                 else
                 {
-                    SetValueToExporterOptions(sp, options);
+                    options.SetValueToExporterOptions(sp);
                     var sdkProviderWrapper = sp.GetRequiredService<SdkProviderWrapper>();
                     sdkProviderWrapper.SdkTracerProvider = (TracerProvider)sdkTracerProviderServiceRegistration.ImplementationFactory(sp);
                     return sdkProviderWrapper.SdkTracerProvider;
@@ -92,7 +92,7 @@ internal static IServiceCollection AddAzureMonitorOpenTelemetryWithAction(IServi
                 }
                 else
                 {
-                    SetValueToExporterOptions(sp, options);
+                    options.SetValueToExporterOptions(sp);
                     var sdkProviderWrapper = sp.GetRequiredService<SdkProviderWrapper>();
                     sdkProviderWrapper.SdkMeterProvider = (MeterProvider)sdkMeterProviderServiceRegistration.ImplementationFactory(sp);
                     return sdkProviderWrapper.SdkMeterProvider;
@@ -106,23 +106,6 @@ internal static IServiceCollection AddAzureMonitorOpenTelemetryWithAction(IServi
             return services;
         }
 
-        private static void SetValueToExporterOptions(IServiceProvider sp, AzureMonitorOpenTelemetryOptions options)
-        {
-            var exporterOptions = sp.GetRequiredService<IOptionsMonitor<AzureMonitorExporterOptions>>().Get("");
-            var defaultOptions = new AzureMonitorExporterOptions();
-
-            if (ReferenceEquals(exporterOptions, defaultOptions))
-            {
-                exporterOptions.ConnectionString = options.AzureMonitorExporterOptions.ConnectionString;
-                exporterOptions.DisableOfflineStorage = options.AzureMonitorExporterOptions.DisableOfflineStorage;
-                exporterOptions.StorageDirectory = options.AzureMonitorExporterOptions.StorageDirectory;
-            }
-            else if (exporterOptions.ConnectionString == null)
-            {
-                exporterOptions.ConnectionString = options.AzureMonitorExporterOptions.ConnectionString;
-            }
-        }
-
         private sealed class NoopTracerProvider : TracerProvider
         {
         }

sdk/monitor/Azure.Monitor.OpenTelemetry/src/AzureMonitorOpenTelemetryOptions.cs

@@ -3,8 +3,10 @@
 
 #nullable disable
 
-using System.Runtime.Serialization;
 using Azure.Monitor.OpenTelemetry.Exporter;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using System;
 
 namespace Azure.Monitor.OpenTelemetry
 {
@@ -13,28 +15,18 @@ namespace Azure.Monitor.OpenTelemetry
     /// </summary>
     public class AzureMonitorOpenTelemetryOptions
     {
-        /// <summary>
-        /// Gets or sets a value of Azure Monitor Exporter Options.
-        /// </summary>
-        public AzureMonitorExporterOptions AzureMonitorExporterOptions { get; set; } = new AzureMonitorExporterOptions();
-
         /// <summary>
         /// The Connection String provides users with a single configuration setting to identify the Azure Monitor resource and endpoint.
         /// </summary>
         /// <remarks>
         /// (https://docs.microsoft.com/azure/azure-monitor/app/sdk-connection-string).
         /// </remarks>
-        public string ConnectionString
-        {
-            get
-            {
-                return AzureMonitorExporterOptions.ConnectionString;
-            }
-            set
-            {
-                AzureMonitorExporterOptions.ConnectionString = value;
-            }
-        }
+        public string ConnectionString { get; set; }
+
+        /// <summary>
+        /// Disable offline storage.
+        /// </summary>
+        public bool DisableOfflineStorage { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether Logs should be enabled.
@@ -51,18 +43,32 @@ public string ConnectionString
         /// </summary>
         public bool EnableTraces { get; set; } = true;
 
+        /// <summary>
+        /// Override the default directory for offline storage.
+        /// </summary>
+        public string StorageDirectory { get; set; }
+
         internal AzureMonitorOpenTelemetryOptions Clone(AzureMonitorOpenTelemetryOptions options)
         {
             if (options != null)
             {
-                AzureMonitorExporterOptions = options.AzureMonitorExporterOptions;
                 ConnectionString = options.ConnectionString;
+                DisableOfflineStorage = options.DisableOfflineStorage;
                 EnableLogs = options.EnableLogs;
                 EnableMetrics = options.EnableMetrics;
                 EnableTraces = options.EnableTraces;
+                StorageDirectory = options.StorageDirectory;
             }
 
             return this;
         }
+
+        internal void SetValueToExporterOptions(IServiceProvider sp)
+        {
+            var exporterOptions = sp.GetRequiredService<IOptionsMonitor<AzureMonitorExporterOptions>>().Get("");
+            exporterOptions.ConnectionString = ConnectionString;
+            exporterOptions.DisableOfflineStorage = DisableOfflineStorage;
+            exporterOptions.StorageDirectory = StorageDirectory;
+        }
     }
 }