open-telemetry
/
opentelemetry-dotnet
mirror of https://github.com/open-telemetry/opentelemetry-dotnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General code improvements (#2744)

This commit is contained in:
Michael Maxwell 2021-12-13 09:42:28 -08:00 committed by GitHub
parent f3eaf4a6f9
commit 83fa9fde68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/Console/TestLogs.cs
View File

@ -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 @@ namespace Examples.Console
builder.AddOpenTelemetry((opt) =>
{
opt.IncludeFormattedMessage = true;
if (options.UseExporter.ToLower() == "otlp")
if (options.UseExporter.Equals("otlp", StringComparison.OrdinalIgnoreCase))
{
/*
* Prerequisite to run this example:

2
examples/Console/TestMetrics.cs
View File

@ -36,7 +36,7 @@ namespace Examples.Console
.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:

4
src/OpenTelemetry/Trace/TracerProviderBuilderBase.cs
View File

@ -30,7 +30,7 @@ namespace OpenTelemetry.Trace
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 @@ namespace OpenTelemetry.Trace
{
Guard.NullOrWhitespace(operationName, nameof(operationName));
this.legacyActivityOperationNames[operationName] = true;
this.legacyActivityOperationNames.Add(operationName);
return this;
}

8
src/OpenTelemetry/Trace/TracerProviderSdk.cs
View File

@ -43,7 +43,7 @@ namespace OpenTelemetry.Trace
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 @@ namespace OpenTelemetry.Trace
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 @@ namespace OpenTelemetry.Trace
}
else
{
legacyActivityPredicate = activity => legacyActivityOperationNames.ContainsKey(activity.OperationName);
legacyActivityPredicate = activity => legacyActivityOperationNames.Contains(activity.OperationName);
}
listener.ActivityStarted = activity =>

2
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Implementation/ExportClient/OtlpHttpTraceExportClientTests.cs
View File

@ -20,7 +20,9 @@ using System.Diagnostics;
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;

1
test/OpenTelemetry.Exporter.Prometheus.Tests/PrometheusSerializerTests.cs
View File

@ -14,7 +14,6 @@
// limitations under the License.
// </copyright>
using System;
using System.Collections.Generic;
using System.Diagnostics.Metrics;
using System.Text;

2
test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/HttpContextHelper.cs
View File

@ -89,7 +89,7 @@ namespace OpenTelemetry.Instrumentation.AspNet.Tests
public override string GetKnownRequestHeader(int index)
{
var name = HttpWorkerRequest.GetKnownRequestHeaderName(index);
var name = GetKnownRequestHeaderName(index);
if (this.headers.ContainsKey(name))
{

1
test/OpenTelemetry.Instrumentation.AspNetCore.Tests/MetricTests.cs
View File

@ -21,7 +21,6 @@ using System.Threading.Tasks;
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;

2
test/OpenTelemetry.Shims.OpenTracing.Tests/SpanBuilderShimTests.cs
View File

@ -122,7 +122,7 @@ namespace OpenTelemetry.Shims.OpenTracing.Tests
{
// Create an activity
var activity = new Activity("foo")
.SetIdFormat(System.Diagnostics.ActivityIdFormat.W3C)
.SetIdFormat(ActivityIdFormat.W3C)
.Start();
// matching root operation name

1
test/OpenTelemetry.Tests/Metrics/MultipleReadersTests.cs
View File

@ -14,7 +14,6 @@
// limitations under the License.
// </copyright>
using System;
using System.Collections.Generic;
using System.Diagnostics.Metrics;
using OpenTelemetry.Exporter;