diff --git a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/api/Azure.ResourceManager.ApiManagement.netstandard2.0.cs b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/api/Azure.ResourceManager.ApiManagement.netstandard2.0.cs
index c7aae330dab2..e538d3db65fd 100644
--- a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/api/Azure.ResourceManager.ApiManagement.netstandard2.0.cs
+++ b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/api/Azure.ResourceManager.ApiManagement.netstandard2.0.cs
@@ -2115,6 +2115,7 @@ public DiagnosticContractData() { }
         public Azure.ResourceManager.ApiManagement.Models.HttpCorrelationProtocol? HttpCorrelationProtocol { get { throw null; } set { } }
         public bool? IsLogClientIPEnabled { get { throw null; } set { } }
         public string LoggerId { get { throw null; } set { } }
+        public bool? Metrics { get { throw null; } set { } }
         public Azure.ResourceManager.ApiManagement.Models.OperationNameFormat? OperationNameFormat { get { throw null; } set { } }
         public Azure.ResourceManager.ApiManagement.Models.SamplingSettings Sampling { get { throw null; } set { } }
         public Azure.ResourceManager.ApiManagement.Models.TraceVerbosityLevel? Verbosity { get { throw null; } set { } }
diff --git a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/DiagnosticContractData.cs b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/DiagnosticContractData.cs
index 84c51be23e64..7da64e445d9d 100644
--- a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/DiagnosticContractData.cs
+++ b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/DiagnosticContractData.cs
@@ -33,7 +33,8 @@ public DiagnosticContractData()
         /// <param name="httpCorrelationProtocol"> Sets correlation protocol to use for Application Insights diagnostics. </param>
         /// <param name="verbosity"> The verbosity level applied to traces emitted by trace policies. </param>
         /// <param name="operationNameFormat"> The format of the Operation Name for Application Insights telemetries. Default is Name. </param>
-        internal DiagnosticContractData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, AlwaysLog? alwaysLog, string loggerId, SamplingSettings sampling, PipelineDiagnosticSettings frontend, PipelineDiagnosticSettings backend, bool? isLogClientIPEnabled, HttpCorrelationProtocol? httpCorrelationProtocol, TraceVerbosityLevel? verbosity, OperationNameFormat? operationNameFormat) : base(id, name, resourceType, systemData)
+        /// <param name="metrics"> Emit custom metrics via emit-metric policy. Applicable only to Application Insights diagnostic settings. </param>
+        internal DiagnosticContractData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, AlwaysLog? alwaysLog, string loggerId, SamplingSettings sampling, PipelineDiagnosticSettings frontend, PipelineDiagnosticSettings backend, bool? isLogClientIPEnabled, HttpCorrelationProtocol? httpCorrelationProtocol, TraceVerbosityLevel? verbosity, OperationNameFormat? operationNameFormat, bool? metrics) : base(id, name, resourceType, systemData)
         {
             AlwaysLog = alwaysLog;
             LoggerId = loggerId;
@@ -44,6 +45,7 @@ internal DiagnosticContractData(ResourceIdentifier id, string name, ResourceType
             HttpCorrelationProtocol = httpCorrelationProtocol;
             Verbosity = verbosity;
             OperationNameFormat = operationNameFormat;
+            Metrics = metrics;
         }
 
         /// <summary> Specifies for what type of messages sampling settings should not apply. </summary>
@@ -64,5 +66,7 @@ internal DiagnosticContractData(ResourceIdentifier id, string name, ResourceType
         public TraceVerbosityLevel? Verbosity { get; set; }
         /// <summary> The format of the Operation Name for Application Insights telemetries. Default is Name. </summary>
         public OperationNameFormat? OperationNameFormat { get; set; }
+        /// <summary> Emit custom metrics via emit-metric policy. Applicable only to Application Insights diagnostic settings. </summary>
+        public bool? Metrics { get; set; }
     }
 }
