Skip to content

Commit d17cfcd

Browse files
committed
Minor metrics cleanup
1 parent a3c8fad commit d17cfcd

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/Foundatio.TestHarness/Utility/InMemoryMetrics.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ public class InMemoryMetrics : IDisposable
2424
private readonly ConcurrentQueue<RecordedMeasurement<float>> _floatMeasurements = new();
2525
private readonly ConcurrentQueue<RecordedMeasurement<double>> _doubleMeasurements = new();
2626
private readonly ConcurrentQueue<RecordedMeasurement<decimal>> _decimalMeasurements = new();
27-
private readonly int _maxMeasurementCountPerType;
2827
private readonly AsyncAutoResetEvent _measurementEvent = new(false);
2928
private readonly ILogger _logger;
3029

3130
public InMemoryMetrics(string metricNameOrPrefix, ILogger logger, int maxMeasurementCountPerType = 100000) : this(n => n.StartsWith(metricNameOrPrefix), logger, maxMeasurementCountPerType) { }
3231

33-
public InMemoryMetrics(Func<string, bool> shouldCollect, ILogger logger, int maxMeasurementCount = 100000)
32+
public InMemoryMetrics(Func<string, bool> shouldCollect, ILogger logger, int maxMeasurementCountPerType = 100000)
3433
{
3534
_logger = logger;
36-
_maxMeasurementCountPerType = maxMeasurementCount;
3735

3836
_meterListener.InstrumentPublished = (instrument, listener) =>
3937
{
@@ -44,55 +42,55 @@ public InMemoryMetrics(Func<string, bool> shouldCollect, ILogger logger, int max
4442
_meterListener.SetMeasurementEventCallback<byte>((instrument, measurement, tags, state) =>
4543
{
4644
_byteMeasurements.Enqueue(new RecordedMeasurement<byte>(instrument, measurement, ref tags, state));
47-
if (_byteMeasurements.Count > _maxMeasurementCountPerType)
45+
if (_byteMeasurements.Count > maxMeasurementCountPerType)
4846
_byteMeasurements.TryDequeue(out _);
4947
_measurementEvent.Set();
5048
});
5149

5250
_meterListener.SetMeasurementEventCallback<short>((instrument, measurement, tags, state) =>
5351
{
5452
_shortMeasurements.Enqueue(new RecordedMeasurement<short>(instrument, measurement, ref tags, state));
55-
if (_shortMeasurements.Count > _maxMeasurementCountPerType)
53+
if (_shortMeasurements.Count > maxMeasurementCountPerType)
5654
_shortMeasurements.TryDequeue(out _);
5755
_measurementEvent.Set();
5856
});
5957

6058
_meterListener.SetMeasurementEventCallback<int>((instrument, measurement, tags, state) =>
6159
{
6260
_intMeasurements.Enqueue(new RecordedMeasurement<int>(instrument, measurement, ref tags, state));
63-
if (_intMeasurements.Count > _maxMeasurementCountPerType)
61+
if (_intMeasurements.Count > maxMeasurementCountPerType)
6462
_intMeasurements.TryDequeue(out _);
6563
_measurementEvent.Set();
6664
});
6765

6866
_meterListener.SetMeasurementEventCallback<long>((instrument, measurement, tags, state) =>
6967
{
7068
_longMeasurements.Enqueue(new RecordedMeasurement<long>(instrument, measurement, ref tags, state));
71-
if (_longMeasurements.Count > _maxMeasurementCountPerType)
69+
if (_longMeasurements.Count > maxMeasurementCountPerType)
7270
_longMeasurements.TryDequeue(out _);
7371
_measurementEvent.Set();
7472
});
7573

7674
_meterListener.SetMeasurementEventCallback<float>((instrument, measurement, tags, state) =>
7775
{
7876
_floatMeasurements.Enqueue(new RecordedMeasurement<float>(instrument, measurement, ref tags, state));
79-
if (_floatMeasurements.Count > _maxMeasurementCountPerType)
77+
if (_floatMeasurements.Count > maxMeasurementCountPerType)
8078
_floatMeasurements.TryDequeue(out _);
8179
_measurementEvent.Set();
8280
});
8381

8482
_meterListener.SetMeasurementEventCallback<double>((instrument, measurement, tags, state) =>
8583
{
8684
_doubleMeasurements.Enqueue(new RecordedMeasurement<double>(instrument, measurement, ref tags, state));
87-
if (_doubleMeasurements.Count > _maxMeasurementCountPerType)
85+
if (_doubleMeasurements.Count > maxMeasurementCountPerType)
8886
_doubleMeasurements.TryDequeue(out _);
8987
_measurementEvent.Set();
9088
});
9189

9290
_meterListener.SetMeasurementEventCallback<decimal>((instrument, measurement, tags, state) =>
9391
{
9492
_decimalMeasurements.Enqueue(new RecordedMeasurement<decimal>(instrument, measurement, ref tags, state));
95-
if (_decimalMeasurements.Count > _maxMeasurementCountPerType)
93+
if (_decimalMeasurements.Count > maxMeasurementCountPerType)
9694
_decimalMeasurements.TryDequeue(out _);
9795
_measurementEvent.Set();
9896
});

0 commit comments

Comments
 (0)