Merge pull request #69 from serilog/dev

Release 2.4.0
serilog-contrib · Sep 12, 2017 · 7ebe67e · 7ebe67e
2 parents 092d929 + 278fa7c
commit 7ebe67e
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 187 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     - os: linux # Ubuntu 14.04
       dist: trusty
       sudo: required
-      dotnet: 1.0.4
+      dotnet: 2.0.0
 
 script:
   - ./build.sh
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,43 +1,56 @@
-##2.2.0
-- [#47] Tooling updates to VS2017
+## 2.4.0
+- [#62](https://github.com/serilog/serilog-sinks-splunk/issues/62) Default fields added by serilog to splunk
+- [#63](https://github.com/serilog/serilog-sinks-splunk/issues/63) Possible thread leak when ILogger instances are disposed
 
-##2.1.2
-- [#43](https://github.com/serilog/serilog-sinks-splunk/pull/43) - Extend sink & static configuration to allow for custom JSON formatter.
+## 2.3.0
+- [#59](https://github.com/serilog/serilog-sinks-splunk/issues/59) Added ability to use custom fields with HEC.  See http://dev.splunk.com/view/event-collector/SP-CAAAFB6.
 
-##2.1.1
+## 2.2.1
+- [#47](https://github.com/serilog/serilog-sinks-splunk/issues/47) Tooling updates to VS2017
+- [#48](https://github.com/serilog/serilog-sinks-splunk/issues/48)
+- [#49](https://github.com/serilog/serilog-sinks-splunk/issues/49)
+- [#52](https://github.com/serilog/serilog-sinks-splunk/issues/52)
+
+## 2.1.3
+- [#45](https://github.com/serilog/serilog-sinks-splunk/issues/45) - Deadlock fix on UI thread.
+
+## 2.1.2
+- [#43](https://github.com/serilog/serilog-sinks-splunk/issues/43) - Extend sink & static configuration to allow for custom JSON formatter.
+
+## 2.1.1
 - [#38](https://github.com/serilog/serilog-sinks-splunk/issues/38) - Fix for HttpEventlogCollector and sourceType
 - Clean up of sample app using examples of host, sourcetype, source override
 
-##2.1.0
+## 2.1.0
 
 * Change to use a standalone formatter
-* Resolves #32 & #26 by exposing `HttpMessageHandler`
-* Resolves #30 by ignoring OSX build and including tests in `build.sh` for TravisCI
+* Resolves - [#32](https://github.com/serilog/serilog-sinks-splunk/issues/32) & - [#26](https://github.com/serilog/serilog-sinks-splunk/issues/26) by exposing `HttpMessageHandler`
+* Resolves - [#30](https://github.com/serilog/serilog-sinks-splunk/issues/30) by ignoring OSX build and including tests in `build.sh` for TravisCI
 
-##2.0
+## 2.0
  - Support for DotNet Core
  - Event Collector fluent interface changed to `.WriteTo.EventCollector`
  - Event Collector Sink targeting core
  - TCP/UDP Sinks targeting 4.5 *ONLY*
  - Updated Event Collector HTTP Client to add URI endpoint to host: "services/collector" if not included.
  - Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)
 
-##1.8
+## 1.8
  - Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)
 
-##1.7
+## 1.7
  - Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
  - Cleanup on Event Collector
 
-##1.6.50
+## 1.6.50
  - Streaming support for Event Collector
 
-##1.6.42
+## 1.6.42
  - Added support for Splunk 6.3 Event Collector
  - Deprecated Splunk HTTP Sink using Management Port/API
 
-##1.5.30
+## 1.5.30
  - Added switch for template rendering
 
- ##1.5.0
+## 1.5.0
  - Moved the sink from its [original location](https://github.com/serilog/serilog)
diff --git a/build.sh b/build.sh
@@ -5,10 +5,11 @@ dotnet restore
 
 for path in src/**/*.csproj; do
     dotnet build -f netstandard1.1 -c Release ${path}
+    dotnet build -f netstandard1.3 -c Release ${path}
 done
 
 for path in test/*.Tests/*.csproj; do
-    dotnet test -f netcoreapp1.0  -c Release ${path}
+    dotnet test -f netcoreapp2.0  -c Release ${path}
 done
 
-dotnet build -f netcoreapp1.0 -c Release sample/Sample/Sample.csproj
+dotnet build -f netcoreapp2.0 -c Release sample/Sample/Sample.csproj
diff --git a/sample/Sample/Program.cs b/sample/Sample/Program.cs
@@ -47,7 +47,7 @@ private static void WithCompactSplunkFormatter(int eventsToCreate)
             // Vanilla Test with full uri specified
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_FULL_ENDPOINT,
                     Program.EventCollectorToken, new CompactSplunkJsonFormatter())
@@ -70,7 +70,7 @@ public static void OverridingSource(int eventsToCreate)
             // Override Source
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken,
@@ -92,7 +92,7 @@ public static void OverridingSourceType(int eventsToCreate)
             // Override Source
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken,
@@ -114,7 +114,7 @@ public static void OverridingHost(int eventsToCreate)
             // Override Host
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken,
@@ -136,7 +136,7 @@ public static void UsingFullUri(int eventsToCreate)
             // Vanilla Test with full uri specified
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_FULL_ENDPOINT,
                     Program.EventCollectorToken)
@@ -158,7 +158,7 @@ public static void UsingHostOnly(int eventsToCreate)
             // Vanilla Tests just host
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken)
@@ -179,7 +179,7 @@ public static void WithNoTemplate(int eventsToCreate)
             // No Template
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken,
@@ -201,7 +201,7 @@ public static void UsingSSL(int eventsToCreate)
             // SSL
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     SPLUNK_ENDPOINT,
                     Program.EventCollectorToken)
@@ -228,7 +228,7 @@ public static void AddCustomFields(int eventsToCreate)
             // Override Source
             Log.Logger = new LoggerConfiguration()
                 .MinimumLevel.Debug()
-                .WriteTo.LiterateConsole()
+                .WriteTo.Console()
                 .WriteTo.EventCollector(
                     splunkHost: SPLUNK_ENDPOINT
                     , eventCollectorToken: SPLUNK_HEC_TOKEN

diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.4.0" />
-    <PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj b/src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>The Splunk Sink for Serilog</Description>
-    <VersionPrefix>2.3.0</VersionPrefix>
+    <VersionPrefix>2.3.1</VersionPrefix>
     <Authors>Matthew Erbs, Serilog Contributors</Authors>
-    <TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.Splunk</AssemblyName>
     <PackageId>Serilog.Sinks.Splunk</PackageId>
@@ -27,15 +27,17 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Collections" Version="4.0.11" />
-    <PackageReference Include="System.Collections.Concurrent" Version="4.0.12" />
-    <PackageReference Include="System.Runtime" Version="4.1.0" />
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-    <PackageReference Include="System.Net.Http" Version="4.1.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="System.Net.Http" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog" Version="2.4.0" />
+    <PackageReference Include="Serilog" Version="2.5.0" />
+    <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
+    <PackageReference Include="System.Net.Http" Version="4.3.2" />
   </ItemGroup>
 
 </Project>