General code improvements (#2744)

open-telemetry · Dec 13, 2021 · 83fa9fd · 83fa9fd
1 parent f3eaf4a
commit 83fa9fd
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 17 deletions.
diff --git a/examples/Console/TestLogs.cs b/examples/Console/TestLogs.cs
@@ -15,11 +15,7 @@
 // </copyright>
 
 using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using OpenTelemetry;
 using OpenTelemetry.Logs;
 
 namespace Examples.Console
@@ -33,7 +29,7 @@ internal static object Run(LogsOptions options)
                 builder.AddOpenTelemetry((opt) =>
                 {
                     opt.IncludeFormattedMessage = true;
-                    if (options.UseExporter.ToLower() == "otlp")
+                    if (options.UseExporter.Equals("otlp", StringComparison.OrdinalIgnoreCase))
                     {
                         /*
                          * Prerequisite to run this example:

diff --git a/examples/Console/TestMetrics.cs b/examples/Console/TestMetrics.cs
@@ -36,7 +36,7 @@ internal static object Run(MetricsOptions options)
                 .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("myservice"))
                 .AddMeter(meter.Name); // All instruments from this meter are enabled.
 
-            if (options.UseExporter.ToLower() == "otlp")
+            if (options.UseExporter.Equals("otlp", StringComparison.OrdinalIgnoreCase))
             {
                 /*
                  * Prerequisite to run this example:

diff --git a/src/OpenTelemetry/Trace/TracerProviderBuilderBase.cs b/src/OpenTelemetry/Trace/TracerProviderBuilderBase.cs
@@ -30,7 +30,7 @@ public abstract class TracerProviderBuilderBase : TracerProviderBuilder
         private readonly List<InstrumentationFactory> instrumentationFactories = new List<InstrumentationFactory>();
         private readonly List<BaseProcessor<Activity>> processors = new List<BaseProcessor<Activity>>();
         private readonly List<string> sources = new List<string>();
-        private readonly Dictionary<string, bool> legacyActivityOperationNames = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
+        private readonly HashSet<string> legacyActivityOperationNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
         private ResourceBuilder resourceBuilder = ResourceBuilder.CreateDefault();
         private Sampler sampler = new ParentBasedSampler(new AlwaysOnSampler());
 
@@ -76,7 +76,7 @@ public override TracerProviderBuilder AddLegacySource(string operationName)
         {
             Guard.NullOrWhitespace(operationName, nameof(operationName));
 
-            this.legacyActivityOperationNames[operationName] = true;
+            this.legacyActivityOperationNames.Add(operationName);
 
             return this;
         }

diff --git a/src/OpenTelemetry/Trace/TracerProviderSdk.cs b/src/OpenTelemetry/Trace/TracerProviderSdk.cs
@@ -43,7 +43,7 @@ internal TracerProviderSdk(
             IEnumerable<TracerProviderBuilderBase.InstrumentationFactory> instrumentationFactories,
             Sampler sampler,
             List<BaseProcessor<Activity>> processors,
-            Dictionary<string, bool> legacyActivityOperationNames)
+            HashSet<string> legacyActivityOperationNames)
         {
             this.Resource = resource;
             this.sampler = sampler;
@@ -53,10 +53,10 @@ internal TracerProviderSdk(
             Regex legacyActivityWildcardModeRegex = null;
             foreach (var legacyName in legacyActivityOperationNames)
             {
-                if (legacyName.Key.Contains('*'))
+                if (legacyName.Contains('*'))
                 {
                     legacyActivityWildcardMode = true;
-                    legacyActivityWildcardModeRegex = GetWildcardRegex(legacyActivityOperationNames.Keys);
+                    legacyActivityWildcardModeRegex = GetWildcardRegex(legacyActivityOperationNames);
                     break;
                 }
             }
@@ -85,7 +85,7 @@ internal TracerProviderSdk(
                 }
                 else
                 {
-                    legacyActivityPredicate = activity => legacyActivityOperationNames.ContainsKey(activity.OperationName);
+                    legacyActivityPredicate = activity => legacyActivityOperationNames.Contains(activity.OperationName);
                 }
 
                 listener.ActivityStarted = activity =>

diff --git a/...OpenTelemetryProtocol.Tests/Implementation/ExportClient/OtlpHttpTraceExportClientTests.cs b/...OpenTelemetryProtocol.Tests/Implementation/ExportClient/OtlpHttpTraceExportClientTests.cs
@@ -20,7 +20,9 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
+#if !NET5_0_OR_GREATER
 using System.Threading.Tasks;
+#endif
 using Moq;
 using Moq.Protected;
 using OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation;

diff --git a/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusSerializerTests.cs b/test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusSerializerTests.cs
@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using System.Text;

diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/HttpContextHelper.cs b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/HttpContextHelper.cs
@@ -89,7 +89,7 @@ public override string GetUnknownRequestHeader(string name)
 
             public override string GetKnownRequestHeader(int index)
             {
-                var name = HttpWorkerRequest.GetKnownRequestHeaderName(index);
+                var name = GetKnownRequestHeaderName(index);
 
                 if (this.headers.ContainsKey(name))
                 {

diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
@@ -21,7 +21,6 @@
 using Microsoft.AspNetCore.Mvc.Testing;
 using OpenTelemetry.Exporter;
 using OpenTelemetry.Metrics;
-using OpenTelemetry.Tests;
 using OpenTelemetry.Trace;
 #if NETCOREAPP3_1
 using TestApp.AspNetCore._3._1;

diff --git a/test/OpenTelemetry.Shims.OpenTracing.Tests/SpanBuilderShimTests.cs b/test/OpenTelemetry.Shims.OpenTracing.Tests/SpanBuilderShimTests.cs
@@ -122,7 +122,7 @@ public void Start_ActivityOperationRootSpanChecks()
         {
             // Create an activity
             var activity = new Activity("foo")
-                .SetIdFormat(System.Diagnostics.ActivityIdFormat.W3C)
+                .SetIdFormat(ActivityIdFormat.W3C)
                 .Start();
 
             // matching root operation name

diff --git a/test/OpenTelemetry.Tests/Metrics/MultipleReadersTests.cs b/test/OpenTelemetry.Tests/Metrics/MultipleReadersTests.cs
@@ -14,7 +14,6 @@
 // limitations under the License.
 // </copyright>
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
 using OpenTelemetry.Exporter;