Fixed structed logging names

Author: niemyjski

src/Exceptionless.Core/Billing/StripeEventHandler.cs

@@ -156,26 +156,26 @@ private async Task InvoicePaymentSucceededAsync(Invoice inv)
             return;
         }
 
-        _logger.LogInformation("Stripe payment succeeded. Customer: {CustomerId} Org: {organization} Org Name: {OrganizationName}", inv.CustomerId, org.Id, org.Name);
+        _logger.LogInformation("Stripe payment succeeded. Customer: {CustomerId} Org: {Organization} Org Name: {OrganizationName}", inv.CustomerId, org.Id, org.Name);
     }
 
-    private async Task InvoicePaymentFailedAsync(Invoice inv)
+    private async Task InvoicePaymentFailedAsync(Invoice invoice)
     {
-        var org = await _organizationRepository.GetByStripeCustomerIdAsync(inv.CustomerId);
+        var org = await _organizationRepository.GetByStripeCustomerIdAsync(invoice.CustomerId);
         if (org is null)
         {
-            _logger.LogError("Unknown customer id in payment failed notification: {CustomerId}", inv.CustomerId);
+            _logger.LogError("Unknown customer id in payment failed notification: {CustomerId}", invoice.CustomerId);
             return;
         }
 
         var user = await _userRepository.GetByIdAsync(org.BillingChangedByUserId);
         if (user is null)
         {
-            _logger.LogError("Unable to find billing user: {0}", org.BillingChangedByUserId);
+            _logger.LogError("Unable to find billing user: {UserId}", org.BillingChangedByUserId);
             return;
         }
 
-        _logger.LogInformation("Stripe payment failed. Customer: {CustomerId} Org: {organization} Org Name: {OrganizationName} Email: {EmailAddress}", inv.CustomerId, org.Id, org.Name, user.EmailAddress);
+        _logger.LogInformation("Stripe payment failed. Customer: {CustomerId} Org: {Organization} Org Name: {OrganizationName} Email: {EmailAddress}", invoice.CustomerId, org.Id, org.Name, user.EmailAddress);
         await _mailer.SendOrganizationPaymentFailedAsync(user, org);
     }
 }

src/Exceptionless.Core/Jobs/DailySummaryJob.cs

@@ -1,4 +1,4 @@
-using Exceptionless.Core.Billing;
+using Exceptionless.Core.Billing;
 using Exceptionless.Core.Configuration;
 using Exceptionless.Core.Mail;
 using Exceptionless.Core.Models;
@@ -70,28 +70,28 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                     var utcStartTime = new DateTime(project.NextSummaryEndOfDayTicks - TimeSpan.TicksPerDay);
                     if (utcStartTime < processSummariesNewerThan)
                     {
-                        _logger.LogInformation("Skipping daily summary older than two days for project: {Name}", project.Name);
-                        projectsToBulkUpdate.Add(project);
-                        continue;
-                    }
+                    _logger.LogInformation("Skipping daily summary older than two days for project: {Name}", project.Name);
+                    projectsToBulkUpdate.Add(project);
+                    continue;
+                }
 
-                    var notification = new SummaryNotification
-                    {
-                        Id = project.Id,
-                        UtcStartTime = utcStartTime,
-                        UtcEndTime = new DateTime(project.NextSummaryEndOfDayTicks - TimeSpan.TicksPerSecond)
-                    };
+                var notification = new SummaryNotification
+                {
+                    Id = project.Id,
+                    UtcStartTime = utcStartTime,
+                    UtcEndTime = new DateTime(project.NextSummaryEndOfDayTicks - TimeSpan.TicksPerSecond)
+                };
 
-                    bool summarySent = await SendSummaryNotificationAsync(project, notification);
-                    if (summarySent)
-                    {
-                        await _projectRepository.IncrementNextSummaryEndOfDayTicksAsync(new[] { project });
+                bool summarySent = await SendSummaryNotificationAsync(project, notification);
+                if (summarySent)
+                {
+                    await _projectRepository.IncrementNextSummaryEndOfDayTicksAsync(new[] { project });
 
-                        // Sleep so we are not hammering the backend as we just generated a report.
-                        await SystemClock.SleepAsync(TimeSpan.FromSeconds(2.5));
-                    }
-                    else
-                    {
+                    // Sleep so we are not hammering the backend as we just generated a report.
+                    await SystemClock.SleepAsync(TimeSpan.FromSeconds(2.5));
+                }
+                else
+                {
                         projectsToBulkUpdate.Add(project);
                     }
                 }
