Increase use of NotNullWhen polyfill (#6090)

SimonCropp · Kielek · rajkumar-rangaraj · web-flow · commit 41e1a59eb9eb · 2025-02-11T15:03:29.000-08:00
Co-authored-by: Piotr Kiełkowicz &lt;pkiekowicz@splunk.com&gt;
Co-authored-by: Rajkumar Rangaraj &lt;rajrang@microsoft.com&gt;
diff --git a/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExperimentalOptions.cs b/src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExperimentalOptions.cs
@@ -29,7 +29,7 @@ public ExperimentalOptions(IConfiguration configuration)
             this.EmitLogEventAttributes = emitLogEventAttributes;
         }
 
-        if (configuration.TryGetStringValue(OtlpRetryEnvVar, out var retryPolicy) && retryPolicy != null)
+        if (configuration.TryGetStringValue(OtlpRetryEnvVar, out var retryPolicy))
         {
             if (retryPolicy.Equals("in_memory", StringComparison.OrdinalIgnoreCase))
             {
@@ -38,7 +38,7 @@ public ExperimentalOptions(IConfiguration configuration)
             else if (retryPolicy.Equals("disk", StringComparison.OrdinalIgnoreCase))
             {
                 this.EnableDiskRetry = true;
-                if (configuration.TryGetStringValue(OtlpDiskRetryDirectoryPathEnvVar, out var path) && path != null)
+                if (configuration.TryGetStringValue(OtlpDiskRetryDirectoryPathEnvVar, out var path))
                 {
                     this.DiskRetryDirectoryPath = path;
                 }
diff --git a/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterOptions.cs b/src/OpenTelemetry.Exporter.Zipkin/ZipkinExporterOptions.cs
@@ -42,7 +42,7 @@ internal ZipkinExporterOptions(
 
         if (configuration!.TryGetUriValue(ZipkinExporterEventSource.Log, ZipkinEndpointEnvVar, out var endpoint))
         {
-            this.Endpoint = endpoint!;
+            this.Endpoint = endpoint;
         }
 
         this.BatchExportProcessorOptions = defaultBatchOptions!;
diff --git a/src/OpenTelemetry/Logs/LoggerProviderSdk.cs b/src/OpenTelemetry/Logs/LoggerProviderSdk.cs
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-#if NETSTANDARD2_1_OR_GREATER || NET
 using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using OpenTelemetry.Internal;
@@ -201,9 +199,7 @@ public bool ContainsBatchProcessor(BaseProcessor<LogRecord> processor)
 #endif
         override bool TryCreateLogger(
         string? name,
-#if NETSTANDARD2_1_OR_GREATER || NET
         [NotNullWhen(true)]
-#endif
         out Logger? logger)
     {
         logger = new LoggerSdk(this, name);
diff --git a/src/OpenTelemetry/Resources/OtelEnvResourceDetector.cs b/src/OpenTelemetry/Resources/OtelEnvResourceDetector.cs
@@ -24,7 +24,7 @@ public Resource Detect()
 
         if (this.configuration.TryGetStringValue(EnvVarKey, out string? envResourceAttributeValue))
         {
-            var attributes = ParseResourceAttributes(envResourceAttributeValue!);
+            var attributes = ParseResourceAttributes(envResourceAttributeValue);
             resource = new Resource(attributes);
         }
 
diff --git a/src/OpenTelemetry/Resources/OtelServiceNameEnvVarDetector.cs b/src/OpenTelemetry/Resources/OtelServiceNameEnvVarDetector.cs
@@ -24,7 +24,7 @@ public Resource Detect()
         {
             resource = new Resource(new Dictionary<string, object>
             {
-                [ResourceSemanticConventions.AttributeServiceName] = envResourceAttributeValue!,
+                [ResourceSemanticConventions.AttributeServiceName] = envResourceAttributeValue,
             });
         }
 
diff --git a/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs b/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs
@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 using System.Diagnostics;
-#if !NETFRAMEWORK && !NETSTANDARD2_0
 using System.Diagnostics.CodeAnalysis;
-#endif
 using System.Globalization;
 
 namespace Microsoft.Extensions.Configuration;
@@ -13,17 +11,13 @@ internal static class OpenTelemetryConfigurationExtensions
 {
     public delegate bool TryParseFunc<T>(
         string value,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
         [NotNullWhen(true)]
-#endif
         out T? parsedValue);
 
     public static bool TryGetStringValue(
         this IConfiguration configuration,
         string key,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
         [NotNullWhen(true)]
-#endif
         out string? value)
     {
         Debug.Assert(configuration != null, "configuration was null");
@@ -37,9 +31,7 @@ public static bool TryGetUriValue(
         this IConfiguration configuration,
         IConfigurationExtensionsLogger logger,
         string key,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
         [NotNullWhen(true)]
-#endif
         out Uri? value)
     {
         Debug.Assert(logger != null, "logger was null");
@@ -52,7 +44,7 @@ public static bool TryGetUriValue(
 
         if (!Uri.TryCreate(stringValue, UriKind.Absolute, out value))
         {
-            logger!.LogInvalidConfigurationValue(key, stringValue!);
+            logger!.LogInvalidConfigurationValue(key, stringValue);
             return false;
         }
 
@@ -75,7 +67,7 @@ public static bool TryGetIntValue(
 
         if (!int.TryParse(stringValue, NumberStyles.None, CultureInfo.InvariantCulture, out value))
         {
-            logger!.LogInvalidConfigurationValue(key, stringValue!);
+            logger!.LogInvalidConfigurationValue(key, stringValue);
             return false;
         }
 
@@ -98,7 +90,7 @@ public static bool TryGetBoolValue(
 
         if (!bool.TryParse(stringValue, out value))
         {
-            logger!.LogInvalidConfigurationValue(key, stringValue!);
+            logger!.LogInvalidConfigurationValue(key, stringValue);
             return false;
         }
 
@@ -110,9 +102,7 @@ public static bool TryGetValue<T>(
         IConfigurationExtensionsLogger logger,
         string key,
         TryParseFunc<T> tryParseFunc,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
         [NotNullWhen(true)]
-#endif
         out T? value)
     {
         Debug.Assert(logger != null, "logger was null");
@@ -123,9 +113,9 @@ public static bool TryGetValue<T>(
             return false;
         }
 
-        if (!tryParseFunc(stringValue!, out value))
+        if (!tryParseFunc(stringValue, out value))
         {
-            logger!.LogInvalidConfigurationValue(key, stringValue!);
+            logger!.LogInvalidConfigurationValue(key, stringValue);
             return false;
         }
 
diff --git a/test/OpenTelemetry.Api.Tests/Logs/LoggerProviderTests.cs b/test/OpenTelemetry.Api.Tests/Logs/LoggerProviderTests.cs
@@ -1,9 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if NETSTANDARD2_1_OR_GREATER || NET
 using System.Diagnostics.CodeAnalysis;
-#endif
 using Xunit;
 
 namespace OpenTelemetry.Logs.Tests;
@@ -66,9 +64,7 @@ protected override bool TryCreateLogger(
         internal override bool TryCreateLogger(
 #endif
             string? name,
-#if NETSTANDARD2_1_OR_GREATER || NET
             [NotNullWhen(true)]
-#endif
             out Logger? logger)
         {
             logger = new TestLogger(name);
diff --git a/test/OpenTelemetry.Api.Tests/OpenTelemetry.Api.Tests.csproj b/test/OpenTelemetry.Api.Tests/OpenTelemetry.Api.Tests.csproj
@@ -17,6 +17,7 @@
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\SkipUnlessEnvVarFoundFactAttribute.cs" Link="Includes\SkipUnlessEnvVarFoundFactAttribute.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\TestEventListener.cs" Link="Includes\TestEventListener.cs" />
     <Compile Include="$(RepoRoot)\test\OpenTelemetry.Tests\Shared\Utils.cs" Link="Includes\Utils.cs" />
+    <Compile Include="$(RepoRoot)\src\Shared\Shims\NullableAttributes.cs" Link="Includes\Shims\NullableAttributes.cs" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public ExperimentalOptions(IConfiguration configuration)`
`29`	`29`	`this.EmitLogEventAttributes = emitLogEventAttributes;`
`30`	`30`	`}`
`31`	`31`
`32`		`- if (configuration.TryGetStringValue(OtlpRetryEnvVar, out var retryPolicy) && retryPolicy != null)`
	`32`	`+ if (configuration.TryGetStringValue(OtlpRetryEnvVar, out var retryPolicy))`
`33`	`33`	`{`
`34`	`34`	`if (retryPolicy.Equals("in_memory", StringComparison.OrdinalIgnoreCase))`
`35`	`35`	`{`
`@@ -38,7 +38,7 @@ public ExperimentalOptions(IConfiguration configuration)`
`38`	`38`	`else if (retryPolicy.Equals("disk", StringComparison.OrdinalIgnoreCase))`
`39`	`39`	`{`
`40`	`40`	`this.EnableDiskRetry = true;`
`41`		`- if (configuration.TryGetStringValue(OtlpDiskRetryDirectoryPathEnvVar, out var path) && path != null)`
	`41`	`+ if (configuration.TryGetStringValue(OtlpDiskRetryDirectoryPathEnvVar, out var path))`
`42`	`42`	`{`
`43`	`43`	`this.DiskRetryDirectoryPath = path;`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ internal ZipkinExporterOptions(`
`42`	`42`
`43`	`43`	`if (configuration!.TryGetUriValue(ZipkinExporterEventSource.Log, ZipkinEndpointEnvVar, out var endpoint))`
`44`	`44`	`{`
`45`		`- this.Endpoint = endpoint!;`
	`45`	`+ this.Endpoint = endpoint;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`this.BatchExportProcessorOptions = defaultBatchOptions!;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public Resource Detect()`
`24`	`24`
`25`	`25`	`if (this.configuration.TryGetStringValue(EnvVarKey, out string? envResourceAttributeValue))`
`26`	`26`	`{`
`27`		`- var attributes = ParseResourceAttributes(envResourceAttributeValue!);`
	`27`	`+ var attributes = ParseResourceAttributes(envResourceAttributeValue);`
`28`	`28`	`resource = new Resource(attributes);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`	`4`	`using System.Diagnostics;`
`5`		`-#if !NETFRAMEWORK && !NETSTANDARD2_0`
`6`	`5`	`using System.Diagnostics.CodeAnalysis;`
`7`		`-#endif`
`8`	`6`	`using System.Globalization;`
`9`	`7`
`10`	`8`	`namespace Microsoft.Extensions.Configuration;`
`@@ -13,17 +11,13 @@ internal static class OpenTelemetryConfigurationExtensions`
`13`	`11`	`{`
`14`	`12`	`public delegate bool TryParseFunc<T>(`
`15`	`13`	`string value,`
`16`		`-#if !NETFRAMEWORK && !NETSTANDARD2_0`
`17`	`14`	`[NotNullWhen(true)]`
`18`		`-#endif`
`19`	`15`	`out T? parsedValue);`
`20`	`16`
`21`	`17`	`public static bool TryGetStringValue(`
`22`	`18`	`this IConfiguration configuration,`
`23`	`19`	`string key,`
`24`		`-#if !NETFRAMEWORK && !NETSTANDARD2_0`
`25`	`20`	`[NotNullWhen(true)]`
`26`		`-#endif`
`27`	`21`	`out string? value)`
`28`	`22`	`{`
`29`	`23`	`Debug.Assert(configuration != null, "configuration was null");`
`@@ -37,9 +31,7 @@ public static bool TryGetUriValue(`
`37`	`31`	`this IConfiguration configuration,`
`38`	`32`	`IConfigurationExtensionsLogger logger,`
`39`	`33`	`string key,`
`40`		`-#if !NETFRAMEWORK && !NETSTANDARD2_0`
`41`	`34`	`[NotNullWhen(true)]`
`42`		`-#endif`
`43`	`35`	`out Uri? value)`
`44`	`36`	`{`
`45`	`37`	`Debug.Assert(logger != null, "logger was null");`
`@@ -52,7 +44,7 @@ public static bool TryGetUriValue(`
`52`	`44`
`53`	`45`	`if (!Uri.TryCreate(stringValue, UriKind.Absolute, out value))`
`54`	`46`	`{`
`55`		`- logger!.LogInvalidConfigurationValue(key, stringValue!);`
	`47`	`+ logger!.LogInvalidConfigurationValue(key, stringValue);`
`56`	`48`	`return false;`
`57`	`49`	`}`
`58`	`50`
`@@ -75,7 +67,7 @@ public static bool TryGetIntValue(`
`75`	`67`
`76`	`68`	`if (!int.TryParse(stringValue, NumberStyles.None, CultureInfo.InvariantCulture, out value))`
`77`	`69`	`{`
`78`		`- logger!.LogInvalidConfigurationValue(key, stringValue!);`
	`70`	`+ logger!.LogInvalidConfigurationValue(key, stringValue);`
`79`	`71`	`return false;`
`80`	`72`	`}`
`81`	`73`
`@@ -98,7 +90,7 @@ public static bool TryGetBoolValue(`
`98`	`90`
`99`	`91`	`if (!bool.TryParse(stringValue, out value))`
`100`	`92`	`{`
`101`		`- logger!.LogInvalidConfigurationValue(key, stringValue!);`
	`93`	`+ logger!.LogInvalidConfigurationValue(key, stringValue);`
`102`	`94`	`return false;`
`103`	`95`	`}`
`104`	`96`
`@@ -110,9 +102,7 @@ public static bool TryGetValue<T>(`
`110`	`102`	`IConfigurationExtensionsLogger logger,`
`111`	`103`	`string key,`
`112`	`104`	`TryParseFunc<T> tryParseFunc,`
`113`		`-#if !NETFRAMEWORK && !NETSTANDARD2_0`
`114`	`105`	`[NotNullWhen(true)]`
`115`		`-#endif`
`116`	`106`	`out T? value)`
`117`	`107`	`{`
`118`	`108`	`Debug.Assert(logger != null, "logger was null");`
`@@ -123,9 +113,9 @@ public static bool TryGetValue<T>(`
`123`	`113`	`return false;`
`124`	`114`	`}`
`125`	`115`
`126`		`- if (!tryParseFunc(stringValue!, out value))`
	`116`	`+ if (!tryParseFunc(stringValue, out value))`
`127`	`117`	`{`
`128`		`- logger!.LogInvalidConfigurationValue(key, stringValue!);`
	`118`	`+ logger!.LogInvalidConfigurationValue(key, stringValue);`
`129`	`119`	`return false;`
`130`	`120`	`}`
`131`	`121`