Skip to content

Fix metric tests timeout issue #117630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 16, 2025
Merged

Fix metric tests timeout issue #117630

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e4533d
Fix metric tests timeout issue
tarekgh Jul 14, 2025
0a0b9cd
Update src/libraries/System.Diagnostics.DiagnosticSource/tests/Metric…
tarekgh Jul 14, 2025
9cad8dd
Fix the RemoteInvokeOptions initialization
tarekgh Jul 15, 2025
73636cb
mark the propert as readonly
tarekgh Jul 15, 2025
a79a74f
Ensure RemoteExecutor.IsSupported before creating RemoteInvokeOptions
tarekgh Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 27 additions & 23 deletions src/libraries/System.Diagnostics.DiagnosticSource/tests/MetricsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ namespace System.Diagnostics.Metrics.Tests
{
public class MetricsTests
{
// We increase the timeout for remote execution to allow for longer-running tests.
// Ensure RemoteExecutor.IsSupported, otherwise the execution can throw PlatformNotSupportedException.
private static readonly RemoteInvokeOptions? s_remoteExecutionOptions = RemoteExecutor.IsSupported ? new RemoteInvokeOptions { TimeOut = 600_000 } : null;

[Fact]
public void MeasurementConstructionTest()
{
Expand Down Expand Up @@ -53,7 +57,7 @@ public void MeterConstructionTest()
Assert.Equal("v1.0", meter.Version);

Assert.Throws<ArgumentNullException>(() => new Meter(name: null));
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -82,7 +86,7 @@ public void InstrumentCreationTest()

ObservableGauge<double> observableGauge = meter.CreateObservableGauge<double>("ObservableGauge", () => 10, "Fahrenheit", "Fahrenheit ObservableGauge");
ValidateInstrumentInfo(observableGauge, "ObservableGauge", "Fahrenheit", "Fahrenheit ObservableGauge", false, true);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand All @@ -99,7 +103,7 @@ public void CreateInstrumentParametersTest()
Assert.Throws<ArgumentNullException>(() => meter.CreateObservableUpDownCounter<Decimal>(null, () => 0, "items", "Items ObservableUpDownCounter"));
Assert.Throws<ArgumentNullException>(() => meter.CreateObservableGauge<double>(null, () => 0, "seconds", "Seconds ObservableGauge"));

}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -169,7 +173,7 @@ public void SupportedGenericParameterTypesTest()
Assert.Throws<InvalidOperationException>(() => meter.CreateHistogram<ulong>("histogram1", "seconds", "Seconds histogram"));
Assert.Throws<InvalidOperationException>(() => meter.CreateObservableCounter<sbyte>("observableCounter3", () => 0, "seconds", "Seconds ObservableCounter"));
Assert.Throws<InvalidOperationException>(() => meter.CreateObservableGauge<ushort>("observableGauge7", () => 0, "seconds", "Seconds ObservableGauge"));
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -228,7 +232,7 @@ public void ListeningToInstrumentsPublishingTest()
// MeasurementsCompleted should be called 4 times for every instrument.
Assert.Equal(0, instrumentsEncountered);
}
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -280,7 +284,7 @@ public void ThrowingExceptionsFromObservableInstrumentCallbacks()
Assert.Equal(11, accumulated);
}

}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -376,7 +380,7 @@ public void InstrumentMeasurementTest(bool useSpan)
Histogram<decimal> histogram6 = meter.CreateHistogram<decimal>("decimalHistogram");
InstrumentMeasurementAggregationValidation(histogram6, (value, tags) => { Record(histogram6, value, tags, useSpan); } );

}, useSpan.ToString()).Dispose();
}, useSpan.ToString(), s_remoteExecutionOptions).Dispose();

void AddToCounter<T>(Counter<T> counter, T delta, KeyValuePair<string, object?>[] tags, bool useSpan) where T : struct
{
Expand Down Expand Up @@ -723,7 +727,7 @@ public void ObservableInstrumentMeasurementTest()
ObservableGauge<decimal> observableGauge20 = meter.CreateObservableGauge<decimal>("decimalObservableGauge", () => decimalGaugeMeasurementList);
ObservableInstrumentMeasurementAggregationValidation(observableGauge20, decimalGaugeMeasurementList);

}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -875,7 +879,7 @@ public void PassingVariableTagsParametersTest()
PublishHistogramMeasurement(instrument as Histogram<decimal>, value, tags);
return (decimal)(value * 2);
});
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -963,7 +967,7 @@ public void MeterDisposalsTest()
listener.RecordObservableInstruments();
Assert.Equal(13, count);

}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1034,7 +1038,7 @@ public void ListenerDisposalsTest()

listener.RecordObservableInstruments();
Assert.Equal(7, count);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1102,7 +1106,7 @@ public void ListenerWithoutMeasurementsCompletedDisposalsTest()

listener.RecordObservableInstruments();
Assert.Equal(7, count);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1147,7 +1151,7 @@ public void MultipleListenersTest()

gauge.Record(1);
Assert.Equal(15, count);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1184,7 +1188,7 @@ public void NullMeasurementEventCallbackTest()
Assert.Equal(2, count);

Assert.Throws<InvalidOperationException>(() => listener.SetMeasurementEventCallback<ulong>(null));
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1225,7 +1229,7 @@ public void EnableListeningMultipleTimesWithDifferentState()

listener.Dispose();
Assert.Equal(4, completedCount);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1268,7 +1272,7 @@ public void ParallelRunningTest()
Task.WaitAll(taskList);

Assert.Equal(loopLength * 17, totalCount);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1337,7 +1341,7 @@ public void SerializedEventsTest()
Task.WaitAll(jobs);
listener.Dispose();
Assert.Equal(0, instruments.Count);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1441,7 +1445,7 @@ public void TestRecordingMeasurementsWithTagList()
expectedTags[8], expectedTags[9], expectedTags[10], expectedTags[11], expectedTags[12] });
}

}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1529,7 +1533,7 @@ public void TestMeterCreationWithOptions()
Assert.Equal("10.0", meter10.Version);
Assert.Equal("Scope10", meter10.Scope);
Assert.Equal("TestMeterCreationWithOptions10", meter10.Name);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1662,7 +1666,7 @@ public void TestCachedInstruments()

Gauge<int> gauge12 = meter.CreateGauge<int>("name9", null, null, t1);
Assert.NotSame(gauge9, gauge12);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand Down Expand Up @@ -1728,7 +1732,7 @@ public void TestInstrumentCreationWithTags()
{
Assert.True(string.Compare(insArray[i].Key, insArray[i + 1].Key, StringComparison.Ordinal) <= 0);
}
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand All @@ -1748,7 +1752,7 @@ public void TestHistogramCreationWithAdvice()

Assert.NotNull(histogramWithAdvice.Advice?.HistogramBucketBoundaries);
Assert.Equal(explicitBucketBoundaries, histogramWithAdvice.Advice.HistogramBucketBoundaries);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
Expand All @@ -1771,7 +1775,7 @@ public void TestRecordingWithEmptyTagList()
counter.Add(1, new TagList(Array.Empty<KeyValuePair<string, object>>()));

Assert.Equal(4, count);
}).Dispose();
}, s_remoteExecutionOptions).Dispose();
}

private void PublishCounterMeasurement<T>(Counter<T> counter, T value, KeyValuePair<string, object?>[] tags) where T : struct
Expand Down
Loading