Switched Elastic client from NEST to Elastic.Clients.Elasticsearch

Bumped also other dependencies (OpenTelemetry, Marten, etc.)
ritasker · Mar 5, 2023 · 2ee4a70 · 2ee4a70
1 parent 1abd4e2
commit 2ee4a70
Show file tree

Hide file tree

Showing 101 changed files with 185 additions and 185 deletions.
diff --git a/Core.ElasticSearch/Config.cs b/Core.ElasticSearch/Config.cs
@@ -1,7 +1,7 @@
 using Core.Configuration;
+using Elastic.Clients.Elasticsearch;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Nest;
 
 namespace Core.ElasticSearch;
 
@@ -16,17 +16,17 @@ public static class ElasticSearchConfigExtensions
     private const string DefaultConfigKey = "ElasticSearch";
 
     public static IServiceCollection AddElasticsearch(
-        this IServiceCollection services, IConfiguration configuration, Action<ConnectionSettings>? config = null)
+        this IServiceCollection services, IConfiguration configuration, Action<ElasticsearchClientSettings>? config = null)
     {
         var elasticSearchConfig = configuration.GetRequiredConfig<ElasticSearchConfig>(DefaultConfigKey);
 
-        var settings = new ConnectionSettings(new Uri(elasticSearchConfig.Url))
+        var settings = new ElasticsearchClientSettings(new Uri(elasticSearchConfig.Url))
             .DefaultIndex(elasticSearchConfig.DefaultIndex);
 
         config?.Invoke(settings);
 
-        var client = new ElasticClient(settings);
+        var client = new ElasticsearchClient(settings);
 
-        return services.AddSingleton<IElasticClient>(client);
+        return services.AddSingleton(client);
     }
 }
diff --git a/Core.ElasticSearch/Core.ElasticSearch.csproj b/Core.ElasticSearch/Core.ElasticSearch.csproj
@@ -6,7 +6,7 @@
 
 
     <ItemGroup>
-        <PackageReference Include="NEST" Version="7.17.5" />
+        <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.0.5" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.3" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />

diff --git a/Core.ElasticSearch/Projections/ElasticSearchProjection.cs b/Core.ElasticSearch/Projections/ElasticSearchProjection.cs
@@ -1,21 +1,20 @@
 using Core.ElasticSearch.Indices;
 using Core.Events;
 using Core.Projections;
-using Elasticsearch.Net;
+using Elastic.Clients.Elasticsearch;
 using Microsoft.Extensions.DependencyInjection;
