Merge pull request #2273 from Azure/dev

Promote dev to main for 2.8.1 release

Author: davidmrdavid

release_notes.md

@@ -1,12 +0,0 @@
-## Bug Fixes
-- Correctly Serialize HostStoppingEvent in ActivityShim (https://github.com/Azure/azure-functions-durable-extension/pull/2178)
-- Fix NotImplementedException for management API calls from Java client (https://github.com/Azure/azure-functions-durable-extension/pull/2193)
-- Handle OOM and other exceptions in entity shim by aborting the session (https://github.com/Azure/azure-functions-durable-extension/pull/2234)
-
-## Enhancements
-- add optional 'instanceIdPrefix' query parameter to the HTTP API for instance queries
-
-## Dependencies
-- DurableTask.Core --> v2.10.*
-- DurableTask.AzureStorage --> v1.12.*
-- DurableTask.Analyzers --> 0.5.0

src/WebJobs.Extensions.DurableTask/DurableTaskExtension.cs

@@ -497,16 +497,9 @@ private void InitializeLinuxLogging()
             string stampName = this.PlatformInformationService.GetLinuxStampName();
             string containerName = this.PlatformInformationService.GetContainerName();
 
-            // If running in linux, initialize the EventSource listener with the appropiate logger.
-            LinuxAppServiceLogger linuxLogger;
-            if (!inConsumption)
-            {
-                linuxLogger = new LinuxAppServiceLogger(writeToConsole: false, containerName, tenant, stampName);
-            }
-            else
-            {
-                linuxLogger = new LinuxAppServiceLogger(writeToConsole: true, containerName, tenant, stampName);
-            }
+            // in linux consumption, logs are emitted to the console.
+            // In other linux plans, they are emitted to a logfile.
+            var linuxLogger = new LinuxAppServiceLogger(writeToConsole: inConsumption, containerName, tenant, stampName);
 
             // The logging service for linux works by capturing EventSource messages,
             // which our linux platform does not recognize, and logging them via a
@@ -521,10 +514,6 @@ private void InitializeLinuxLogging()
         /// <inheritdoc />
         public void Dispose()
         {
-            // Not flushing the linux logger may lead to lost logs
-            // 40 seconds timeout because we write normally every 30 seconds, so we're just
-            // adding an extra 10 seconds to flush.
-            LinuxAppServiceLogger.Logger?.Stop(TimeSpan.FromSeconds(40));
             this.HttpApiHandler?.Dispose();
             this.eventSourceListener?.Dispose();
         }

src/WebJobs.Extensions.DurableTask/EventSourceListener.cs

@@ -106,5 +106,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
                 }
             }
         }
+
+        public override void Dispose()
+        {
+            this.logger?.Dispose();
+            base.Dispose();
+        }
     }
 }

src/WebJobs.Extensions.DurableTask/LinuxAppServiceFileLogger.cs

@@ -19,8 +19,9 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask
     /// We have modified their implementation to utilize syscall.rename instead of File.Move during file rolling.
     /// This change is necessary for older versions of fluent-bit, our logging infrastructure in linux dedicated, to properly deal with logfile archiving.
     /// </summary>
-    public class LinuxAppServiceFileLogger
+    internal class LinuxAppServiceFileLogger : IDisposable
     {
+        private static readonly SemaphoreSlim Semaphore = new SemaphoreSlim(initialCount: 1, maxCount: 1);
         private readonly string logFileName;
         private readonly string logFileDirectory;
         private readonly string logFilePath;
@@ -126,12 +127,18 @@ internal async Task InternalProcessLogQueue()
             {
                 try
                 {
+                    // block on semaphore to prevent concurrent writes
+                    await Semaphore.WaitAsync();
                     await this.WriteLogs(this.currentBatch);
                 }
                 catch (Exception)
                 {
                     // Ignored
                 }
+                finally
+                {
+                    Semaphore.Release();
+                }
 
                 this.currentBatch.Clear();
             }
@@ -165,6 +172,14 @@ private async Task AppendLogs(string filePath, IEnumerable<string> logs)
             }
         }
 
+        public void Dispose()
+        {
+            // Not flushing the linux logger may lead to lost logs
+            // 40 seconds timeout because we write normally every 30 seconds, so we're just
+            // adding an extra 10 seconds to flush.
+            this.Stop(TimeSpan.FromSeconds(40));
+        }
+
         private void RollFiles()
         {
             // Rename current file to older file.

src/WebJobs.Extensions.DurableTask/LinuxAppServiceLogger.cs

@@ -18,16 +18,12 @@ namespace Microsoft.Azure.WebJobs.Extensions.DurableTask
     /// This class is utilized by <c>EventSourceListener</c> to write logs corresponding to
     /// specific EventSource providers.
     /// </summary>
-    internal class LinuxAppServiceLogger
+    internal class LinuxAppServiceLogger : IDisposable
     {
         private const string ConsolePrefix = "MS_DURABLE_FUNCTION_EVENTS_LOGS";
 
-        // variable below is internal static for testing and other convenient purposes
-        // we need to be able to change the logging path for a windows-based CI
-        // the logger being internal static is convenient for flushing it
 #pragma warning disable SA1401 // Fields should be private
         internal static string LoggingPath = "/var/log/functionsLogs/durableeventsJSON.log";
-        internal static LinuxAppServiceFileLogger Logger; // The File Logger
 #pragma warning restore SA1401 // Fields should be private
 
         // logging metadata
@@ -40,6 +36,8 @@ internal class LinuxAppServiceLogger
         // if true, we write to console (linux consumption), else to a file (linux dedicated).
         private readonly bool writeToConsole;
 
+        private readonly LinuxAppServiceFileLogger fileLogger;
+
         /// <summary>
         /// Create a LinuxAppServiceLogger instance.
         /// </summary>
@@ -86,7 +84,7 @@ public LinuxAppServiceLogger(
                 // int tenMbInBytes = 10000000;
                 string fname = Path.GetFileName(LinuxAppServiceLogger.LoggingPath);
                 string dir = Path.GetDirectoryName(LinuxAppServiceLogger.LoggingPath);
-                Logger = new LinuxAppServiceFileLogger(fname, dir);
+                this.fileLogger = new LinuxAppServiceFileLogger(fname, dir);
             }
         }
 
@@ -173,8 +171,13 @@ public void Log(EventWrittenEventArgs eventData)
             {
                 // We write to a file in Linux Dedicated
                 // Our file logger already handles file rolling (archiving) and deletion of old logs
-                Logger.Log(jsonString);
+                this.fileLogger.Log(jsonString);
             }
         }
+
+        public void Dispose()
+        {
+            this.fileLogger?.Dispose();
+        }
     }
 }

src/WebJobs.Extensions.DurableTask/WebJobs.Extensions.DurableTask.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Microsoft.Azure.WebJobs.Extensions.DurableTask</RootNamespace>
     <MajorVersion>2</MajorVersion>
     <MinorVersion>8</MinorVersion>
-    <PatchVersion>0</PatchVersion>
+    <PatchVersion>1</PatchVersion>
     <Version>$(MajorVersion).$(MinorVersion).$(PatchVersion)</Version>
     <FileVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</FileVersion>
     <AssemblyVersion>$(MajorVersion).0.0.0</AssemblyVersion>