@@ -140,7 +140,7 @@ private async Task<bool> SendSummaryNotificationAsync(Project project, SummaryNo
         var organization = await _organizationRepository.GetByIdAsync(project.OrganizationId, o => o.Cache());
         if (organization is null)
         {
-            _logger.LogInformation("The organization {organization} for project {ProjectName} may have been deleted. No summaries will be sent", project.OrganizationId, project.Name);
+            _logger.LogInformation("The organization {Organization} for project {ProjectName} may have been deleted. No summaries will be sent", project.OrganizationId, project.Name);
             return false;
         }
 

src/Exceptionless.Core/Jobs/EventNotificationsJob.cs

@@ -1,4 +1,4 @@
-using Exceptionless.Core.Configuration;
+using Exceptionless.Core.Configuration;
 using Exceptionless.Core.Extensions;
 using Exceptionless.Core.Mail;
 using Exceptionless.Core.Models;
@@ -52,7 +52,7 @@ protected override async Task<JobResult> ProcessQueueEntryAsync(QueueEntryContex
 
         bool shouldLog = ev.ProjectId != _appOptions.InternalProjectId;
         int sent = 0;
-        if (shouldLog) _logger.LogTrace("Process notification: project={ProjectId} event={id} stack={stack}", ev.ProjectId, ev.Id, ev.StackId);
+        if (shouldLog) _logger.LogTrace("Process notification: project={ProjectId} event={Id} stack={Stack}", ev.ProjectId, ev.Id, ev.StackId);
 
         var project = await _projectRepository.GetByIdAsync(ev.ProjectId, o => o.Cache());
         if (project is null)
@@ -63,79 +63,79 @@ protected override async Task<JobResult> ProcessQueueEntryAsync(QueueEntryContex
             if (shouldLog) _logger.LogTrace("Loaded project: name={ProjectName}", project.Name);
 
             // after the first 2 occurrences, don't send a notification for the same stack more then once every 30 minutes
-            var lastTimeSentUtc = await _cache.GetAsync<DateTime>(String.Concat("notify:stack-throttle:", ev.StackId), DateTime.MinValue);
-            if (wi is { TotalOccurrences: > 2, IsRegression: false } && lastTimeSentUtc != DateTime.MinValue && lastTimeSentUtc > SystemClock.UtcNow.AddMinutes(-30))
-            {
-                if (shouldLog) _logger.LogInformation("Skipping message because of stack throttling: last sent={LastSentUtc} occurrences={TotalOccurrences}", lastTimeSentUtc, wi.TotalOccurrences);
-                return JobResult.Success;
-            }
+        var lastTimeSentUtc = await _cache.GetAsync<DateTime>(String.Concat("notify:stack-throttle:", ev.StackId), DateTime.MinValue);
+        if (wi is { TotalOccurrences: > 2, IsRegression: false } && lastTimeSentUtc != DateTime.MinValue && lastTimeSentUtc > SystemClock.UtcNow.AddMinutes(-30))
+        {
+            if (shouldLog) _logger.LogInformation("Skipping message because of stack throttling: last sent={LastSentUtc} occurrences={TotalOccurrences}", lastTimeSentUtc, wi.TotalOccurrences);
+            return JobResult.Success;
+        }
+
+        if (context.CancellationToken.IsCancellationRequested)
+            return JobResult.Cancelled;
 
-            if (context.CancellationToken.IsCancellationRequested)
-                return JobResult.Cancelled;
+        // don't send more than 10 notifications for a given project every 30 minutes
+        var projectTimeWindow = TimeSpan.FromMinutes(30);
+        string cacheKey = String.Concat("notify:project-throttle:", ev.ProjectId, "-", SystemClock.UtcNow.Floor(projectTimeWindow).Ticks);
+        double notificationCount = await _cache.IncrementAsync(cacheKey, 1, projectTimeWindow);
+        if (notificationCount > 10 && !wi.IsRegression)
+        {
+            if (shouldLog) _logger.LogInformation("Skipping message because of project throttling: count={NotificationCount}", notificationCount);
+            return JobResult.Success;
+        }
 
-            // don't send more than 10 notifications for a given project every 30 minutes
-            var projectTimeWindow = TimeSpan.FromMinutes(30);
-            string cacheKey = String.Concat("notify:project-throttle:", ev.ProjectId, "-", SystemClock.UtcNow.Floor(projectTimeWindow).Ticks);
-            double notificationCount = await _cache.IncrementAsync(cacheKey, 1, projectTimeWindow);
-            if (notificationCount > 10 && !wi.IsRegression)
+        foreach (var kv in project.NotificationSettings)
+        {
+            var settings = kv.Value;
+            if (shouldLog) _logger.LogTrace("Processing notification: {Key}", kv.Key);
+
+            bool isCritical = ev.IsCritical();
+            bool shouldReportNewError = settings.ReportNewErrors && wi.IsNew && ev.IsError();
+            bool shouldReportCriticalError = settings.ReportCriticalErrors && isCritical && ev.IsError();
+            bool shouldReportRegression = settings.ReportEventRegressions && wi.IsRegression;
+            bool shouldReportNewEvent = settings.ReportNewEvents && wi.IsNew;
+            bool shouldReportCriticalEvent = settings.ReportCriticalEvents && isCritical;
+            bool shouldReport = shouldReportNewError || shouldReportCriticalError || shouldReportRegression || shouldReportNewEvent || shouldReportCriticalEvent;
+
+            if (shouldLog)
             {
-                if (shouldLog) _logger.LogInformation("Skipping message because of project throttling: count={NotificationCount}", notificationCount);
-                return JobResult.Success;
+                _logger.LogTrace("Settings: new error={ReportNewErrors} critical error={ReportCriticalErrors} regression={ReportEventRegressions} new={ReportNewEvents} critical={ReportCriticalEvents}", settings.ReportNewErrors, settings.ReportCriticalErrors, settings.ReportEventRegressions, settings.ReportNewEvents, settings.ReportCriticalEvents);
+                _logger.LogTrace("Should process: new error={ShouldReportNewError} critical error={ShouldReportCriticalError} regression={ShouldReportRegression} new={ShouldReportNewEvent} critical={ShouldReportCriticalEvent}", shouldReportNewError, shouldReportCriticalError, shouldReportRegression, shouldReportNewEvent, shouldReportCriticalEvent);
             }
-
-            foreach (var kv in project.NotificationSettings)
+            var request = ev.GetRequestInfo();
+            // check for known bots if the user has elected to not report them
+            if (shouldReport && !String.IsNullOrEmpty(request?.UserAgent))
             {
-                var settings = kv.Value;
-                if (shouldLog) _logger.LogTrace("Processing notification: {Key}", kv.Key);
-
-                bool isCritical = ev.IsCritical();
-                bool shouldReportNewError = settings.ReportNewErrors && wi.IsNew && ev.IsError();
-                bool shouldReportCriticalError = settings.ReportCriticalErrors && isCritical && ev.IsError();
-                bool shouldReportRegression = settings.ReportEventRegressions && wi.IsRegression;
-                bool shouldReportNewEvent = settings.ReportNewEvents && wi.IsNew;
-                bool shouldReportCriticalEvent = settings.ReportCriticalEvents && isCritical;
-                bool shouldReport = shouldReportNewError || shouldReportCriticalError || shouldReportRegression || shouldReportNewEvent || shouldReportCriticalEvent;
-
-                if (shouldLog)
-                {
-                    _logger.LogTrace("Settings: new error={ReportNewErrors} critical error={ReportCriticalErrors} regression={ReportEventRegressions} new={ReportNewEvents} critical={ReportCriticalEvents}", settings.ReportNewErrors, settings.ReportCriticalErrors, settings.ReportEventRegressions, settings.ReportNewEvents, settings.ReportCriticalEvents);
-                    _logger.LogTrace("Should process: new error={ShouldReportNewError} critical error={ShouldReportCriticalError} regression={ShouldReportRegression} new={ShouldReportNewEvent} critical={ShouldReportCriticalEvent}", shouldReportNewError, shouldReportCriticalError, shouldReportRegression, shouldReportNewEvent, shouldReportCriticalEvent);
-                }
-                var request = ev.GetRequestInfo();
-                // check for known bots if the user has elected to not report them
-                if (shouldReport && !String.IsNullOrEmpty(request?.UserAgent))
-                {
-                    var botPatterns = project.Configuration.Settings.GetStringCollection(SettingsDictionary.KnownKeys.UserAgentBotPatterns).ToList();
-
-                    var info = await _parser.ParseAsync(request.UserAgent);
-                    if (info is not null && info.Device.IsSpider || request.UserAgent.AnyWildcardMatches(botPatterns))
-                    {
-                        shouldReport = false;
-                        if (shouldLog) _logger.LogInformation("Skipping because event is from a bot {UserAgent}", request.UserAgent);
-                    }
-                }
+                var botPatterns = project.Configuration.Settings.GetStringCollection(SettingsDictionary.KnownKeys.UserAgentBotPatterns).ToList();
 
-                if (!shouldReport)
-                    continue;
-
-                bool processed = kv.Key switch
+                var info = await _parser.ParseAsync(request.UserAgent);
+                if (info is not null && info.Device.IsSpider || request.UserAgent.AnyWildcardMatches(botPatterns))
                 {
-                    Project.NotificationIntegrations.Slack => await _slackService
-                        .SendEventNoticeAsync(ev, project, wi.IsNew, wi.IsRegression)
-                        ,
-                    _ => await SendEmailNotificationAsync(kv.Key, project, ev, wi, shouldLog)
-                };
-
-                if (shouldLog) _logger.LogTrace("Finished processing notification: {Key}", kv.Key);
-                if (processed)
-                    sent++;
+                    shouldReport = false;
+                    if (shouldLog) _logger.LogInformation("Skipping because event is from a bot {UserAgent}", request.UserAgent);
+                }
             }
 
-            // if we sent any notifications, mark the last time a notification for this stack was sent.
-            if (sent > 0)
+            if (!shouldReport)
+                continue;
+
+            bool processed = kv.Key switch
             {
+                Project.NotificationIntegrations.Slack => await _slackService
+                    .SendEventNoticeAsync(ev, project, wi.IsNew, wi.IsRegression)
+                ,
+                _ => await SendEmailNotificationAsync(kv.Key, project, ev, wi, shouldLog)
+            };
+
+            if (shouldLog) _logger.LogTrace("Finished processing notification: {Key}", kv.Key);
+            if (processed)
+                sent++;
+        }
+
+        // if we sent any notifications, mark the last time a notification for this stack was sent.
+        if (sent > 0)
+        {
                 await _cache.SetAsync(String.Concat("notify:stack-throttle:", ev.StackId), SystemClock.UtcNow, SystemClock.UtcNow.AddMinutes(15));
-                if (shouldLog) _logger.LogInformation("Notifications sent: event={id} stack={stack} count={SentCount}", ev.Id, ev.StackId, sent);
+                if (shouldLog) _logger.LogInformation("Notifications sent: event={Id} stack={Stack} count={SentCount}", ev.Id, ev.StackId, sent);
             }
         }
         return JobResult.Success;
@@ -164,7 +164,7 @@ private async Task<bool> SendEmailNotificationAsync(string userId, Project proje
 
         if (!user.OrganizationIds.Contains(project.OrganizationId))
         {
-            if (shouldLog) _logger.LogError("Unauthorized user: project={ProjectId} user={UserId} organization={organization} event={id}", project.Id, userId, project.OrganizationId, ev.Id);
+            if (shouldLog) _logger.LogError("Unauthorized user: project={ProjectId} user={UserId} organization={Organization} event={Id}", project.Id, userId, project.OrganizationId, ev.Id);
             return false;
         }