-using Nest;
 
 namespace Core.ElasticSearch.Projections;
 
 public class ElasticSearchProjection<TEvent, TView> : IEventHandler<EventEnvelope<TEvent>>
     where TView : class, IProjection
     where TEvent : notnull
 {
-    private readonly IElasticClient elasticClient;
+    private readonly ElasticsearchClient elasticClient;
     private readonly Func<TEvent, string> getId;
 
     public ElasticSearchProjection(
-        IElasticClient elasticClient,
+        ElasticsearchClient elasticClient,
         Func<TEvent, string> getId
     )
     {
@@ -50,7 +49,7 @@ public static IServiceCollection Project<TEvent, TView>(this IServiceCollection
     {
         services.AddTransient<IEventHandler<EventEnvelope<TEvent>>>(sp =>
         {
-            var session = sp.GetRequiredService<IElasticClient>();
+            var session = sp.GetRequiredService<ElasticsearchClient>();
 
             return new ElasticSearchProjection<TEvent, TView>(session, getId);
         });

diff --git a/Core.ElasticSearch/Repository/ElasticSearchExtensions.cs b/Core.ElasticSearch/Repository/ElasticSearchExtensions.cs
@@ -1,31 +1,31 @@
 using System.Collections.Concurrent;
-using Nest;
+using Elastic.Clients.Elasticsearch;
 
 namespace Core.ElasticSearch.Repository;
 
+public static class ElasticSearchRepository
+{
+    public static async Task<T?> Find<T>(this ElasticsearchClient elasticClient, string id, CancellationToken ct)
+        where T : class =>
+        (await elasticClient.GetAsync<T>(id, cancellationToken: ct).ConfigureAwait(false))?.Source;
 
-    public static class ElasticSearchRepository
-    {
-        public static async Task<T?> Find<T>(this IElasticClient elasticClient, string id, CancellationToken ct)
-            where T: class =>
-            (await elasticClient.GetAsync<T>(id, ct: ct).ConfigureAwait(false))?.Source;
-
-        public static async Task Upsert<T>(this IElasticClient elasticClient, string id, T entity, CancellationToken ct)
-            where T: class =>
-            await elasticClient.UpdateAsync<T>(id,
-                u => u.Doc(entity).Upsert(entity).Index(ToIndexName<T>()),
-                ct
-            ).ConfigureAwait(false);
+    public static async Task Upsert<T>(this ElasticsearchClient elasticClient, string id, T entity,
+        CancellationToken ct)
+        where T : class =>
+        await elasticClient.UpdateAsync<T, object>(ToIndexName<T>(), id,
+            u => u.Doc(entity).Upsert(entity),
+            ct
+        ).ConfigureAwait(false);
 
-        private static readonly ConcurrentDictionary<Type, string> TypeNameMap = new();
+    private static readonly ConcurrentDictionary<Type, string> TypeNameMap = new();
 
-        private static string ToIndexName<TIndex>()
+    private static string ToIndexName<TIndex>()
+    {
+        var indexType = typeof(TIndex);
+        return TypeNameMap.GetOrAdd(indexType, _ =>
         {
-            var indexType = typeof(TIndex);
-            return TypeNameMap.GetOrAdd(indexType, _ =>
-            {
-                var modulePrefix = indexType.Namespace!.Split(".").First();
-                return $"{modulePrefix}-{indexType.Name}".ToLower();
-            });
-        }
+            var modulePrefix = indexType.Namespace!.Split(".").First();
+            return $"{modulePrefix}-{indexType.Name}".ToLower();
+        });
     }
+}
diff --git a/Core.ElasticSearch/Repository/ElasticSearchRepository.cs b/Core.ElasticSearch/Repository/ElasticSearchRepository.cs
@@ -1,5 +1,5 @@
 using Core.ElasticSearch.Indices;
-using Nest;
+using Elastic.Clients.Elasticsearch;
 using IAggregate = Core.Aggregates.IAggregate;
 
 namespace Core.ElasticSearch.Repository;
@@ -15,18 +15,18 @@ namespace Core.ElasticSearch.Repository;
 
 public class ElasticSearchRepository<T>: IElasticSearchRepository<T> where T : class, IAggregate, new()
 {
-    private readonly IElasticClient elasticClient;
+    private readonly ElasticsearchClient elasticClient;
 
     public ElasticSearchRepository(
-        IElasticClient elasticClient
+        ElasticsearchClient elasticClient
     )
     {
         this.elasticClient = elasticClient ?? throw new ArgumentNullException(nameof(elasticClient));
     }
 
     public async Task<T?> Find(Guid id, CancellationToken cancellationToken)
     {
-        var response = await elasticClient.GetAsync<T>(id, ct: cancellationToken).ConfigureAwait(false);
+        var response = await elasticClient.GetAsync<T>(id, cancellationToken).ConfigureAwait(false);
         return response?.Source;
     }
 
@@ -37,11 +37,11 @@ public Task Add(T aggregate, CancellationToken cancellationToken)
 
     public Task Update(T aggregate, CancellationToken cancellationToken)
     {
-        return elasticClient.UpdateAsync<T>(aggregate.Id, i => i.Doc(aggregate).Index(IndexNameMapper.ToIndexName<T>()), cancellationToken);
+        return elasticClient.UpdateAsync<T, object>(IndexNameMapper.ToIndexName<T>(), aggregate.Id, i => i.Doc(aggregate), cancellationToken);
     }
 
     public Task Delete(T aggregate, CancellationToken cancellationToken)
     {
-        return elasticClient.DeleteAsync<T>(aggregate.Id, ct: cancellationToken);
+        return elasticClient.DeleteAsync<T>(aggregate.Id, cancellationToken);
     }
 }
diff --git a/Core.EventStoreDB.Tests/Core.EventStoreDB.Tests.csproj b/Core.EventStoreDB.Tests/Core.EventStoreDB.Tests.csproj
@@ -17,7 +17,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Core.Kafka.Tests/Core.Kafka.Tests.csproj b/Core.Kafka.Tests/Core.Kafka.Tests.csproj
@@ -16,7 +16,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Core.Marten/Core.Marten.csproj b/Core.Marten/Core.Marten.csproj
@@ -5,8 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Marten" Version="6.0.0-alpha.4" />
-        <PackageReference Include="MediatR" Version="12.0.0" />
+        <PackageReference Include="Marten" Version="6.0.0-alpha.9" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.3" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />

diff --git a/Core.Marten/Subscriptions/MartenSubscription.cs b/Core.Marten/Subscriptions/MartenSubscription.cs
@@ -44,6 +44,8 @@ CancellationToken ct
             throw;
         }
     }
+
+    public bool EnableDocumentTrackingDuringRebuilds { get; set; }
 }
 
 public interface IMartenEventsConsumer

diff --git a/Core.Tests/Core.Tests.csproj b/Core.Tests/Core.Tests.csproj
@@ -16,8 +16,8 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Marten" Version="6.0.0-alpha.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Marten" Version="6.0.0-alpha.9" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -13,10 +13,10 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
         <PackageReference Include="Polly" Version="7.2.3" />
         <PackageReference Include="RestSharp" Version="108.0.3" />
-        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.9" />
+        <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.4.0" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc9.9" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.9" />
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.3.2" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.4.0" />
         <PackageReference Include="Scrutor" Version="4.2.1" />
     </ItemGroup>
 

diff --git a/Core/OpenTelemetry/TelemetryExtensions.cs b/Core/OpenTelemetry/TelemetryExtensions.cs
@@ -21,7 +21,8 @@ OpenTelemetryOptions options
         Activity.DefaultIdFormat = ActivityIdFormat.W3C;
 
         services
-            .AddOpenTelemetryTracing(builder =>
+            .AddOpenTelemetry()
+            .WithTracing(builder =>
             {
                 options.ConfigureTracerProvider(builder
                         .AddSource(ActivitySourceProvider.DefaultSourceName)

diff --git a/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj b/EventSourcing.Integration.Tests/EventSourcing.Integration.Tests.csproj
@@ -12,8 +12,8 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Marten" Version="6.0.0-alpha.4" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Marten" Version="6.0.0-alpha.9" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Marten.Integration.Tests/CompositeIds/CompositeIdsTests.cs b/Marten.Integration.Tests/CompositeIds/CompositeIdsTests.cs
@@ -261,7 +261,7 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? setStore
             options.Projections.SelfAggregate<Reservation>();
         });
 
-        return store.OpenSession();
+        return store.LightweightSession();
     }
 
     [Fact]

diff --git a/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs b/Marten.Integration.Tests/EventStore/Aggregate/OutOfOrder/OutOfOrderProjectionsTest.cs
@@ -58,7 +58,7 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? setStore
             options.Projections.SelfAggregate<IssuesList>();
         });
 
