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

Fix IDE0001: Name can be simplified. (#3011)

This commit is contained in:
Travis Illig 2022-03-10 07:39:27 -08:00 committed by GitHub
parent 899be1f695
commit 7b19794de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/ExporterClientValidation.cs
View File

@ -22,7 +22,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation.ExportClie
{
internal static void EnsureUnencryptedSupportIsEnabled(OtlpExporterOptions options)
{
var version = System.Environment.Version;
var version = Environment.Version;
// This verification is only required for .NET Core 3.x
if (version.Major != 3)

2
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs
View File

@ -45,7 +45,7 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
var exporterOptions = new OtlpExporterOptions
{
Endpoint = new System.Uri($"http://{CollectorHostname}{endpoint}"),
Endpoint = new Uri($"http://{CollectorHostname}{endpoint}"),
Protocol = protocol,
};

6
test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs
View File

@ -229,7 +229,7 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
using var source = new ActivitySource("test-source");
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
{
action(message, "customField", "customValue");
@ -321,7 +321,7 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
bool isPropagatorCalled = false;
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
{
isPropagatorCalled = true;
@ -383,7 +383,7 @@ namespace OpenTelemetry.Instrumentation.Grpc.Tests
bool isPropagatorCalled = false;
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
{
isPropagatorCalled = true;

6
test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.netcore31.cs
View File

@ -18,10 +18,8 @@ using System;
using System.Diagnostics;
using System.Linq;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Moq;
using OpenTelemetry.Context;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Instrumentation.Http.Implementation;
using OpenTelemetry.Tests;
@ -134,7 +132,7 @@ namespace OpenTelemetry.Instrumentation.Http.Tests
public async Task HttpClientInstrumentationInjectsHeadersAsync_CustomFormat(bool shouldEnrich)
{
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
{
action(message, "custom_traceparent", $"00/{context.ActivityContext.TraceId}/{context.ActivityContext.SpanId}/01");
@ -201,7 +199,7 @@ namespace OpenTelemetry.Instrumentation.Http.Tests
try
{
var propagator = new Mock<TextMapPropagator>();
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
{
action(message, "custom_traceparent", $"00/{context.ActivityContext.TraceId}/{context.ActivityContext.SpanId}/01");

6
test/OpenTelemetry.Shims.OpenTracing.Tests/TracerShimTests.cs
View File

@ -19,11 +19,11 @@ using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using global::OpenTracing;
using global::OpenTracing.Propagation;
using Moq;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Trace;
using OpenTracing;
using OpenTracing.Propagation;
using Xunit;
namespace OpenTelemetry.Shims.OpenTracing.Tests
@ -42,7 +42,7 @@ namespace OpenTelemetry.Shims.OpenTracing.Tests
Assert.Throws<ArgumentNullException>(() => new TracerShim(null, new TraceContextPropagator()));
// null context format
var tracerMock = new Mock<Trace.Tracer>();
var tracerMock = new Mock<Tracer>();
Assert.Throws<ArgumentNullException>(() => new TracerShim(TracerProvider.Default.GetTracer("test"), null));
}