[repo] Small cleanup/simplification

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/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));
         }
     }
 

src/OpenTelemetry/Metrics/CircularBufferBuckets.cs

@@ -263,10 +263,11 @@ internal void Reset()
     {
         if (this.trait != null)
         {
-            for (var i = 0; i < this.trait.Length; ++i)
-            {
-                this.trait[i] = 0;
-            }
+#if NET
+            Array.Clear(this.trait);
+#else
+            Array.Clear(this.trait, 0, this.trait.Length);
+#endif
         }
     }
 

src/OpenTelemetry/Metrics/MeterProviderSdk.cs

@@ -143,12 +143,12 @@ internal MeterProviderSdk(
         }
 
         // Setup Listener
-        if (state.MeterSources.Any(s => WildcardHelper.ContainsWildcard(s)))
+        if (state.MeterSources.Exists(WildcardHelper.ContainsWildcard))
         {
             var regex = WildcardHelper.GetWildcardRegex(state.MeterSources);
             this.shouldListenTo = instrument => regex.IsMatch(instrument.Meter.Name);
         }
-        else if (state.MeterSources.Any())
+        else if (state.MeterSources.Count > 0)
         {
             var meterSourcesToSubscribe = new HashSet<string>(state.MeterSources, StringComparer.OrdinalIgnoreCase);
             this.shouldListenTo = instrument => meterSourcesToSubscribe.Contains(instrument.Meter.Name);

src/OpenTelemetry/Metrics/MetricPoint/MetricPointsAccessor.cs

@@ -13,9 +13,9 @@ public readonly struct MetricPointsAccessor
 {
     private readonly MetricPoint[] metricsPoints;
     private readonly int[] metricPointsToProcess;
-    private readonly long targetCount;
+    private readonly int targetCount;
 
-    internal MetricPointsAccessor(MetricPoint[] metricsPoints, int[] metricPointsToProcess, long targetCount)
+    internal MetricPointsAccessor(MetricPoint[] metricsPoints, int[] metricPointsToProcess, int targetCount)
     {
         Debug.Assert(metricsPoints != null, "metricPoints was null");
         Debug.Assert(metricPointsToProcess != null, "metricPointsToProcess was null");
@@ -39,10 +39,10 @@ public struct Enumerator
     {
         private readonly MetricPoint[] metricsPoints;
         private readonly int[] metricPointsToProcess;
-        private readonly long targetCount;
-        private long index;
+        private readonly int targetCount;
+        private int index;
 
-        internal Enumerator(MetricPoint[] metricsPoints, int[] metricPointsToProcess, long targetCount)
+        internal Enumerator(MetricPoint[] metricsPoints, int[] metricPointsToProcess, int targetCount)
         {
             this.metricsPoints = metricsPoints;
             this.metricPointsToProcess = metricPointsToProcess;

src/OpenTelemetry/Metrics/Reader/MetricReader.cs

@@ -125,7 +125,7 @@ public bool Collect(int timeoutMilliseconds = Timeout.Infinite)
 
         if (!shouldRunCollect)
         {
-            return Task.WaitAny(tcs.Task, this.shutdownTcs.Task, Task.Delay(timeoutMilliseconds)) == 0 && tcs.Task.Result;
+            return Task.WaitAny([tcs.Task, this.shutdownTcs.Task], timeoutMilliseconds) == 0 && tcs.Task.Result;
         }
 
         var result = false;

src/OpenTelemetry/Metrics/View/ExplicitBucketHistogramConfiguration.cs

@@ -25,17 +25,7 @@ public class ExplicitBucketHistogramConfiguration : HistogramConfiguration
     /// </remarks>
     public double[]? Boundaries
     {
-        get
-        {
-            if (this.CopiedBoundaries != null)
-            {
-                double[] copy = new double[this.CopiedBoundaries.Length];
-                this.CopiedBoundaries.AsSpan().CopyTo(copy);
-                return copy;
-            }
-
-            return null;
-        }
+        get => this.CopiedBoundaries != null ? this.CopiedBoundaries.AsSpan().ToArray() : null;
 
         set
         {
@@ -46,9 +36,7 @@ public double[]? Boundaries
                     throw new ArgumentException($"Histogram boundaries are invalid. Histogram boundaries must be in ascending order with distinct values.", nameof(value));
                 }
 
-                double[] copy = new double[value.Length];
-                value.AsSpan().CopyTo(copy);
-                this.CopiedBoundaries = copy;
+                this.CopiedBoundaries = value.AsSpan().ToArray();
             }
             else
             {

src/OpenTelemetry/Metrics/View/MetricStreamConfiguration.cs

@@ -71,31 +71,8 @@ public string? Name
     /// </remarks>
     public string[]? TagKeys
     {
-        get
-        {
-            if (this.CopiedTagKeys != null)
-            {
-                string[] copy = new string[this.CopiedTagKeys.Length];
-                this.CopiedTagKeys.AsSpan().CopyTo(copy);
-                return copy;
-            }
-
-            return null;
-        }
-
-        set
-        {
-            if (value != null)
-            {
-                string[] copy = new string[value.Length];
-                value.AsSpan().CopyTo(copy);
-                this.CopiedTagKeys = copy;
-            }
-            else
-            {
-                this.CopiedTagKeys = null;
-            }
-        }
+        get => this.CopiedTagKeys != null ? this.CopiedTagKeys.AsSpan().ToArray() : null;
+        set => this.CopiedTagKeys = value != null ? value.AsSpan().ToArray() : null;
     }
 
     /// <summary>

src/OpenTelemetry/OpenTelemetrySdkExtensions.cs

@@ -12,8 +12,6 @@ namespace OpenTelemetry;
 /// </summary>
 public static class OpenTelemetrySdkExtensions
 {
-    private static readonly NullLoggerFactory NoopLoggerFactory = new();
-
     /// <summary>
     /// Gets the <see cref="ILoggerFactory"/> contained in an <see
     /// cref="OpenTelemetrySdk"/> instance.
@@ -31,6 +29,6 @@ public static ILoggerFactory GetLoggerFactory(this OpenTelemetrySdk sdk)
         Guard.ThrowIfNull(sdk);
 
         return (ILoggerFactory?)sdk.Services.GetService(typeof(ILoggerFactory))
-            ?? NoopLoggerFactory;
+            ?? NullLoggerFactory.Instance;
     }
 }

test/OpenTelemetry.Api.Tests/Trace/TracerTest.cs

@@ -404,7 +404,10 @@ static void InnerTest()
                 getTracerThread.Join();
             }
 
-            Assert.Empty(tracers);
+            foreach (var kvp in tracers)
+            {
+                Assert.Null(kvp.Value.ActivitySource);
+            }
         }
     }