diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
index d089eaa7079..63220e5512a 100644
--- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
+++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj
@@ -22,9 +22,9 @@
-
+
-
+
diff --git a/test/OpenTelemetry.Tests/Metrics/AggregatorTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/AggregatorTests.cs
similarity index 99%
rename from test/OpenTelemetry.Tests/Metrics/AggregatorTestsBase.cs
rename to test/OpenTelemetry.Tests/Metrics/AggregatorTests.cs
index 44d808755bd..9c5613c5795 100644
--- a/test/OpenTelemetry.Tests/Metrics/AggregatorTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/AggregatorTests.cs
@@ -7,9 +7,7 @@
namespace OpenTelemetry.Metrics.Tests;
-#pragma warning disable SA1402
-
-public abstract class AggregatorTestsBase
+public class AggregatorTests
{
private static readonly Meter Meter = new("testMeter");
private static readonly Instrument Instrument = Meter.CreateHistogram("testInstrument");
@@ -18,7 +16,7 @@ public abstract class AggregatorTestsBase
private readonly AggregatorStore aggregatorStore;
- protected AggregatorTestsBase()
+ public AggregatorTests()
{
this.aggregatorStore = new(MetricStreamIdentity, AggregationType.HistogramWithBuckets, AggregationTemporality.Cumulative, 1024);
}
@@ -510,11 +508,3 @@ public ThreadArguments(MetricPoint histogramPoint, ManualResetEvent mreToEnsureA
}
}
}
-
-public class AggregatorTests : AggregatorTestsBase
-{
- public AggregatorTests()
- : base()
- {
- }
-}
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricApiTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/MetricApiTests.cs
similarity index 99%
rename from test/OpenTelemetry.Tests/Metrics/MetricApiTestsBase.cs
rename to test/OpenTelemetry.Tests/Metrics/MetricApiTests.cs
index 67b55caff09..ff7205e8009 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricApiTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricApiTests.cs
@@ -3,7 +3,6 @@
using System.Diagnostics;
using System.Diagnostics.Metrics;
-using Microsoft.Extensions.Configuration;
using OpenTelemetry.Exporter;
using OpenTelemetry.Internal;
using OpenTelemetry.Tests;
@@ -12,9 +11,7 @@
namespace OpenTelemetry.Metrics.Tests;
-#pragma warning disable SA1402
-
-public abstract class MetricApiTestsBase : MetricTestsBase
+public class MetricApiTests : MetricTestsBase
{
private const int MaxTimeToAllowForFlush = 10000;
private static readonly int NumberOfThreads = Environment.ProcessorCount;
@@ -23,8 +20,7 @@ public abstract class MetricApiTestsBase : MetricTestsBase
private static readonly int NumberOfMetricUpdateByEachThread = 100000;
private readonly ITestOutputHelper output;
- protected MetricApiTestsBase(ITestOutputHelper output)
- : base(BuildConfiguration())
+ public MetricApiTests(ITestOutputHelper output)
{
this.output = output;
}
@@ -1703,14 +1699,6 @@ public void GaugeHandlesNoNewMeasurementsCorrectlyWithTemporality(MetricReaderTe
}
}
- internal static IConfiguration BuildConfiguration()
- {
- var configurationData = new Dictionary();
- return new ConfigurationBuilder()
- .AddInMemoryCollection(configurationData)
- .Build();
- }
-
private static void CounterUpdateThread(object? obj)
where T : struct, IComparable
{
@@ -1878,11 +1866,3 @@ public UpdateThreadArguments(ManualResetEvent mreToBlockUpdateThread, ManualRese
}
}
}
-
-public class MetricApiTest : MetricApiTestsBase
-{
- public MetricApiTest(ITestOutputHelper output)
- : base(output)
- {
- }
-}
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTests.cs
similarity index 92%
rename from test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTestsBase.cs
rename to test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTests.cs
index 9f05f4277bf..2652d3de0c9 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricOverflowAttributeTests.cs
@@ -2,30 +2,13 @@
// SPDX-License-Identifier: Apache-2.0
using System.Diagnostics.Metrics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Tests;
using Xunit;
namespace OpenTelemetry.Metrics.Tests;
-#pragma warning disable SA1402
-
-public abstract class MetricOverflowAttributeTestsBase
+public class MetricOverflowAttributeTests
{
- private readonly Dictionary configurationData = new()
- {
- };
-
- private readonly IConfiguration configuration;
-
- public MetricOverflowAttributeTestsBase()
- {
- this.configuration = new ConfigurationBuilder()
- .AddInMemoryCollection(this.configurationData)
- .Build();
- }
-
[Theory]
[InlineData(MetricReaderTemporalityPreference.Delta)]
[InlineData(MetricReaderTemporalityPreference.Cumulative)]
@@ -37,10 +20,6 @@ public void MetricOverflowAttributeIsRecordedCorrectlyForCounter(MetricReaderTem
var counter = meter.CreateCounter("TestCounter");
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(meter.Name)
.AddInMemoryExporter(exportedItems, metricReaderOptions => metricReaderOptions.TemporalityPreference = temporalityPreference)
.Build();
@@ -181,10 +160,6 @@ public void MetricOverflowAttributeIsRecordedCorrectlyForHistogram(MetricReaderT
var histogram = meter.CreateHistogram("TestHistogram");
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(meter.Name)
.AddInMemoryExporter(exportedItems, metricReaderOptions => metricReaderOptions.TemporalityPreference = temporalityPreference)
.Build();
@@ -318,11 +293,3 @@ public void MetricOverflowAttributeIsRecordedCorrectlyForHistogram(MetricReaderT
}
}
}
-
-public class MetricOverflowAttributeTests : MetricOverflowAttributeTestsBase
-{
- public MetricOverflowAttributeTests()
- : base()
- {
- }
-}
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTests.cs
similarity index 89%
rename from test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTestsBase.cs
rename to test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTests.cs
index b6f6dfcd442..b7b5ef2d6df 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricPointReclaimTests.cs
@@ -2,30 +2,13 @@
// SPDX-License-Identifier: Apache-2.0
using System.Diagnostics.Metrics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Tests;
using Xunit;
namespace OpenTelemetry.Metrics.Tests;
-#pragma warning disable SA1402
-
-public abstract class MetricPointReclaimTestsBase
+public class MetricPointReclaimTests
{
- private readonly Dictionary configurationData = new()
- {
- };
-
- private readonly IConfiguration configuration;
-
- protected MetricPointReclaimTestsBase()
- {
- this.configuration = new ConfigurationBuilder()
- .AddInMemoryCollection(this.configurationData)
- .Build();
- }
-
[Theory]
[InlineData(false)]
[InlineData(true)]
@@ -44,10 +27,6 @@ public void MeasurementsAreNotDropped(bool emitMetricWithNoDimensions)
};
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(Utils.GetCurrentMethodName())
.AddReader(metricReader)
.Build();
@@ -137,10 +116,6 @@ public void MeasurementsAreAggregatedEvenAfterTheyAreDropped(bool emitMetricWith
};
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(Utils.GetCurrentMethodName())
.SetMaxMetricPointsPerMetricStream(10) // Set max MetricPoints limit to 10
.AddReader(metricReader)
@@ -262,11 +237,3 @@ public override ExportResult Export(in Batch batch)
}
}
}
-
-public class MetricPointReclaimTests : MetricPointReclaimTestsBase
-{
- public MetricPointReclaimTests()
- : base()
- {
- }
-}
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricSnapshotTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/MetricSnapshotTests.cs
similarity index 88%
rename from test/OpenTelemetry.Tests/Metrics/MetricSnapshotTestsBase.cs
rename to test/OpenTelemetry.Tests/Metrics/MetricSnapshotTests.cs
index d3c2a1b4339..0e8bc481f7e 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricSnapshotTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricSnapshotTests.cs
@@ -2,25 +2,14 @@
// SPDX-License-Identifier: Apache-2.0
using System.Diagnostics.Metrics;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
using OpenTelemetry.Tests;
using Xunit;
namespace OpenTelemetry.Metrics.Tests;
-#pragma warning disable SA1402
-
-public abstract class MetricSnapshotTestsBase
+public class MetricSnapshotTests
{
- private readonly IConfiguration configuration;
-
- protected MetricSnapshotTestsBase()
- {
- this.configuration = MetricApiTestsBase.BuildConfiguration();
- }
-
[Fact]
public void VerifySnapshot_Counter()
{
@@ -30,10 +19,6 @@ public void VerifySnapshot_Counter()
using var meter = new Meter(Utils.GetCurrentMethodName());
var counter = meter.CreateCounter("meter");
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(meter.Name)
.AddInMemoryExporter(exportedMetrics)
.AddInMemoryExporter(exportedSnapshots)
@@ -103,10 +88,6 @@ public void VerifySnapshot_Histogram()
using var meter = new Meter(Utils.GetCurrentMethodName());
var histogram = meter.CreateHistogram("histogram");
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(meter.Name)
.AddInMemoryExporter(exportedMetrics)
.AddInMemoryExporter(exportedSnapshots)
@@ -199,10 +180,6 @@ public void VerifySnapshot_ExponentialHistogram()
using var meter = new Meter(Utils.GetCurrentMethodName());
var histogram = meter.CreateHistogram("histogram");
using var meterProvider = Sdk.CreateMeterProviderBuilder()
- .ConfigureServices(services =>
- {
- services.AddSingleton(this.configuration);
- })
.AddMeter(meter.Name)
.AddView("histogram", new Base2ExponentialBucketHistogramConfiguration())
.AddInMemoryExporter(exportedMetrics)
@@ -225,7 +202,7 @@ public void VerifySnapshot_ExponentialHistogram()
metricPoint1.TryGetHistogramMinMaxValues(out var min, out var max);
Assert.Equal(10, min);
Assert.Equal(10, max);
- AggregatorTestsBase.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint1.GetExponentialHistogramData());
+ AggregatorTests.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint1.GetExponentialHistogramData());
// Verify Snapshot 1
Assert.Single(exportedSnapshots);
@@ -236,7 +213,7 @@ public void VerifySnapshot_ExponentialHistogram()
snapshot1.MetricPoints[0].TryGetHistogramMinMaxValues(out min, out max);
Assert.Equal(10, min);
Assert.Equal(10, max);
- AggregatorTestsBase.AssertExponentialBucketsAreCorrect(expectedHistogram, snapshot1.MetricPoints[0].GetExponentialHistogramData());
+ AggregatorTests.AssertExponentialBucketsAreCorrect(expectedHistogram, snapshot1.MetricPoints[0].GetExponentialHistogramData());
// Verify Metric == Snapshot
Assert.Equal(metric1.Name, snapshot1.Name);
@@ -270,7 +247,7 @@ public void VerifySnapshot_ExponentialHistogram()
metricPoint1.TryGetHistogramMinMaxValues(out min, out max);
Assert.Equal(5, min);
Assert.Equal(10, max);
- AggregatorTestsBase.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint2.GetExponentialHistogramData());
+ AggregatorTests.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint2.GetExponentialHistogramData());
// Verify Snapshot 1 after second export
// This value is expected to be unchanged.
@@ -289,14 +266,6 @@ public void VerifySnapshot_ExponentialHistogram()
snapshot2.MetricPoints[0].TryGetHistogramMinMaxValues(out min, out max);
Assert.Equal(5, min);
Assert.Equal(10, max);
- AggregatorTestsBase.AssertExponentialBucketsAreCorrect(expectedHistogram, snapshot2.MetricPoints[0].GetExponentialHistogramData());
- }
-}
-
-public class MetricSnapshotTests : MetricSnapshotTestsBase
-{
- public MetricSnapshotTests()
- : base()
- {
+ AggregatorTests.AssertExponentialBucketsAreCorrect(expectedHistogram, snapshot2.MetricPoints[0].GetExponentialHistogramData());
}
}
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricTestsBase.cs b/test/OpenTelemetry.Tests/Metrics/MetricTestsBase.cs
index 9023575db66..934433a6fe6 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricTestsBase.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricTestsBase.cs
@@ -4,9 +4,9 @@
#if BUILDING_HOSTING_TESTS
using System.Diagnostics;
#endif
+#if BUILDING_HOSTING_TESTS
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-#if BUILDING_HOSTING_TESTS
using Microsoft.Extensions.Diagnostics.Metrics;
using Microsoft.Extensions.Hosting;
#endif
@@ -14,19 +14,12 @@
namespace OpenTelemetry.Metrics.Tests;
-public class MetricTestsBase
+public abstract class MetricTestsBase
{
- protected readonly IConfiguration? configuration;
-
protected MetricTestsBase()
{
}
- protected MetricTestsBase(IConfiguration configuration)
- {
- this.configuration = configuration;
- }
-
#if BUILDING_HOSTING_TESTS
public static IHost BuildHost(
bool useWithMetricsStyle,
@@ -204,14 +197,7 @@ public IDisposable BuildMeterProvider(
#if BUILDING_HOSTING_TESTS
var host = BuildHost(
useWithMetricsStyle: false,
- configureMeterProviderBuilder: configure,
- configureServices: services =>
- {
- if (this.configuration != null)
- {
- services.AddSingleton(this.configuration);
- }
- });
+ configureMeterProviderBuilder: configure);
meterProvider = host.Services.GetRequiredService();
@@ -219,11 +205,6 @@ public IDisposable BuildMeterProvider(
#else
var builder = Sdk.CreateMeterProviderBuilder();
- if (this.configuration != null)
- {
- builder.ConfigureServices(services => services.AddSingleton(this.configuration));
- }
-
configure(builder);
return meterProvider = builder.Build();
diff --git a/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs b/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs
index 50c9be30d31..f2a9ceb6eab 100644
--- a/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs
+++ b/test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs
@@ -784,7 +784,7 @@ public void ViewToProduceExponentialHistogram()
var count = metricPoint.GetHistogramCount();
var sum = metricPoint.GetHistogramSum();
- AggregatorTestsBase.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint.GetExponentialHistogramData());
+ AggregatorTests.AssertExponentialBucketsAreCorrect(expectedHistogram, metricPoint.GetExponentialHistogramData());
Assert.Equal(50, sum);
Assert.Equal(6, count);
}