[repo/PersistentStorage] Prepare to .NET9

src/OpenTelemetry.PersistentStorage.Abstractions/PersistentBlobProvider.cs

@@ -102,12 +102,12 @@ public IEnumerable<PersistentBlob> GetBlobs()
     {
         try
         {
-            return this.OnGetBlobs() ?? Enumerable.Empty<PersistentBlob>();
+            return this.OnGetBlobs() ?? [];
         }
         catch (Exception ex)
         {
             PersistentStorageAbstractionsEventSource.Log.PersistentStorageAbstractionsException(nameof(PersistentBlobProvider), "Failed to get all the blobs", ex);
-            return Enumerable.Empty<PersistentBlob>();
+            return [];
         }
     }
 

src/OpenTelemetry.PersistentStorage.FileSystem/DirectorySizeTracker.cs

@@ -56,16 +56,16 @@ internal static long CalculateFolderSize(string path)
         long directorySize = 0;
         try
         {
-            foreach (string file in Directory.EnumerateFiles(path))
+            foreach (var file in Directory.EnumerateFiles(path))
             {
                 if (File.Exists(file))
                 {
-                    FileInfo fileInfo = new FileInfo(file);
+                    var fileInfo = new FileInfo(file);
                     directorySize += fileInfo.Length;
                 }
             }
 
-            foreach (string dir in Directory.GetDirectories(path))
+            foreach (var dir in Directory.GetDirectories(path))
             {
                 directorySize += CalculateFolderSize(dir);
             }

src/OpenTelemetry.PersistentStorage.FileSystem/FileBlob.cs

@@ -58,7 +58,7 @@ protected override bool OnTryWrite(byte[] buffer, int leasePeriodMilliseconds =
     {
         Guard.ThrowIfNull(buffer);
 
-        string path = this.FullPath + ".tmp";
+        var path = this.FullPath + ".tmp";
 
         try
         {

src/OpenTelemetry.PersistentStorage.FileSystem/FileBlobProvider.cs

@@ -121,7 +121,7 @@ protected override IEnumerable<PersistentBlob> OnGetBlobs()
 
         foreach (var file in Directory.EnumerateFiles(this.DirectoryPath, "*.blob", SearchOption.TopDirectoryOnly).OrderByDescending(f => f))
         {
-            DateTime fileDateTime = PersistentStorageHelper.GetDateTimeFromBlobName(file);
+            var fileDateTime = PersistentStorageHelper.GetDateTimeFromBlobName(file);
             if (fileDateTime > retentionDeadline)
             {
                 yield return new FileBlob(file, this.directorySizeTracker);
@@ -173,7 +173,7 @@ private void OnMaintenanceEvent(object? source, ElapsedEventArgs e)
 
     private bool CheckStorageSize()
     {
-        if (!this.directorySizeTracker.IsSpaceAvailable(out long size))
+        if (!this.directorySizeTracker.IsSpaceAvailable(out var size))
         {
             // TODO: check accuracy of size reporting.
             PersistentStorageEventSource.Log.PersistentStorageWarning(
@@ -197,14 +197,7 @@ private bool CheckStorageSize()
             var blobFilePath = Path.Combine(this.DirectoryPath, PersistentStorageHelper.GetUniqueFileName(".blob"));
             var blob = new FileBlob(blobFilePath, this.directorySizeTracker);
 
-            if (blob.TryWrite(buffer, leasePeriodMilliseconds))
-            {
-                return blob;
-            }
-            else
-            {
-                return null;
-            }
+            return blob.TryWrite(buffer, leasePeriodMilliseconds) ? blob : null;
         }
         catch (Exception ex)
         {

src/OpenTelemetry.PersistentStorage.FileSystem/PersistentStorageHelper.cs

@@ -12,7 +12,7 @@ internal static void RemoveExpiredBlob(DateTime retentionDeadline, string filePa
     {
         if (filePath.EndsWith(".blob", StringComparison.OrdinalIgnoreCase))
         {
-            DateTime fileDateTime = GetDateTimeFromBlobName(filePath);
+            var fileDateTime = GetDateTimeFromBlobName(filePath);
             if (fileDateTime < retentionDeadline)
             {
                 try
@@ -30,11 +30,11 @@ internal static void RemoveExpiredBlob(DateTime retentionDeadline, string filePa
 
     internal static bool RemoveExpiredLease(DateTime leaseDeadline, string filePath)
     {
-        bool success = false;
+        var success = false;
 
         if (filePath.EndsWith(".lock", StringComparison.OrdinalIgnoreCase))
         {
-            DateTime fileDateTime = GetDateTimeFromLeaseName(filePath);
+            var fileDateTime = GetDateTimeFromLeaseName(filePath);
             if (fileDateTime < leaseDeadline)
             {
                 var newFilePath = filePath.Substring(0, filePath.LastIndexOf('@'));
@@ -55,11 +55,11 @@ internal static bool RemoveExpiredLease(DateTime leaseDeadline, string filePath)
 
     internal static bool RemoveTimedOutTmpFiles(DateTime timeoutDeadline, string filePath)
     {
-        bool success = false;
+        var success = false;
 
         if (filePath.EndsWith(".tmp", StringComparison.OrdinalIgnoreCase))
         {
-            DateTime fileDateTime = GetDateTimeFromBlobName(filePath);
+            var fileDateTime = GetDateTimeFromBlobName(filePath);
             if (fileDateTime < timeoutDeadline)
             {
                 try
@@ -144,7 +144,7 @@ internal static DateTime GetDateTimeFromLeaseName(string filePath)
     {
         var fileName = Path.GetFileNameWithoutExtension(filePath);
         var startIndex = fileName.LastIndexOf('@') + 1;
-        var time = fileName.Substring(startIndex, fileName.Length - startIndex);
+        var time = fileName.Substring(startIndex);
         DateTime.TryParseExact(time, "yyyy-MM-ddTHHmmss.fffffffZ", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTime);
         return dateTime.ToUniversalTime();
     }

test/Shared/EventSourceTestHelper.cs

@@ -13,7 +13,7 @@ internal static class EventSourceTestHelper
 {
     public static void MethodsAreImplementedConsistentlyWithTheirAttributes(EventSource eventSource)
     {
-        foreach (MethodInfo publicMethod in GetEventMethods(eventSource))
+        foreach (var publicMethod in GetEventMethods(eventSource))
         {
             VerifyMethodImplementation(eventSource, publicMethod);
         }
@@ -25,7 +25,7 @@ private static void VerifyMethodImplementation(EventSource eventSource, MethodIn
         listener.EnableEvents(eventSource, EventLevel.Verbose, EventKeywords.All);
         try
         {
-            object[] eventArguments = GenerateEventArguments(eventMethod);
+            var eventArguments = GenerateEventArguments(eventMethod);
             eventMethod.Invoke(eventSource, eventArguments);
 
             var actualEvent = listener.Messages.First(q => q.EventName == eventMethod.Name);
@@ -54,9 +54,9 @@ private static void VerifyMethodImplementation(EventSource eventSource, MethodIn
 
     private static object[] GenerateEventArguments(MethodInfo eventMethod)
     {
-        ParameterInfo[] parameters = eventMethod.GetParameters();
+        var parameters = eventMethod.GetParameters();
         var arguments = new object[parameters.Length];
-        for (int i = 0; i < parameters.Length; i++)
+        for (var i = 0; i < parameters.Length; i++)
         {
             arguments[i] = GenerateArgument(parameters[i]);
         }
@@ -71,37 +71,35 @@ private static object GenerateArgument(ParameterInfo parameter)
             return "Test String";
         }
 
-        if (parameter.ParameterType.IsValueType)
-        {
-            return Activator.CreateInstance(parameter.ParameterType)
-                ?? throw new NotSupportedException($"Could not create an instance of the '{parameter.ParameterType}' type.");
-        }
-
-        throw new NotSupportedException("Complex types are not supported");
+        return parameter.ParameterType.IsValueType
+            ? Activator.CreateInstance(parameter.ParameterType)
+              ?? throw new NotSupportedException(
+                  $"Could not create an instance of the '{parameter.ParameterType}' type.")
+            : throw new NotSupportedException("Complex types are not supported");
     }
 
     private static void VerifyEventId(MethodInfo eventMethod, EventWrittenEventArgs actualEvent)
     {
-        int expectedEventId = GetEventAttribute(eventMethod).EventId;
+        var expectedEventId = GetEventAttribute(eventMethod).EventId;
         AssertEqual(nameof(VerifyEventId), expectedEventId, actualEvent.EventId);
     }
 
     private static void VerifyEventLevel(MethodInfo eventMethod, EventWrittenEventArgs actualEvent)
     {
-        EventLevel expectedLevel = GetEventAttribute(eventMethod).Level;
+        var expectedLevel = GetEventAttribute(eventMethod).Level;
         AssertEqual(nameof(VerifyEventLevel), expectedLevel, actualEvent.Level);
     }
 
     private static void VerifyEventMessage(MethodInfo eventMethod, EventWrittenEventArgs actualEvent, object[] eventArguments)
     {
-        string expectedMessage = eventArguments.Length == 0
+        var expectedMessage = eventArguments.Length == 0
             ? GetEventAttribute(eventMethod).Message!
             : string.Format(CultureInfo.InvariantCulture, GetEventAttribute(eventMethod).Message!, eventArguments);
 
-        string actualMessage = string.Format(
+        var actualMessage = string.Format(
             CultureInfo.InvariantCulture,
             actualEvent.Message!,
-            actualEvent.Payload?.ToArray() ?? Array.Empty<object>());
+            actualEvent.Payload?.ToArray() ?? []);
 
         AssertEqual(nameof(VerifyEventMessage), expectedMessage, actualMessage);
     }
@@ -128,7 +126,7 @@ private static EventAttribute GetEventAttribute(MethodInfo eventMethod)
 
     private static IEnumerable<MethodInfo> GetEventMethods(EventSource eventSource)
     {
-        MethodInfo[] methods = eventSource.GetType().GetMethods();
+        var methods = eventSource.GetType().GetMethods();
         return methods.Where(m => m.GetCustomAttributes(typeof(EventAttribute), false).Length != 0);
     }
 }

test/Shared/TestEventListener.cs

@@ -77,7 +77,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
     protected override void OnEventSourceCreated(EventSource eventSource)
     {
         // Check for null because this method is called by the base class constructor before we can initialize it
-        Action<EventSource>? callback = this.OnOnEventSourceCreated;
+        var callback = this.OnOnEventSourceCreated;
         callback?.Invoke(eventSource);
     }
 }