Increase use of NotNullWhen polyfill

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;
                 }

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!;

src/OpenTelemetry/AssemblyInfo.cs

@@ -13,6 +13,7 @@
 [assembly: InternalsVisibleTo("OpenTelemetry.Extensions.Hosting" + AssemblyInfo.PublicKey)]
 [assembly: InternalsVisibleTo("OpenTelemetry.Extensions.Hosting.Tests" + AssemblyInfo.PublicKey)]
 [assembly: InternalsVisibleTo("OpenTelemetry.Tests" + AssemblyInfo.PublicKey)]
+[assembly: InternalsVisibleTo("OpenTelemetry.Api.Tests" + AssemblyInfo.PublicKey)]
 [assembly: InternalsVisibleTo("OpenTelemetry.Tests.Stress.Metrics" + AssemblyInfo.PublicKey)]
 [assembly: InternalsVisibleTo("Benchmarks" + AssemblyInfo.PublicKey)]
 

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);

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);
         }
 

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,
             });
         }
 

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;
         }
 

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);