[repo] Small cleanup/simplification (#6048)

Co-authored-by: Piotr Kiełkowicz <pkiekowicz@splunk.com>

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)

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/OpenTelemetrySdkEventSource.cs

@@ -16,7 +16,7 @@ namespace OpenTelemetry.Internal;
 [EventSource(Name = "OpenTelemetry-Sdk")]
 internal sealed class OpenTelemetrySdkEventSource : EventSource, IConfigurationExtensionsLogger
 {
-    public static OpenTelemetrySdkEventSource Log = new();
+    public static readonly OpenTelemetrySdkEventSource Log = new();
 #if DEBUG
     public static OpenTelemetryEventListener Listener = new();
 #endif

src/OpenTelemetry/Logs/LogRecord.cs

@@ -429,19 +429,17 @@ public void ForEachScope<TState>(Action<LogRecordScope, TState> callback, TState
     {
         Guard.ThrowIfNull(callback);
 
-        var forEachScopeState = new ScopeForEachState<TState>(callback, state);
-
         var bufferedScopes = this.ILoggerData.BufferedScopes;
         if (bufferedScopes != null)
         {
             foreach (object? scope in bufferedScopes)
             {
-                ScopeForEachState<TState>.ForEachScope(scope, forEachScopeState);
+                callback(new(scope), state);
             }
         }
         else
         {
-            this.ILoggerData.ScopeProvider?.ForEachScope(ScopeForEachState<TState>.ForEachScope, forEachScopeState);
+            this.ILoggerData.ScopeProvider?.ForEachScope(ScopeForEachState<TState>.ForEachScope, new(callback, state));
         }
     }