Will now store one new report per day once the report limit per incident is reached. In that way we get fresh data per incident without putting preasure on the system

Author: jgauffin

src/Server/Coderr.Server.App/Core/Reports/Config/ReportConfig.cs renamed to src/Server/Coderr.Server.Abstractions/Reports/ReportConfig.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Coderr.Server.Abstractions.Config;
 
-namespace Coderr.Server.App.Core.Reports.Config
+namespace Coderr.Server.Abstractions.Reports
 {
     /// <summary>
     ///     Configuration settings for reports.

src/Server/Coderr.Server.App/Coderr.Server.App.csproj

@@ -40,5 +40,6 @@
   <ItemGroup>
     <Folder Include="Core\Environments\" />
     <Folder Include="Core\Incidents\Events\" />
+    <Folder Include="Core\Reports\Config\" />
   </ItemGroup>
 </Project>

src/Server/Coderr.Server.App/Core/Incidents/Jobs/DeleteEmptyIncidents.cs

@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Abstractions.Config;
-using Coderr.Server.App.Core.Reports.Config;
+using Coderr.Server.Abstractions.Reports;
 using Griffin.ApplicationServices;
 using Griffin.Data;
 using Griffin.Data.Mapper;

src/Server/Coderr.Server.App/Core/Reports/Jobs/DeleteReportsBelowReportLimit.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Abstractions.Config;
-using Coderr.Server.App.Core.Reports.Config;
+using Coderr.Server.Abstractions.Reports;
 using Griffin.ApplicationServices;
 using Griffin.Data;
 using log4net;

src/Server/Coderr.Server.ReportAnalyzer/Inbound/Handlers/Reports/ReportAnalyzer.cs

@@ -3,6 +3,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Coderr.Server.Abstractions.Boot;
+using Coderr.Server.Abstractions.Config;
+using Coderr.Server.Abstractions.Reports;
 using Coderr.Server.Domain.Core.ErrorReports;
 using Coderr.Server.Domain.Core.Incidents.Events;
 using Coderr.Server.ReportAnalyzer.Abstractions;
@@ -27,7 +29,8 @@ public class ReportAnalyzer : IReportAnalyzer
         private readonly IHashCodeGenerator _hashCodeGenerator;
         private readonly ILog _logger = LogManager.GetLogger(typeof(ReportAnalyzer));
         private readonly IAnalyticsRepository _repository;
-        private IDomainQueue _domainQueue;
+        private readonly IDomainQueue _domainQueue;
+
         /// <summary>
         ///     Creates a new instance of <see cref="ReportAnalyzer" />.
         /// </summary>
@@ -77,7 +80,7 @@ public async Task Analyze(IMessageContext context, ErrorReportEntity report)
                 var reportJson = JsonConvert.SerializeObject(report);
                 if (reportJson.Length > 1000000)
                     reportJson = reportJson.Substring(0, 100000) + "[....]";
-                _logger.Fatal("Failed to init report " + reportJson, ex);
+                _logger.Fatal($"Failed to init report {reportJson}", ex);
                 return;
             }
 
@@ -133,20 +136,28 @@ public async Task Analyze(IMessageContext context, ErrorReportEntity report)
                 }
 
                 incident.AddReport(report);
-                _repository.UpdateIncident(incident);
-                if (incident.ReportCount > 25)
+
+                // Let's continue to receive reports once a day when
+                // limit is reached (to get more fresh data, and still not load the system unnecessary).
+                var timesSinceLastReport = DateTime.UtcNow.Subtract(incident.LastStoredReportUtc);
+                if (incident.ReportCount > 25
+                    && timesSinceLastReport < TimeSpan.FromDays(1))
                 {
-                    _logger.Debug("Report count is more than 25. Storing only report stats for incident " + incident.Id);
+                    _repository.UpdateIncident(incident);
+                    _logger.Debug($"Report count is more than 25. Ignoring report for incident {incident.Id}.");
                     return;
                 }
+
+                incident.LastStoredReportUtc = DateTime.UtcNow;
+                _repository.UpdateIncident(incident);
             }
 
             if (!string.IsNullOrWhiteSpace(report.EnvironmentName))
                 _repository.SaveEnvironmentName(incident.Id, report.EnvironmentName);
 
             report.IncidentId = incident.Id;
             _repository.CreateReport(report);
