Small metrics handling optimizations/cleanup

Author: pentp

src/OpenTelemetry.Api.ProviderBuilderExtensions/Logs/OpenTelemetryDependencyInjectionLoggerProviderBuilderExtensions.cs

@@ -36,7 +36,7 @@ public static LoggerProviderBuilder AddInstrumentation<
 
         loggerProviderBuilder.ConfigureBuilder((sp, builder) =>
         {
-            builder.AddInstrumentation(() => sp.GetRequiredService<T>());
+            builder.AddInstrumentation(sp.GetRequiredService<T>);
         });
 
         return loggerProviderBuilder;

src/OpenTelemetry.Api.ProviderBuilderExtensions/Metrics/OpenTelemetryDependencyInjectionMeterProviderBuilderExtensions.cs

@@ -36,7 +36,7 @@ public static MeterProviderBuilder AddInstrumentation<
 
         meterProviderBuilder.ConfigureBuilder((sp, builder) =>
         {
-            builder.AddInstrumentation(() => sp.GetRequiredService<T>());
+            builder.AddInstrumentation(sp.GetRequiredService<T>);
         });
 
         return meterProviderBuilder;

src/OpenTelemetry.Api.ProviderBuilderExtensions/Trace/OpenTelemetryDependencyInjectionTracerProviderBuilderExtensions.cs

@@ -36,7 +36,7 @@ public static TracerProviderBuilder AddInstrumentation<
 
         tracerProviderBuilder.ConfigureBuilder((sp, builder) =>
         {
-            builder.AddInstrumentation(() => sp.GetRequiredService<T>());
+            builder.AddInstrumentation(sp.GetRequiredService<T>);
         });
 
         return tracerProviderBuilder;

src/OpenTelemetry.Api/Internal/OpenTelemetryApiEventSource.cs

@@ -12,7 +12,7 @@ namespace OpenTelemetry.Internal;
 [EventSource(Name = "OpenTelemetry-Api")]
 internal sealed class OpenTelemetryApiEventSource : EventSource
 {
-    public static OpenTelemetryApiEventSource Log = new();
+    public static readonly OpenTelemetryApiEventSource Log = new();
 
     [NonEvent]
     public void ActivityContextExtractException(string format, Exception ex)

src/OpenTelemetry.Api/Trace/TracerProvider.cs

@@ -78,7 +78,7 @@ protected override void Dispose(bool disposing)
     {
         if (disposing)
         {
-            var tracers = Interlocked.CompareExchange(ref this.Tracers, null, this.Tracers);
+            var tracers = Interlocked.Exchange(ref this.Tracers, null);
             if (tracers != null)
             {
                 lock (tracers)
@@ -90,8 +90,6 @@ protected override void Dispose(bool disposing)
                         tracer.ActivitySource = null;
                         activitySource?.Dispose();
                     }
-
-                    tracers.Clear();
                 }
             }
         }

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/PersistentStorage/DirectorySizeTracker.cs

@@ -36,14 +36,14 @@ public DirectorySizeTracker(long maxSizeInBytes, string path)
     /// <returns>True if space is available else false.</returns>
     public bool IsSpaceAvailable(out long currentSizeInBytes)
     {
-        currentSizeInBytes = Interlocked.Read(ref this.directoryCurrentSizeInBytes);
+        currentSizeInBytes = Volatile.Read(ref this.directoryCurrentSizeInBytes);
         return currentSizeInBytes < this.maxSizeInBytes;
     }
 
     public void RecountCurrentSize()
     {
         var size = CalculateFolderSize(this.path);
-        Interlocked.Exchange(ref this.directoryCurrentSizeInBytes, size);
+        Volatile.Write(ref this.directoryCurrentSizeInBytes, size);
     }
 
     internal static long CalculateFolderSize(string path)

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/PersistentStorage/PersistentStorageAbstractionsEventSource.cs

@@ -9,7 +9,7 @@ namespace OpenTelemetry.PersistentStorage.Abstractions;
 [EventSource(Name = EventSourceName)]
 internal sealed class PersistentStorageAbstractionsEventSource : EventSource
 {
-    public static PersistentStorageAbstractionsEventSource Log = new PersistentStorageAbstractionsEventSource();
+    public static readonly PersistentStorageAbstractionsEventSource Log = new PersistentStorageAbstractionsEventSource();
 #if BUILDING_INTERNAL_PERSISTENT_STORAGE
     private const string EventSourceName = "OpenTelemetry-PersistentStorage-Abstractions-Otlp";
 #else

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/PersistentStorage/PersistentStorageEventSource.cs

@@ -9,7 +9,7 @@ namespace OpenTelemetry.PersistentStorage.FileSystem;
 [EventSource(Name = EventSourceName)]
 internal sealed class PersistentStorageEventSource : EventSource
 {
-    public static PersistentStorageEventSource Log = new PersistentStorageEventSource();
+    public static readonly PersistentStorageEventSource Log = new PersistentStorageEventSource();
 #if BUILDING_INTERNAL_PERSISTENT_STORAGE
     private const string EventSourceName = "OpenTelemetry-PersistentStorage-FileSystem-Otlp";
 #else

src/OpenTelemetry.Extensions.Hosting/Implementation/HostingExtensionsEventSource.cs

@@ -11,7 +11,7 @@ namespace OpenTelemetry.Extensions.Hosting.Implementation;
 [EventSource(Name = "OpenTelemetry-Extensions-Hosting")]
 internal sealed class HostingExtensionsEventSource : EventSource
 {
-    public static HostingExtensionsEventSource Log = new();
+    public static readonly HostingExtensionsEventSource Log = new();
 
     [Event(1, Message = "OpenTelemetry TracerProvider was not found in application services. Tracing will remain disabled.", Level = EventLevel.Warning)]
     public void TracerProviderNotRegistered()

src/OpenTelemetry/Internal/InterlockedHelper.cs

@@ -18,29 +18,28 @@ public static void Add(ref double location, double value)
         var returnedValue = Interlocked.CompareExchange(ref location, currentValue + value, currentValue);
         if (returnedValue != currentValue)
         {
-            AddRare(ref location, value, returnedValue);
+            AddRare(ref location, value);
         }
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static double Read(ref double location)
-        => Interlocked.CompareExchange(ref location, double.NaN, double.NaN);
+        => Interlocked.CompareExchange(ref location, 0, 0);
 
     [MethodImpl(MethodImplOptions.NoInlining)]
-    private static void AddRare(ref double location, double value, double currentValue)
+    private static void AddRare(ref double location, double value)
     {
         var sw = default(SpinWait);
         while (true)
         {
             sw.SpinOnce();
 
+            double currentValue = Volatile.Read(ref location);
             var returnedValue = Interlocked.CompareExchange(ref location, currentValue + value, currentValue);
             if (returnedValue == currentValue)
             {
                 break;
             }
-
-            currentValue = returnedValue;
         }
     }
 }