Skip to content

Commit 19e1663

Browse files
ysolomchenkoKielekCodeBlanch
authored
[Extensions.Hosting.Tests] Nullable (open-telemetry#5862)
Co-authored-by: Piotr Kiełkowicz <[email protected]> Co-authored-by: Mikel Blanchard <[email protected]>
1 parent f502355 commit 19e1663

File tree

7 files changed

+145
-134
lines changed

7 files changed

+145
-134
lines changed

‎test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<PropertyGroup>
33
<Description>Unit test project for OpenTelemetry .NET Core hosting library</Description>
44
<TargetFrameworks>$(TargetFrameworksForTests)</TargetFrameworks>
5-
<!-- this is temporary. will remove in future PR. -->
6-
<Nullable>disable</Nullable>
75
<DefineConstants>$(DefineConstants);BUILDING_HOSTING_TESTS</DefineConstants>
86
</PropertyGroup>
97

‎test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetryServicesExtensionsTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public async Task AddOpenTelemetry_WithTracing_HostConfigurationHonoredTest()
129129
var builder = new HostBuilder()
130130
.ConfigureAppConfiguration(builder =>
131131
{
132-
builder.AddInMemoryCollection(new Dictionary<string, string>
132+
builder.AddInMemoryCollection(new Dictionary<string, string?>
133133
{
134134
["TEST_KEY"] = "TEST_KEY_VALUE",
135135
});
@@ -147,7 +147,7 @@ public async Task AddOpenTelemetry_WithTracing_HostConfigurationHonoredTest()
147147

148148
var configuration = sp.GetRequiredService<IConfiguration>();
149149

150-
var testKeyValue = configuration.GetValue<string>("TEST_KEY", null);
150+
var testKeyValue = configuration.GetValue<string?>("TEST_KEY", null);
151151

152152
Assert.Equal("TEST_KEY_VALUE", testKeyValue);
153153
});
@@ -252,7 +252,7 @@ public async Task AddOpenTelemetry_WithMetrics_HostConfigurationHonoredTest()
252252
var builder = new HostBuilder()
253253
.ConfigureAppConfiguration(builder =>
254254
{
255-
builder.AddInMemoryCollection(new Dictionary<string, string>
255+
builder.AddInMemoryCollection(new Dictionary<string, string?>
256256
{
257257
["TEST_KEY"] = "TEST_KEY_VALUE",
258258
});
@@ -270,7 +270,7 @@ public async Task AddOpenTelemetry_WithMetrics_HostConfigurationHonoredTest()
270270

271271
var configuration = sp.GetRequiredService<IConfiguration>();
272272

273-
var testKeyValue = configuration.GetValue<string>("TEST_KEY", null);
273+
var testKeyValue = configuration.GetValue<string?>("TEST_KEY", null);
274274

275275
Assert.Equal("TEST_KEY_VALUE", testKeyValue);
276276
});
@@ -375,7 +375,7 @@ public void AddOpenTelemetry_WithLogging_HostConfigurationHonoredTest()
375375
var builder = new HostBuilder()
376376
.ConfigureAppConfiguration(builder =>
377377
{
378-
builder.AddInMemoryCollection(new Dictionary<string, string>
378+
builder.AddInMemoryCollection(new Dictionary<string, string?>
379379
{
380380
["TEST_KEY"] = "TEST_KEY_VALUE",
381381
});
@@ -393,7 +393,7 @@ public void AddOpenTelemetry_WithLogging_HostConfigurationHonoredTest()
393393

394394
var configuration = sp.GetRequiredService<IConfiguration>();
395395

396-
var testKeyValue = configuration.GetValue<string>("TEST_KEY", null);
396+
var testKeyValue = configuration.GetValue<string?>("TEST_KEY", null);
397397

398398
Assert.Equal("TEST_KEY_VALUE", testKeyValue);
399399
});

‎test/OpenTelemetry.Tests/Metrics/AggregatorTestsBase.cs‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#nullable enable
5+
6+
using System.Diagnostics;
47
using System.Diagnostics.Metrics;
58
using Xunit;
69

@@ -193,11 +196,7 @@ public void MultiThreadedHistogramUpdateAndSnapShotTest()
193196
{
194197
var boundaries = Array.Empty<double>();
195198
var histogramPoint = new MetricPoint(this.aggregatorStore, AggregationType.Histogram, null, boundaries, Metric.DefaultExponentialHistogramMaxBuckets, Metric.DefaultExponentialHistogramMaxScale);
196-
var argsToThread = new ThreadArguments
197-
{
198-
HistogramPoint = histogramPoint,
199-
MreToEnsureAllThreadsStart = new ManualResetEvent(false),
200-
};
199+
var argsToThread = new ThreadArguments(histogramPoint, new ManualResetEvent(false));
201200

202201
var numberOfThreads = 2;
203202
var snapshotThread = new Thread(HistogramSnapshotThread);
@@ -243,7 +242,7 @@ public void MultiThreadedHistogramUpdateAndSnapShotTest()
243242
[InlineData("System.Net.Http", "http.client.request.time_in_queue", "s", KnownHistogramBuckets.DefaultShortSeconds)]
244243
[InlineData("System.Net.NameResolution", "dns.lookup.duration", "s", KnownHistogramBuckets.DefaultShortSeconds)]
245244
[InlineData("General.App", "simple.alternative.counter", "s", KnownHistogramBuckets.Default)]
246-
public void HistogramBucketsDefaultUpdatesForSecondsTest(string meterName, string instrumentName, string unit, KnownHistogramBuckets expectedHistogramBuckets)
245+
public void HistogramBucketsDefaultUpdatesForSecondsTest(string meterName, string instrumentName, string? unit, KnownHistogramBuckets expectedHistogramBuckets)
247246
{
248247
using var meter = new Meter(meterName);
249248

@@ -341,7 +340,7 @@ internal void ExponentialHistogramTests(AggregationType aggregationType, Aggrega
341340

342341
foreach (var value in valuesToRecord)
343342
{
344-
aggregatorStore.Update(value, Array.Empty<KeyValuePair<string, object>>());
343+
aggregatorStore.Update(value, Array.Empty<KeyValuePair<string, object?>>());
345344

346345
if (value >= 0)
347346
{
@@ -446,7 +445,7 @@ internal void ExponentialMaxScaleConfigWorks(int? maxScale)
446445
this.emitOverflowAttribute,
447446
this.shouldReclaimUnusedMetricPoints);
448447

449-
aggregatorStore.Update(10, Array.Empty<KeyValuePair<string, object>>());
448+
aggregatorStore.Update(10, Array.Empty<KeyValuePair<string, object?>>());
450449

451450
aggregatorStore.Snapshot();
452451

@@ -466,10 +465,11 @@ internal void ExponentialMaxScaleConfigWorks(int? maxScale)
466465
Assert.Equal(expectedScale, metricPoint.GetExponentialHistogramData().Scale);
467466
}
468467

469-
private static void HistogramSnapshotThread(object obj)
468+
private static void HistogramSnapshotThread(object? obj)
470469
{
471470
var args = obj as ThreadArguments;
472-
var mreToEnsureAllThreadsStart = args.MreToEnsureAllThreadsStart;
471+
Debug.Assert(args != null, "args was null");
472+
var mreToEnsureAllThreadsStart = args!.MreToEnsureAllThreadsStart;
473473

474474
if (Interlocked.Increment(ref args.ThreadStartedCount) == 3)
475475
{
@@ -487,10 +487,11 @@ private static void HistogramSnapshotThread(object obj)
487487
}
488488
}
489489

490-
private static void HistogramUpdateThread(object obj)
490+
private static void HistogramUpdateThread(object? obj)
491491
{
492492
var args = obj as ThreadArguments;
493-
var mreToEnsureAllThreadsStart = args.MreToEnsureAllThreadsStart;
493+
Debug.Assert(args != null, "args was null");
494+
var mreToEnsureAllThreadsStart = args!.MreToEnsureAllThreadsStart;
494495

495496
if (Interlocked.Increment(ref args.ThreadStartedCount) == 3)
496497
{
@@ -509,11 +510,17 @@ private static void HistogramUpdateThread(object obj)
509510

510511
private class ThreadArguments
511512
{
513+
public readonly ManualResetEvent MreToEnsureAllThreadsStart;
512514
public MetricPoint HistogramPoint;
513-
public ManualResetEvent MreToEnsureAllThreadsStart;
514515
public int ThreadStartedCount;
515516
public long ThreadsFinishedAllUpdatesCount;
516517
public double SumOfDelta;
518+
519+
public ThreadArguments(MetricPoint histogramPoint, ManualResetEvent mreToEnsureAllThreadsStart)
520+
{
521+
this.HistogramPoint = histogramPoint;
522+
this.MreToEnsureAllThreadsStart = mreToEnsureAllThreadsStart;
523+
}
517524
}
518525
}
519526

0 commit comments

Comments
 (0)