PR for feature branch

src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterFilter.cs

@@ -38,6 +38,8 @@ public void AddFilter(string providerName, string[] counters)
 
         public IEnumerable<string> GetProviders() => _enabledCounters.Keys;
 
+        public int IntervalSeconds => _intervalMilliseconds / 1000;
+
         public bool IsIncluded(string providerName, string counterName, int intervalMilliseconds)
         {
             if (_intervalMilliseconds != intervalMilliseconds)

src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/EventCounterPipeline.cs → src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipeline.cs

@@ -11,14 +11,14 @@
 
 namespace Microsoft.Diagnostics.Monitoring.EventPipe
 {
-    internal class EventCounterPipeline : EventSourcePipeline<EventPipeCounterPipelineSettings>
+    internal class CounterPipeline : EventSourcePipeline<CounterPipelineSettings>
     {
         private readonly IEnumerable<ICountersLogger> _loggers;
         private readonly CounterFilter _filter;
         private string _sessionId;
 
-        public EventCounterPipeline(DiagnosticsClient client,
-            EventPipeCounterPipelineSettings settings,
+        public CounterPipeline(DiagnosticsClient client,
+            CounterPipelineSettings settings,
             IEnumerable<ICountersLogger> loggers) : base(client, settings)
         {
             _loggers = loggers ?? throw new ArgumentNullException(nameof(loggers));

src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/EventPipeCounterPipelineSettings.cs → src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs

@@ -8,7 +8,7 @@
 
 namespace Microsoft.Diagnostics.Monitoring.EventPipe
 {
-    internal class EventPipeCounterPipelineSettings : EventSourcePipelineSettings
+    internal class CounterPipelineSettings : EventSourcePipelineSettings
     {
         public EventPipeCounterGroup[] CounterGroups { get; set; }
 

src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/TraceEventExtensions.cs

@@ -191,9 +191,14 @@ private static void HandleCounterRate(TraceEvent traceEvent, CounterFilter filte
             string tags = (string)traceEvent.PayloadValue(5);
             string rateText = (string)traceEvent.PayloadValue(6);
 
+            if (!filter.IsIncluded(meterName, instrumentName))
+            {
+                return;
+            }
+
             if (double.TryParse(rateText, out double rate))
             {
-                payload = new RatePayload(meterName, instrumentName, null, unit, tags, rate, 10, traceEvent.TimeStamp);
+                payload = new RatePayload(meterName, instrumentName, null, unit, tags, rate, filter.IntervalSeconds, traceEvent.TimeStamp);
             }
         }
 

src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs

@@ -99,7 +99,7 @@ public async Task TestCounterEventPipeline(TestConfiguration config)
             {
                 var client = new DiagnosticsClient(testRunner.Pid);
 
-                await using EventCounterPipeline pipeline = new EventCounterPipeline(client, new EventPipeCounterPipelineSettings
+                await using CounterPipeline pipeline = new CounterPipeline(client, new CounterPipelineSettings
                 {
                     Duration = Timeout.InfiniteTimeSpan,
                     CounterGroups = new[]