[Benchmarks] Nullabe (#5875)

Co-authored-by: Piotr Kiełkowicz <[email protected]> Co-authored-by: Mikel Blanchard <[email protected]>
open-telemetry · Oct 4, 2024 · 02f4b2d · 02f4b2d
1 parent 25d99a5
commit 02f4b2d
Show file tree

Hide file tree

Showing 23 changed files with 210 additions and 215 deletions.
diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj
@@ -3,9 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>$(TargetFrameworksForTests)</TargetFrameworks>
-
-    <!-- this is temporary. will remove in future PR. -->
-    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/Benchmarks/Context/Propagation/TraceContextPropagatorBenchmarks.cs b/test/Benchmarks/Context/Propagation/TraceContextPropagatorBenchmarks.cs
@@ -26,15 +26,13 @@ public class TraceContextPropagatorBenchmarks
         return [];
     };
 
-    private Dictionary<string, string> headers;
-
     [Params(true, false)]
     public bool LongListMember { get; set; }
 
     [Params(0, 4, 32)]
     public int MembersCount { get; set; }
 
-    public Dictionary<string, string> Headers => this.headers;
+    public Dictionary<string, string>? Headers { get; private set; }
 
     [GlobalSetup]
     public void Setup()
@@ -60,13 +58,13 @@ public void Setup()
             traceState += i < this.MembersCount - 1 ? $"{listMember}," : listMember;
         }
 
-        this.headers = new Dictionary<string, string>
+        this.Headers = new Dictionary<string, string>
         {
             { TraceParent, $"00-{TraceId}-{SpanId}-01" },
             { TraceState, traceState },
         };
     }
 
     [Benchmark(Baseline = true)]
-    public void Extract() => _ = TraceContextPropagator!.Extract(default, this.headers, Getter);
+    public void Extract() => _ = TraceContextPropagator!.Extract(default, this.Headers!, Getter);
 }
diff --git a/test/Benchmarks/EventSourceBenchmarks.cs b/test/Benchmarks/EventSourceBenchmarks.cs
@@ -17,7 +17,7 @@ public void EventWithIdAllocation()
         activity.Start();
         activity.Stop();
 
-        OpenTelemetrySdkEventSource.Log.ActivityStarted(activity.OperationName, activity.Id);
+        OpenTelemetrySdkEventSource.Log.ActivityStarted(activity.OperationName, activity.Id!);
     }
 
     [Benchmark]

diff --git a/test/Benchmarks/Exporter/OtlpGrpcExporterBenchmarks.cs b/test/Benchmarks/Exporter/OtlpGrpcExporterBenchmarks.cs
@@ -18,9 +18,9 @@ namespace Benchmarks.Exporter;
 
 public class OtlpGrpcExporterBenchmarks
 {
-    private OtlpTraceExporter exporter;
-    private Activity activity;
-    private CircularBuffer<Activity> activityBatch;
+    private OtlpTraceExporter? exporter;
+    private Activity? activity;
+    private CircularBuffer<Activity>? activityBatch;
 
     [Params(1, 10, 100)]
     public int NumberOfBatches { get; set; }
@@ -45,8 +45,8 @@ public void GlobalSetup()
     [GlobalCleanup]
     public void GlobalCleanup()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
     }
 
     [Benchmark]
@@ -56,10 +56,10 @@ public void OtlpExporter_Batching()
         {
             for (int c = 0; c < this.NumberOfSpans; c++)
             {
-                this.activityBatch.Add(this.activity);
+                this.activityBatch!.Add(this.activity!);
             }
 
-            this.exporter.Export(new Batch<Activity>(this.activityBatch, this.NumberOfSpans));
+            this.exporter!.Export(new Batch<Activity>(this.activityBatch!, this.NumberOfSpans));
         }
     }
 }
diff --git a/test/Benchmarks/Exporter/OtlpHttpExporterBenchmarks.cs b/test/Benchmarks/Exporter/OtlpHttpExporterBenchmarks.cs
@@ -20,12 +20,12 @@ namespace Benchmarks.Exporter;
 public class OtlpHttpExporterBenchmarks
 {
     private readonly byte[] buffer = new byte[1024 * 1024];
-    private IDisposable server;
-    private string serverHost;
+    private IDisposable? server;
+    private string? serverHost;
     private int serverPort;
-    private OtlpTraceExporter exporter;
-    private Activity activity;
-    private CircularBuffer<Activity> activityBatch;
+    private OtlpTraceExporter? exporter;
+    private Activity? activity;
+    private CircularBuffer<Activity>? activityBatch;
 
     [Params(1, 10, 100)]
     public int NumberOfBatches { get; set; }
@@ -73,9 +73,9 @@ public void GlobalSetup()
     [GlobalCleanup]
     public void GlobalCleanup()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
-        this.server.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
+        this.server?.Dispose();
     }
 
     [Benchmark]
