diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/MetricSourceConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/MetricSourceConfiguration.cs
index 701d5e8c34..f5bb9eae30 100644
--- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/MetricSourceConfiguration.cs
+++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Configuration/MetricSourceConfiguration.cs
@@ -17,7 +17,8 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe
     public enum MetricType
     {
         EventCounter = 0x1,
-        Meter = 0x2
+        Meter = 0x2,
+        All = 0xFF
     }
 
     public sealed class MetricEventPipeProvider
@@ -26,7 +27,7 @@ public sealed class MetricEventPipeProvider
 
         public float? IntervalSeconds { get; set; }
 
-        public MetricType Type { get; set; } = MetricType.EventCounter | MetricType.Meter;
+        public MetricType Type { get; set; } = MetricType.All;
     }
 
     public sealed class MetricSourceConfiguration : MonitoringSourceConfiguration
diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs
index 9833f71038..7fdc85e24f 100644
--- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs
+++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Counters/CounterPipelineSettings.cs
@@ -26,6 +26,7 @@ internal enum CounterGroupType
     {
         EventCounter = 0x1,
         Meter = 0x2,
+        All = 0xFF
     }
 
     internal class EventPipeCounterGroup
@@ -34,7 +35,7 @@ internal class EventPipeCounterGroup
 
         public string[] CounterNames { get; set; }
 
-        public CounterGroupType Type { get; set; } = CounterGroupType.EventCounter | CounterGroupType.Meter;
+        public CounterGroupType Type { get; set; } = CounterGroupType.All;
 
         public float? IntervalSeconds { get; set; }
     }
diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs
index 1e4609d859..8770c98269 100644
--- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs
+++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs
@@ -499,7 +499,7 @@ public void ValidateMetadataParsing_Success()
             const string value1 = "V1";
             const string key2 = "K2";
             const string value2 = "V:2";
-            IDictionary<string, string> metadataDict = TraceEventExtensions.GetMetadata($"{key1}:{value1},{key2}:{value2}");
+            IDictionary<string, string> metadataDict = CounterUtilities.GetMetadata($"{key1}:{value1},{key2}:{value2}");
 
             Assert.Equal(2, metadataDict.Count);
             Assert.Equal(value1, metadataDict[key1]);
@@ -515,7 +515,7 @@ public void ValidateMetadataParsing_Success()
         [InlineData("K1")]
         public void ValidateMetadataParsing_Failure(string invalidMetadata)
         {
-            IDictionary<string, string> metadataDict = TraceEventExtensions.GetMetadata(invalidMetadata);
+            IDictionary<string, string> metadataDict = CounterUtilities.GetMetadata(invalidMetadata);
 
             Assert.Empty(metadataDict);
         }