Merge branch 'dev'

Author: mivano

README.md

@@ -63,7 +63,7 @@ This example shows the options that are currently available when using the appSe
     <add key="serilog:write-to:Elasticsearch.batchPostingLimit" value="50"/>
     <add key="serilog:write-to:Elasticsearch.period" value="2"/>
     <add key="serilog:write-to:Elasticsearch.inlineFields" value="true"/>
-    <add key="serilog:write-to:Elasticsearch.minimumLogEventLevel" value="Warning"/>
+    <add key="serilog:write-to:Elasticsearch.restrictedToMinimumLevel" value="Warning"/>
     <add key="serilog:write-to:Elasticsearch.bufferBaseFilename" value="C:\Temp\SerilogElasticBuffer"/>
     <add key="serilog:write-to:Elasticsearch.bufferFileSizeLimitBytes" value="5242880"/>
     <add key="serilog:write-to:Elasticsearch.bufferLogShippingInterval" value="5000"/>
@@ -182,7 +182,7 @@ In your `appsettings.json` file, under the `Serilog` node, :
           "batchPostingLimit": 50,
           "period": 2000,
           "inlineFields": true,
-          "minimumLogEventLevel": "Warning",
+          "restrictedToMinimumLevel": "Warning",
           "bufferBaseFilename":  "C:/Temp/LogDigipolis/docker-elk-serilog-web-buffer",
           "bufferFileSizeLimitBytes": 5242880,
           "bufferLogShippingInterval": 5000,

src/Serilog.Formatting.Elasticsearch/ElasticsearchJsonFormatter.cs

@@ -247,7 +247,7 @@ protected void WriteSingleException(Exception exception, ref string delim, TextW
 
         private void WriteMultilineString(string name, string value, ref string delimeter, TextWriter output)
         {
-            string[] lines = value.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
+            var lines = value?.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries) ?? new string[] { };
             WriteJsonArrayProperty(name, lines, ref delimeter, output);
         }
 

src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/Durable/Elasticsearch/ElasticsearchLogClient.cs

@@ -35,7 +35,7 @@ public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload)
             return await SendPayloadAsync(payload, true);
         }
 
