Fixup merge issue with schema splitting (#3848) (#3849)

Co-authored-by: Wiktor Kopec <[email protected]>
dotnet · Mar 5, 2023 · fe7de57 · fe7de57
1 parent 3afcf62
commit fe7de57
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 81 deletions.
diff --git a/documentation/openapi.json b/documentation/openapi.json
@@ -1522,9 +1522,6 @@
               "type": "string"
             },
             "nullable": true
-          },
-          "metricType": {
-            "$ref": "#/components/schemas/MetricProviderType"
           }
         },
         "additionalProperties": false
@@ -1617,14 +1614,6 @@
         },
         "additionalProperties": false
       },
-      "MetricProviderType": {
-        "enum": [
-          "EventCounter",
-          "Meter",
-          "All"
-        ],
-        "type": "string"
-      },
       "OperationError": {
         "type": "object",
         "properties": {

diff --git a/documentation/schema.json b/documentation/schema.json
@@ -1424,36 +1424,9 @@
           "items": {
             "type": "string"
           }
-        },
-        "MetricType": {
-          "description": "The type of metrics this provider consumes",
-          "default": "All",
-          "oneOf": [
-            {
-              "type": "null"
-            },
-            {
-              "$ref": "#/definitions/MetricProviderType"
-            }
-          ]
         }
       }
     },
-    "MetricProviderType": {
-      "type": "string",
-      "description": "",
-      "x-enumFlags": true,
-      "x-enumNames": [
-        "EventCounter",
-        "Meter",
-        "All"
-      ],
-      "enum": [
-        "EventCounter",
-        "Meter",
-        "All"
-      ]
-    },
     "MeterConfiguration": {
       "type": "object",
       "additionalProperties": false,
@@ -1816,16 +1789,6 @@
           "items": {
             "type": "string"
           }
-        },
-        "MetricType": {
-          "oneOf": [
-            {
-              "type": "null"
-            },
-            {
-              "$ref": "#/definitions/MetricProviderType"
-            }
-          ]
         }
       }
     },

diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptions.cs
@@ -63,20 +63,6 @@ public class MetricProvider
             ResourceType = typeof(OptionsDisplayStrings),
             Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_MetricProvider_CounterNames))]
         public List<string> CounterNames { get; set; } = new List<string>(0);
-
-        [Display(
-            ResourceType = typeof(OptionsDisplayStrings),
-            Description = nameof(OptionsDisplayStrings.DisplayAttributeDescription_MetricProvider_MetricType))]
-        [DefaultValue(MetricsOptionsDefaults.MetricType)]
-        public MetricProviderType? MetricType { get; set; }
-    }
-
-    [Flags]
-    public enum MetricProviderType
-    {
-        EventCounter = 0x1,
-        Meter = 0x2,
-        All = 0xFF
     }
 
     public class MeterConfiguration

diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs b/src/Microsoft.Diagnostics.Monitoring.Options/MetricsOptionsDefaults.cs
@@ -10,7 +10,5 @@ internal static class MetricsOptionsDefaults
         public const int MetricCount = 3;
 
         public const bool IncludeDefaultProviders = true;
-
-        public const MetricProviderType MetricType = MetricProviderType.All;
     }
 }
diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs b/src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.Designer.cs
diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsSettingsFactory.cs
@@ -98,9 +98,6 @@ private static List<EventPipeCounterGroup> ConvertCounterGroups(IList<MetricProv
                     {
                         customCounterGroup.CounterNames = customProvider.CounterNames.ToArray();
                     }
-
-                    customCounterGroup.Type = (CounterGroupType)customProvider.MetricType.GetValueOrDefault(MetricsOptionsDefaults.MetricType);
-
                     counterGroups.Add(customCounterGroup);
                 }
             }
@@ -135,8 +132,6 @@ private static List<EventPipeCounterGroup> ConvertCounterGroups(IList<Models.Eve
                         customCounterGroup.CounterNames = customProvider.CounterNames.ToArray();
                     }
 
-                    customCounterGroup.Type = (CounterGroupType)customProvider.MetricType.GetValueOrDefault(MetricsOptionsDefaults.MetricType);
-
                     counterGroups.Add(customCounterGroup);
                 }
             }

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EventMetricsConfiguration.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Models/EventMetricsConfiguration.cs
@@ -27,9 +27,6 @@ public class EventMetricsProvider
 
         [JsonPropertyName("counterNames")]
         public string[] CounterNames { get; set; }
-
-        [JsonPropertyName("metricType")]
-        public MetricProviderType? MetricType { get; set; }
     }
 
     public class EventMetricsMeter