Fix Foundatio NRT nullable reference type errors

src/Directory.Build.props

@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.201" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.202" PrivateAssets="All"/>
     <PackageReference Include="AsyncFixer" Version="2.1.0" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
   </ItemGroup>

src/Exceptionless.Core/Billing/StripeEventHandler.cs

@@ -153,6 +153,12 @@ private async Task InvoicePaymentSucceededAsync(Invoice invoice)
             return;
         }
 
+        if (String.IsNullOrEmpty(org.BillingChangedByUserId))
+        {
+            _logger.LogError("No billing user set for organization: {OrganizationId}", org.Id);
+            return;
+        }
+
         var user = await _userRepository.GetByIdAsync(org.BillingChangedByUserId);
         if (user is null)
         {
@@ -172,6 +178,12 @@ private async Task InvoicePaymentFailedAsync(Invoice invoice)
             return;
         }
 
+        if (String.IsNullOrEmpty(org.BillingChangedByUserId))
+        {
+            _logger.LogError("No billing user set for organization: {OrganizationId}", org.Id);
+            return;
+        }
+
         var user = await _userRepository.GetByIdAsync(org.BillingChangedByUserId);
         if (user is null)
         {

src/Exceptionless.Core/Configuration/CacheOptions.cs

@@ -8,7 +8,7 @@ public class CacheOptions
 {
     public string? ConnectionString { get; internal set; }
     public string? Provider { get; internal set; }
-    public Dictionary<string, string> Data { get; internal set; } = null!;
+    public Dictionary<string, string?> Data { get; internal set; } = null!;
 
     public string Scope { get; internal set; } = null!;
     public string ScopePrefix { get; internal set; } = null!;
@@ -26,7 +26,7 @@ public static CacheOptions ReadFromConfiguration(IConfiguration config, AppOptio
             string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
 
             var providerOptions = providerConnectionString.ParseConnectionString(defaultKey: "server");
-            options.Data ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            options.Data ??= new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
             options.Data.AddRange(providerOptions);
 
             options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });

src/Exceptionless.Core/Configuration/MessageBusOptions.cs

@@ -8,7 +8,7 @@ public class MessageBusOptions
 {
     public string? ConnectionString { get; internal set; }
     public string? Provider { get; internal set; }
-    public Dictionary<string, string> Data { get; internal set; } = null!;
+    public Dictionary<string, string?> Data { get; internal set; } = null!;
 
     public string Scope { get; internal set; } = null!;
     public string ScopePrefix { get; internal set; } = null!;
@@ -29,7 +29,7 @@ public static MessageBusOptions ReadFromConfiguration(IConfiguration config, App
             string? providerConnectionString = !String.IsNullOrEmpty(options.Provider) ? config.GetConnectionString(options.Provider) : null;
 
             var providerOptions = providerConnectionString.ParseConnectionString(defaultKey: "server");
-            options.Data ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            options.Data ??= new Dictionary<string, string?>(StringComparer.OrdinalIgnoreCase);
             options.Data.AddRange(providerOptions);
 
             options.ConnectionString = options.Data.BuildConnectionString(new HashSet<string> { nameof(options.Provider) });

src/Exceptionless.Core/Configuration/MetricOptions.cs

@@ -8,7 +8,7 @@ public class MetricOptions
 {
     public string? ConnectionString { get; internal set; }
     public string? Provider { get; internal set; }
-    public Dictionary<string, string> Data { get; internal set; } = null!;
+    public Dictionary<string, string?> Data { get; internal set; } = null!;
 
     public static MetricOptions ReadFromConfiguration(IConfiguration config)
     {

src/Exceptionless.Core/Configuration/QueueOptions.cs

@@ -8,7 +8,7 @@ public class QueueOptions
 {
     public string? ConnectionString { get; internal set; }
     public string? Provider { get; internal set; }
-    public Dictionary<string, string> Data { get; internal set; } = new(StringComparer.OrdinalIgnoreCase);
+    public Dictionary<string, string?> Data { get; internal set; } = new(StringComparer.OrdinalIgnoreCase);
 
     public string Scope { get; internal set; } = null!;
     public string ScopePrefix { get; internal set; } = null!;

src/Exceptionless.Core/Configuration/StorageOptions.cs

@@ -8,7 +8,7 @@ public class StorageOptions
 {
     public string? ConnectionString { get; internal set; }
     public string? Provider { get; internal set; }
-    public Dictionary<string, string> Data { get; internal set; } = new(StringComparer.OrdinalIgnoreCase);
+    public Dictionary<string, string?> Data { get; internal set; } = new(StringComparer.OrdinalIgnoreCase);
 
     public string Scope { get; internal set; } = null!;
     public string ScopePrefix { get; internal set; } = null!;

src/Exceptionless.Core/Exceptionless.Core.csproj

@@ -22,19 +22,19 @@
   <ItemGroup>
     <PackageReference Include="Exceptionless.DateTimeExtensions" Version="6.0.1" />
     <PackageReference Include="FluentValidation" Version="12.1.1" />
-    <PackageReference Include="Foundatio.Extensions.Hosting" Version="13.0.0-beta3.23" />
-    <PackageReference Include="Foundatio.JsonNet" Version="13.0.0-beta3.23" />
+    <PackageReference Include="Foundatio.Extensions.Hosting" Version="13.0.0-beta6" />
+    <PackageReference Include="Foundatio.JsonNet" Version="13.0.0-beta6" />
     <PackageReference Include="MiniValidation" Version="0.9.2" />
     <PackageReference Include="NEST.JsonNetSerializer" Version="7.17.5" />
     <PackageReference Include="Handlebars.Net" Version="2.1.6" />
     <PackageReference Include="McSherry.SemanticVersioning" Version="1.4.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.6" />
     <PackageReference Include="Stripe.net" Version="47.4.0" />
-    <PackageReference Include="System.DirectoryServices" Version="10.0.5" />
+    <PackageReference Include="System.DirectoryServices" Version="10.0.6" />
     <PackageReference Include="UAParser" Version="3.1.47" />
-    <PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.18.0-beta4.27" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
+    <PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.18.0-beta6" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
     <ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
   </ItemGroup>
 </Project>

src/Exceptionless.Core/Extensions/DictionaryExtensions.cs

@@ -141,12 +141,12 @@ public static int GetCollectionHashCode<TValue>(this IDictionary<string, TValue>
         return hashCode;
     }
 
-    public static T? GetValueOrDefault<T>(this IDictionary<string, string> source, string key, T? defaultValue = default)
+    public static T? GetValueOrDefault<T>(this IDictionary<string, string?> source, string key, T? defaultValue = default)
     {
         if (!source.ContainsKey(key))
             return defaultValue;
 
-        object data = source[key];
+        object? data = source[key];
         if (data is T variable)
             return variable;
 
@@ -162,12 +162,12 @@ public static int GetCollectionHashCode<TValue>(this IDictionary<string, TValue>
         return defaultValue;
     }
 
-    public static string GetString(this IDictionary<string, string> source, string name)
+    public static string GetString(this IDictionary<string, string?> source, string name)
     {
         return source.GetString(name, String.Empty);
     }
 
-    public static string GetString(this IDictionary<string, string> source, string name, string @default)
+    public static string GetString(this IDictionary<string, string?> source, string name, string @default)
     {
         if (!source.TryGetValue(name, out string? value) || value is null)
             return @default;

src/Exceptionless.Core/Extensions/EnumerableExtensions.cs

@@ -7,7 +7,7 @@ public static class EnumerableExtensions
 {
     public static IReadOnlyCollection<T> UnionOriginalAndModified<T>(this IReadOnlyCollection<ModifiedDocument<T>> documents) where T : class, new()
     {
-        return documents.Select(d => d.Value).Union(documents.Select(d => d.Original).Where(d => d is not null)).ToList();
+        return documents.Select(d => d.Value).Union(documents.Select(d => d.Original).OfType<T>()).ToList();
     }
 
     public static bool Contains<T>(this IEnumerable<T> enumerable, Func<T, bool> function)

src/Exceptionless.Core/Jobs/CleanupDataJob.cs

@@ -61,9 +61,9 @@ ILoggerFactory loggerFactory
         _cacheClient = cacheClient;
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(CleanupDataJob), TimeSpan.FromMinutes(15), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(CleanupDataJob), TimeSpan.FromMinutes(15), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)
@@ -91,7 +91,12 @@ private async Task MarkTokensSuspended(JobContext context)
 
         do
         {
-            long updatedCount = await _tokenRepository.PatchAllAsync(q => q.Organization(suspendedOrganizations.Hits.Select(o => o.Id)).FieldEquals(t => t.IsSuspended, false), new PartialPatch(new { is_suspended = true }));
+            // Foundatio Hits can contain null elements, so filter them before accessing properties.
+            var suspendedOrganizationIds = suspendedOrganizations.Hits
+                .Where(o => o is not null && o.Id is not null)
+                .Select(o => o!.Id!)
+                .ToList();
+            long updatedCount = await _tokenRepository.PatchAllAsync(q => q.Organization(suspendedOrganizationIds).FieldEquals(t => t.IsSuspended, false), new PartialPatch(new { is_suspended = true }));
             if (updatedCount > 0)
                 _logger.LogInformation("Marking {SuspendedTokenCount} tokens as suspended", updatedCount);
         } while (!context.CancellationToken.IsCancellationRequested && await suspendedOrganizations.NextPageAsync());

src/Exceptionless.Core/Jobs/CleanupOrphanedDataJob.cs

@@ -42,9 +42,9 @@ ILoggerFactory loggerFactory
         _lockProvider = lockProvider;
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(CleanupOrphanedDataJob), TimeSpan.FromHours(2), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(CleanupOrphanedDataJob), TimeSpan.FromHours(2), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)

src/Exceptionless.Core/Jobs/CloseInactiveSessionsJob.cs

@@ -36,9 +36,9 @@ ILoggerFactory loggerFactory
         _jsonOptions = jsonOptions;
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(CloseInactiveSessionsJob), TimeSpan.FromMinutes(15), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(CloseInactiveSessionsJob), TimeSpan.FromMinutes(15), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)

src/Exceptionless.Core/Jobs/DailySummaryJob.cs

@@ -51,9 +51,9 @@ ILoggerFactory loggerFactory
         _lockProvider = new ThrottlingLockProvider(cacheClient, 1, TimeSpan.FromHours(1), timeProvider, resiliencePolicyProvider, loggerFactory);
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(DailySummaryJob), TimeSpan.FromHours(1), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(DailySummaryJob), TimeSpan.FromHours(1), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)

src/Exceptionless.Core/Jobs/DownloadGeoIPDatabaseJob.cs

@@ -30,9 +30,9 @@ ILoggerFactory loggerFactory
         _lockProvider = new ThrottlingLockProvider(cacheClient, 1, TimeSpan.FromDays(1), timeProvider, resiliencePolicyProvider, loggerFactory);
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(DownloadGeoIPDatabaseJob), TimeSpan.FromHours(2), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(DownloadGeoIPDatabaseJob), TimeSpan.FromHours(2), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)

src/Exceptionless.Core/Jobs/Elastic/DataMigrationJob.cs

@@ -141,7 +141,7 @@ protected override async Task<JobResult> RunInternalAsync(JobContext context)
                 var status = taskStatus?.Task?.Status;
                 if (taskStatus?.Task is null || status is null)
                 {
-                    _logger.LogWarning(taskStatus?.OriginalException, "Error getting task status for {TargetIndex} {TaskId}: {Message}", workItem.TargetIndex, workItem.TaskId, taskStatus.GetErrorMessage());
+                    _logger.LogWarning(taskStatus?.OriginalException, "Error getting task status for {TargetIndex} {TaskId}: {Message}", workItem.TargetIndex, workItem.TaskId, taskStatus?.GetErrorMessage());
                     if (taskStatus?.ServerError?.Status == 429)
                         await Task.Delay(TimeSpan.FromSeconds(1), _timeProvider);
 

src/Exceptionless.Core/Jobs/EventNotificationsJob.cs

@@ -60,7 +60,8 @@ public EventNotificationsJob(IQueue<EventNotification> queue,
 
     protected override async Task<JobResult> ProcessQueueEntryAsync(QueueEntryContext<EventNotification> context)
     {
-        var wi = context.QueueEntry.Value;
+        var wi = context.QueueEntry.Value!;
+
         var ev = await _eventRepository.GetByIdAsync(wi.EventId);
         if (ev is null)
             return JobResult.SuccessWithMessage($"Could not load event: {wi.EventId}");

src/Exceptionless.Core/Jobs/EventPostsJob.cs

@@ -5,13 +5,13 @@
 using Exceptionless.Core.Plugins.EventParser;
 using Exceptionless.Core.Queues.Models;
 using Exceptionless.Core.Repositories;
-using Foundatio.Repositories.Exceptions;
 using Exceptionless.Core.Services;
 using Exceptionless.Core.Validation;
 using FluentValidation;
 using Foundatio.Jobs;
 using Foundatio.Queues;
 using Foundatio.Repositories;
+using Foundatio.Repositories.Exceptions;
 using Foundatio.Resilience;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -54,10 +54,11 @@ public EventPostsJob(IQueue<EventPost> queue, EventPostService eventPostService,
     protected override async Task<JobResult> ProcessQueueEntryAsync(QueueEntryContext<EventPost> context)
     {
         var entry = context.QueueEntry;
-        var ep = entry.Value;
+        var ep = entry.Value!;
+
         using var _ = _logger.BeginScope(new ExceptionlessState().Organization(ep.OrganizationId).Project(ep.ProjectId));
 
-        string payloadPath = Path.ChangeExtension(entry.Value.FilePath, ".payload");
+        string payloadPath = Path.ChangeExtension(ep.FilePath, ".payload");
         var payloadTask = AppDiagnostics.PostsMarkFileActiveTime.TimeAsync(() => _eventPostService.GetEventPostPayloadAsync(payloadPath));
         var projectTask = _projectRepository.GetByIdAsync(ep.ProjectId, o => o.Cache());
         var organizationTask = _organizationRepository.GetByIdAsync(ep.OrganizationId, o => o.Cache());
@@ -124,7 +125,10 @@ protected override async Task<JobResult> ProcessQueueEntryAsync(QueueEntryContex
         if (uncompressedData.Length > maxEventPostSize)
         {
             var org = await organizationTask;
-            await _usageService.IncrementTooBigAsync(org.Id, project.Id);
+            if (org is not null)
+                await _usageService.IncrementTooBigAsync(org.Id, project.Id);
+            else
+                _logger.LogWarning("Organization {OrganizationId} not found, skipping too-big usage increment for event post {EventPostId}", ep.OrganizationId, entry.Id);
             await CompleteEntryAsync(entry, ep, _timeProvider.GetUtcNow().UtcDateTime);
             return JobResult.FailedWithMessage($"Unable to process decompressed EventPost data '{payloadPath}' ({payload.Length} bytes compressed, {uncompressedData.Length} bytes): Maximum uncompressed event post size limit ({maxEventPostSize} bytes) reached.");
         }
@@ -322,7 +326,7 @@ await _eventPostService.EnqueueAsync(new EventPost(false)
                 if (!isInternalProject && _logger.IsEnabled(LogLevel.Critical))
                 {
                     using (_logger.BeginScope(new ExceptionlessState().Property("Event", new { ev.Date, ev.StackId, ev.Type, ev.Source, ev.Message, ev.Value, ev.Geo, ev.ReferenceId, ev.Tags })))
-                        _logger.LogCritical(ex, "Error while requeuing event post {FilePath}: {Message}", queueEntry.Value.FilePath, ex.Message);
+                        _logger.LogCritical(ex, "Error while requeuing event post {QueueEntryId} {FilePath}: {Message}", queueEntry.Id, queueEntry.Value!.FilePath, ex.Message);
                 }
 
                 AppDiagnostics.EventsRetryErrors.Add(1);
@@ -335,12 +339,12 @@ private Task AbandonEntryAsync(IQueueEntry<EventPost> queueEntry)
         return AppDiagnostics.PostsAbandonTime.TimeAsync(queueEntry.AbandonAsync);
     }
 
-    private Task CompleteEntryAsync(IQueueEntry<EventPost> entry, EventPostInfo eventPostInfo, DateTime created)
+    private Task CompleteEntryAsync(IQueueEntry<EventPost> entry, EventPost eventPost, DateTime created)
     {
         return AppDiagnostics.PostsCompleteTime.TimeAsync(async () =>
         {
             await entry.CompleteAsync();
-            await _eventPostService.CompleteEventPostAsync(entry.Value.FilePath, eventPostInfo.ProjectId, created, entry.Value.ShouldArchive);
+            await _eventPostService.CompleteEventPostAsync(eventPost.FilePath, eventPost.ProjectId, created, eventPost.ShouldArchive);
         });
     }
 

src/Exceptionless.Core/Jobs/EventUsageJob.cs

@@ -24,9 +24,9 @@ ILoggerFactory loggerFactory
         _lockProvider = lockProvider;
     }
 
-    protected override Task<ILock> GetLockAsync(CancellationToken cancellationToken = default)
+    protected override Task<ILock?> GetLockAsync(CancellationToken cancellationToken = default)
     {
-        return _lockProvider.AcquireAsync(nameof(EventUsageJob), TimeSpan.FromMinutes(4), new CancellationToken(true));
+        return _lockProvider.AcquireAsync(nameof(EventUsageJob), TimeSpan.FromMinutes(4), cancellationToken);
     }
 
     protected override async Task<JobResult> RunInternalAsync(JobContext context)