Merge remote-tracking branch 'origin/feature/custom-fields' into feature/custom-fields

# Conflicts:
#	src/Exceptionless.Core/Models/PersistentEvent.cs
#	src/Exceptionless.Core/Repositories/EventRepository.cs
#	tests/Exceptionless.Tests/Migrations/FixDuplicateStacksMigrationTests.cs
#	tests/Exceptionless.Tests/Search/EventIndexTests.cs
#	tests/Exceptionless.Tests/Search/PersistentEventQueryValidatorTests.cs

Author: niemyjski

src/Exceptionless.Core/Exceptionless.Core.csproj

@@ -38,5 +38,11 @@
     <ProjectReference
       Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj"
       Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
+    <PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="7.17.15-alpha.0.5" Condition="'$(ReferenceFoundatioRepositoriesSource)' == '' OR '$(ReferenceFoundatioRepositoriesSource)' == 'false'" />
+    <ProjectReference Include="..\..\..\..\Foundatio\Foundatio.Repositories\src\Foundatio.Repositories.Elasticsearch\Foundatio.Repositories.Elasticsearch.csproj" Condition="'$(ReferenceFoundatioRepositoriesSource)' == 'true'" />
+  </ItemGroup>
+
+  <ItemGroup Label="Transitive dependency updates to resolve vulnerability warnings">
+    <PackageReference Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
 </Project>

src/Exceptionless.Core/Repositories/Configuration/ExceptionlessElasticConfiguration.cs

@@ -50,6 +50,7 @@ ILoggerFactory loggerFactory
         AddIndex(Tokens = new TokenIndex(this));
         AddIndex(Users = new UserIndex(this));
         AddIndex(WebHooks = new WebHookIndex(this));
+        AddCustomFieldIndex(_appOptions.ElasticsearchOptions.ScopePrefix + "customfields", appOptions.ElasticsearchOptions.NumberOfReplicas);
     }
 
     public Task RunAsync(CancellationToken shutdownToken = default)

src/Exceptionless.Core/Repositories/Configuration/Indexes/EventIndex.cs

@@ -21,6 +21,8 @@ public sealed class EventIndex : DailyIndex<PersistentEvent>
 
     public EventIndex(ExceptionlessElasticConfiguration configuration, IServiceProvider serviceProvider, AppOptions appOptions) : base(configuration, configuration.Options.ScopePrefix + "events", 1, doc => ((PersistentEvent)doc).Date.UtcDateTime)
     {
+        AddStandardCustomFieldTypes();
+
         _configuration = configuration;
         _serviceProvider = serviceProvider;
 
@@ -70,7 +72,6 @@ public override TypeMappingDescriptor<PersistentEvent> ConfigureIndexMapping(Typ
                 .Scalar(f => f.Count)
                 .Boolean(f => f.Name(e => e.IsFirstOccurrence))
                     .FieldAlias(a => a.Name(Alias.IsFirstOccurrence).Path(f => f.IsFirstOccurrence))
-                .Object<object>(f => f.Name(e => e.Idx).Dynamic())
                 .Object<DataDictionary>(f => f.Name(e => e.Data).Properties(p2 => p2
                     .AddVersionMapping()
                     .AddLevelMapping()

tests/Exceptionless.Tests/AppWebHostFactory.cs

@@ -45,7 +45,8 @@ private static async Task<DistributedApplication> StartSharedApplicationAsync()
 
         var elasticsearch = builder.AddElasticsearch("Elasticsearch", port: 9200)
             .WithContainerName("Exceptionless-Elasticsearch-Test")
-            .WithLifetime(ContainerLifetime.Persistent);
+            .WithLifetime(ContainerLifetime.Persistent)
+            .WithKibana(b => b.WithLifetime(ContainerLifetime.Persistent).WithContainerName("Exceptionless-Kibana-Test"));
 
         var app = builder.Build();
 

tests/Exceptionless.Tests/Migrations/FixDuplicateStacksMigrationTests.cs

@@ -10,6 +10,7 @@
 using Foundatio.Utility;
 using Nest;
 using Xunit;
+using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace Exceptionless.Tests.Migrations;
 
@@ -38,6 +39,7 @@ protected override void RegisterServices(IServiceCollection services)
     [Fact]
     public async Task WillMergeDuplicatedStacks()
     {
+        Log.DefaultMinimumLevel = LogLevel.Trace;
         var originalStack = _stackData.GenerateStack();
         originalStack.Id = ObjectId.GenerateNewId().ToString();
         originalStack.TotalOccurrences = 100;