@@ -85,10 +85,10 @@ public void OtlpExporter_Batching()
         {
             for (int c = 0; c < this.NumberOfSpans; c++)
             {
-                this.activityBatch.Add(this.activity);
+                this.activityBatch!.Add(this.activity!);
             }
 
-            this.exporter.Export(new Batch<Activity>(this.activityBatch, this.NumberOfSpans));
+            this.exporter!.Export(new Batch<Activity>(this.activityBatch!, this.NumberOfSpans));
         }
     }
 }
diff --git a/test/Benchmarks/Exporter/OtlpLogExporterBenchmarks.cs b/test/Benchmarks/Exporter/OtlpLogExporterBenchmarks.cs
@@ -36,13 +36,13 @@ namespace Benchmarks.Exporter;
 
 public class OtlpLogExporterBenchmarks
 {
-    private OtlpLogExporter exporter;
-    private LogRecord logRecord;
-    private CircularBuffer<LogRecord> logRecordBatch;
+    private OtlpLogExporter? exporter;
+    private LogRecord? logRecord;
+    private CircularBuffer<LogRecord>? logRecordBatch;
 
-    private IHost host;
-    private IDisposable server;
-    private string serverHost;
+    private IHost? host;
+    private IDisposable? server;
+    private string? serverHost;
     private int serverPort;
 
     [GlobalSetup(Target = nameof(OtlpLogExporter_Grpc))]
@@ -103,29 +103,29 @@ public void GlobalSetupHttp()
     [GlobalCleanup(Target = nameof(OtlpLogExporter_Grpc))]
     public void GlobalCleanupGrpc()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
-        this.host.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
+        this.host?.Dispose();
     }
 
     [GlobalCleanup(Target = nameof(OtlpLogExporter_Http))]
     public void GlobalCleanupHttp()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
-        this.server.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
+        this.server?.Dispose();
     }
 
     [Benchmark]
     public void OtlpLogExporter_Http()
     {
-        this.exporter.Export(new Batch<LogRecord>(this.logRecordBatch, 1));
+        this.exporter!.Export(new Batch<LogRecord>(this.logRecordBatch!, 1));
     }
 
     [Benchmark]
     public void OtlpLogExporter_Grpc()
     {
-        this.exporter.Export(new Batch<LogRecord>(this.logRecordBatch, 1));
+        this.exporter!.Export(new Batch<LogRecord>(this.logRecordBatch!, 1));
     }
 
     private sealed class MockLogService : OtlpCollector.LogsService.LogsServiceBase

diff --git a/test/Benchmarks/Exporter/OtlpTraceExporterBenchmarks.cs b/test/Benchmarks/Exporter/OtlpTraceExporterBenchmarks.cs
@@ -36,13 +36,13 @@ namespace Benchmarks.Exporter;
 
 public class OtlpTraceExporterBenchmarks
 {
-    private OtlpTraceExporter exporter;
-    private Activity activity;
-    private CircularBuffer<Activity> activityBatch;
+    private OtlpTraceExporter? exporter;
+    private Activity? activity;
+    private CircularBuffer<Activity>? activityBatch;
 
-    private IHost host;
-    private IDisposable server;
-    private string serverHost;
+    private IHost? host;
+    private IDisposable? server;
+    private string? serverHost;
     private int serverPort;
 
     [GlobalSetup(Target = nameof(OtlpTraceExporter_Grpc))]
@@ -103,31 +103,31 @@ public void GlobalSetupHttp()
     [GlobalCleanup(Target = nameof(OtlpTraceExporter_Grpc))]
     public void GlobalCleanupGrpc()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
-        this.activity.Dispose();
-        this.host.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
+        this.activity?.Dispose();
+        this.host?.Dispose();
     }
 
     [GlobalCleanup(Target = nameof(OtlpTraceExporter_Http))]
     public void GlobalCleanupHttp()
     {
-        this.exporter.Shutdown();
-        this.exporter.Dispose();
-        this.server.Dispose();
-        this.activity.Dispose();
+        this.exporter?.Shutdown();
+        this.exporter?.Dispose();
+        this.server?.Dispose();
+        this.activity?.Dispose();
     }
 
     [Benchmark]
     public void OtlpTraceExporter_Http()
     {
-        this.exporter.Export(new Batch<Activity>(this.activityBatch, 1));
+        this.exporter!.Export(new Batch<Activity>(this.activityBatch!, 1));
     }
 
     [Benchmark]
     public void OtlpTraceExporter_Grpc()
     {
-        this.exporter.Export(new Batch<Activity>(this.activityBatch, 1));
+        this.exporter!.Export(new Batch<Activity>(this.activityBatch!, 1));
     }
 
     private sealed class MockTraceService : OtlpCollector.TraceService.TraceServiceBase