-        return store.OpenSession();
+        return store.LightweightSession();
     }
 
     [Fact]

diff --git a/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs b/Marten.Integration.Tests/EventStore/Projections/AggregationProjectionsTest.cs
@@ -84,7 +84,7 @@ protected override IDocumentSession CreateSession(Action<StoreOptions>? setStore
             options.Projections.Add(new IssueDescriptionsProjection());
         });
 
-        return store.OpenSession();
+        return store.LightweightSession();
     }
 
     [Fact]

diff --git a/Marten.Integration.Tests/EventStore/Stream/StreamLoading.cs b/Marten.Integration.Tests/EventStore/Stream/StreamLoading.cs
@@ -70,7 +70,7 @@ public void GivenExistingStreamWithOneEvent_WhenStreamIsLoadedByEventType_ThenIt
 
         //Then
         @event.Should().NotBeNull();
-        @event.Id.Should().Be(eventId);
+        @event!.Id.Should().Be(eventId);
     }
 
     [Fact]

diff --git a/Marten.Integration.Tests/EventStore/Stream/StreamStarting.cs b/Marten.Integration.Tests/EventStore/Stream/StreamStarting.cs
@@ -75,7 +75,7 @@ public void GivenOneEvent_WhenEventsArePublishedWithStreamId_ThenEventsAreSavedW
         var streamState = EventStore.FetchStreamState(streamId);
 
         streamState.Should().NotBeNull();
