Enabling DiagnosticEvents, minor bug fixes (Azure#8370)

kaibocai · May 11, 2022 · 4fd0de1 · 4fd0de1
1 parent c1fc996
commit 4fd0de1
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -7,6 +7,7 @@
 - Updated Java Worker Version to [2.2.3](https://github.com/Azure/azure-functions-java-worker/releases/tag/2.2.3)
 - Updated Node.js Worker Version to [3.3.0](https://github.com/Azure/azure-functions-nodejs-worker/releases/tag/v3.3.0)
 - Add Include minimum durable payload to sync trigger (#8292)
+- Enable diagnostic events collection
 
 **Release sprint:** Sprint 118
 [ [bugs](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+118%22+label%3Abug+is%3Aclosed) | [features](https://github.com/Azure/azure-functions-host/issues?q=is%3Aissue+milestone%3A%22Functions+Sprint+118%22+label%3Afeature+is%3Aclosed) ]

diff --git a/src/WebJobs.Script.WebHost/Diagnostics/DiagnosticEvent.cs b/src/WebJobs.Script.WebHost/Diagnostics/DiagnosticEvent.cs
@@ -21,7 +21,7 @@ public DiagnosticEvent(string hostId, DateTime timestamp)
 
         public int HitCount { get; set; }
 
-        public DateTime LastTimeStamp { get; set; }
+        public DateTimeOffset TimeStamp { get; set; }
 
         public string Message { get; set; }
 

diff --git a/src/WebJobs.Script.WebHost/Diagnostics/DiagnosticEventTableStorageRepository.cs b/src/WebJobs.Script.WebHost/Diagnostics/DiagnosticEventTableStorageRepository.cs
@@ -184,7 +184,7 @@ public void WriteDiagnosticEvent(DateTime timestamp, string errorCode, LogLevel
             {
                 ErrorCode = errorCode,
                 HelpLink = helpLink,
-                LastTimeStamp = timestamp,
+                TimeStamp = timestamp,
                 Message = message,
                 LogLevel = level,
                 Details = exception?.ToFormattedString(),

diff --git a/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs
@@ -90,7 +90,7 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                         loggingBuilder.Services.AddSingleton<ILoggerProvider, AzureMonitorDiagnosticLoggerProvider>();
                     }
 
-                    if (FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagEnableDiagnosticEventLogging))
+                    if (!FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagDisableDiagnosticEventLogging))
                     {
                         loggingBuilder.Services.AddSingleton<ILoggerProvider, DiagnosticEventLoggerProvider>();
                         loggingBuilder.Services.TryAddSingleton<IDiagnosticEventRepository, DiagnosticEventTableStorageRepository>();

diff --git a/src/WebJobs.Script/Diagnostics/DiagnosticEventLoggerExtensions.cs b/src/WebJobs.Script/Diagnostics/DiagnosticEventLoggerExtensions.cs
@@ -30,7 +30,7 @@ public static void LogInformation(this ILogger logger, int eventId, string error
 
         public static void LogError(this ILogger logger, int eventId, string errorCode, string message, string helpLink, Exception exception)
         {
-            logger.LogDiagnosticEvent(LogLevel.Information, eventId, errorCode, message, helpLink, exception);
+            logger.LogDiagnosticEvent(LogLevel.Error, eventId, errorCode, message, helpLink, exception);
         }
     }
 }
diff --git a/src/WebJobs.Script/ScriptConstants.cs b/src/WebJobs.Script/ScriptConstants.cs
@@ -105,6 +105,7 @@ public static class ScriptConstants
         public const string FeatureFlagAllowSynchronousIO = "AllowSynchronousIO";
         public const string FeatureFlagRelaxedAssemblyUnification = "RelaxedAssemblyUnification";
         public const string FeatureFlagEnableDiagnosticEventLogging = "EnableDiagnosticEventLogging";
+        public const string FeatureFlagDisableDiagnosticEventLogging = "DisableDiagnosticEventLogging";
         public const string FeatureFlagDisableMergedWebHostScriptHostConfiguration = "DisableMergedConfiguration";
         public const string FeatureFlagEnableWorkerIndexing = "EnableWorkerIndexing";
 

diff --git a/...ebJobs.Script.Tests.Integration/Diagnostics/DiagnosticEventTableStorageRepositoryTests.cs b/...ebJobs.Script.Tests.Integration/Diagnostics/DiagnosticEventTableStorageRepositoryTests.cs
@@ -231,7 +231,7 @@ public async Task ExecuteBatchAsync_WritesToTableStorage()
 
             var dateTime = DateTime.UtcNow;
             var diagnosticEvent = new DiagnosticEvent("hostId", dateTime);
-            diagnosticEvent.LastTimeStamp = dateTime;
+            diagnosticEvent.TimeStamp = dateTime;
             var events = new ConcurrentDictionary<string, DiagnosticEvent>();
             events.TryAdd("EC123", diagnosticEvent);
             await repository.ExecuteBatchAsync(events, table);
@@ -274,7 +274,7 @@ private async Task EmptyTableAsync(CloudTable table)
                 {
                     batch.Add(TableOperation.Delete(entity));
 
-                    if (batch.Count == 100)
+                    if (batch.Count == 1)
                     {
                         var result = await table.ExecuteBatchAsync(batch);
                         batch = new TableBatchOperation();

diff --git a/test/WebJobs.Script.Tests/Configuration/LoggingConfigurationTests.cs b/test/WebJobs.Script.Tests/Configuration/LoggingConfigurationTests.cs
@@ -188,7 +188,7 @@ public void LoggerProviders_Default()
             {
                 IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-                Assert.Equal(4, loggerProviders.Count());
+                Assert.Equal(5, loggerProviders.Count());
                 loggerProviders.OfType<SystemLoggerProvider>().Single();
                 loggerProviders.OfType<HostFileLoggerProvider>().Single();
                 loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
@@ -207,7 +207,7 @@ public void LoggerProviders_ConsoleEnabled_IfDevelopmentEnvironment()
             {
                 IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-                Assert.Equal(5, loggerProviders.Count());
+                Assert.Equal(6, loggerProviders.Count());
                 loggerProviders.OfType<SystemLoggerProvider>().Single();
                 loggerProviders.OfType<HostFileLoggerProvider>().Single();
                 loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
@@ -233,7 +233,7 @@ public void LoggerProviders_ConsoleEnabled_InConfiguration()
             {
                 IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-                Assert.Equal(5, loggerProviders.Count());
+                Assert.Equal(6, loggerProviders.Count());
                 loggerProviders.OfType<SystemLoggerProvider>().Single();
                 loggerProviders.OfType<HostFileLoggerProvider>().Single();
                 loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
@@ -259,7 +259,7 @@ public void LoggerProviders_ApplicationInsights()
             {
                 IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-                Assert.Equal(5, loggerProviders.Count());
+                Assert.Equal(6, loggerProviders.Count());
                 loggerProviders.OfType<SystemLoggerProvider>().Single();
                 loggerProviders.OfType<HostFileLoggerProvider>().Single();
                 loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
@@ -295,7 +295,7 @@ public void LoggerProviders_AzureMonitor(string azureMonitorEnabledValue)
 
                 int expectedCount = isAzureMonitorEnabled ? 5 : 4;
 
-                Assert.Equal(4, loggerProviders.Count());
+                Assert.Equal(5, loggerProviders.Count());
                 loggerProviders.OfType<SystemLoggerProvider>().Single();
                 loggerProviders.OfType<HostFileLoggerProvider>().Single();
                 loggerProviders.OfType<FunctionFileLoggerProvider>().Single();

diff --git a/test/WebJobs.Script.Tests/Diagnostics/DiagnosticEventLoggerTests.cs b/test/WebJobs.Script.Tests/Diagnostics/DiagnosticEventLoggerTests.cs
@@ -84,7 +84,7 @@ public void WriteDiagnosticEvent(DateTime timestamp, string errorCode, LogLevel
             {
                 _events.Add(new DiagnosticEvent("hostid", timestamp)
                 {
-                    LastTimeStamp = timestamp,
+                    TimeStamp = timestamp,
                     ErrorCode = errorCode,
                     LogLevel = level,
                     Message = message,