Merge pull request #9 from skbkontur/a.dobrynin/update-elasticsearch.net-6.8

Bump elasticsearch.net to 6.8.9

Author: aldobrynin

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.5.X - 2021.11.23
+- Update Elasticsearch.NET to v6.8.9
+
 ## v1.4.X - 2021.08.06
 - Reporting pending tasks count by topic and name
 

Cassandra.DistributedTaskQueue.FunctionalTests.Common/ContainerExtensions.cs

@@ -0,0 +1,21 @@
+using System;
+
+using Elasticsearch.Net;
+
+using GroboContainer.Core;
+
+using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Storage;
+
+namespace SkbKontur.Cassandra.DistributedTaskQueue.FunctionalTests.Common
+{
+    public static class ContainerExtensions
+    {
+        public static void ConfigureRtqElasticClient(this IContainer container)
+        {
+            var elasticUrl = Environment.GetEnvironmentVariable("ES_URL") ?? "http://localhost:9205";
+            var connectionPool = new SingleNodeConnectionPool(new Uri(elasticUrl));
+            var configuration = new ConnectionConfiguration(connectionPool).DisableDirectStreaming();
+            container.Configurator.ForAbstraction<IRtqElasticsearchClient>().UseInstances(new RtqElasticsearchClient(configuration));
+        }
+    }
+}

Cassandra.DistributedTaskQueue.FunctionalTests.Common/TestRemoteTaskQueueContainerConfigurator.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Net;
 
 using GroboContainer.Core;
@@ -20,7 +21,8 @@ public static class TestRemoteTaskQueueContainerConfigurator
     {
         public static void ConfigureCassandra([NotNull] this IContainer container)
         {
-            var localEndPoint = new IPEndPoint(IPAddress.Loopback, 9160);
+            var cassandraAddress = Environment.GetEnvironmentVariable("CASSANDRA_ADDRESS") ?? "127.0.0.1";
+            var localEndPoint = new IPEndPoint(GetIpV4Address(cassandraAddress), 9160);
             var cassandraClusterSettings = new CassandraClusterSettings
                 {
                     Endpoints = new[] {localEndPoint},
@@ -69,5 +71,13 @@ public static IContainer ConfigureRemoteTaskQueue([NotNull] this IContainer cont
             container.Configurator.ForAbstraction<IRtqTaskManager>().UseInstances(remoteTaskQueue);
             return container;
         }
+
+        private static IPAddress GetIpV4Address([NotNull] string hostNameOrIpAddress)
+        {
+            if (IPAddress.TryParse(hostNameOrIpAddress, out var res))
+                return res;
+
+            return Dns.GetHostEntry(hostNameOrIpAddress).AddressList.First(address => !address.ToString().Contains(':'));
+        }
     }
 }

Cassandra.DistributedTaskQueue.Monitoring.TestService/GroboControllerFactory.cs

@@ -38,7 +38,7 @@ private static IContainer ConfigureContainer()
             container.ConfigureCassandra();
             ConfigureRemoteLock(container);
 
-            container.Configurator.ForAbstraction<IRtqElasticsearchClient>().UseInstances(new RtqElasticsearchClient(new Uri("http://localhost:9205")));
+            container.ConfigureRtqElasticClient();
             container.Configurator.ForAbstraction<IRtqTaskCounterStateStorage>().UseType<NoOpRtqTaskCounterStateStorage>();
             var rtqTaskCounterSettings = new RtqTaskCounterSettings(eventFeedKey : "RtqTaskCounterEventFeed", rtqGraphitePathPrefix : "None")
                 {

Cassandra.DistributedTaskQueue.Monitoring/Cassandra.DistributedTaskQueue.Monitoring.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elasticsearch.Net" Version="6.6.0" />
+    <PackageReference Include="Elasticsearch.Net" Version="6.8.9" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SkbKontur.EventFeeds" Version="1.1.2" />

Cassandra.DistributedTaskQueue.Monitoring/Indexer/ElasticAvailabilityChecker.cs

@@ -47,12 +47,9 @@ private bool IsAlive()
         {
             try
             {
-                var response = elasticClient.Info<DynamicResponse>();
+                var response = elasticClient.Ping<StringResponse>();
                 if (!response.Success)
                     return false;
-                var legacyStatus = response.Body["status"];
-                if (legacyStatus != null)
-                    return (int)legacyStatus == 200;
                 return response.HttpStatusCode == 200;
             }
             catch (Exception e)

Cassandra.DistributedTaskQueue.Monitoring/Storage/RtqElasticsearchClient.cs

@@ -1,14 +1,35 @@
 using System;
+using System.Collections.Generic;
 
 using Elasticsearch.Net;
 
 using JetBrains.Annotations;
 
 namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Storage
 {
+    [PublicAPI]
     public class RtqElasticsearchClient : ElasticLowLevelClient, IRtqElasticsearchClient
     {
-        public RtqElasticsearchClient([NotNull, ItemNotNull] params Uri[] uris)
+        public RtqElasticsearchClient()
+        {
+        }
+
+        public RtqElasticsearchClient(IConnectionConfigurationValues settings)
+            : base(settings)
+        {
+        }
+
+        public RtqElasticsearchClient(string cloudId, BasicAuthenticationCredentials credentials)
+            : base(cloudId, credentials)
+        {
+        }
+
+        public RtqElasticsearchClient(ITransport<IConnectionConfigurationValues> transport)
+            : base(transport)
+        {
+        }
+
+        public RtqElasticsearchClient([NotNull, ItemNotNull] IEnumerable<Uri> uris)
             : base(new ConnectionConfiguration(new SniffingConnectionPool(uris)).DisableDirectStreaming())
         {
         }

Cassandra.DistributedTaskQueue.Tests/WithRtqElasticsearchClient.cs

@@ -1,20 +1,19 @@
-using System;
-using System.Reflection;
+using System.Reflection;
 
 using GroboContainer.NUnitExtensions;
 using GroboContainer.NUnitExtensions.Impl.TestContext;
 
 using JetBrains.Annotations;
 
-using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Storage;
+using SkbKontur.Cassandra.DistributedTaskQueue.FunctionalTests.Common;
 
 namespace SkbKontur.Cassandra.DistributedTaskQueue.Tests
 {
     public class WithRtqElasticsearchClient : GroboTestSuiteWrapperAttribute
     {
         public override sealed void SetUp([NotNull] string suiteName, [NotNull] Assembly testAssembly, [NotNull] IEditableGroboTestContext suiteContext)
         {
-            suiteContext.Container.Configurator.ForAbstraction<IRtqElasticsearchClient>().UseInstances(new RtqElasticsearchClient(new Uri("http://localhost:9205")));
+            suiteContext.Container.ConfigureRtqElasticClient();
         }
     }
 }

appveyor.yml

@@ -85,7 +85,7 @@ deploy:
   - provider: NuGet
     server: https://nuget.org
     api_key:
-      secure: y2RPf+gBBqffQVm8pg9qZcg99m7K8hsSa4z7VHvIE6t+kuO7r/oIqTVcryZzL93D
+      secure: 3Myenol+seNdEnkmH7tadxQLsmOE7VWQSp6vQii4vt2dX1S7XwjNV4T24HQTUsrr
     skip_symbols: true
     on:
       SHOULD_PUBLISH_NUGET_PACKAGE: true

global.json

@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.401"
+    "version": "5.0",
+    "rollForward": "latestFeature"
   }
 }