Merged with master

Author: mivano

CHANGES.md

@@ -1,3 +1,6 @@
+2.0.33
+ * Option added to exclude redundant properties from serialized JSON in column LogEvent. (https://github.com/serilog/serilog-sinks-mssqlserver/pull/27)
+
 2.0.32
  * Safe conversion of data types. Also included selflog for bulk operation errors. (https://github.com/serilog/serilog-sinks-mssqlserver/pull/4)
 

README.md

@@ -148,7 +148,7 @@ Columns can be defined with the name and data type of the column in SQL Server.
 
 #### JSON (LogEvent column)
 
-The log event JSON can be stored to the LogEvent column. This can be enabled by adding the LogEvent column to the `columnOptions.Store` collection.
+The log event JSON can be stored to the LogEvent column. This can be enabled by adding the LogEvent column to the `columnOptions.Store` collection. Use the `columnOptions.LogEvent.ExcludeAdditionalProperties` parameter to exclude redundant properties from the JSON. This is analogue to excluding redundant items from XML in the Properties column.
 
 #### XML (Properties column)
 

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/ColumnOptions.cs

@@ -32,6 +32,8 @@ public ColumnOptions()
             };
 
             TimeStamp = new TimeStampColumnOptions();
+
+            LogEvent = new LogEventColumnOptions();
         }
 
         /// <summary>
@@ -77,6 +79,11 @@ public ICollection<StandardColumn> Store
         /// </summary>
         public TimeStampColumnOptions TimeStamp { get; private set; }
 
+        /// <summary>
+        ///     Options for the LogEvent column.
+        /// </summary>
+        public LogEventColumnOptions LogEvent { get; private set; }
+
         /// <summary>
         ///     Options for the Level column.
         /// </summary>
@@ -178,5 +185,16 @@ public class TimeStampColumnOptions
             /// </summary>
             public bool ConvertToUtc { get; set; }
         }
+
+        /// <summary>
+        ///     Options for the LogEvent column.
+        /// </summary>
+        public class LogEventColumnOptions
+        {
+            /// <summary>
+            ///     Exclude properties from the LogEvent column if they are being saved to additional columns.
+            /// </summary>
+            public bool ExcludeAdditionalProperties { get; set; }
+        }
     }
 }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

@@ -357,6 +357,12 @@ private string ConvertPropertiesToXmlStructure(IEnumerable<KeyValuePair<string,
 
         private string LogEventToJson(LogEvent logEvent)
         {
+            if (_columnOptions.LogEvent.ExcludeAdditionalProperties)
+            {
+                var filteredProperties = logEvent.Properties.Where(p => !_additionalDataColumnNames.Contains(p.Key));
+                logEvent = new LogEvent(logEvent.Timestamp, logEvent.Level, logEvent.Exception, logEvent.MessageTemplate, filteredProperties.Select(x => new LogEventProperty(x.Key, x.Value)));
+            }
+
             var sb = new StringBuilder();
             using (var writer = new System.IO.StringWriter(sb))
                 _jsonFormatter.Format(logEvent, writer);