[repo] remove incorrect null suppressions (open-telemetry#6075)

SimonCropp · Kielek · web-flow · commit c643b7fb22e2 · 2025-02-14T09:41:12.000-08:00
Co-authored-by: Piotr Kiełkowicz &lt;pkiekowicz@splunk.com&gt;
diff --git a/examples/AspNetCore/Program.cs b/examples/AspNetCore/Program.cs
@@ -13,16 +13,16 @@
 var appBuilder = WebApplication.CreateBuilder(args);
 
 // Note: Switch between Zipkin/OTLP/Console by setting UseTracingExporter in appsettings.json.
-var tracingExporter = appBuilder.Configuration.GetValue("UseTracingExporter", defaultValue: "console")!.ToLowerInvariant();
+var tracingExporter = appBuilder.Configuration.GetValue("UseTracingExporter", defaultValue: "console").ToLowerInvariant();
 
 // Note: Switch between Prometheus/OTLP/Console by setting UseMetricsExporter in appsettings.json.
-var metricsExporter = appBuilder.Configuration.GetValue("UseMetricsExporter", defaultValue: "console")!.ToLowerInvariant();
+var metricsExporter = appBuilder.Configuration.GetValue("UseMetricsExporter", defaultValue: "console").ToLowerInvariant();
 
 // Note: Switch between Console/OTLP by setting UseLogExporter in appsettings.json.
-var logExporter = appBuilder.Configuration.GetValue("UseLogExporter", defaultValue: "console")!.ToLowerInvariant();
+var logExporter = appBuilder.Configuration.GetValue("UseLogExporter", defaultValue: "console").ToLowerInvariant();
 
 // Note: Switch between Explicit/Exponential by setting HistogramAggregation in appsettings.json
-var histogramAggregation = appBuilder.Configuration.GetValue("HistogramAggregation", defaultValue: "explicit")!.ToLowerInvariant();
+var histogramAggregation = appBuilder.Configuration.GetValue("HistogramAggregation", defaultValue: "explicit").ToLowerInvariant();
 
 // Create a service to expose ActivitySource, and Metric Instruments
 // for manual instrumentation
@@ -69,7 +69,7 @@
                 builder.AddOtlpExporter(otlpOptions =>
                 {
                     // Use IConfiguration directly for Otlp exporter endpoint option.
-                    otlpOptions.Endpoint = new Uri(appBuilder.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317")!);
+                    otlpOptions.Endpoint = new Uri(appBuilder.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317"));
                 });
                 break;
 
@@ -133,7 +133,7 @@
                 builder.AddOtlpExporter(otlpOptions =>
                 {
                     // Use IConfiguration directly for Otlp exporter endpoint option.
-                    otlpOptions.Endpoint = new Uri(appBuilder.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317")!);
+                    otlpOptions.Endpoint = new Uri(appBuilder.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317"));
                 });
                 break;
             default:
diff --git a/examples/GrpcService/Startup.cs b/examples/GrpcService/Startup.cs
@@ -23,23 +23,23 @@ public void ConfigureServices(IServiceCollection services)
             .WithTracing(builder =>
             {
                 builder
-                    .ConfigureResource(r => r.AddService(this.Configuration.GetValue("ServiceName", defaultValue: "otel-test")!))
+                    .ConfigureResource(r => r.AddService(this.Configuration.GetValue("ServiceName", defaultValue: "otel-test")))
                     .AddAspNetCoreInstrumentation();
 
                 // Switch between Otlp/Zipkin/Console by setting UseExporter in appsettings.json.
-                var exporter = this.Configuration.GetValue("UseExporter", defaultValue: "console")!.ToLowerInvariant();
+                var exporter = this.Configuration.GetValue("UseExporter", defaultValue: "console").ToLowerInvariant();
                 switch (exporter)
                 {
                     case "otlp":
                         builder.AddOtlpExporter(otlpOptions =>
                         {
-                            otlpOptions.Endpoint = new Uri(this.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317")!);
+                            otlpOptions.Endpoint = new Uri(this.Configuration.GetValue("Otlp:Endpoint", defaultValue: "http://localhost:4317"));
                         });
                         break;
                     case "zipkin":
                         builder.AddZipkinExporter(zipkinOptions =>
                         {
-                            zipkinOptions.Endpoint = new Uri(this.Configuration.GetValue("Zipkin:Endpoint", defaultValue: "http://localhost:9411/api/v2/spans")!);
+                            zipkinOptions.Endpoint = new Uri(this.Configuration.GetValue("Zipkin:Endpoint", defaultValue: "http://localhost:9411/api/v2/spans"));
                         });
                         break;
                     default:
diff --git a/src/OpenTelemetry.Extensions.Propagators/B3Propagator.cs b/src/OpenTelemetry.Extensions.Propagators/B3Propagator.cs
@@ -193,13 +193,20 @@ private static PropagationContext ExtractFromSingleHeader<T>(PropagationContext
     {
         try
         {
-            var header = getter(carrier, XB3Combined)?.FirstOrDefault();
+            var headers = getter(carrier, XB3Combined);
+            if (headers == null)
+            {
+                return context;
+            }
+
+            var header = headers.FirstOrDefault();
+
             if (string.IsNullOrWhiteSpace(header))
             {
                 return context;
             }
 
-            var parts = header!.Split(XB3CombinedDelimiter);
+            var parts = header.Split(XB3CombinedDelimiter);
             if (parts.Length < 2 || parts.Length > 4)
             {
                 return context;
diff --git a/src/OpenTelemetry.Extensions.Propagators/JaegerPropagator.cs b/src/OpenTelemetry.Extensions.Propagators/JaegerPropagator.cs
@@ -49,14 +49,19 @@ public override PropagationContext Extract<T>(PropagationContext context, T carr
         try
         {
             var jaegerHeaderCollection = getter(carrier, JaegerHeader);
-            var jaegerHeader = jaegerHeaderCollection?.First();
+            if (jaegerHeaderCollection == null)
+            {
+                return context;
+            }
+
+            var jaegerHeader = jaegerHeaderCollection.First();
 
             if (string.IsNullOrWhiteSpace(jaegerHeader))
             {
                 return context;
             }
 
-            var jaegerHeaderParsed = TryExtractTraceContext(jaegerHeader!, out var traceId, out var spanId, out var traceOptions);
+            var jaegerHeaderParsed = TryExtractTraceContext(jaegerHeader, out var traceId, out var spanId, out var traceOptions);
 
             if (!jaegerHeaderParsed)
             {
diff --git a/src/Shared/TagWriter/TagWriter.cs b/src/Shared/TagWriter/TagWriter.cs
@@ -196,7 +196,7 @@ private void WriteArrayTagInternal(ref TTagState state, string key, Array array,
                 key,
                 "TRUNCATED".AsSpan());
 
-            this.LogUnsupportedTagTypeAndReturnFalse(key, array!.GetType().ToString());
+            this.LogUnsupportedTagTypeAndReturnFalse(key, array.GetType().ToString());
             return;
         }
 
diff --git a/test/Benchmarks/Context/Propagation/TraceContextPropagatorBenchmarks.cs b/test/Benchmarks/Context/Propagation/TraceContextPropagatorBenchmarks.cs
@@ -66,5 +66,5 @@ public void Setup()
     }
 
     [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/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/MockCollectorIntegrationTests.cs b/test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/MockCollectorIntegrationTests.cs
@@ -393,7 +393,7 @@ public async Task HttpPersistentStorageRetryTests(bool usePersistentStorageTrans
             Assert.NotNull(mockProvider);
             if (exportResult == ExportResult.Success)
             {
-                Assert.Single(mockProvider!.TryGetBlobs());
+                Assert.Single(mockProvider.TryGetBlobs());
 
                 // Force Retry
                 Assert.True((transmissionHandler as OtlpExporterPersistentStorageTransmissionHandler)?.InitiateAndWaitForRetryProcess(-1));
diff --git a/test/OpenTelemetry.Tests/Shared/EventSourceTestHelper.cs b/test/OpenTelemetry.Tests/Shared/EventSourceTestHelper.cs
@@ -100,7 +100,7 @@ private static void VerifyEventMessage(MethodInfo eventMethod, EventWrittenEvent
     {
         string expectedMessage = eventArguments.Length == 0
             ? GetEventAttribute(eventMethod).Message!
-            : string.Format(CultureInfo.InvariantCulture, GetEventAttribute(eventMethod).Message!, eventArguments)!;
+            : string.Format(CultureInfo.InvariantCulture, GetEventAttribute(eventMethod).Message!, eventArguments);
         string actualMessage = string.Format(CultureInfo.InvariantCulture, actualEvent.Message!, actualEvent.Payload!.ToArray());
         AssertEqual(nameof(VerifyEventMessage), expectedMessage, actualMessage);
     }

Original file line number	Diff line number	Diff line change
`@@ -193,13 +193,20 @@ private static PropagationContext ExtractFromSingleHeader<T>(PropagationContext`
`193`	`193`	`{`
`194`	`194`	`try`
`195`	`195`	`{`
`196`		`- var header = getter(carrier, XB3Combined)?.FirstOrDefault();`
	`196`	`+ var headers = getter(carrier, XB3Combined);`
	`197`	`+ if (headers == null)`
	`198`	`+ {`
	`199`	`+ return context;`
	`200`	`+ }`
	`201`	`+`
	`202`	`+ var header = headers.FirstOrDefault();`
	`203`	`+`
`197`	`204`	`if (string.IsNullOrWhiteSpace(header))`
`198`	`205`	`{`
`199`	`206`	`return context;`
`200`	`207`	`}`
`201`	`208`
`202`		`- var parts = header!.Split(XB3CombinedDelimiter);`
	`209`	`+ var parts = header.Split(XB3CombinedDelimiter);`
`203`	`210`	`if (parts.Length < 2 \|\| parts.Length > 4)`
`204`	`211`	`{`
`205`	`212`	`return context;`
Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,19 @@ public override PropagationContext Extract<T>(PropagationContext context, T carr`
`49`	`49`	`try`
`50`	`50`	`{`
`51`	`51`	`var jaegerHeaderCollection = getter(carrier, JaegerHeader);`
`52`		`- var jaegerHeader = jaegerHeaderCollection?.First();`
	`52`	`+ if (jaegerHeaderCollection == null)`
	`53`	`+ {`
	`54`	`+ return context;`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ var jaegerHeader = jaegerHeaderCollection.First();`
`53`	`58`
`54`	`59`	`if (string.IsNullOrWhiteSpace(jaegerHeader))`
`55`	`60`	`{`
`56`	`61`	`return context;`
`57`	`62`	`}`
`58`	`63`
`59`		`- var jaegerHeaderParsed = TryExtractTraceContext(jaegerHeader!, out var traceId, out var spanId, out var traceOptions);`
	`64`	`+ var jaegerHeaderParsed = TryExtractTraceContext(jaegerHeader, out var traceId, out var spanId, out var traceOptions);`
`60`	`65`
`61`	`66`	`if (!jaegerHeaderParsed)`
`62`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ private void WriteArrayTagInternal(ref TTagState state, string key, Array array,`
`196`	`196`	`key,`
`197`	`197`	`"TRUNCATED".AsSpan());`
`198`	`198`
`199`		`- this.LogUnsupportedTagTypeAndReturnFalse(key, array!.GetType().ToString());`
	`199`	`+ this.LogUnsupportedTagTypeAndReturnFalse(key, array.GetType().ToString());`
`200`	`200`	`return;`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,5 @@ public void Setup()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Benchmark(Baseline = true)]`
`69`		`- public void Extract() => _ = TraceContextPropagator!.Extract(default, this.Headers!, Getter);`
	`69`	`+ public void Extract() => _ = TraceContextPropagator.Extract(default, this.Headers!, Getter);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ public async Task HttpPersistentStorageRetryTests(bool usePersistentStorageTrans`
`393`	`393`	`Assert.NotNull(mockProvider);`
`394`	`394`	`if (exportResult == ExportResult.Success)`
`395`	`395`	`{`
`396`		`- Assert.Single(mockProvider!.TryGetBlobs());`
	`396`	`+ Assert.Single(mockProvider.TryGetBlobs());`
`397`	`397`
`398`	`398`	`// Force Retry`
`399`	`399`	`Assert.True((transmissionHandler as OtlpExporterPersistentStorageTransmissionHandler)?.InitiateAndWaitForRetryProcess(-1));`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private static void VerifyEventMessage(MethodInfo eventMethod, EventWrittenEvent`
`100`	`100`	`{`
`101`	`101`	`string expectedMessage = eventArguments.Length == 0`
`102`	`102`	`? GetEventAttribute(eventMethod).Message!`
`103`		`- : string.Format(CultureInfo.InvariantCulture, GetEventAttribute(eventMethod).Message!, eventArguments)!;`
	`103`	`+ : string.Format(CultureInfo.InvariantCulture, GetEventAttribute(eventMethod).Message!, eventArguments);`
`104`	`104`	`string actualMessage = string.Format(CultureInfo.InvariantCulture, actualEvent.Message!, actualEvent.Payload!.ToArray());`
`105`	`105`	`AssertEqual(nameof(VerifyEventMessage), expectedMessage, actualMessage);`
`106`	`106`	`}`