Skip to content

Commit 7ebe67e

Browse files
merblamerbla
authored
Merge pull request #69 from serilog/dev
Release 2.4.0
2 parents 092d929 + 278fa7c commit 7ebe67e

File tree

10 files changed

+83
-187
lines changed

10 files changed

+83
-187
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ matrix:
55
- os: linux # Ubuntu 14.04
66
dist: trusty
77
sudo: required
8-
dotnet: 1.0.4
8+
dotnet: 2.0.0
99

1010
script:
1111
- ./build.sh

‎CHANGES.md‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,56 @@
1-
##2.2.0
2-
- [#47] Tooling updates to VS2017
1+
## 2.4.0
2+
- [#62](https://github.com/serilog/serilog-sinks-splunk/issues/62) Default fields added by serilog to splunk
3+
- [#63](https://github.com/serilog/serilog-sinks-splunk/issues/63) Possible thread leak when ILogger instances are disposed
34

4-
##2.1.2
5-
- [#43](https://github.com/serilog/serilog-sinks-splunk/pull/43) - Extend sink & static configuration to allow for custom JSON formatter.
5+
## 2.3.0
6+
- [#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.
67

7-
##2.1.1
8+
## 2.2.1
9+
- [#47](https://github.com/serilog/serilog-sinks-splunk/issues/47) Tooling updates to VS2017
10+
- [#48](https://github.com/serilog/serilog-sinks-splunk/issues/48)
11+
- [#49](https://github.com/serilog/serilog-sinks-splunk/issues/49)
12+
- [#52](https://github.com/serilog/serilog-sinks-splunk/issues/52)
13+
14+
## 2.1.3
15+
- [#45](https://github.com/serilog/serilog-sinks-splunk/issues/45) - Deadlock fix on UI thread.
16+
17+
## 2.1.2
18+
- [#43](https://github.com/serilog/serilog-sinks-splunk/issues/43) - Extend sink & static configuration to allow for custom JSON formatter.
19+
20+
## 2.1.1
821
- [#38](https://github.com/serilog/serilog-sinks-splunk/issues/38) - Fix for HttpEventlogCollector and sourceType
922
- Clean up of sample app using examples of host, sourcetype, source override
1023

11-
##2.1.0
24+
## 2.1.0
1225

1326
* Change to use a standalone formatter
14-
* Resolves #32 & #26 by exposing `HttpMessageHandler`
15-
* Resolves #30 by ignoring OSX build and including tests in `build.sh` for TravisCI
27+
* Resolves - [#32](https://github.com/serilog/serilog-sinks-splunk/issues/32) & - [#26](https://github.com/serilog/serilog-sinks-splunk/issues/26) by exposing `HttpMessageHandler`
28+
* Resolves - [#30](https://github.com/serilog/serilog-sinks-splunk/issues/30) by ignoring OSX build and including tests in `build.sh` for TravisCI
1629

17-
##2.0
30+
## 2.0
1831
- Support for DotNet Core
1932
- Event Collector fluent interface changed to `.WriteTo.EventCollector`
2033
- Event Collector Sink targeting core
2134
- TCP/UDP Sinks targeting 4.5 *ONLY*
2235
- Updated Event Collector HTTP Client to add URI endpoint to host: "services/collector" if not included.
2336
- Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)
2437

25-
##1.8
38+
## 1.8
2639
- Event Collector changed to use epoch time [#15](https://github.com/serilog/serilog-sinks-splunk/pull/15)
2740

28-
##1.7
41+
## 1.7
2942
- Better support for formatting including [#578](https://github.com/serilog/serilog/issues/578)
3043
- Cleanup on Event Collector
3144

32-
##1.6.50
45+
## 1.6.50
3346
- Streaming support for Event Collector
3447

35-
##1.6.42
48+
## 1.6.42
3649
- Added support for Splunk 6.3 Event Collector
3750
- Deprecated Splunk HTTP Sink using Management Port/API
3851

39-
##1.5.30
52+
## 1.5.30
4053
- Added switch for template rendering
4154

42-
##1.5.0
55+
## 1.5.0
4356
- Moved the sink from its [original location](https://github.com/serilog/serilog)

‎build.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ dotnet restore
55

66
for path in src/**/*.csproj; do
77
dotnet build -f netstandard1.1 -c Release ${path}
8+
dotnet build -f netstandard1.3 -c Release ${path}
89
done
910

1011
for path in test/*.Tests/*.csproj; do
11-
dotnet test -f netcoreapp1.0 -c Release ${path}
12+
dotnet test -f netcoreapp2.0 -c Release ${path}
1213
done
1314

14-
dotnet build -f netcoreapp1.0 -c Release sample/Sample/Sample.csproj
15+
dotnet build -f netcoreapp2.0 -c Release sample/Sample/Sample.csproj

‎sample/Sample/Program.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private static void WithCompactSplunkFormatter(int eventsToCreate)
4747
// Vanilla Test with full uri specified
4848
Log.Logger = new LoggerConfiguration()
4949
.MinimumLevel.Debug()
50-
.WriteTo.LiterateConsole()
50+
.WriteTo.Console()
5151
.WriteTo.EventCollector(
5252
SPLUNK_FULL_ENDPOINT,
5353
Program.EventCollectorToken, new CompactSplunkJsonFormatter())
@@ -70,7 +70,7 @@ public static void OverridingSource(int eventsToCreate)
7070
// Override Source
7171
Log.Logger = new LoggerConfiguration()
7272
.MinimumLevel.Debug()
73-
.WriteTo.LiterateConsole()
73+
.WriteTo.Console()
7474
.WriteTo.EventCollector(
7575
SPLUNK_ENDPOINT,
7676
Program.EventCollectorToken,
@@ -92,7 +92,7 @@ public static void OverridingSourceType(int eventsToCreate)
9292
// Override Source
9393
Log.Logger = new LoggerConfiguration()
9494
.MinimumLevel.Debug()
95-
.WriteTo.LiterateConsole()
95+
.WriteTo.Console()
9696
.WriteTo.EventCollector(
9797
SPLUNK_ENDPOINT,
9898
Program.EventCollectorToken,
@@ -114,7 +114,7 @@ public static void OverridingHost(int eventsToCreate)
114114
// Override Host
115115
Log.Logger = new LoggerConfiguration()
116116
.MinimumLevel.Debug()
117-
.WriteTo.LiterateConsole()
117+
.WriteTo.Console()
118118
.WriteTo.EventCollector(
119119
SPLUNK_ENDPOINT,
120120
Program.EventCollectorToken,
@@ -136,7 +136,7 @@ public static void UsingFullUri(int eventsToCreate)
136136
// Vanilla Test with full uri specified
137137
Log.Logger = new LoggerConfiguration()
138138
.MinimumLevel.Debug()
139-
.WriteTo.LiterateConsole()
139+
.WriteTo.Console()
140140
.WriteTo.EventCollector(
141141
SPLUNK_FULL_ENDPOINT,
142142
Program.EventCollectorToken)
@@ -158,7 +158,7 @@ public static void UsingHostOnly(int eventsToCreate)
158158
// Vanilla Tests just host
159159
Log.Logger = new LoggerConfiguration()
160160
.MinimumLevel.Debug()
161-
.WriteTo.LiterateConsole()
161+
.WriteTo.Console()
162162
.WriteTo.EventCollector(
163163
SPLUNK_ENDPOINT,
164164
Program.EventCollectorToken)
@@ -179,7 +179,7 @@ public static void WithNoTemplate(int eventsToCreate)
179179
// No Template
180180
Log.Logger = new LoggerConfiguration()
181181
.MinimumLevel.Debug()
182-
.WriteTo.LiterateConsole()
182+
.WriteTo.Console()
183183
.WriteTo.EventCollector(
184184
SPLUNK_ENDPOINT,
185185
Program.EventCollectorToken,
@@ -201,7 +201,7 @@ public static void UsingSSL(int eventsToCreate)
201201
// SSL
202202
Log.Logger = new LoggerConfiguration()
203203
.MinimumLevel.Debug()
204-
.WriteTo.LiterateConsole()
204+
.WriteTo.Console()
205205
.WriteTo.EventCollector(
206206
SPLUNK_ENDPOINT,
207207
Program.EventCollectorToken)
@@ -228,7 +228,7 @@ public static void AddCustomFields(int eventsToCreate)
228228
// Override Source
229229
Log.Logger = new LoggerConfiguration()
230230
.MinimumLevel.Debug()
231-
.WriteTo.LiterateConsole()
231+
.WriteTo.Console()
232232
.WriteTo.EventCollector(
233233
splunkHost: SPLUNK_ENDPOINT
234234
, eventCollectorToken: SPLUNK_HEC_TOKEN

‎sample/Sample/Sample.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp1.0</TargetFramework>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Serilog" Version="2.4.0" />
10-
<PackageReference Include="Serilog.Sinks.Literate" Version="2.1.0" />
9+
<PackageReference Include="Serilog" Version="2.5.0" />
10+
<PackageReference Include="Serilog.Sinks.Console" Version="3.0.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Serilog.Sinks.Splunk/Serilog.Sinks.Splunk.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<Description>The Splunk Sink for Serilog</Description>
5-
<VersionPrefix>2.3.0</VersionPrefix>
5+
<VersionPrefix>2.3.1</VersionPrefix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
7-
<TargetFrameworks>net45;netstandard1.1</TargetFrameworks>
7+
<TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<AssemblyName>Serilog.Sinks.Splunk</AssemblyName>
1010
<PackageId>Serilog.Sinks.Splunk</PackageId>
@@ -27,15 +27,17 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
30-
<PackageReference Include="System.Collections" Version="4.0.11" />
31-
<PackageReference Include="System.Collections.Concurrent" Version="4.0.12" />
32-
<PackageReference Include="System.Runtime" Version="4.1.0" />
33-
<PackageReference Include="System.Threading" Version="4.0.11" />
34-
<PackageReference Include="System.Net.Http" Version="4.1.1" />
30+
<PackageReference Include="System.Net.Http" Version="4.3.0" />
31+
</ItemGroup>
32+
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
34+
<PackageReference Include="System.Net.Http" Version="4.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="Serilog" Version="2.4.0" />
38+
<PackageReference Include="Serilog" Version="2.5.0" />
39+
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
40+
<PackageReference Include="System.Net.Http" Version="4.3.2" />
3941
</ItemGroup>
4042

4143
</Project>

0 commit comments

Comments
 (0)