Skip to content

Commit fd10320

Browse files
authored
Merge branch 'main' into use-some-collection-expressions
2 parents 2f53a5e + 62af9ad commit fd10320

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/OpenTelemetry/Metrics/View/ExplicitBucketHistogramConfiguration.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ExplicitBucketHistogramConfiguration : HistogramConfiguration
2525
/// </remarks>
2626
public double[]? Boundaries
2727
{
28-
get => this.CopiedBoundaries != null ? this.CopiedBoundaries.AsSpan().ToArray() : null;
28+
get => this.CopiedBoundaries?.ToArray();
2929

3030
set
3131
{
@@ -36,7 +36,7 @@ public double[]? Boundaries
3636
throw new ArgumentException($"Histogram boundaries are invalid. Histogram boundaries must be in ascending order with distinct values.", nameof(value));
3737
}
3838

39-
this.CopiedBoundaries = value.AsSpan().ToArray();
39+
this.CopiedBoundaries = value.ToArray();
4040
}
4141
else
4242
{

src/OpenTelemetry/Metrics/View/MetricStreamConfiguration.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public string? Name
7171
/// </remarks>
7272
public string[]? TagKeys
7373
{
74-
get => this.CopiedTagKeys != null ? this.CopiedTagKeys.AsSpan().ToArray() : null;
75-
set => this.CopiedTagKeys = value != null ? value.AsSpan().ToArray() : null;
74+
get => this.CopiedTagKeys?.ToArray();
75+
set => this.CopiedTagKeys = value?.ToArray();
7676
}
7777

7878
/// <summary>

src/Shared/Options/DelegatingOptionsFactory.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public DelegatingOptionsFactory(
6464

6565
this.optionsFactoryFunc = optionsFactoryFunc!;
6666
this.configuration = configuration!;
67-
_setups = setups as IConfigureOptions<TOptions>[] ?? new List<IConfigureOptions<TOptions>>(setups).ToArray();
68-
_postConfigures = postConfigures as IPostConfigureOptions<TOptions>[] ?? new List<IPostConfigureOptions<TOptions>>(postConfigures).ToArray();
69-
_validations = validations as IValidateOptions<TOptions>[] ?? new List<IValidateOptions<TOptions>>(validations).ToArray();
67+
_setups = setups as IConfigureOptions<TOptions>[] ?? setups.ToArray();
68+
_postConfigures = postConfigures as IPostConfigureOptions<TOptions>[] ?? postConfigures.ToArray();
69+
_validations = validations as IValidateOptions<TOptions>[] ?? validations.ToArray();
7070
}
7171

7272
/// <summary>

0 commit comments

Comments
 (0)