diff --git a/test/Benchmarks/Exporter/PrometheusSerializerBenchmarks.cs b/test/Benchmarks/Exporter/PrometheusSerializerBenchmarks.cs
@@ -14,8 +14,8 @@ public class PrometheusSerializerBenchmarks
 {
     private readonly List<Metric> metrics = new();
     private readonly byte[] buffer = new byte[85000];
-    private Meter meter;
-    private MeterProvider meterProvider;
+    private Meter? meter;
+    private MeterProvider? meterProvider;
     private Dictionary<Metric, PrometheusMetric> cache = new Dictionary<Metric, PrometheusMetric>();
 
     [Params(1, 1000, 10000)]
@@ -45,7 +45,7 @@ public void GlobalSetup()
     public void GlobalCleanup()
     {
         this.meter?.Dispose();
-        this.meterProvider.Dispose();
+        this.meterProvider?.Dispose();
     }
 
     // TODO: this has a dependency on https://github.com/open-telemetry/opentelemetry-dotnet/issues/2361

diff --git a/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs b/test/Benchmarks/Exporter/ZipkinExporterBenchmarks.cs
@@ -19,10 +19,10 @@ namespace Benchmarks.Exporter;
 public class ZipkinExporterBenchmarks
 {
     private readonly byte[] buffer = new byte[4096];
-    private Activity activity;
-    private CircularBuffer<Activity> activityBatch;
-    private IDisposable server;
-    private string serverHost;
+    private Activity? activity;
+    private CircularBuffer<Activity>? activityBatch;
+    private IDisposable? server;
+    private string? serverHost;
     private int serverPort;
 
     [Params(1, 10, 100)]
@@ -60,7 +60,7 @@ public void GlobalSetup()
     [GlobalCleanup]
     public void GlobalCleanup()
     {
-        this.server.Dispose();
+        this.server?.Dispose();
     }
 
     [Benchmark]
@@ -76,10 +76,10 @@ public void ZipkinExporter_Batching()
         {
             for (int c = 0; c < this.NumberOfSpans; c++)
             {
-                this.activityBatch.Add(this.activity);
+                this.activityBatch!.Add(this.activity!);
             }
 
-            exporter.Export(new Batch<Activity>(this.activityBatch, this.NumberOfSpans));
+            exporter.Export(new Batch<Activity>(this.activityBatch!, this.NumberOfSpans));
         }
 
         exporter.Shutdown();

diff --git a/test/Benchmarks/Helper/ActivityHelper.cs b/test/Benchmarks/Helper/ActivityHelper.cs
@@ -31,14 +31,14 @@ public static Activity CreateTestActivity()
             new ActivityEvent(
                 "Event1",
                 eventTimestamp,
-                new ActivityTagsCollection(new Dictionary<string, object>
+                new ActivityTagsCollection(new Dictionary<string, object?>
                 {
                     { "key", "value" },
                 })),
             new ActivityEvent(
                 "Event2",
                 eventTimestamp,
-                new ActivityTagsCollection(new Dictionary<string, object>
+                new ActivityTagsCollection(new Dictionary<string, object?>
                 {
                     { "key", "value" },
                 })),
@@ -48,7 +48,7 @@ public static Activity CreateTestActivity()
 
         using var activitySource = new ActivitySource(nameof(CreateTestActivity));
 
-        var tags = attributes.Select(kvp => new KeyValuePair<string, object>(kvp.Key, kvp.Value.ToString()));
+        var tags = attributes.Select(kvp => new KeyValuePair<string, object?>(kvp.Key, kvp.Value.ToString()));
         var links = new[]
         {
             new ActivityLink(new ActivityContext(
@@ -75,10 +75,10 @@ public static Activity CreateTestActivity()
 
         foreach (var evnt in events)
         {
-            activity.AddEvent(evnt);
+            activity!.AddEvent(evnt);
         }
 
-        activity.SetEndTime(endTimestamp);
+        activity!.SetEndTime(endTimestamp);
         activity.Stop();
 
         return activity;

diff --git a/test/Benchmarks/Logs/LogScopeBenchmarks.cs b/test/Benchmarks/Logs/LogScopeBenchmarks.cs
@@ -75,6 +75,6 @@ public LogScopeBenchmarks()
     [Benchmark]
     public void ForEachScope()
     {
-        this.logRecord.ForEachScope(this.callback, null);
+        this.logRecord.ForEachScope(this.callback!, null);
     }
 }