Skip to content

Commit cf4f649

Browse files
merblamerbla
authored
Merge pull request #41 from serilog/dev
Release 2.1.1
2 parents 6ed3774 + 3da9a12 commit cf4f649

File tree

5 files changed

+122
-51
lines changed

5 files changed

+122
-51
lines changed

‎CHANGES.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
##2.1.1
2+
- [#38](https://github.com/serilog/serilog-sinks-splunk/issues/38)
3+
- Clean up of sample app using examples of host, sourcetype, source override
4+
5+
##2.1.0
6+
7+
* Change to use a standalone formatter
8+
* Resolves #32 & #26 by exposing `HttpMessageHandler`
9+
* Resolves #30 by ignoring OSX build and including tests in `build.sh` for TravisCI
10+
111
##2.0
212
- Support for DotNet Core
313
- Event Collector fluent interface changed to `.WriteTo.EventCollector`

‎sample/Program.cs‎

Lines changed: 109 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,94 +5,155 @@
55

66
namespace Sample
77
{
8+
///
9+
/// Sample 10 false
10+
///
811
public class Program
912
{
10-
public static string EventCollectorToken = "1A4D65C9-601A-4717-AD6C-E1EC36A46B69";
13+
public static string EventCollectorToken = "2B94855F-1184-46F7-BFF1-56A3112F627E";
1114

1215
public static void Main(string[] args)
1316
{
1417
var eventsToCreate = 100;
18+
var runSSL = false;
1519

1620
if(args.Length > 0)
1721
eventsToCreate = int.Parse(args[0]);
1822

23+
if(args.Length == 2)
24+
runSSL = bool.Parse(args[1]);
25+
1926
Log.Information("Sample starting up");
20-
Serilog.Debugging.SelfLog.Out = System.Console.Out;
27+
Serilog.Debugging.SelfLog.Enable(System.Console.Out);
2128

22-
// Vanilla Tests just host
29+
UsingHostOnly(eventsToCreate);
30+
UsingFullUri(eventsToCreate);
31+
OverridingSource(eventsToCreate);
32+
OverridingSourceType(eventsToCreate);
33+
OverridingHost(eventsToCreate);
34+
WithNoTemplate(eventsToCreate);
35+
36+
if(runSSL)
37+
UsingSSL(eventsToCreate);
38+
39+
Log.Debug("Done");
40+
}
41+
42+
public static void OverridingSource(int eventsToCreate)
43+
{
44+
// Override Source
2345
Log.Logger = new LoggerConfiguration()
2446
.MinimumLevel.Debug()
2547
.WriteTo.LiterateConsole()
2648
.WriteTo.EventCollector(
27-
"http://localhost:8088",
28-
Program.EventCollectorToken)
49+
"http://localhost:8088",
50+
Program.EventCollectorToken,
51+
source: "Serilog.Sinks.Splunk.Sample.TestSource")
2952
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
30-
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Vanilla No services/collector")
31-
.CreateLogger();
32-
53+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Source Override")
54+
.CreateLogger();
55+
3356
foreach (var i in Enumerable.Range(0, eventsToCreate))
3457
{
35-
Log.Information("Running vanilla without extended endpoint loop {Counter}", i);
58+
Log.Information("Running source override loop {Counter}", i);
3659
}
3760

3861
Log.CloseAndFlush();
3962

40-
// Vanilla Test with full uri specified
63+
}
64+
65+
public static void OverridingSourceType(int eventsToCreate)
66+
{
67+
// Override Source
4168
Log.Logger = new LoggerConfiguration()
4269
.MinimumLevel.Debug()
4370
.WriteTo.LiterateConsole()
4471
.WriteTo.EventCollector(
45-
"http://localhost:8088/services/collector",
46-
Program.EventCollectorToken)
72+
"http://localhost:8088",
73+
Program.EventCollectorToken,
74+
sourceType: "Serilog.Sinks.Splunk.Sample.TestSourceType")
4775
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
48-
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Vanilla with full uri specified")
49-
.CreateLogger();
50-
76+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Source Type Override")
77+
.CreateLogger();
78+
5179
foreach (var i in Enumerable.Range(0, eventsToCreate))
5280
{
53-
Log.Information("Running vanilla loop {Counter}", i);
81+
Log.Information("Running source type override loop {Counter}", i);
5482
}
5583

5684
Log.CloseAndFlush();
5785

58-
// Override Source
86+
}
87+
88+
public static void OverridingHost(int eventsToCreate)
89+
{
90+
// Override Host
5991
Log.Logger = new LoggerConfiguration()
6092
.MinimumLevel.Debug()
6193
.WriteTo.LiterateConsole()
6294
.WriteTo.EventCollector(
6395
"http://localhost:8088",
6496
Program.EventCollectorToken,
65-
source: "Serilog.Sinks.Splunk.Sample")
97+
host: "myamazingmachine")
6698
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
67-
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Source Override")
99+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Host Override")
68100
.CreateLogger();
69101

70102
foreach (var i in Enumerable.Range(0, eventsToCreate))
71103
{
72-
Log.Information("Running source override loop {Counter}", i);
104+
Log.Information("Running host override loop {Counter}", i);
73105
}
74106

75107
Log.CloseAndFlush();
76-
77-
// Override Host
108+
109+
}
110+
111+
public static void UsingFullUri(int eventsToCreate)
112+
{
113+
// Vanilla Test with full uri specified
78114
Log.Logger = new LoggerConfiguration()
79115
.MinimumLevel.Debug()
80116
.WriteTo.LiterateConsole()
81117
.WriteTo.EventCollector(
82-
"http://localhost:8088",
83-
Program.EventCollectorToken,
84-
host: "myamazingmachine")
118+
"http://localhost:8088/services/collector",
119+
Program.EventCollectorToken)
85120
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
86-
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Host Override")
121+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Vanilla with full uri specified")
87122
.CreateLogger();
88-
123+
124+
89125
foreach (var i in Enumerable.Range(0, eventsToCreate))
90126
{
91-
Log.Information("Running host override loop {Counter}", i);
92-
}
127+
Log.Information("Running vanilla loop with full uri {Counter}", i);
128+
}
129+
130+
Log.CloseAndFlush();
131+
}
132+
133+
public static void UsingHostOnly(int eventsToCreate)
134+
{
135+
// Vanilla Tests just host
136+
Log.Logger = new LoggerConfiguration()
137+
.MinimumLevel.Debug()
138+
.WriteTo.LiterateConsole()
139+
.WriteTo.EventCollector(
140+
"http://localhost:8088",
141+
Program.EventCollectorToken)
142+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
143+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "Vanilla No services/collector in uri")
144+
.CreateLogger();
145+
146+
foreach (var i in Enumerable.Range(0, eventsToCreate))
147+
{
148+
Log.Information("Running vanilla without host name and port only {Counter}", i);
149+
}
150+
93151
Log.CloseAndFlush();
152+
}
94153

