[repo] Simplify preprocessor directives after dropping support for .NET 6 (open-telemetry#2180)

joegoldman2 · web-flow · commit c32fea375a52 · 2024-10-07T07:27:29.000+02:00
diff --git a/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs b/src/OpenTelemetry.Exporter.OneCollector/Internal/Transports/TransportSendRequest.cs
@@ -13,7 +13,7 @@ internal readonly struct TransportSendRequest
 {
     public TransportSendRequest()
     {
-#if !NET8_0_OR_GREATER
+#if !NET
         // Note: This is needed because < NET7 doesn't understand required.
         this.ItemType = string.Empty;
         this.ItemStream = default!;
diff --git a/src/OpenTelemetry.Exporter.OneCollector/OneCollectorExporterValidationException.cs b/src/OpenTelemetry.Exporter.OneCollector/OneCollectorExporterValidationException.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if !NET8_0_OR_GREATER
+#if !NET
 using System.Runtime.Serialization;
 #endif
 
@@ -43,7 +43,7 @@ public OneCollectorExporterValidationException(string message, Exception? innerE
     {
     }
 
-#if !NET8_0_OR_GREATER
+#if !NET
     private OneCollectorExporterValidationException(SerializationInfo serializationInfo, StreamingContext streamingContext)
         : base(serializationInfo, streamingContext)
     {
diff --git a/src/OpenTelemetry.Extensions.AWS/AWSXRayIdGenerator.net.cs b/src/OpenTelemetry.Extensions.AWS/AWSXRayIdGenerator.net.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if NET6_0_OR_GREATER
+#if NET
 using System.Buffers.Binary;
 using System.Diagnostics;
 using System.Security.Cryptography;
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationMeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreInstrumentationMeterProviderBuilderExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if !NET8_0_OR_GREATER
+#if !NET
 using OpenTelemetry.Instrumentation.AspNetCore;
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 #endif
@@ -24,7 +24,7 @@ public static MeterProviderBuilder AddAspNetCoreInstrumentation(
     {
         Guard.ThrowIfNull(builder);
 
-#if NET8_0_OR_GREATER
+#if NET
         return builder.ConfigureMeters();
 #else
         // Note: Warm-up the status code and method mapping.
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreMetrics.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/AspNetCoreMetrics.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if !NET8_0_OR_GREATER
+#if !NET
 using OpenTelemetry.Instrumentation.AspNetCore.Implementation;
 
 namespace OpenTelemetry.Instrumentation.AspNetCore;
diff --git a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumerBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryConsumerBuilderExtensions.cs
@@ -17,7 +17,7 @@ public static class OpenTelemetryConsumerBuilderExtensions
     /// <typeparam name="TValue">Type of the value.</typeparam>
     /// <param name="consumerBuilder">The <see cref="ConsumerBuilder{TKey, TValue}"/> instance.</param>
     /// <returns>An <see cref="InstrumentedConsumerBuilder{TKey, TValue}"/> instance.</returns>
-#if !NETFRAMEWORK && !NETSTANDARD
+#if NET
     [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Use 'InstrumentedConsumerBuilder<TKey, TValue>' constructor to avoid reflection.")]
 #endif
     public static InstrumentedConsumerBuilder<TKey, TValue> AsInstrumentedConsumerBuilder<TKey, TValue>(this ConsumerBuilder<TKey, TValue> consumerBuilder)
diff --git a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryProducerBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetryProducerBuilderExtensions.cs
@@ -17,7 +17,7 @@ public static class OpenTelemetryProducerBuilderExtensions
     /// <typeparam name="TValue">Type of the value.</typeparam>
     /// <param name="producerBuilder">The <see cref="ProducerBuilder{TKey, TValue}"/> instance.</param>
     /// <returns>An <see cref="InstrumentedProducerBuilder{TKey, TValue}"/> instance.</returns>
-#if !NETFRAMEWORK && !NETSTANDARD
+#if NET
     [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Use 'InstrumentedProducerBuilder<TKey, TValue>' constructor to avoid reflection.")]
 #endif
     public static InstrumentedProducerBuilder<TKey, TValue> AsInstrumentedProducerBuilder<TKey, TValue>(this ProducerBuilder<TKey, TValue> producerBuilder)
diff --git a/src/OpenTelemetry.Instrumentation.Http/HttpClientInstrumentationMeterProviderBuilderExtensions.cs b/src/OpenTelemetry.Instrumentation.Http/HttpClientInstrumentationMeterProviderBuilderExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if !NET8_0_OR_GREATER
+#if !NET
 #if !NETFRAMEWORK
 using OpenTelemetry.Instrumentation.Http;
 #endif
@@ -27,7 +27,7 @@ public static MeterProviderBuilder AddHttpClientInstrumentation(
     {
         Guard.ThrowIfNull(builder);
 
-#if NET8_0_OR_GREATER
+#if NET
         return builder
             .AddMeter("System.Net.Http")
             .AddMeter("System.Net.NameResolution");
diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs
@@ -310,7 +310,7 @@ static bool TryFetchException(object? payload, [NotNullWhen(true)] out Exception
 
     private static string? GetErrorType(Exception exc)
     {
-#if NET8_0_OR_GREATER
+#if NET
         // For net8.0 and above exception type can be found using HttpRequestError.
         // https://learn.microsoft.com/dotnet/api/system.net.http.httprequesterror?view=net-8.0
         if (exc is HttpRequestException httpRequestException)
diff --git a/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs b/src/Shared/Configuration/OpenTelemetryConfigurationExtensions.cs
@@ -4,7 +4,7 @@
 #nullable enable
 
 using System.Diagnostics;
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if NET || NETSTANDARD2_1
 using System.Diagnostics.CodeAnalysis;
 #endif
 using System.Globalization;
@@ -15,15 +15,15 @@ internal static class OpenTelemetryConfigurationExtensions
 {
     public delegate bool TryParseFunc<T>(
         string value,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if NET || NETSTANDARD2_1
         [NotNullWhen(true)]
 #endif
         out T? parsedValue);
 
     public static bool TryGetStringValue(
         this IConfiguration configuration,
         string key,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if NET || NETSTANDARD2_1
         [NotNullWhen(true)]
 #endif
         out string? value)
@@ -39,7 +39,7 @@ public static bool TryGetUriValue(
         this IConfiguration configuration,
         IConfigurationExtensionsLogger logger,
         string key,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if NET || NETSTANDARD2_1
         [NotNullWhen(true)]
 #endif
         out Uri? value)
@@ -112,7 +112,7 @@ public static bool TryGetValue<T>(
         IConfigurationExtensionsLogger logger,
         string key,
         TryParseFunc<T> tryParseFunc,
-#if !NETFRAMEWORK && !NETSTANDARD2_0
+#if NET || NETSTANDARD2_1
         [NotNullWhen(true)]
 #endif
         out T? value)
diff --git a/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs b/test/OpenTelemetry.Exporter.OneCollector.Tests/CommonSchemaJsonSerializationHelperTests.cs
@@ -99,9 +99,7 @@ public void SerializeComplexValueToJsonTest()
 
         var typeWithISpanFormattableOverflow = new TypeWithISpanFormattable(overflow: true);
         this.SerializeValueToJsonTest(typeWithISpanFormattableOverflow, "\"Overflow\"");
-#endif
 
-#if NET8_0_OR_GREATER
         var dateOnly = DateOnly.FromDateTime(dt);
         this.SerializeValueToJsonTest(dateOnly, $"\"{dateOnly:O}\"");
 
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/BasicTests.cs
@@ -738,7 +738,7 @@ public async Task ActivitiesStartedInMiddlewareBySettingHostActivityToNullShould
         Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", aspnetcoreframeworkactivity.OperationName);
     }
 
-#if NET8_0_OR_GREATER
+#if NET
     [Fact]
     public async Task UserRegisteredActivitySourceIsUsedForActivityCreationByAspNetCore()
     {
@@ -1150,7 +1150,7 @@ private static void WaitForActivityExport(List<Activity> exportedItems, int coun
     private static void ValidateAspNetCoreActivity(Activity activityToValidate, string expectedHttpPath)
     {
         Assert.Equal(ActivityKind.Server, activityToValidate.Kind);
-#if NET8_0_OR_GREATER
+#if NET
         Assert.Equal(HttpInListener.AspNetCoreActivitySourceName, activityToValidate.Source.Name);
         Assert.NotNull(activityToValidate.Source.Version);
         Assert.Empty(activityToValidate.Source.Version);
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
@@ -1,19 +1,19 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#if NET8_0_OR_GREATER
+#if NET
 using System.Threading.RateLimiting;
 using Microsoft.AspNetCore.Builder;
 #endif
 using Microsoft.AspNetCore.Hosting;
-#if NET8_0_OR_GREATER
+#if NET
 using Microsoft.AspNetCore.Http;
 #endif
 using Microsoft.AspNetCore.Mvc.Testing;
-#if NET8_0_OR_GREATER
+#if NET
 using Microsoft.AspNetCore.RateLimiting;
 #endif
-#if NET8_0_OR_GREATER
+#if NET
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 #endif
@@ -38,7 +38,7 @@ public void AddAspNetCoreInstrumentation_BadArgs()
         Assert.Throws<ArgumentNullException>(builder!.AddAspNetCoreInstrumentation);
     }
 
-#if NET8_0_OR_GREATER
+#if NET
     [Fact]
     public async Task ValidateNet8MetricsAsync()
     {
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/RouteInfo.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/RouteInfo.cs
@@ -5,7 +5,7 @@
 
 using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Http;
-#if NET8_0_OR_GREATER
+#if NET
 using Microsoft.AspNetCore.Http.Metadata;
 #endif
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -40,7 +40,7 @@ public void SetValues(HttpContext context)
         this.Path = $"{context.Request.Path}{context.Request.QueryString}";
         var endpoint = context.GetEndpoint();
         this.RawText = (endpoint as RouteEndpoint)?.RoutePattern.RawText;
-#if NET8_0_OR_GREATER
+#if NET
         this.RouteDiagnosticMetadata = endpoint?.Metadata.GetMetadata<IRouteDiagnosticsMetadata>()?.Route;
 #endif
         this.RouteData = new Dictionary<string, string?>();
diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/TestApplicationFactory.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/RouteTests/TestApplication/TestApplicationFactory.cs
@@ -131,7 +131,7 @@ private static WebApplication CreateMinimalApiApplication()
         app.MapGet("/MinimalApi", () => Results.Ok());
         app.MapGet("/MinimalApi/{id}", (int id) => Results.Ok());
 
-#if NET8_0_OR_GREATER
+#if NET
         var api = app.MapGroup("/MinimalApiUsingMapGroup");
         api.MapGet("/", () => Results.Ok());
         api.MapGet("/{id}", (int id) => Results.Ok());
@@ -188,7 +188,7 @@ private static WebApplication CreateExceptionHandlerApplication()
         // This is because ASP.NET Core 8+ has native metric instrumentation.
         // When ASP.NET Core 8.0.2 is released then its behavior will align with .NET 6/7.
         // See: https://github.com/dotnet/aspnetcore/issues/52648#issuecomment-1853432776
-#if !NET8_0_OR_GREATER
+#if !NET
         app.MapGet("/Exception", (ctx) => throw new ApplicationException());
 #else
         app.MapGet("/Exception", () => Results.Content(content: "Error", contentType: null, contentEncoding: null, statusCode: 500));
diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs b/test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs
@@ -5,7 +5,7 @@
 #if NETFRAMEWORK
 using System.Net.Http;
 #endif
-#if !NET8_0_OR_GREATER
+#if !NET
 using System.Globalization;
 using System.Reflection;
 using System.Text.Json;
@@ -21,7 +21,7 @@ public partial class HttpClientTests
 {
     public static readonly IEnumerable<object[]> TestData = HttpTestData.ReadTestCases();
 
-#if !NET8_0_OR_GREATER
+#if !NET
     private static readonly JsonSerializerOptions JsonSerializerOptions = new() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
 #endif
 
@@ -73,7 +73,7 @@ await HttpOutCallsAreCollectedSuccessfullyBodyAsync(
             enableMetrics: false);
     }
 
-#if !NET8_0_OR_GREATER
+#if !NET
     [Fact]
     public async Task DebugIndividualTestAsync()
     {
@@ -115,7 +115,7 @@ public async Task CheckEnrichmentWhenSampling()
         await CheckEnrichment(new AlwaysOnSampler(), true, this.url);
     }
 
-#if NET8_0_OR_GREATER
+#if NET
     [Theory]
     [MemberData(nameof(TestData))]
     public async Task ValidateNet8MetricsAsync(HttpOutTestCase tc)
@@ -172,7 +172,7 @@ public async Task ValidateNet8MetricsAsync(HttpOutTestCase tc)
     }
 #endif
 
-#if NET8_0_OR_GREATER
+#if NET
     [Fact]
     public async Task HttpCancellationLogsError()
     {
@@ -362,7 +362,7 @@ private static async Task HttpOutCallsAreCollectedSuccessfullyBodyAsync(
                 Assert.DoesNotContain(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeHttpResponseStatusCode);
                 Assert.DoesNotContain(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeNetworkProtocolVersion);
 
-#if NET8_0_OR_GREATER
+#if NET
                 // we are using fake address so it will be "name_resolution_error"
                 // TODO: test other error types.
                 Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeErrorType && kvp.Value?.ToString() == "name_resolution_error");
@@ -410,7 +410,7 @@ private static async Task HttpOutCallsAreCollectedSuccessfullyBodyAsync(
             if (enableTracing)
             {
                 var activity = Assert.Single(activities);
-#if !NET8_0_OR_GREATER
+#if !NET
                 Assert.Equal(activity.Duration.TotalSeconds, sum);
 #endif
             }
@@ -461,7 +461,7 @@ private static async Task HttpOutCallsAreCollectedSuccessfullyBodyAsync(
                 Assert.DoesNotContain(attributes, kvp => kvp.Key == SemanticConventions.AttributeNetworkProtocolVersion);
                 Assert.DoesNotContain(attributes, kvp => kvp.Key == SemanticConventions.AttributeHttpResponseStatusCode);
 
-#if NET8_0_OR_GREATER
+#if NET
                 // we are using fake address so it will be "name_resolution_error"
                 // TODO: test other error types.
                 Assert.Contains(attributes, kvp => kvp.Key == SemanticConventions.AttributeErrorType && kvp.Value?.ToString() == "name_resolution_error");

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ internal readonly struct TransportSendRequest`
`13`	`13`	`{`
`14`	`14`	`public TransportSendRequest()`
`15`	`15`	`{`
`16`		`-#if !NET8_0_OR_GREATER`
	`16`	`+#if !NET`
`17`	`17`	`// Note: This is needed because < NET7 doesn't understand required.`
`18`	`18`	`this.ItemType = string.Empty;`
`19`	`19`	`this.ItemStream = default!;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright The OpenTelemetry Authors`
`2`	`2`	`// SPDX-License-Identifier: Apache-2.0`
`3`	`3`
`4`		`-#if !NET8_0_OR_GREATER`
	`4`	`+#if !NET`
`5`	`5`	`using System.Runtime.Serialization;`
`6`	`6`	`#endif`
`7`	`7`
`@@ -43,7 +43,7 @@ public OneCollectorExporterValidationException(string message, Exception? innerE`
`43`	`43`	`{`
`44`	`44`	`}`
`45`	`45`
`46`		`-#if !NET8_0_OR_GREATER`
	`46`	`+#if !NET`
`47`	`47`	`private OneCollectorExporterValidationException(SerializationInfo serializationInfo, StreamingContext streamingContext)`
`48`	`48`	`: base(serializationInfo, streamingContext)`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ static bool TryFetchException(object? payload, [NotNullWhen(true)] out Exception`
`310`	`310`
`311`	`311`	`private static string? GetErrorType(Exception exc)`
`312`	`312`	`{`
`313`		`-#if NET8_0_OR_GREATER`
	`313`	`+#if NET`
`314`	`314`	`// For net8.0 and above exception type can be found using HttpRequestError.`
`315`	`315`	`// https://learn.microsoft.com/dotnet/api/system.net.http.httprequesterror?view=net-8.0`
`316`	`316`	`if (exc is HttpRequestException httpRequestException)`