Skip to content

Commit 2ea6e04

Browse files
[repo] ProviderBuilderExtensions.Tests - AnalysisLevel latest-all (#6156)
Co-authored-by: Rajkumar Rangaraj <[email protected]>
1 parent 1b555c1 commit 2ea6e04

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ dotnet_diagnostic.IDE0005.severity = warning
156156
# RS0041: Public members should not use oblivious types
157157
dotnet_diagnostic.RS0041.severity = suggestion
158158

159+
[*Tests.cs]
160+
# CA1515: Disable making types internal for Tests classes. It is required by xunit
161+
dotnet_diagnostic.CA1515.severity = none
162+
159163
[**/obj/**.cs]
160164
generated_code = true
161165

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Metrics/TestMeterProviderBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests;
88

9-
public sealed class TestMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder, IDisposable
9+
internal sealed class TestMeterProviderBuilder : MeterProviderBuilder, IMeterProviderBuilder, IDisposable
1010
{
1111
public TestMeterProviderBuilder()
1212
{
@@ -17,9 +17,9 @@ public TestMeterProviderBuilder()
1717

1818
public ServiceProvider? ServiceProvider { get; private set; }
1919

20-
public List<string> Meters { get; } = new();
20+
public List<string> Meters { get; } = [];
2121

22-
public List<object> Instrumentation { get; } = new();
22+
public List<object> Instrumentation { get; } = [];
2323

2424
public MeterProvider? Provider { get; private set; }
2525

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/OpenTelemetry.Api.ProviderBuilderExtensions.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>Unit test project for OpenTelemetry .NET dependency injection extensions</Description>
44
<TargetFrameworks>$(TargetFrameworksForTests)</TargetFrameworks>
5+
<AnalysisLevel>latest-all</AnalysisLevel>
56
</PropertyGroup>
67

78
<ItemGroup>

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/ServiceCollectionExtensionsTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void ConfigureOpenTelemetryTracerProvider(int numberOfCalls)
3030

3131
using var serviceProvider = services.BuildServiceProvider();
3232

33-
var registrations = serviceProvider.GetServices<IConfigureTracerProviderBuilder>();
33+
var registrations = serviceProvider.GetServices<IConfigureTracerProviderBuilder>().ToArray();
3434

3535
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
3636
Assert.Equal(0, afterServiceProviderInvocations);
@@ -43,7 +43,7 @@ public void ConfigureOpenTelemetryTracerProvider(int numberOfCalls)
4343
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
4444
Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
4545

46-
Assert.Equal(numberOfCalls * 2, registrations.Count());
46+
Assert.Equal(numberOfCalls * 2, registrations.Length);
4747
}
4848

4949
[Theory]
@@ -65,7 +65,7 @@ public void ConfigureOpenTelemetryMeterProvider(int numberOfCalls)
6565

6666
using var serviceProvider = services.BuildServiceProvider();
6767

68-
var registrations = serviceProvider.GetServices<IConfigureMeterProviderBuilder>();
68+
var registrations = serviceProvider.GetServices<IConfigureMeterProviderBuilder>().ToArray();
6969

7070
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
7171
Assert.Equal(0, afterServiceProviderInvocations);
@@ -78,7 +78,7 @@ public void ConfigureOpenTelemetryMeterProvider(int numberOfCalls)
7878
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
7979
Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
8080

81-
Assert.Equal(numberOfCalls * 2, registrations.Count());
81+
Assert.Equal(numberOfCalls * 2, registrations.Length);
8282
}
8383

8484
[Theory]
@@ -100,7 +100,7 @@ public void ConfigureOpenTelemetryLoggerProvider(int numberOfCalls)
100100

101101
using var serviceProvider = services.BuildServiceProvider();
102102

103-
var registrations = serviceProvider.GetServices<IConfigureLoggerProviderBuilder>();
103+
var registrations = serviceProvider.GetServices<IConfigureLoggerProviderBuilder>().ToArray();
104104

105105
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
106106
Assert.Equal(0, afterServiceProviderInvocations);
@@ -113,6 +113,6 @@ public void ConfigureOpenTelemetryLoggerProvider(int numberOfCalls)
113113
Assert.Equal(numberOfCalls, beforeServiceProviderInvocations);
114114
Assert.Equal(numberOfCalls, afterServiceProviderInvocations);
115115

116-
Assert.Equal(numberOfCalls * 2, registrations.Count());
116+
Assert.Equal(numberOfCalls * 2, registrations.Length);
117117
}
118118
}

test/OpenTelemetry.Api.ProviderBuilderExtensions.Tests/Trace/TestTracerProviderBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace OpenTelemetry.Api.ProviderBuilderExtensions.Tests;
88

9-
public sealed class TestTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder, IDisposable
9+
internal sealed class TestTracerProviderBuilder : TracerProviderBuilder, ITracerProviderBuilder, IDisposable
1010
{
1111
public TestTracerProviderBuilder()
1212
{
@@ -17,11 +17,11 @@ public TestTracerProviderBuilder()
1717

1818
public ServiceProvider? ServiceProvider { get; private set; }
1919

20-
public List<string> Sources { get; } = new();
20+
public List<string> Sources { get; } = [];
2121

22-
public List<string> LegacySources { get; } = new();
22+
public List<string> LegacySources { get; } = [];
2323

24-
public List<object> Instrumentation { get; } = new();
24+
public List<object> Instrumentation { get; } = [];
2525

2626
public TracerProvider? Provider { get; private set; }
2727

0 commit comments

Comments
 (0)