From 72595ac4bf0c424b6ee68527c5b676d41a5fbba6 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Date: Wed, 7 Dec 2022 16:02:08 -0800 Subject: [PATCH] remove `ImplicitUsings disable` from projects (part 2) (#3983) --- src/OpenTelemetry.Api/Internal/StatusHelper.cs | 2 ++ src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs | 3 --- .../Implementation/EmitBatchArgs.cs | 3 --- .../Implementation/IJaegerClient.cs | 2 -- src/OpenTelemetry.Exporter.Jaeger/Implementation/Int128.cs | 1 - .../Implementation/JaegerActivityExtensions.cs | 1 - .../Implementation/JaegerExporterEventSource.cs | 1 - .../Implementation/JaegerExporterException.cs | 1 - .../Implementation/JaegerHttpClient.cs | 3 ++- .../Implementation/JaegerTagTransformer.cs | 1 - src/OpenTelemetry.Exporter.Jaeger/Implementation/Process.cs | 1 - src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs | 3 --- .../JaegerExporterHelperExtensions.cs | 3 ++- src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptions.cs | 3 ++- .../OpenTelemetry.Exporter.Jaeger.csproj | 1 - src/OpenTelemetry/Internal/ConfigurationExtensions.cs | 2 ++ src/OpenTelemetry/Internal/PeerServiceResolver.cs | 2 ++ src/OpenTelemetry/Internal/PooledList.cs | 3 +++ 18 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/OpenTelemetry.Api/Internal/StatusHelper.cs b/src/OpenTelemetry.Api/Internal/StatusHelper.cs index 736a748e7..9104bc947 100644 --- a/src/OpenTelemetry.Api/Internal/StatusHelper.cs +++ b/src/OpenTelemetry.Api/Internal/StatusHelper.cs @@ -14,9 +14,11 @@ // limitations under the License. // +#pragma warning disable IDE0005 // Temporarily suppressing "Using directive is unnecessary" until other projects have been updated. See #3958. using System; using System.Runtime.CompilerServices; using OpenTelemetry.Trace; +#pragma warning restore IDE0005 namespace OpenTelemetry.Internal { diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs index 37c8ff4ce..d8f4f2305 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Batch.cs @@ -14,9 +14,6 @@ // limitations under the License. // -#if NETSTANDARD2_0 || NETFRAMEWORK -using System; -#endif using Thrift.Protocol; using Thrift.Protocol.Entities; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs index edc241cea..f8ac2bbd8 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/EmitBatchArgs.cs @@ -14,9 +14,6 @@ // limitations under the License. // -#if NETSTANDARD2_0 || NETFRAMEWORK -using System; -#endif using Thrift.Protocol; using Thrift.Protocol.Entities; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/IJaegerClient.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/IJaegerClient.cs index ada32a9e3..ed4171666 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/IJaegerClient.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/IJaegerClient.cs @@ -14,8 +14,6 @@ // limitations under the License. // -using System; - namespace OpenTelemetry.Exporter.Jaeger.Implementation { internal interface IJaegerClient : IDisposable diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Int128.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Int128.cs index 2573fc357..d4a1232e8 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Int128.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Int128.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System; using System.Diagnostics; using System.Runtime.InteropServices; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerActivityExtensions.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerActivityExtensions.cs index d1a7851a1..a2f33e156 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerActivityExtensions.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerActivityExtensions.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System; using System.Diagnostics; using System.Runtime.CompilerServices; using OpenTelemetry.Internal; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterEventSource.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterEventSource.cs index f3fee3b9d..ec996487f 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterEventSource.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterEventSource.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System; using System.Diagnostics.Tracing; using OpenTelemetry.Internal; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterException.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterException.cs index 5deb4960d..9603af88d 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterException.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerExporterException.cs @@ -13,7 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. // -using System; namespace OpenTelemetry.Exporter.Jaeger.Implementation { diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerHttpClient.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerHttpClient.cs index 90d2cc8fc..478c35035 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerHttpClient.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerHttpClient.cs @@ -14,9 +14,10 @@ // limitations under the License. // -using System; using System.Diagnostics; +#if NETFRAMEWORK using System.Net.Http; +#endif using System.Net.Http.Headers; namespace OpenTelemetry.Exporter.Jaeger.Implementation diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs index ccc38b2ef..bd4af789e 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System; using OpenTelemetry.Internal; namespace OpenTelemetry.Exporter.Jaeger.Implementation; diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Process.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Process.cs index 0f0da694d..858071131 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/Process.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/Process.cs @@ -14,7 +14,6 @@ // limitations under the License. // -using System.Collections.Generic; using System.Text; using Thrift.Protocol; using Thrift.Protocol.Entities; diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs index 462d67ffb..dc3e53abe 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporter.cs @@ -14,10 +14,7 @@ // limitations under the License. // -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Runtime.CompilerServices; using OpenTelemetry.Exporter.Jaeger.Implementation; using OpenTelemetry.Internal; diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterHelperExtensions.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterHelperExtensions.cs index df4c4180c..1629655b0 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterHelperExtensions.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterHelperExtensions.cs @@ -14,8 +14,9 @@ // limitations under the License. // -using System; +#if NETFRAMEWORK using System.Net.Http; +#endif using System.Reflection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; diff --git a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptions.cs b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptions.cs index a2286a71b..fc7ee9a13 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptions.cs +++ b/src/OpenTelemetry.Exporter.Jaeger/JaegerExporterOptions.cs @@ -14,9 +14,10 @@ // limitations under the License. // -using System; using System.Diagnostics; +#if NETFRAMEWORK using System.Net.Http; +#endif using Microsoft.Extensions.Configuration; using OpenTelemetry.Internal; using OpenTelemetry.Trace; diff --git a/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj b/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj index 5b11451b1..2526d6422 100644 --- a/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj +++ b/src/OpenTelemetry.Exporter.Jaeger/OpenTelemetry.Exporter.Jaeger.csproj @@ -9,7 +9,6 @@ disable - disable diff --git a/src/OpenTelemetry/Internal/ConfigurationExtensions.cs b/src/OpenTelemetry/Internal/ConfigurationExtensions.cs index ecaba0dfc..29cc740ce 100644 --- a/src/OpenTelemetry/Internal/ConfigurationExtensions.cs +++ b/src/OpenTelemetry/Internal/ConfigurationExtensions.cs @@ -16,6 +16,7 @@ #nullable enable +#pragma warning disable IDE0005 // Temporarily suppressing "Using directive is unnecessary" until other projects have been updated. See #3958. using System; using System.Collections.Generic; using System.Diagnostics; @@ -27,6 +28,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; +#pragma warning restore IDE0005 namespace OpenTelemetry.Internal; diff --git a/src/OpenTelemetry/Internal/PeerServiceResolver.cs b/src/OpenTelemetry/Internal/PeerServiceResolver.cs index a48f2514b..f1f812b1e 100644 --- a/src/OpenTelemetry/Internal/PeerServiceResolver.cs +++ b/src/OpenTelemetry/Internal/PeerServiceResolver.cs @@ -14,10 +14,12 @@ // limitations under the License. // +#pragma warning disable IDE0005 // Temporarily suppressing "Using directive is unnecessary" until other projects have been updated. See #3958. using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using OpenTelemetry.Trace; +#pragma warning restore IDE0005 namespace OpenTelemetry.Exporter { diff --git a/src/OpenTelemetry/Internal/PooledList.cs b/src/OpenTelemetry/Internal/PooledList.cs index d00ba2657..77aa51fbb 100644 --- a/src/OpenTelemetry/Internal/PooledList.cs +++ b/src/OpenTelemetry/Internal/PooledList.cs @@ -13,10 +13,13 @@ // See the License for the specific language governing permissions and // limitations under the License. // + +#pragma warning disable IDE0005 // Temporarily suppressing "Using directive is unnecessary" until other projects have been updated. See #3958. using System; using System.Buffers; using System.Collections; using System.Collections.Generic; +#pragma warning restore IDE0005 namespace OpenTelemetry.Internal {