95-
// No Template
154+
public static void WithNoTemplate(int eventsToCreate)
155+
{
156+
// No Template
96157
Log.Logger = new LoggerConfiguration()
97158
.MinimumLevel.Debug()
98159
.WriteTo.LiterateConsole()
@@ -110,26 +171,26 @@ public static void Main(string[] args)
110171
}
111172

112173
Log.CloseAndFlush();
174+
}
113175

114-
// // SSL
115-
// Log.Logger = new LoggerConfiguration()
116-
// .MinimumLevel.Debug()
117-
// .WriteTo.LiterateConsole()
118-
// .WriteTo.EventCollector(
119-
// "https://localhost:8088",
120-
// Program.EventCollectorToken)
121-
// .Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
122-
// .Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "HTTPS")
123-
// .CreateLogger();
176+
public static void UsingSSL(int eventsToCreate)
177+
{
178+
// SSL
179+
Log.Logger = new LoggerConfiguration()
180+
.MinimumLevel.Debug()
181+
.WriteTo.LiterateConsole()
182+
.WriteTo.EventCollector(
183+
"https://localhost:8088",
184+
Program.EventCollectorToken)
185+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample", "ViaEventCollector")
186+
.Enrich.WithProperty("Serilog.Sinks.Splunk.Sample.TestType", "HTTPS")
187+
.CreateLogger();
124188

125-
// foreach (var i in Enumerable.Range(0, eventsToCreate))
126-
// {
127-
// Log.Information("HTTPS {Counter}", i);
128-
// }
129-
// Log.CloseAndFlush();
130-
131-
Log.Debug("Done");
132-
189+
foreach (var i in Enumerable.Range(0, eventsToCreate))
190+
{
191+
Log.Information("HTTPS {Counter}", i);
192+
}
193+
Log.CloseAndFlush();
133194
}
134195
}
135196
}

‎sample/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.0",
2+
"version": "2.1.1",
33
"buildOptions": {
44
"emitEntryPoint": true
55
},

‎src/Serilog.Sinks.Splunk/Sinks/Splunk/SplunkJsonFormatter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public SplunkJsonFormatter(
7676

7777
if (!string.IsNullOrWhiteSpace(sourceType))
7878
{
79-
suffixWriter.Write(",\"sourceType\":");
79+
suffixWriter.Write(",\"sourcetype\":");
8080
JsonValueFormatter.WriteQuotedJsonString(sourceType, suffixWriter);
8181
}
8282

‎src/Serilog.Sinks.Splunk/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.1.0-*",
2+
"version": "2.1.1-*",
33
"description": "The Splunk Sink for Serilog",
44
"authors": [
55
"Matthew Erbs, Serilog Contributors"

0 commit comments

Comments
 (0)