Add a timeout on Dispose/Flush so we avoid infinitely hanging.

Author: nojaf

PingPonger/Program.cs

@@ -68,7 +68,7 @@ public static int Main(string[] args)
                     }
                     if (options.TCP)
                     {
-                        logConfig.WriteTo.TCPSink(options.Url, options.Port, new LogstashJsonFormatter());
+                        logConfig.WriteTo.TCPSink(options.Url, options.Port, null, null, new LogstashJsonFormatter());
                     }
                 }
                 else if (options.IP.Length > 0)
@@ -86,7 +86,7 @@ public static int Main(string[] args)
                     }
                     if (options.TCP)
                     {
-                        logConfig.WriteTo.TCPSink(ipAddress, options.Port, new LogstashJsonFormatter());
+                        logConfig.WriteTo.TCPSink(ipAddress, options.Port,null,null, new LogstashJsonFormatter());
                     }
                 }
                 else

Serilog.Sinks.Network.Test/JsonFormatter.cs

@@ -21,7 +21,7 @@ private void ConfigureTestLogger(ITextFormatter formatter = null)
             _server.Start();
 
             _logger = new LoggerConfiguration()
-                .WriteTo.TCPSink(IPAddress.Loopback, port, formatter)
+                .WriteTo.TCPSink(IPAddress.Loopback, port, null, null, formatter)
                 .CreateLogger();
         }
 

Serilog.Sinks.Network.Test/WhenLoggingViaTCP.cs

@@ -22,7 +22,7 @@ private void ConfigureTestLogger(ITextFormatter formatter = null)
             _server.Start();
 
             _logger = new LoggerConfiguration()
-                .WriteTo.TCPSink(IPAddress.Loopback, port, formatter)
+                .WriteTo.TCPSink(IPAddress.Loopback, port, null, null, formatter)
                 .CreateLogger();
         }
 

Serilog.Sinks.Network/NetworkLoggerConfigurationExtensions.cs

@@ -41,30 +41,39 @@ public static LoggerConfiguration TCPSink(
             this LoggerSinkConfiguration loggerConfiguration,
             IPAddress ipAddress,
             int port,
+            int? writeTimeoutMs = null,
+            int? disposeTimeoutMs = null,
             ITextFormatter textFormatter = null,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum)
         {
-            var sink = new TCPSink(ipAddress, port, textFormatter ?? new LogstashJsonFormatter());
-            return loggerConfiguration.Sink(sink, restrictedToMinimumLevel);
+            return TCPSink(loggerConfiguration, $"tcp://{ipAddress}:{port}", writeTimeoutMs, disposeTimeoutMs,  textFormatter, restrictedToMinimumLevel);
         }
 
         public static LoggerConfiguration TCPSink(
             this LoggerSinkConfiguration loggerConfiguration,
             string host,
             int port,
+            int? writeTimeoutMs = null,
+            int? disposeTimeoutMs = null,
             ITextFormatter textFormatter = null,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum)
         {
-            return TCPSink(loggerConfiguration, $"{host}:{port}", textFormatter, restrictedToMinimumLevel);
+            return TCPSink(loggerConfiguration, $"{host}:{port}", writeTimeoutMs, disposeTimeoutMs, textFormatter, restrictedToMinimumLevel);
         }
 
         public static LoggerConfiguration TCPSink(
             this LoggerSinkConfiguration loggerConfiguration,
             string uri,
+            int? writeTimeoutMs = null,
+            int? disposeTimeoutMs = null,
             ITextFormatter textFormatter = null,
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum)
         {
-            var sink = new TCPSink(BuildUri(uri), textFormatter ?? new LogstashJsonFormatter());
+            var socketWriter = new TcpSocketWriter(
+                BuildUri(uri),
+                writeTimeoutMs: writeTimeoutMs,
+                disposeTimeoutMs: disposeTimeoutMs);
+            var sink = new TCPSink(socketWriter, textFormatter ?? new LogstashJsonFormatter());
             return loggerConfiguration.Sink(sink, restrictedToMinimumLevel);
         }
 

Serilog.Sinks.Network/Serilog.Sinks.Network.csproj

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <RootNamespace>Serilog.Sinks.Network</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>

Serilog.Sinks.Network/Sinks/TCP/TCPSink.cs

@@ -13,15 +13,14 @@ public class TCPSink : ILogEventSink, IDisposable
         private readonly ITextFormatter _formatter;
         private readonly TcpSocketWriter _socketWriter;
 
-        public TCPSink(IPAddress ipAddress, int port, ITextFormatter formatter)
+        public TCPSink(Uri uri, ITextFormatter formatter)
+            : this(new TcpSocketWriter(uri), formatter)
         {
-            _socketWriter = new TcpSocketWriter(new Uri($"tcp://{ipAddress}:{port}"));
-            _formatter = formatter;
         }
 
-        public TCPSink(Uri uri, ITextFormatter formatter)
+        public TCPSink(TcpSocketWriter socketWriter, ITextFormatter formatter)
         {
-            _socketWriter = new TcpSocketWriter(uri);
+            _socketWriter = socketWriter;
             _formatter = formatter;
         }