logging error code as part of eventId for diagnostic events (#9643)

Author: soninaren

src/WebJobs.Script.WebHost/Diagnostics/SystemLogger.cs

@@ -69,6 +69,8 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             string stateFunctionName = null;
             string stateEventName = null;
             string stateActivityId = null;
+            string diagnosticEventErrorCode = null;
+            bool isDiagnosticEvent = false;
             if (state is IEnumerable<KeyValuePair<string, object>> stateProps)
             {
                 foreach (var kvp in stateProps)
@@ -77,6 +79,14 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                     {
                         stateSourceValue = kvp.Value?.ToString();
                     }
+                    else if (string.Equals(kvp.Key, ScriptConstants.DiagnosticEventKey, StringComparison.OrdinalIgnoreCase))
+                    {
+                        isDiagnosticEvent = true;
+                    }
+                    else if (string.Equals(kvp.Key, ScriptConstants.ErrorCodeKey, StringComparison.OrdinalIgnoreCase))
+                    {
+                        diagnosticEventErrorCode = kvp.Value?.ToString();
+                    }
                     else if (string.Equals(kvp.Key, ScriptConstants.LogPropertyIsUserLogKey, StringComparison.OrdinalIgnoreCase))
                     {
                         if ((bool)kvp.Value)
@@ -147,6 +157,8 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             // otherwise the ETW event will fail to be persisted (silently)
             string summary = formattedMessage ?? string.Empty;
             string eventName = !string.IsNullOrEmpty(eventId.Name) ? eventId.Name : stateEventName ?? string.Empty;
+            eventName = isDiagnosticEvent ? $"DiagnosticEvent-{diagnosticEventErrorCode}" : eventName;
+
             string activityId = stateActivityId ?? scopeActivityId ?? string.Empty;
             var options = _appServiceOptions;
             string subscriptionId = options.SubscriptionId ?? string.Empty;