Merge branch 'master' into trace-and-span-ids

Author: nojaf

PingPonger/PingPonger.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1"/>

PingPonger/Program.cs

@@ -21,11 +21,11 @@ internal class Options
 
         [Option('i', "ip", Required = false,
                 HelpText = "IP to send to")]
-        public string IP { get; set; }
+        public string? IP { get; set; }
 
         [Option('l', "url", Required = false,
         HelpText = "URL to send to")]
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
         [Option('p', "port", Required = false,
                 HelpText = "the Port to send to")]
@@ -60,7 +60,7 @@ public static int Main(string[] args)
 
                 logConfig.WriteTo.ColoredConsole();
 
-                if (options.Url.Length > 0)
+                if (options.Url?.Length > 0)
                 {
                     if (options.UDP)
                     {
@@ -71,10 +71,9 @@ public static int Main(string[] args)
                         logConfig.WriteTo.TCPSink(options.Url, options.Port, null, null, new LogstashJsonFormatter());
                     }
                 }
-                else if (options.IP.Length > 0)
+                else if (options.IP?.Length > 0)
                 {
-                    IPAddress ipAddress;
-                    if (!IPAddress.TryParse(options.IP, out ipAddress))
+                    if (!IPAddress.TryParse(options.IP, out var ipAddress))
                     {
                         Console.WriteLine("Could not parse " + options.IP + " as an IP address");
                         return 1;

Serilog.Sinks.Network.Test/JsonFormatter.cs

@@ -16,7 +16,7 @@ namespace Serilog.Sinks.Network.Test
     public class JsonFormatter
     {
         private static LoggerAndSocket ConfigureTestLogger(
-            ITextFormatter formatter = null,
+            ITextFormatter? formatter = null,
             ILogEventEnricher[] enrichers = null
         )
         {

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

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <LangVersion>Preview</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />

Serilog.Sinks.Network.Test/WhenLoggingViaTcp.cs

@@ -15,7 +15,7 @@ namespace Serilog.Sinks.Network.Test
 {
     public class WhenLoggingViaTcp
     {
-        private static LoggerAndSocket ConfigureTestLogger(ITextFormatter formatter = null)
+        private static LoggerAndSocket ConfigureTestLogger(ITextFormatter? formatter = null)
         {
             var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
             socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));
@@ -66,7 +66,7 @@ public async Task CanLogWithProperties()
             using var fixture = ConfigureTestLogger();
             fixture.Logger.Information("TCP Hello {location}", "world");
             var receivedData = await ServerPoller.PollForReceivedData(fixture.Socket);
-            dynamic payload = JsonConvert.DeserializeObject<ExpandoObject>(receivedData);
+            dynamic? payload = JsonConvert.DeserializeObject<ExpandoObject>(receivedData);
             if (payload == null)
             {
                 throw new AssertionFailedException("expected payload not null");

Serilog.Sinks.Network.Test/WhenLoggingViaUdp.cs

@@ -15,7 +15,7 @@ namespace Serilog.Sinks.Network.Test
 {
     public class WhenLoggingViaUdp 
     {
-        private static LoggerAndSocket ConfigureTestLogger(ITextFormatter formatter = null)
+        private static LoggerAndSocket ConfigureTestLogger(ITextFormatter? formatter = null)
         {
             var socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
             socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));

Serilog.Sinks.Network/Sinks/TCP/TCPSocketWriter.cs

@@ -206,7 +206,7 @@ private async Task Run(Func<Task<Stream?>> tryOpenStream)
             }
         }
 
-        private async Task FlushQueue(string entry)
+        private async Task FlushQueue(string? entry)
         {
             while (_eventQueue.Count > 0)
             {
@@ -285,7 +285,7 @@ public class ExponentialBackoffTcpReconnectionPolicy
     {
         private const int Ceiling = 10 * 60; // 10 minutes in seconds
 
-        public static async Task<Stream> ConnectAsync(Func<Uri, Task<Stream>> connect, Uri host,
+        public static async Task<Stream?> ConnectAsync(Func<Uri, Task<Stream>> connect, Uri host,
             CancellationToken cancellationToken)
         {
             int delay = 1; // in seconds