Skip to content

Commit d3c81a5

Browse files
dependabot[bot]EEParker
dependabot[bot]
and
EEParker
authored
Bump Serilog from 3.1.1 to 4.0.0 (#210)
* Bump Serilog from 3.1.1 to 4.0.0 Bumps [Serilog](https://github.com/serilog/serilog) from 3.1.1 to 4.0.0. - [Release notes](https://github.com/serilog/serilog/releases) - [Commits](serilog/serilog@v3.1.1...v4.0.0) --- updated-dependencies: - dependency-name: Serilog dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Drop dependency Serilog.Sinks.PeriodicBatching in favor of built in batching from Serilog 4.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: EEParker <[email protected]>
1 parent 61d2219 commit d3c81a5

File tree

13 files changed

+30
-66
lines changed

13 files changed

+30
-66
lines changed

‎sample/Sample/Sample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
11-
<PackageReference Include="Serilog" Version="3.1.1" />
11+
<PackageReference Include="Serilog" Version="4.0.0" />
1212
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
1313
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
1414
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="../common.props"/>
3+
<Import Project="../common.props" />
44

55
<PropertyGroup>
66
<Description>The Splunk Sink for Serilog</Description>
@@ -18,8 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Serilog" Version="3.1.1" />
22-
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="4.1.1" />
21+
<PackageReference Include="Serilog" Version="4.0.0" />
2322
</ItemGroup>
2423

2524
</Project>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using Serilog.Formatting.Json;
1818
using Serilog.Parsing;
1919
using System;
20-
using System.Globalization;
2120
using System.IO;
2221
using System.Linq;
2322

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
using System.Collections.Generic;
62

73
namespace Serilog.Sinks.Splunk
84
{ /// <summary>

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
using System.Collections.Generic;
62

73
namespace Serilog.Sinks.Splunk
84
{

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
using Serilog.Core;
1516
using Serilog.Debugging;
1617
using Serilog.Events;
1718
using Serilog.Formatting;
18-
using Serilog.Sinks.PeriodicBatching;
1919
using System;
2020
using System.Collections.Generic;
2121
using System.IO;
@@ -177,15 +177,15 @@ public EventCollectorSink(
177177
: new EventCollectorClient(eventCollectorToken);
178178
}
179179

180-
/// <summary>
181-
/// Emit a batch of log events, running asynchronously.
182-
/// </summary>
183-
/// <param name="events">The events to emit.</param>
184-
public virtual async Task EmitBatchAsync(IEnumerable<LogEvent> events)
180+
/// <inheritdoc />
181+
public virtual Task OnEmptyBatchAsync() => Task.CompletedTask;
182+
183+
/// <inheritdoc />
184+
public virtual async Task EmitBatchAsync(IReadOnlyCollection<LogEvent> batch)
185185
{
186186
var allEvents = new StringWriter();
187187

188-
foreach (var logEvent in events)
188+
foreach (var logEvent in batch)
189189
{
190190
_jsonFormatter.Format(logEvent, allEvents);
191191
}
@@ -210,8 +210,5 @@ public virtual async Task EmitBatchAsync(IEnumerable<LogEvent> events)
210210
}
211211
}
212212
}
213-
214-
/// <inheritdoc />
215-
public Task OnEmptyBatchAsync() => Task.CompletedTask;
216213
}
217214
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using Serilog.Formatting.Json;
1818
using System;
1919
using System.Collections.Generic;
20-
using System.Globalization;
2120
using System.IO;
2221

2322
namespace Serilog.Sinks.Splunk

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using Serilog.Core;
1818
using Serilog.Events;
1919
using Serilog.Formatting;
20-
using Serilog.Sinks.PeriodicBatching;
2120
using Serilog.Sinks.Splunk;
2221
using System;
2322
using System.Net.Http;
@@ -73,10 +72,10 @@ public static LoggerConfiguration EventCollector(
7372
{
7473
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
7574

76-
var batchingOptions = new PeriodicBatchingSinkOptions
75+
var batchingOptions = new BatchingOptions
7776
{
7877
BatchSizeLimit = batchSizeLimit,
79-
Period = TimeSpan.FromSeconds(batchIntervalInSeconds),
78+
BufferingTimeLimit = TimeSpan.FromSeconds(batchIntervalInSeconds),
8079
EagerlyEmitFirstEvent = true,
8180
QueueLimit = queueLimit
8281
};
@@ -95,9 +94,7 @@ public static LoggerConfiguration EventCollector(
9594
messageHandler: messageHandler,
9695
subSecondPrecision: subSecondPrecision);
9796

98-
var batchingSink = new PeriodicBatchingSink(eventCollectorSink, batchingOptions);
99-
100-
return configuration.Sink(batchingSink, restrictedToMinimumLevel, levelSwitch);
97+
return configuration.Sink(eventCollectorSink, batchingOptions, restrictedToMinimumLevel, levelSwitch);
10198
}
10299

103100
/// <summary>
@@ -132,10 +129,10 @@ public static LoggerConfiguration EventCollector(
132129
if (jsonFormatter == null) throw new ArgumentNullException(nameof(jsonFormatter));
133130

134131

135-
var batchingOptions = new PeriodicBatchingSinkOptions
132+
var batchingOptions = new BatchingOptions
136133
{
137134
BatchSizeLimit = batchSizeLimit,
138-
Period = TimeSpan.FromSeconds(batchIntervalInSeconds),
135+
BufferingTimeLimit = TimeSpan.FromSeconds(batchIntervalInSeconds),
139136
EagerlyEmitFirstEvent = true,
140137
QueueLimit = queueLimit
141138
};
@@ -147,9 +144,7 @@ public static LoggerConfiguration EventCollector(
147144
jsonFormatter,
148145
messageHandler);
149146

150-
var batchingSink = new PeriodicBatchingSink(eventCollectorSink, batchingOptions);
151-
152-
return configuration.Sink(batchingSink, restrictedToMinimumLevel, levelSwitch);
147+
return configuration.Sink(eventCollectorSink, batchingOptions, restrictedToMinimumLevel, levelSwitch);
153148
}
154149

155150

@@ -199,10 +194,10 @@ public static LoggerConfiguration EventCollector(
199194
{
200195
if (configuration == null) throw new ArgumentNullException(nameof(configuration));
201196

202-
var batchingOptions = new PeriodicBatchingSinkOptions
197+
var batchingOptions = new BatchingOptions
203198
{
204199
BatchSizeLimit = batchSizeLimit,
205-
Period = TimeSpan.FromSeconds(batchIntervalInSeconds),
200+
BufferingTimeLimit = TimeSpan.FromSeconds(batchIntervalInSeconds),
206201
EagerlyEmitFirstEvent = true,
207202
QueueLimit = queueLimit
208203
};
@@ -223,10 +218,7 @@ public static LoggerConfiguration EventCollector(
223218
subSecondPrecision: subSecondPrecision
224219
);
225220

226-
227-
var batchingSink = new PeriodicBatchingSink(eventCollectorSink, batchingOptions);
228-
229-
return configuration.Sink(batchingSink, restrictedToMinimumLevel, levelSwitch);
221+
return configuration.Sink(eventCollectorSink, batchingOptions, restrictedToMinimumLevel, levelSwitch);
230222
}
231223
}
232224
}

‎src/Serilog.Sinks.UDP/Sinks/Splunk/UdpSink.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
using System.Net.Sockets;
2222
using System.Text;
2323
using System.Threading.Tasks;
24-
using Serilog.Sinks.PeriodicBatching;
2524

2625
namespace Serilog.Sinks.Splunk
2726
{
@@ -95,7 +94,7 @@ private void DisposeSocket()
9594
/// or <see cref="M:Serilog.Sinks.PeriodicBatching.PeriodicBatchingSink.EmitBatchAsync(System.Collections.Generic.IEnumerable{Serilog.Events.LogEvent})" />,
9695
/// not both.
9796
/// </remarks>
98-
public async Task EmitBatchAsync(IEnumerable<LogEvent> batch)
97+
public async Task EmitBatchAsync(IReadOnlyCollection<LogEvent> batch)
9998
{
10099
foreach (var logEvent in batch)
101100
{

‎src/Serilog.Sinks.UDP/SplunkLoggingConfigurationExtensions.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Serilog.Configuration;
1616
using Serilog.Events;
1717
using Serilog.Formatting;
18-
using Serilog.Sinks.PeriodicBatching;
1918
using Serilog.Sinks.Splunk;
2019
using System;
2120

@@ -44,19 +43,17 @@ public static LoggerConfiguration SplunkViaUdp(
4443
bool renderTemplate = true,
4544
bool renderMessage = true)
4645
{
47-
var batchingOptions = new PeriodicBatchingSinkOptions
46+
var batchingOptions = new BatchingOptions
4847
{
4948
BatchSizeLimit = connectionInfo.BatchPostingLimit,
50-
Period = connectionInfo.Period,
49+
BufferingTimeLimit = connectionInfo.Period,
5150
EagerlyEmitFirstEvent = true,
5251
QueueLimit = connectionInfo.QueueSizeLimit
5352
};
5453

5554
var sink = new UdpSink(connectionInfo, formatProvider, renderTemplate, renderMessage);
5655

57-
var batchingSink = new PeriodicBatchingSink(sink, batchingOptions);
58-
59-
return loggerConfiguration.Sink(batchingSink, restrictedToMinimumLevel);
56+
return loggerConfiguration.Sink(sink, batchingOptions, restrictedToMinimumLevel);
6057
}
6158

6259
/// <summary>
@@ -73,19 +70,17 @@ public static LoggerConfiguration SplunkViaUdp(
7370
ITextFormatter formatter,
7471
LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum)
7572
{
76-
var batchingOptions = new PeriodicBatchingSinkOptions
73+
var batchingOptions = new BatchingOptions
7774
{
7875
BatchSizeLimit = connectionInfo.BatchPostingLimit,
79-
Period = connectionInfo.Period,
76+
BufferingTimeLimit = connectionInfo.Period,
8077
EagerlyEmitFirstEvent = true,
8178
QueueLimit = connectionInfo.QueueSizeLimit
8279
};
8380

8481
var sink = new UdpSink(connectionInfo, formatter);
8582

86-
var batchingSink = new PeriodicBatchingSink(sink, batchingOptions);
87-
88-
return loggerConfiguration.Sink(batchingSink, restrictedToMinimumLevel);
83+
return loggerConfiguration.Sink(sink, batchingOptions, restrictedToMinimumLevel);
8984
}
9085
}
9186
}

‎src/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">4.1.1</VersionPrefix>
4+
<VersionPrefix Condition=" '$(VersionPrefix)' == '' ">5.0.0</VersionPrefix>
55
<VersionSuffix Condition="$(VersionSuffix) == '' and '$(Configuration)' == 'Debug' ">debug</VersionSuffix>
66
<Authors>Matthew Erbs, Serilog Contributors</Authors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

‎test/Serilog.Sinks.Splunk.TCP.Tests/TCPCollectorTests.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
42
using System.Net;
5-
using System.Net.NetworkInformation;
63
using System.Net.Sockets;
7-
using System.Text;
8-
using System.Threading;
9-
using System.Threading.Tasks;
104
using Serilog.Events;
115
using Xunit;
126

‎test/Serilog.Sinks.Splunk.Tests/EpochExtensionsTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Serilog.Sinks.Splunk;
2-
using System;
3-
using System.Diagnostics;
1+
using System;
42
using Xunit;
53

64
namespace Serilog.Sinks.Splunk.Tests

0 commit comments

Comments
 (0)