upgrade to ES 6x

Author: Alex McCool

src/ElasticLogger.Test/ElasticLogger.Test.csproj

@@ -13,10 +13,10 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.*"/>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.*" />
 
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
-    <PackageReference Include="NEST" Version="2.5.8" />
+    <PackageReference Include="NEST" Version="6.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

src/ElasticLogger.Test/MiscTests.cs

@@ -1,24 +1,9 @@
-using System;
-using System.Diagnostics;
 using System.IO;
-using System.Net;
-using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
 using AM.Extensions.Logging.ElasticSearch;
-using Elasticsearch.Net;
-using ElasticsearchInside;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-using Nest;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
-using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace ElasticLogger.Test
 {

src/ElasticSearch.Extensions.Logging/AM.Extensions.Logging.ElasticSearch.csproj

@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elasticsearch.Net" Version="2.5.8" />
+    <PackageReference Include="Elasticsearch.Net" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/ElasticSearch.Extensions.Logging/ElasticSearchLogger.cs

@@ -1,4 +1,8 @@
-using System;
+using Elasticsearch.Net;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -72,9 +76,9 @@ public bool IsEnabled(LogLevel logLevel)
             return logLevel != LogLevel.None && logLevel >= _logLevel;
         }
 
-        public void Log<TState>(LogLevel logLevel, EventId eventId, 
-            TState state, 
-            Exception exception, 
+        public void Log<TState>(LogLevel logLevel, EventId eventId,
+            TState state,
+            Exception exception,
             Func<TState, Exception, string> formatter)
         {
             if (!IsEnabled(logLevel))
@@ -93,7 +97,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId,
             }
 
             var message = formatter(state, exception);
-            
+
             WriteTrace(Name, logLevel, eventId.Id, message, Guid.Empty, exception);
         }
 
@@ -114,7 +118,7 @@ protected void WriteTrace(
                 {
                     updatedMessage = ((Exception)data).Message;
 
-                    
+
                     payload = JObject.FromObject(data, serializerIgnoreReferenceLoop);
                 }
                 else if (data is XPathNavigator)

src/ElasticSearch.Extensions.Logging/ElasticSearchLoggerProvider.cs

@@ -67,11 +67,10 @@ public IElasticLowLevelClient Client
                 {
                     var singleNode = new SingleNodeConnectionPool(_endpoint);
 
-                    var cc = new ConnectionConfiguration(singleNode,
-                            connectionSettings => new ElasticsearchJsonNetSerializer())
-                        .RequestTimeout(TimeSpan.FromSeconds(15))
-                        .EnableHttpPipelining()
-                        .ThrowExceptions();
+                    var cc = new ConnectionConfiguration(singleNode, new ElasticsearchJsonNetSerializer())
+                    .EnableHttpPipelining()
+                    .EnableHttpCompression()
+                    .ThrowExceptions();
 
                     //the 1.x serializer we needed to use, as the default SimpleJson didnt work right
                     //Elasticsearch.Net.JsonNet.ElasticsearchJsonNetSerializer()
@@ -137,7 +136,10 @@ private async Task WriteDirectlyToESAsBatch(IEnumerable<JObject> jos)
 
             try
             {
-                await Client.BulkPutAsync<VoidResponse>(Index, DocumentType, bbo.ToArray(), br => br.Refresh(false));
+                //await Client.BulkPutAsync<VoidResponse>(Index, DocumentType, bbo.ToArray(), br => br.Refresh(false));
+                await Client.BulkPutAsync<VoidResponse>(Index, DocumentType, 
+                    PostData.MultiJson(bbo.ToArray()), 
+                    new BulkRequestParameters { Refresh = Refresh.False });
             }
             catch (Exception ex)
             {

src/ElasticSearch.Extensions.Logging/ElasticsearchJsonNetSerializer.cs

@@ -1,10 +1,11 @@
-using System.IO;
 using System.Reflection;
+using Elasticsearch.Net;
+using Newtonsoft.Json;
+using System;
+using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Elasticsearch.Net;
-using Newtonsoft.Json;
 
 namespace AM.Extensions.Logging.ElasticSearch
 {
@@ -15,7 +16,7 @@ public class ElasticsearchJsonNetSerializer : IElasticsearchSerializer
         /// <summary>
         /// The size of the buffer to use when writing the serialized request
         /// to the request stream
-        /// Performance tests as part of https://github.com/elastic/elasticsearch-net/issues/1899 indicate this 
+        /// Performance tests as part of https://github.com/elastic/elasticsearch-net/issues/1899 indicate this
         /// to be a good compromise buffer size for performance throughput and bytes allocated.
         /// </summary>
         protected virtual int BufferSize => 1024;
@@ -40,31 +41,41 @@ private JsonSerializerSettings CreateSettings()
             return settings;
         }
 
+        public object Deserialize(Type type, Stream stream)
+        {
+            var settings = this._settings;
+            return _Deserialize(type, stream, settings);
+        }
 
         public T Deserialize<T>(Stream stream)
         {
             var settings = this._settings;
-            return _Deserialize<T>(stream, settings);
+            return (T)_Deserialize(typeof(T), stream, settings);
         }
 
-        public async Task<T> DeserializeAsync<T>(Stream responseStream, CancellationToken cancellationToken = new CancellationToken())
+        public Task<object> DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default(CancellationToken))
         {
-            return this.Deserialize<T>(responseStream);
+            return Task.FromResult(_Deserialize(type, stream));
         }
 
-        protected internal T _Deserialize<T>(Stream stream, JsonSerializerSettings settings = null)
+        protected internal object _Deserialize(Type type, Stream stream, JsonSerializerSettings settings = null)
         {
             settings = settings ?? this._settings;
             var serializer = JsonSerializer.Create(settings);
             var jsonTextReader = new JsonTextReader(new StreamReader(stream));
-            var t = (T) serializer.Deserialize(jsonTextReader, typeof(T));
+            var t = serializer.Deserialize(jsonTextReader, type);
             return t;
         }
 
+        public Task<T> DeserializeAsync<T>(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            var result = this.Deserialize<T>(stream);
+            return Task.FromResult(result);
+        }
 
-        public void Serialize(object data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.Indented)
+        public void Serialize<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented)
         {
-            using (var writer = new StreamWriter(writableStream, ExpectedEncoding, BufferSize, leaveOpen: true))
+            using (var writer = new StreamWriter(stream, ExpectedEncoding, BufferSize, leaveOpen: true))
             using (var jsonWriter = new JsonTextWriter(writer))
             {
                 _defaultSerializer.Serialize(jsonWriter, data);
@@ -73,6 +84,10 @@ public void Serialize(object data, Stream writableStream, SerializationFormattin
             }
         }
 
-        public IPropertyMapping CreatePropertyMapping(MemberInfo memberInfo) => null;
+        public Task SerializeAsync<T>(T data, Stream stream, SerializationFormatting formatting = SerializationFormatting.Indented, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            Serialize(data, stream, formatting);
+            return Task.CompletedTask;
+        }
     }
 }