-            _logger.Debug("saving report " + report.Id + " for incident " + incident.Id);
+            _logger.Debug($"saving report {report.Id} for incident {incident.Id}");
 
             await _repository.StoreReportStats(new ReportMapping()
             {
@@ -177,7 +188,7 @@ await _repository.StoreReportStats(new ReportMapping()
             await context.SendAsync(new ProcessInboundContextCollections());
 
             if (sw.ElapsedMilliseconds > 200)
-                _logger.Debug("PublishAsync took " + sw.ElapsedMilliseconds);
+                _logger.Debug($"PublishAsync took {sw.ElapsedMilliseconds}");
             sw.Stop();
         }
 

src/Server/Coderr.Server.ReportAnalyzer/Incidents/IncidentBeingAnalyzed.cs

@@ -138,8 +138,16 @@ public string Description
         /// </summary>
         public bool IsReOpened { get; set; }
 
+        /// <summary>
+        /// When we received a report (just to keep track of how fresh this incident is).
+        /// </summary>
         public DateTime LastReportAtUtc { get; set; }
 
+        /// <summary>
+        /// When we received a report that we stored.
+        /// </summary>
+        public DateTime LastStoredReportUtc { get; set; }
+
         /// <summary>
         ///     Set if incident was closed and a solution was written
         /// </summary>

src/Server/Coderr.Server.ReportAnalyzer/ReportSpikes/Handlers/CheckForReportPeak.cs renamed to src/Server/Coderr.Server.ReportAnalyzer/ReportSpikes/Handlers/CheckForReportSpike.cs

@@ -22,20 +22,20 @@ namespace Coderr.Server.ReportAnalyzer.ReportSpikes.Handlers
 {
     /// <summary>
     /// </summary>
-    public class CheckForReportPeak : IMessageHandler<ReportAddedToIncident>
+    public class CheckForReportSpike : IMessageHandler<ReportAddedToIncident>
     {
         private readonly IUserNotificationsRepository _repository;
         private readonly IReportSpikeRepository _spikeRepository;
         private readonly BaseConfiguration _baseConfiguration;
         private readonly INotificationService _notificationService;
 
         /// <summary>
-        ///     Creates a new instance of <see cref="CheckForReportPeak" />.
+        ///     Creates a new instance of <see cref="CheckForReportSpike" />.
         /// </summary>
         /// <param name="repository">To check if spikes should be analyzed</param>
         /// <param name="spikeRepository">store/fetch information of current spikes.</param>
         /// <param name="baseConfiguration"></param>
-        public CheckForReportPeak(IUserNotificationsRepository repository, IReportSpikeRepository spikeRepository, IConfiguration<BaseConfiguration> baseConfiguration, INotificationService notificationService)
+        public CheckForReportSpike(IUserNotificationsRepository repository, IReportSpikeRepository spikeRepository, IConfiguration<BaseConfiguration> baseConfiguration, INotificationService notificationService)
         {
             _repository = repository;
             _spikeRepository = spikeRepository;
@@ -138,7 +138,7 @@ private EmailMessage BuildEmail(ReportAddedToIncident e, UserNotificationSetting
             {
                 Subject = $"Spike detected for {e.Incident.ApplicationName} ({countToday} reports)",
                 HtmlBody =
-                    $"We've detected a spike in incoming reports for application <a href=\"{_baseConfiguration.BaseUrl}/discover/{e.Incident.ApplicationId}/\">{e.Incident.ApplicationName}</a>\r\n" +
+                    $"We've detected a spike in incoming reports for application <a href=\"{_baseConfiguration.BaseUrl}discover/{e.Incident.ApplicationId}/\">{e.Incident.ApplicationName}</a>\r\n" +
                     "\r\n" +
                     $"We've received {countToday.SpikeCount} reports so far. Day average is {countToday.DayAverage}\r\n" +
                     "\r\n" + "No further spike emails will be sent today for this application."

src/Server/Coderr.Server.SqlServer/Coderr.Server.SqlServer.csproj

@@ -27,9 +27,4 @@
     <EmbeddedResource Include="Schema\*.sql" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="Schema\Coderr.v21.sql" />
-    <None Remove="Schema\Coderr.v22.sql" />
-  </ItemGroup>
-
 </Project>

src/Server/Coderr.Server.SqlServer/Migrations/MigrationScripts.cs

@@ -75,18 +75,22 @@ public void Execute(IDbConnection connection, int version)
 
         private static void ExecuteSql(IDbConnection connection, string sql)
         {
-            using (var transaction = connection.BeginTransaction())
+            var parts = sql.Split(new[] {"\r\ngo\r\n", "\r\nGO\r\n", "\r\ngo;\r\n"},
+                StringSplitOptions.RemoveEmptyEntries);
+            foreach (var part in parts)
             {
-                using (var cmd = connection.CreateCommand())
+                using (var transaction = connection.BeginTransaction())
                 {
-                    cmd.Transaction = transaction;
-                    cmd.CommandText = sql;
-                    cmd.ExecuteNonQuery();
+                    using (var cmd = connection.CreateCommand())
+                    {
+                        cmd.Transaction = transaction;
+                        cmd.CommandText = part;
+                        cmd.ExecuteNonQuery();
+                    }
+
+                    transaction.Commit();
                 }
-
-                transaction.Commit();
             }
-
         }
 
         public int GetHighestVersion()

src/Server/Coderr.Server.SqlServer/Schema/Coderr.v23.sql

@@ -0,0 +1,3 @@
+ALTER TABLE Incidents ADD LastStoredReportUtc datetime;
+go
+UPDATE Incidents SET LastStoredReportUtc = LastReportAtUtc;