-        streamState.Version.Should().Be(1);
+        streamState!.Version.Should().Be(1);
     }
 
     [Fact]

diff --git a/Marten.Integration.Tests/General/StoreInitializationTests.cs b/Marten.Integration.Tests/General/StoreInitializationTests.cs
@@ -81,7 +81,7 @@ public void GivenProperConnectionString_WhenDocumentSessionIsCreatedAndTransacti
                 options.Events.DatabaseSchemaName = Settings.SchemaName;
             });
 
-            using var session = store.OpenSession();
+            using var session = store.LightweightSession();
             using var transaction = session.Connection!.BeginTransaction();
             ConnectionShouldBeEstablished(store);
 
@@ -93,11 +93,9 @@ public void GivenProperConnectionString_WhenDocumentSessionIsCreatedAndTransacti
 
     private static void ConnectionShouldBeEstablished(IDocumentStore store)
     {
-        using (var session = store.OpenSession())
-        {
-            var result = session.Query<int>("SELECT 1");
+        using var session = store.LightweightSession();
+        var result = session.Query<int>("SELECT 1");
 
-            result.Should().NotBeNull();
-        }
+        result.Should().NotBeNull();
     }
 }
diff --git a/Marten.Integration.Tests/Marten.Integration.Tests.csproj b/Marten.Integration.Tests/Marten.Integration.Tests.csproj
@@ -18,10 +18,10 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Marten" Version="6.0.0-alpha.4" />
+        <PackageReference Include="Marten" Version="6.0.0-alpha.9" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Marten.Integration.Tests/TestsInfrastructure/DocumentSessionProvider.cs b/Marten.Integration.Tests/TestsInfrastructure/DocumentSessionProvider.cs
@@ -6,6 +6,6 @@ public static IDocumentSession Get(string? schemaName = null, Action<StoreOption
     {
         var store = DocumentStoreProvider.Get(schemaName, setOptions);
 
-        return store.OpenSession();
+        return store.LightweightSession();
     }
-}
+}
diff --git a/Sample/ECommerce/Carts/Carts.Api.Tests/Carts.Api.Tests.csproj b/Sample/ECommerce/Carts/Carts.Api.Tests/Carts.Api.Tests.csproj
@@ -9,7 +9,7 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.3" />

diff --git a/Sample/ECommerce/Carts/Carts.Api/Carts.Api.csproj b/Sample/ECommerce/Carts/Carts.Api/Carts.Api.csproj
@@ -13,7 +13,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0-beta.3" />
+        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Sample/ECommerce/Carts/Carts.Tests/Carts.Tests.csproj b/Sample/ECommerce/Carts/Carts.Tests/Carts.Tests.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/Sample/ECommerce/Orders/Orders.Api.Tests/Orders.Api.Tests.csproj b/Sample/ECommerce/Orders/Orders.Api.Tests/Orders.Api.Tests.csproj
@@ -9,7 +9,7 @@
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.3" />

diff --git a/Sample/ECommerce/Orders/Orders.Api/Orders.Api.csproj b/Sample/ECommerce/Orders/Orders.Api/Orders.Api.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="Npgsql.OpenTelemetry" Version="7.0.2" />
-        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0-beta.3" />
+        <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.4.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.3" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">

diff --git a/Sample/ECommerce/Orders/Orders.Tests/Orders.Tests.csproj b/Sample/ECommerce/Orders/Orders.Tests/Orders.Tests.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
         <PackageReference Include="NSubstitute" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">