Update preprocessor directives ahead of System.Diagnostics.Diagnostic…

…Source .NET 7 update. (#3095)
open-telemetry · Mar 28, 2022 · bf79f0d · bf79f0d
1 parent de44411
commit bf79f0d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/src/OpenTelemetry.Api/Context/RemotingRuntimeContextSlot.cs b/src/OpenTelemetry.Api/Context/RemotingRuntimeContextSlot.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461
+#if NETFRAMEWORK
 using System.Collections;
 using System.Reflection;
 using System.Runtime.CompilerServices;

diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
 using System;
 #endif
 using Thrift.Protocol;

diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
 using System;
 #endif
 using Thrift.Protocol;

diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/ShimExtensions.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/ShimExtensions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NETSTANDARD2_0 || NET461
+#if NETSTANDARD2_0 || NETFRAMEWORK
 namespace System
 {
     internal static class ShimExtensions

diff --git a/src/OpenTelemetry/Internal/ServiceProviderExtensions.cs b/src/OpenTelemetry/Internal/ServiceProviderExtensions.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if NET461 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER
 using Microsoft.Extensions.Options;
 #endif
 
@@ -34,7 +34,7 @@ internal static class ServiceProviderExtensions
         public static T GetOptions<T>(this IServiceProvider serviceProvider)
             where T : class, new()
         {
-#if NET461 || NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1_OR_GREATER
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER
             IOptions<T> options = (IOptions<T>)serviceProvider.GetService(typeof(IOptions<T>));
 
             // Note: options could be null if user never invoked services.AddOptions().

diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusCollectionManagerTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusCollectionManagerTests.cs
@@ -16,7 +16,7 @@
 
 using System;
 using System.Diagnostics.Metrics;
-#if NET461
+#if NETFRAMEWORK
 using System.Linq;
 #endif
 using System.Threading;

diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterHttpServerTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterHttpServerTests.cs
@@ -48,7 +48,7 @@ public async Task PrometheusExporterHttpServerIntegration()
                         .AddMeter(meter.Name)
                         .AddPrometheusExporter(o =>
                         {
-#if NET461
+#if NETFRAMEWORK
                             bool expectedDefaultState = true;
 #else
                             bool expectedDefaultState = false;
@@ -142,7 +142,7 @@ public void ServerEndpointSanityCheckNegativeTest(params string[] uris)
                 if (ex is not ArgumentNullException)
                 {
                     Assert.Equal("System.ArgumentException", ex.GetType().ToString());
-#if NET461
+#if NETFRAMEWORK
                     Assert.Equal("Prometheus server path should be a valid URI with http/https scheme.\r\nParameter name: httpListenerPrefixes", ex.Message);
 #else
                     Assert.Equal("Prometheus server path should be a valid URI with http/https scheme. (Parameter 'httpListenerPrefixes')", ex.Message);

diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterMiddlewareTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusExporterMiddlewareTests.cs
@@ -14,7 +14,7 @@
 // limitations under the License.
 // </copyright>
 
-#if !NET461
+#if !NETFRAMEWORK
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;

diff --git a/...ion.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs b/...ion.StackExchangeRedis.Tests/Implementation/RedisProfilerEntryToActivityConverterTests.cs
@@ -160,7 +160,7 @@ public void ProfilerCommandToActivity_UsesDnsEndPointAsEndPoint()
             Assert.Equal(dnsEndPoint.Port, result.GetTagValue(SemanticConventions.AttributeNetPeerPort));
         }
 
-#if !NET461
+#if !NETFRAMEWORK
         [Fact]
         public void ProfilerCommandToActivity_UsesOtherEndPointAsEndPoint()
         {

diff --git a/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs b/test/OpenTelemetry.Tests/Logs/LogRecordTest.cs
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // </copyright>
-#if !NET461
+
+#if !NETFRAMEWORK
 using System;
 using System.Collections;
 using System.Collections.Generic;