diff --git a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/Models/DiagnosticContractData.Serialization.cs b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/Models/DiagnosticContractData.Serialization.cs
index 102863c1f98b..1340d77100e9 100644
--- a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/Models/DiagnosticContractData.Serialization.cs
+++ b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/Generated/Models/DiagnosticContractData.Serialization.cs
@@ -64,6 +64,11 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer)
                 writer.WritePropertyName("operationNameFormat");
                 writer.WriteStringValue(OperationNameFormat.Value.ToString());
             }
+            if (Optional.IsDefined(Metrics))
+            {
+                writer.WritePropertyName("metrics");
+                writer.WriteBooleanValue(Metrics.Value);
+            }
             writer.WriteEndObject();
             writer.WriteEndObject();
         }
@@ -83,6 +88,7 @@ internal static DiagnosticContractData DeserializeDiagnosticContractData(JsonEle
             Optional<HttpCorrelationProtocol> httpCorrelationProtocol = default;
             Optional<TraceVerbosityLevel> verbosity = default;
             Optional<OperationNameFormat> operationNameFormat = default;
+            Optional<bool> metrics = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("id"))
@@ -204,11 +210,21 @@ internal static DiagnosticContractData DeserializeDiagnosticContractData(JsonEle
                             operationNameFormat = new OperationNameFormat(property0.Value.GetString());
                             continue;
                         }
+                        if (property0.NameEquals("metrics"))
+                        {
+                            if (property0.Value.ValueKind == JsonValueKind.Null)
+                            {
+                                property0.ThrowNonNullablePropertyIsNull();
+                                continue;
+                            }
+                            metrics = property0.Value.GetBoolean();
+                            continue;
+                        }
                     }
                     continue;
                 }
             }
-            return new DiagnosticContractData(id, name, type, systemData.Value, Optional.ToNullable(alwaysLog), loggerId.Value, sampling.Value, frontend.Value, backend.Value, Optional.ToNullable(logClientIP), Optional.ToNullable(httpCorrelationProtocol), Optional.ToNullable(verbosity), Optional.ToNullable(operationNameFormat));
+            return new DiagnosticContractData(id, name, type, systemData.Value, Optional.ToNullable(alwaysLog), loggerId.Value, sampling.Value, frontend.Value, backend.Value, Optional.ToNullable(logClientIP), Optional.ToNullable(httpCorrelationProtocol), Optional.ToNullable(verbosity), Optional.ToNullable(operationNameFormat), Optional.ToNullable(metrics));
         }
     }
 }
diff --git a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/autorest.md b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/autorest.md
index 303c3d0fcd3c..85e86bb96755 100644
--- a/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/autorest.md
+++ b/sdk/apimanagement/Azure.ResourceManager.ApiManagement/src/autorest.md
@@ -8,7 +8,7 @@ azure-arm: true
 csharp: true
 library-name: ApiManagement
 namespace: Azure.ResourceManager.ApiManagement
-require: https://github.com/Azure/azure-rest-api-specs/blob/b9b91929c304f8fb44002267b6c98d9fb9dde014/specification/apimanagement/resource-manager/readme.md
+require: https://github.com/Azure/azure-rest-api-specs/blob/2f28b5026a4b44adefd0237087acb0c48cfe31a6/specification/apimanagement/resource-manager/readme.md
 tag: package-2021-08
 output-folder: $(this-folder)/Generated
 clear-output-folder: true
@@ -320,7 +320,8 @@ directive:
   - from: apimdeployment.json
     where: $.definitions
     transform: >
-      $.Operation['x-ms-client-name'] = 'RestApiOperation';
+      delete $.Operation;
+      delete $.OperationListResult;
       $.VirtualNetworkConfiguration.properties.vnetid['format'] = 'uuid';
       $.VirtualNetworkConfiguration.properties.subnetResourceId['x-ms-format'] = 'arm-id';
       $.ResourceSkuResult.properties.resourceType['x-ms-format'] = 'resource-type';