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 IDE0017: Use object initializers (#3022)

This commit is contained in:
Travis Illig 2022-03-11 07:43:21 -08:00 committed by GitHub
parent 5f509bfea9
commit f6b627134b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 83 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@ -68,6 +68,7 @@ csharp_prefer_simple_using_statement = true:suggestion
dotnet_style_readonly_field = true:suggestion
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_object_initializer = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion

22
src/OpenTelemetry.Exporter.OpenTelemetryProtocol/Implementation/MetricItemExtensions.cs
View File

@ -144,9 +144,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation
{
case MetricType.LongSum:
{
var sum = new OtlpMetrics.Sum();
sum.IsMonotonic = true;
sum.AggregationTemporality = temporality;
var sum = new OtlpMetrics.Sum
{
IsMonotonic = true,
AggregationTemporality = temporality,
};
foreach (ref readonly var metricPoint in metric.GetMetricPoints())
{
@ -168,9 +170,11 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation
case MetricType.DoubleSum:
{
var sum = new OtlpMetrics.Sum();
sum.IsMonotonic = true;
sum.AggregationTemporality = temporality;
var sum = new OtlpMetrics.Sum
{
IsMonotonic = true,
AggregationTemporality = temporality,
};
foreach (ref readonly var metricPoint in metric.GetMetricPoints())
{
@ -234,8 +238,10 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Implementation
case MetricType.Histogram:
{
var histogram = new OtlpMetrics.Histogram();
histogram.AggregationTemporality = temporality;
var histogram = new OtlpMetrics.Histogram
{
AggregationTemporality = temporality,
};
foreach (ref readonly var metricPoint in metric.GetMetricPoints())
{

12
test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/OtlpExporterOptionsExtensionsTests.cs
View File

@ -33,8 +33,10 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
[InlineData("key1=value1;key2=value2", new string[] { "key1" }, new string[] { "value1;key2=value2" })] // semicolon is not treated as a delimeter (https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#specifying-headers-via-environment-variables)
public void GetMetadataFromHeadersWorksCorrectFormat(string headers, string[] keys, string[] values)
{
var options = new OtlpExporterOptions();
options.Headers = headers;
var options = new OtlpExporterOptions
{
Headers = headers,
};
var metadata = options.GetMetadataFromHeaders();
Assert.Equal(keys.Length, metadata.Count);
@ -52,8 +54,10 @@ namespace OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests
{
try
{
var options = new OtlpExporterOptions();
options.Headers = headers;
var options = new OtlpExporterOptions
{
Headers = headers,
};
var metadata = options.GetMetadataFromHeaders();
}
catch (Exception ex)

36
test/OpenTelemetry.Tests/Trace/BatchExportActivityProcessorTest.cs
View File

@ -53,8 +53,10 @@ namespace OpenTelemetry.Trace.Tests
maxExportBatchSize: 1,
scheduledDelayMilliseconds: 100_000);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity);
@ -93,11 +95,15 @@ namespace OpenTelemetry.Trace.Tests
maxExportBatchSize: 3,
exporterTimeoutMilliseconds: 30000);
var activity1 = new Activity("start1");
activity1.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity1 = new Activity("start1")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
var activity2 = new Activity("start2");
activity2.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity2 = new Activity("start2")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity1);
processor.OnEnd(activity2);
@ -138,8 +144,10 @@ namespace OpenTelemetry.Trace.Tests
maxExportBatchSize: 3,
exporterTimeoutMilliseconds: 30000);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity);
processor.Shutdown(timeout);
@ -167,8 +175,10 @@ namespace OpenTelemetry.Trace.Tests
maxQueueSize: 1,
maxExportBatchSize: 1);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.None;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.None,
};
processor.OnEnd(activity);
processor.Shutdown();
@ -186,8 +196,10 @@ namespace OpenTelemetry.Trace.Tests
maxQueueSize: 3,
maxExportBatchSize: 3);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity);
processor.OnEnd(activity);

36
test/OpenTelemetry.Tests/Trace/SimpleExportActivityProcessorTest.cs
View File

@ -38,14 +38,18 @@ namespace OpenTelemetry.Trace.Tests
using var exporter = new InMemoryExporter<Activity>(exportedItems);
using var processor = new SimpleActivityExportProcessor(exporter);
var activity1 = new Activity("start1");
activity1.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity1 = new Activity("start1")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity1);
Assert.Single(exportedItems);
var activity2 = new Activity("start2");
activity2.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity2 = new Activity("start2")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity2);
Assert.Equal(2, exportedItems.Count);
@ -61,11 +65,15 @@ namespace OpenTelemetry.Trace.Tests
using var exporter = new InMemoryExporter<Activity>(exportedItems);
using var processor = new SimpleActivityExportProcessor(exporter);
var activity1 = new Activity("start1");
activity1.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity1 = new Activity("start1")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
var activity2 = new Activity("start2");
activity2.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity2 = new Activity("start2")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity1);
processor.OnEnd(activity2);
@ -88,8 +96,10 @@ namespace OpenTelemetry.Trace.Tests
using var exporter = new InMemoryExporter<Activity>(exportedItems);
using var processor = new SimpleActivityExportProcessor(exporter);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.Recorded;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.Recorded,
};
processor.OnEnd(activity);
@ -107,8 +117,10 @@ namespace OpenTelemetry.Trace.Tests
using var exporter = new InMemoryExporter<Activity>(exportedItems);
using var processor = new SimpleActivityExportProcessor(exporter);
var activity = new Activity("start");
activity.ActivityTraceFlags = ActivityTraceFlags.None;
var activity = new Activity("start")
{
ActivityTraceFlags = ActivityTraceFlags.None,
};
processor.OnEnd(activity);
Assert.Empty(exportedItems);

20
test/OpenTelemetry.Tests/Trace/TracerProviderSdkTest.cs
View File

@ -195,12 +195,14 @@ namespace OpenTelemetry.Trace.Tests
[InlineData(SamplingDecision.RecordAndSample)]
public void TracerProviderSdkSamplerAttributesAreAppliedToActivity(SamplingDecision sampling)
{
var testSampler = new TestSampler();
testSampler.SamplingAction = (samplingParams) =>
var testSampler = new TestSampler
{
var attributes = new Dictionary<string, object>();
attributes.Add("tagkeybysampler", "tagvalueaddedbysampler");
return new SamplingResult(sampling, attributes);
SamplingAction = (samplingParams) =>
{
var attributes = new Dictionary<string, object>();
attributes.Add("tagkeybysampler", "tagvalueaddedbysampler");
return new SamplingResult(sampling, attributes);
},
};
using var activitySource = new ActivitySource(ActivitySourceName);
@ -937,9 +939,11 @@ namespace OpenTelemetry.Trace.Tests
{
// Create some parent activity.
string tracestate = "a=b;c=d";
var activityLocalParent = new Activity("TestParent");
activityLocalParent.ActivityTraceFlags = traceFlags;
activityLocalParent.TraceStateString = tracestate;
var activityLocalParent = new Activity("TestParent")
{
ActivityTraceFlags = traceFlags,
TraceStateString = tracestate,
};
activityLocalParent.Start();
var operationNameForLegacyActivity = "TestOperationName";