-        public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload,bool first)
+        public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload, bool first)
         {
             try
             {
@@ -45,10 +45,10 @@ public async Task<SentPayloadResult> SendPayloadAsync(List<string> payload,bool
                 if (response.Success)
                 {
                     var cleanPayload = new List<string>();
-                    var invalidPayload = GetInvalidPayloadAsync(response, payload,out cleanPayload);
-                    if ((cleanPayload?.Any() ?? false) && first)
+                    var invalidPayload = GetInvalidPayloadAsync(response, payload, out cleanPayload);
+                    if ((cleanPayload?.Any() == false) && first)
                     {
-                        await SendPayloadAsync(cleanPayload,false);
+                        await SendPayloadAsync(cleanPayload, false);
                     }
 
                     return new SentPayloadResult(response, true, invalidPayload);
@@ -85,16 +85,17 @@ private InvalidResult GetInvalidPayloadAsync(DynamicResponse baseResult, List<st
             bool hasErrors = false;
             foreach (dynamic item in items)
             {
-                long? status = item.index?.status;
+                var itemIndex = item?["index"];
+                long? status = itemIndex?["status"];
                 i++;
                 if (!status.HasValue || status < 300)
                 {
                     continue;
                 }
 
                 hasErrors = true;
-                var id = item.index?._id;
-                var error = item.index?.error;
+                var id = itemIndex?["_id"];
+                var error = itemIndex?["error"];
                 if (int.TryParse(id.Split('_')[0], out int index))
                 {
                     SelfLog.WriteLine("Received failed ElasticSearch shipping result {0}: {1}. Failed payload : {2}.", status, error?.ToString(), payload.ElementAt(index * 2 + 1));

src/Serilog.Sinks.Elasticsearch/Sinks/ElasticSearch/ElasticSearchSink.cs

@@ -72,7 +72,7 @@ protected override void EmitBatch(IEnumerable<LogEvent> events)
                 var items = result.Body["items"];
                 foreach (var item in items)
                 {
-                    if (item["index"] != null && item["index"]["error"] != null)
+                    if (item["index"] != null && HasProperty(item["index"], "error") && item["index"]["error"] != null)
                     {
                         var e = events.ElementAt(indexer);
                         if (_state.Options.EmitEventFailure.HasFlag(EmitEventFailureHandling.WriteToSelfLog))
@@ -219,5 +219,17 @@ protected virtual void HandleException(Exception ex, IEnumerable<LogEvent> event
             if (_state.Options.EmitEventFailure.HasFlag(EmitEventFailureHandling.ThrowException))
                 throw ex;
         }
+
+        // Helper function: checks if a given dynamic member / dictionary key exists at runtime
+        private static bool HasProperty(dynamic settings, string name)
+        {
+            if (settings is System.Dynamic.ExpandoObject)
+                return ((IDictionary<string, object>)settings).ContainsKey(name);
+            
+            if (settings is System.Dynamic.DynamicObject)
+                return ((System.Dynamic.DynamicObject)settings).GetDynamicMemberNames().Contains(name);
+
+            return settings.GetType().GetProperty(name) != null;
+        }
     }
 }

test/Serilog.Sinks.Elasticsearch.Tests/ElasticsearchJsonFormatterTests.cs

@@ -19,7 +19,7 @@ static LogEvent CreateLogEvent() =>
             DateTimeOffset.Now,
             LogEventLevel.Debug,
            //exception: CreateThrownException(),
-           exception: null,
+            exception: null,
             messageTemplate: new MessageTemplate(Enumerable.Empty<MessageTemplateToken>()),
             properties: Enumerable.Empty<LogEventProperty>()
         );
@@ -55,12 +55,26 @@ static void ThrowInnerException()
             throw new Exception("Test inner exception message");
         }
 
-        static LogEvent CreateLogEventWithException() =>
+        static Exception CreateThrownExceptionWithNotThrownInner()
+        {
+            Exception retEx = null;
+            try
+            {
+                throw new Exception("Test exception message", new Exception("Test inner exception message"));
+            }
+            catch (Exception ex)
+            {
+                retEx = ex;
+            }
+            return retEx;
+        }
+
+        static LogEvent CreateLogEventWithException(Exception ex) =>
         new LogEvent
         (
             DateTimeOffset.Now,
             LogEventLevel.Debug,
-            exception: CreateThrownException(),
+            exception: ex,
             messageTemplate: new MessageTemplate(Enumerable.Empty<MessageTemplateToken>()),
             properties: Enumerable.Empty<LogEventProperty>()
         );
@@ -181,7 +195,7 @@ public void When_provide_closing_delimiter_should_use_it()
         public void DefaultJsonFormater_Should_Render_Exceptions()
         {
             CheckProperties(
-                CreateLogEventWithException,
+                () => CreateLogEventWithException(CreateThrownException()),
                 new ElasticsearchJsonFormatter(),
                 result =>
                 {
@@ -205,11 +219,12 @@ public void DefaultJsonFormater_Should_Render_Exceptions()
                 });
         }
 
-        [Fact]
-        public void DefaultJsonFormater_Should_Render_Exceptions_With_StackTrace_As_Array()
+        [Theory]
+        [MemberData(nameof(TestExceptions))]
+        public void DefaultJsonFormater_Should_Render_Exceptions_With_StackTrace_As_Array(Exception exception)
         {
             CheckProperties(
-                CreateLogEventWithException,
+                () => CreateLogEventWithException(exception),
                 new ElasticsearchJsonFormatter(formatStackTraceAsArray: true),
                 result =>
                 {
@@ -232,5 +247,13 @@ public void DefaultJsonFormater_Should_Render_Exceptions_With_StackTrace_As_Arra
                     Assert.StartsWith("[", stackTraceValue);
                 });
         }
+
+        public static IEnumerable<object[]> TestExceptions =>
+            new List<object[]>
+            {
+                new object[] { CreateThrownException() },
+                new object[] { CreateThrownExceptionWithNotThrownInner() },
+                new object[] { new Exception("Not thrown exception message") }
+            };
     }
 }