Skip to content

Commit 7b19794

Browse files
authored
Fix IDE0001: Name can be simplified. (#3011)
1 parent 899be1f commit 7b19794

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/ExportClient/ExporterClientValidation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal static class ExporterClientValidation
2222
{
2323
internal static void EnsureUnencryptedSupportIsEnabled(OtlpExporterOptions options)
2424
{
25-
var version = System.Environment.Version;
25+
var version = Environment.Version;
2626

2727
// This verification is only required for .NET Core 3.x
2828
if (version.Major != 3)

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void ExportResultIsSuccess(OtlpExportProtocol protocol, string endpoint)
4545

4646
var exporterOptions = new OtlpExporterOptions
4747
{
48-
Endpoint = new System.Uri($"http://{CollectorHostname}{endpoint}"),
48+
Endpoint = new Uri($"http://{CollectorHostname}{endpoint}"),
4949
Protocol = protocol,
5050
};
5151

test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public void GrpcPropagatesContextWithSuppressInstrumentationOptionSetToTrue()
229229
using var source = new ActivitySource("test-source");
230230

231231
var propagator = new Mock<TextMapPropagator>();
232-
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
232+
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
233233
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
234234
{
235235
action(message, "customField", "customValue");
@@ -321,7 +321,7 @@ public void GrpcDoesNotPropagateContextWithSuppressInstrumentationOptionSetToFal
321321

322322
bool isPropagatorCalled = false;
323323
var propagator = new Mock<TextMapPropagator>();
324-
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
324+
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
325325
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
326326
{
327327
isPropagatorCalled = true;
@@ -383,7 +383,7 @@ public void GrpcClientInstrumentationRespectsSdkSuppressInstrumentation()
383383

384384
bool isPropagatorCalled = false;
385385
var propagator = new Mock<TextMapPropagator>();
386-
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
386+
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
387387
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
388388
{
389389
isPropagatorCalled = true;

test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.netcore31.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
using System.Diagnostics;
1919
using System.Linq;
2020
using System.Net.Http;
21-
using System.Threading;
2221
using System.Threading.Tasks;
2322
using Moq;
24-
using OpenTelemetry.Context;
2523
using OpenTelemetry.Context.Propagation;
2624
using OpenTelemetry.Instrumentation.Http.Implementation;
2725
using OpenTelemetry.Tests;
@@ -134,7 +132,7 @@ public async Task HttpClientInstrumentationInjectsHeadersAsync(bool shouldEnrich
134132
public async Task HttpClientInstrumentationInjectsHeadersAsync_CustomFormat(bool shouldEnrich)
135133
{
136134
var propagator = new Mock<TextMapPropagator>();
137-
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
135+
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
138136
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
139137
{
140138
action(message, "custom_traceparent", $"00/{context.ActivityContext.TraceId}/{context.ActivityContext.SpanId}/01");
@@ -201,7 +199,7 @@ public async Task HttpClientInstrumentationRespectsSuppress()
201199
try
202200
{
203201
var propagator = new Mock<TextMapPropagator>();
204-
propagator.Setup(m => m.Inject<HttpRequestMessage>(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
202+
propagator.Setup(m => m.Inject(It.IsAny<PropagationContext>(), It.IsAny<HttpRequestMessage>(), It.IsAny<Action<HttpRequestMessage, string, string>>()))
205203
.Callback<PropagationContext, HttpRequestMessage, Action<HttpRequestMessage, string, string>>((context, message, action) =>
206204
{
207205
action(message, "custom_traceparent", $"00/{context.ActivityContext.TraceId}/{context.ActivityContext.SpanId}/01");

test/OpenTelemetry.Shims.OpenTracing.Tests/TracerShimTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
using System.Collections.Generic;
2020
using System.Diagnostics;
2121
using System.IO;
22-
using global::OpenTracing;
23-
using global::OpenTracing.Propagation;
2422
using Moq;
2523
using OpenTelemetry.Context.Propagation;
2624
using OpenTelemetry.Trace;
25+
using OpenTracing;
26+
using OpenTracing.Propagation;
2727
using Xunit;
2828

2929
namespace OpenTelemetry.Shims.OpenTracing.Tests
@@ -42,7 +42,7 @@ public void CtorArgumentValidation()
4242
Assert.Throws<ArgumentNullException>(() => new TracerShim(null, new TraceContextPropagator()));
4343

4444
// null context format
45-
var tracerMock = new Mock<Trace.Tracer>();
45+
var tracerMock = new Mock<Tracer>();
4646
Assert.Throws<ArgumentNullException>(() => new TracerShim(TracerProvider.Default.GetTracer("test"), null));
4747
}
4848

0 commit comments

Comments
 (0)