From 40635704cef78026743c359f713387d54a5ffc5d Mon Sep 17 00:00:00 2001
From: kinelski <camaiaor@microsoft.com>
Date: Tue, 9 Feb 2021 14:42:21 -0800
Subject: [PATCH] [MetricsAdvisor] Updated Create methods to return whole
 models instead of ID (#18491)

---
 .../Azure.AI.MetricsAdvisor/CHANGELOG.md      |   7 +-
 .../Azure.AI.MetricsAdvisor/README.md         |  51 ++-
 .../Azure.AI.MetricsAdvisor.netstandard2.0.cs |  20 +-
 .../src/MetricsAdvisorAdministrationClient.cs | 138 +++++++--
 .../src/MetricsAdvisorClient.cs               |  38 ++-
 .../src/Models/DataFeed/DataFeed.cs           |   2 +-
 .../tests/DisposableAlertConfiguration.cs     |   7 +-
 .../tests/DisposableDataFeed.cs               |   7 +-
 .../tests/DisposableDetectionConfiguration.cs |   7 +-
 .../tests/DisposableNotificationHook.cs       |   7 +-
 .../AnomalyAlertConfigurationLiveTests.cs     |   3 +-
 .../AnomalyDetectionConfigurationLiveTests.cs |   3 +-
 .../DataFeedLiveTests.cs                      |   3 +-
 .../NotificationHookLiveTests.cs              |   3 +-
 .../MetricFeedbackLiveTests.cs                |  52 +---
 .../Sample01_DataFeedCrudOperations.cs        |  37 ++-
 ...03_DetectionConfigurationCrudOperations.cs |   8 +-
 .../Samples/Sample04_HookCrudOperations.cs    |   8 +-
 ...mple05_AlertConfigurationCrudOperations.cs |   8 +-
 .../Sample10_FeedbackCrudOperations.cs        |   6 +-
 ...ationWithMultipleMetricConfigurations.json | 109 +++++--
 ...WithMultipleMetricConfigurationsAsync.json | 109 +++++--
 ...ionalSingleMetricConfigurationMembers.json | 290 +++++++++++++-----
 ...SingleMetricConfigurationMembersAsync.json | 290 +++++++++++++-----
 ...lertConfigurationWithSeriesGroupScope.json |  98 ++++--
 ...onfigurationWithSeriesGroupScopeAsync.json |  98 ++++--
 ...AndGetAlertConfigurationWithTopNScope.json |  98 ++++--
 ...tAlertConfigurationWithTopNScopeAsync.json |  98 ++++--
 ...figurationWithWholeSeriesScope(False).json | 102 ++++--
 ...ationWithWholeSeriesScope(False)Async.json |  98 ++++--
 ...nfigurationWithWholeSeriesScope(True).json | 101 ++++--
 ...rationWithWholeSeriesScope(True)Async.json |  99 ++++--
 .../DeleteAlertConfiguration(False).json      | 110 +++++--
 .../DeleteAlertConfiguration(False)Async.json | 110 +++++--
 .../DeleteAlertConfiguration(True).json       | 109 +++++--
 .../DeleteAlertConfiguration(True)Async.json  | 109 +++++--
 ...gurationWithEveryMemberAndGetInstance.json | 251 ++++++++++-----
 ...ionWithEveryMemberAndGetInstanceAsync.json | 251 ++++++++++-----
 ...gurationWithEveryMemberAndNewInstance.json | 243 +++++++++++----
 ...ionWithEveryMemberAndNewInstanceAsync.json | 241 +++++++++++----
 ...WithMinimumSetupAndGetInstance(False).json | 276 ++++++++++++-----
 ...inimumSetupAndGetInstance(False)Async.json | 276 ++++++++++++-----
 ...nWithMinimumSetupAndGetInstance(True).json | 274 ++++++++++++-----
 ...MinimumSetupAndGetInstance(True)Async.json | 274 ++++++++++++-----
 ...igurationWithChangeAndSmartConditions.json | 118 +++++--
 ...tionWithChangeAndSmartConditionsAsync.json | 118 +++++--
 ...ConfigurationWithHardCondition(False).json | 107 +++++--
 ...gurationWithHardCondition(False)Async.json | 107 +++++--
 ...nConfigurationWithHardCondition(True).json | 106 +++++--
 ...igurationWithHardCondition(True)Async.json | 106 +++++--
 ...tionConfigurationWithSeriesConditions.json | 143 +++++++--
 ...onfigurationWithSeriesConditionsAsync.json | 141 +++++++--
 ...onfigurationWithSeriesGroupConditions.json | 140 +++++++--
 ...urationWithSeriesGroupConditionsAsync.json | 140 +++++++--
 .../DeleteDetectionConfiguration(False).json  | 115 +++++--
 ...eteDetectionConfiguration(False)Async.json | 115 +++++--
 .../DeleteDetectionConfiguration(True).json   | 114 +++++--
 ...leteDetectionConfiguration(True)Async.json | 114 +++++--
 ...gurationWithEveryMemberAndGetInstance.json | 205 ++++++++++---
 ...ionWithEveryMemberAndGetInstanceAsync.json | 205 ++++++++++---
 ...gurationWithEveryMemberAndNewInstance.json | 164 ++++++++--
 ...ionWithEveryMemberAndNewInstanceAsync.json | 164 ++++++++--
 ...WithMinimumSetupAndGetInstance(False).json | 195 +++++++++---
 ...inimumSetupAndGetInstance(False)Async.json | 195 +++++++++---
 ...nWithMinimumSetupAndGetInstance(True).json | 194 +++++++++---
 ...MinimumSetupAndGetInstance(True)Async.json | 194 +++++++++---
 ...urationWithMinimumSetupAndNewInstance.json | 174 ++++++++---
 ...onWithMinimumSetupAndNewInstanceAsync.json | 174 ++++++++---
 ...sightsDataFeedWithMinimumSetup(False).json | 141 +++++++--
 ...sDataFeedWithMinimumSetup(False)Async.json | 141 +++++++--
 ...nsightsDataFeedWithMinimumSetup(True).json | 140 +++++++--
 ...tsDataFeedWithMinimumSetup(True)Async.json | 140 +++++++--
 ...onInsightsDataFeedWithOptionalMembers.json | 146 +++++++--
 ...ightsDataFeedWithOptionalMembersAsync.json | 159 ++++++++--
 ...dGetAzureBlobDataFeedWithMinimumSetup.json | 140 +++++++--
 ...zureBlobDataFeedWithMinimumSetupAsync.json | 140 +++++++--
 ...tAzureBlobDataFeedWithOptionalMembers.json | 145 +++++++--
 ...eBlobDataFeedWithOptionalMembersAsync.json | 160 ++++++++--
 ...AzureCosmosDbDataFeedWithMinimumSetup.json | 141 +++++++--
 ...CosmosDbDataFeedWithMinimumSetupAsync.json | 141 +++++++--
 ...reCosmosDbDataFeedWithOptionalMembers.json | 146 +++++++--
 ...mosDbDataFeedWithOptionalMembersAsync.json | 161 ++++++++--
 ...eDataExplorerDataFeedWithMinimumSetup.json | 139 +++++++--
 ...ExplorerDataFeedWithMinimumSetupAsync.json | 139 +++++++--
 ...taExplorerDataFeedWithOptionalMembers.json | 144 +++++++--
 ...lorerDataFeedWithOptionalMembersAsync.json | 159 ++++++++--
 ...keStorageGen2DataFeedWithMinimumSetup.json | 142 +++++++--
 ...rageGen2DataFeedWithMinimumSetupAsync.json | 142 +++++++--
 ...torageGen2DataFeedWithOptionalMembers.json | 147 +++++++--
 ...eGen2DataFeedWithOptionalMembersAsync.json | 162 ++++++++--
 ...GetAzureTableDataFeedWithMinimumSetup.json | 140 +++++++--
 ...ureTableDataFeedWithMinimumSetupAsync.json | 140 +++++++--
 ...AzureTableDataFeedWithOptionalMembers.json | 145 +++++++--
 ...TableDataFeedWithOptionalMembersAsync.json | 158 ++++++++--
 ...ElasticsearchDataFeedWithMinimumSetup.json | 141 +++++++--
 ...icsearchDataFeedWithMinimumSetupAsync.json | 141 +++++++--
 ...sticsearchDataFeedWithOptionalMembers.json | 146 +++++++--
 ...earchDataFeedWithOptionalMembersAsync.json | 161 ++++++++--
 ...etHttpRequestDataFeedWithMinimumSetup.json | 141 +++++++--
 ...pRequestDataFeedWithMinimumSetupAsync.json | 141 +++++++--
 ...ttpRequestDataFeedWithOptionalMembers.json | 146 +++++++--
 ...questDataFeedWithOptionalMembersAsync.json | 161 ++++++++--
 ...ndGetInfluxDbDataFeedWithMinimumSetup.json | 142 +++++++--
 ...InfluxDbDataFeedWithMinimumSetupAsync.json | 142 +++++++--
 ...etInfluxDbDataFeedWithOptionalMembers.json | 147 +++++++--
 ...luxDbDataFeedWithOptionalMembersAsync.json | 162 ++++++++--
 ...AndGetMongoDbDataFeedWithMinimumSetup.json | 140 +++++++--
 ...tMongoDbDataFeedWithMinimumSetupAsync.json | 140 +++++++--
 ...GetMongoDbDataFeedWithOptionalMembers.json | 145 +++++++--
 ...ngoDbDataFeedWithOptionalMembersAsync.json | 160 ++++++++--
 ...teAndGetMySqlDataFeedWithMinimumSetup.json | 139 +++++++--
 ...GetMySqlDataFeedWithMinimumSetupAsync.json | 139 +++++++--
 ...ndGetMySqlDataFeedWithOptionalMembers.json | 144 +++++++--
 ...MySqlDataFeedWithOptionalMembersAsync.json | 159 ++++++++--
 ...GetPostgreSqlDataFeedWithMinimumSetup.json | 139 +++++++--
 ...stgreSqlDataFeedWithMinimumSetupAsync.json | 139 +++++++--
 ...PostgreSqlDataFeedWithOptionalMembers.json | 144 +++++++--
 ...reSqlDataFeedWithOptionalMembersAsync.json | 159 ++++++++--
 ...dGetSqlServerDataFeedWithMinimumSetup.json | 139 +++++++--
 ...qlServerDataFeedWithMinimumSetupAsync.json | 139 +++++++--
 ...tSqlServerDataFeedWithOptionalMembers.json | 144 +++++++--
 ...erverDataFeedWithOptionalMembersAsync.json | 159 ++++++++--
 .../DeleteDataFeed(False).json                | 139 +++++++--
 .../DeleteDataFeed(False)Async.json           | 139 +++++++--
 .../DeleteDataFeed(True).json                 | 138 +++++++--
 .../DeleteDataFeed(True)Async.json            | 138 +++++++--
 ...DataFeedWithEveryMemberAndGetInstance.json | 164 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 189 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 144 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 144 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 189 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 189 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 144 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 144 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 163 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 188 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 143 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 143 ++++++---
 ...WithMinimumSetupAndGetInstance(False).json | 188 +++++++++---
 ...inimumSetupAndGetInstance(False)Async.json | 188 +++++++++---
 ...dWithMinimumSetupAndGetInstance(True).json | 187 ++++++++---
 ...MinimumSetupAndGetInstance(True)Async.json | 187 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 143 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 143 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 164 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 189 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 144 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 144 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 189 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 189 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 144 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 144 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 162 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 187 ++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 142 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 142 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 187 ++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 187 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 142 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 142 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 165 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 190 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 145 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 145 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 190 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 190 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 145 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 145 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 163 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 188 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 143 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 143 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 188 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 188 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 143 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 143 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 164 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 189 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 144 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 144 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 189 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 189 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 144 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 144 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 164 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 189 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 144 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 144 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 189 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 187 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 144 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 144 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 165 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 190 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 145 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 145 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 190 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 190 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 145 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 145 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 163 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 188 +++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 143 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 143 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 188 +++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 188 +++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 143 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 143 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 162 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 187 ++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 140 +++++++--
 ...eedWithEveryMemberAndNewInstanceAsync.json | 142 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 187 ++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 185 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 142 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 142 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 160 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 187 ++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 142 ++++++---
 ...eedWithEveryMemberAndNewInstanceAsync.json | 142 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 187 ++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 187 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 142 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 142 ++++++---
 ...DataFeedWithEveryMemberAndGetInstance.json | 162 +++++++---
 ...eedWithEveryMemberAndGetInstanceAsync.json | 187 ++++++++---
 ...DataFeedWithEveryMemberAndNewInstance.json | 140 +++++++--
 ...eedWithEveryMemberAndNewInstanceAsync.json | 142 ++++++---
 ...ataFeedWithMinimumSetupAndGetInstance.json | 187 ++++++++---
 ...edWithMinimumSetupAndGetInstanceAsync.json | 187 ++++++++---
 ...ataFeedWithMinimumSetupAndNewInstance.json | 142 ++++++---
 ...edWithMinimumSetupAndNewInstanceAsync.json | 142 ++++++---
 ...tificationHookWithMinimumSetup(False).json | 105 +++++--
 ...ationHookWithMinimumSetup(False)Async.json | 105 +++++--
 ...otificationHookWithMinimumSetup(True).json | 104 +++++--
 ...cationHookWithMinimumSetup(True)Async.json | 104 +++++--
 ...ilNotificationHookWithOptionalMembers.json | 105 +++++--
 ...ificationHookWithOptionalMembersAsync.json | 105 +++++--
 ...etWebNotificationHookWithMinimumSetup.json | 107 +++++--
 ...NotificationHookWithMinimumSetupAsync.json | 107 +++++--
 ...ebNotificationHookWithOptionalMembers.json | 110 +++++--
 ...ificationHookWithOptionalMembersAsync.json | 110 +++++--
 .../DeleteNotificationHook(False).json        | 113 +++++--
 .../DeleteNotificationHook(False)Async.json   | 113 +++++--
 .../DeleteNotificationHook(True).json         | 112 +++++--
 .../DeleteNotificationHook(True)Async.json    | 112 +++++--
 .../GetHooksWithOptionalNameFilter.json       | 106 +++++--
 .../GetHooksWithOptionalNameFilterAsync.json  | 106 +++++--
 ...tionHookWithEveryMemberAndGetInstance.json | 149 ++++++---
 ...ookWithEveryMemberAndGetInstanceAsync.json | 149 ++++++---
 ...tionHookWithEveryMemberAndNewInstance.json | 100 ++++--
 ...ookWithEveryMemberAndNewInstanceAsync.json | 100 ++++--
 ...WithMinimumSetupAndGetInstance(False).json | 149 ++++++---
 ...inimumSetupAndGetInstance(False)Async.json | 149 ++++++---
 ...kWithMinimumSetupAndGetInstance(True).json | 148 ++++++---
 ...MinimumSetupAndGetInstance(True)Async.json | 148 ++++++---
 ...ionHookWithMinimumSetupAndNewInstance.json | 100 ++++--
 ...okWithMinimumSetupAndNewInstanceAsync.json | 100 ++++--
 ...tionHookWithEveryMemberAndGetInstance.json | 137 ++++++---
 ...ookWithEveryMemberAndGetInstanceAsync.json | 137 ++++++---
 ...tionHookWithEveryMemberAndNewInstance.json | 102 ++++--
 ...ookWithEveryMemberAndNewInstanceAsync.json | 102 ++++--
 ...ionHookWithMinimumSetupAndGetInstance.json | 151 ++++++---
 ...okWithMinimumSetupAndGetInstanceAsync.json | 151 ++++++---
 ...ionHookWithMinimumSetupAndNewInstance.json | 102 ++++--
 ...okWithMinimumSetupAndNewInstanceAsync.json | 102 ++++--
 266 files changed, 28585 insertions(+), 9226 deletions(-)

diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md
index d6cfd27c612d..ef53d29153b1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.3 (2021-02-09)
 
 ### New Features
 - Added support for AAD authentication in `MetricsAdvisorClient` and `MetricsAdvisorAdministrationClient`.
@@ -14,6 +14,11 @@
 - The constructor of the `MetricSeriesGroupDetectionCondition` class is now parameterless. Dimension columns can be added directly to `SeriesGroupKey`.
 - The constructor of the `AnomalyAlertConfiguration` class is now parameterless. Required properties should be set via setters.
 - The constructor of the `EmailNotificationHook` and `WebNotificationHook` are now parameterless. Required properies should be set via setters.
+- In `MetricsAdvisorAdministratorClient`, changed return types of sync and async `CreateDataFeed` methods to a `Response<DataFeed>` containing the created data feed.
+- In `MetricsAdvisorAdministratorClient`, changed return types of sync and async `CreateDetectionConfiguration` methods to a `Response<AnomalyDetectionConfiguration>` containing the created configuration.
+- In `MetricsAdvisorAdministratorClient`, changed return types of sync and async `CreateAlertConfiguration` methods to a `Response<AnomalyAlertConfiguration>` containing the created configuration.
+- In `MetricsAdvisorAdministratorClient`, changed return types of sync and async `CreateHook` methods to a `Response<NotificationHook>` containing the created hook.
+- In `MetricsAdvisorClient`, changed return types of sync and async `AddMetricFeedback` methods to a `Response<MetricFeedback>` containing the added feedback.
 - In `DataFeed`, added property setters to `Name`, `DataSource`, `Granularity`, `IngestionSettings`, and `Schema`.
 - In `DataFeedIngestionSettings`, added a property setter to `IngestionStartTime`.
 - In `AnomalyDetectionConfiguration`, added property setters to `MetricId`, `Name`, and `WholeSeriesDetectionConditions`.
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/README.md b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/README.md
index 030200b16568..df81c0274136 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/README.md
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/README.md
@@ -16,7 +16,7 @@ Azure Cognitive Services Metrics Advisor is a cloud service that uses machine le
 Install the Azure Metrics Advisor client library for .NET with [NuGet][nuget]:
 
 ```PowerShell
-dotnet add package Azure.AI.MetricsAdvisor --version 1.0.0-beta.2
+dotnet add package Azure.AI.MetricsAdvisor --version 1.0.0-beta.3
 ```
 
 ### Prerequisites
@@ -203,36 +203,31 @@ dataFeed.IngestionSettings = new DataFeedIngestionSettings()
     IngestionStartTime = DateTimeOffset.Parse("2020-01-01T00:00:00Z")
 };
 
-Response<string> response = await adminClient.CreateDataFeedAsync(dataFeed);
+Response<DataFeed> response = await adminClient.CreateDataFeedAsync(dataFeed);
 
-string dataFeedId = response.Value;
+DataFeed createdDataFeed = response.Value;
 
-Console.WriteLine($"Data feed ID: {dataFeedId}");
-```
-
-Note that only the ID of the data feed is known at this point. You can perform another service call to `GetDataFeedAsync` or `GetDataFeed` to get more information, such as status, created time, the list of administrators, or the metric IDs.
-
-```C# Snippet:GetDataFeedAsync
-string dataFeedId = "<dataFeedId>";
-
-Response<DataFeed> response = await adminClient.GetDataFeedAsync(dataFeedId);
-
-DataFeed dataFeed = response.Value;
-
-Console.WriteLine($"Data feed status: {dataFeed.Status.Value}");
-Console.WriteLine($"Data feed created time: {dataFeed.CreatedTime.Value}");
+Console.WriteLine($"Data feed ID: {createdDataFeed.Id}");
+Console.WriteLine($"Data feed status: {createdDataFeed.Status.Value}");
+Console.WriteLine($"Data feed created time: {createdDataFeed.CreatedTime.Value}");
 
 Console.WriteLine($"Data feed administrators:");
-foreach (string admin in dataFeed.Administrators)
+foreach (string admin in createdDataFeed.Administrators)
 {
     Console.WriteLine($" - {admin}");
 }
 
 Console.WriteLine($"Metric IDs:");
-foreach (DataFeedMetric metric in dataFeed.Schema.MetricColumns)
+foreach (DataFeedMetric metric in createdDataFeed.Schema.MetricColumns)
 {
     Console.WriteLine($" - {metric.MetricName}: {metric.MetricId}");
 }
+
+Console.WriteLine($"Dimension columns:");
+foreach (DataFeedDimension dimension in createdDataFeed.Schema.DimensionColumns)
+{
+    Console.WriteLine($" - {dimension.DimensionName}");
+}
 ```
 
 ### Check the ingestion status of a data feed
@@ -297,11 +292,11 @@ detectCondition.SmartDetectionCondition = new SmartDetectionCondition(10.0, Anom
 
 detectCondition.CrossConditionsOperator = DetectionConditionsOperator.Or;
 
-Response<string> response = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
+Response<AnomalyDetectionConfiguration> response = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
 
-string detectionConfigurationId = response.Value;
+AnomalyDetectionConfiguration createdDetectionConfiguration = response.Value;
 
-Console.WriteLine($"Anomaly detection configuration ID: {detectionConfigurationId}");
+Console.WriteLine($"Anomaly detection configuration ID: {createdDetectionConfiguration.Id}");
 ```
 
 ### Create a hook for receiving anomaly alerts
@@ -319,11 +314,11 @@ var emailHook = new EmailNotificationHook()
 emailHook.EmailsToAlert.Add("email1@sample.com");
 emailHook.EmailsToAlert.Add("email2@sample.com");
 
-Response<string> response = await adminClient.CreateHookAsync(emailHook);
+Response<NotificationHook> response = await adminClient.CreateHookAsync(emailHook);
 
-string hookId = response.Value;
+NotificationHook createdHook = response.Value;
 
-Console.WriteLine($"Hook ID: {hookId}");
+Console.WriteLine($"Hook ID: {createdHook.Id}");
 ```
 
 ### Create an anomaly alert configuration
@@ -348,11 +343,11 @@ var metricAlertConfiguration = new MetricAnomalyAlertConfiguration(anomalyDetect
 
 alertConfiguration.MetricAlertConfigurations.Add(metricAlertConfiguration);
 
-Response<string> response = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
+Response<AnomalyAlertConfiguration> response = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
 
-string alertConfigurationId = response.Value;
+AnomalyAlertConfiguration createdAlertConfiguration = response.Value;
 
-Console.WriteLine($"Alert configuration ID: {alertConfigurationId}");
+Console.WriteLine($"Alert configuration ID: {createdAlertConfiguration.Id}");
 ```
 
 ### Query detected anomalies and triggered alerts
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs
index c527b457e022..f377f5a08f87 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/api/Azure.AI.MetricsAdvisor.netstandard2.0.cs
@@ -171,8 +171,8 @@ public MetricsAdvisorClient(System.Uri endpoint, Azure.AI.MetricsAdvisor.Metrics
         public MetricsAdvisorClient(System.Uri endpoint, Azure.AI.MetricsAdvisor.MetricsAdvisorKeyCredential credential, Azure.AI.MetricsAdvisor.MetricsAdvisorClientsOptions options) { }
         public MetricsAdvisorClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
         public MetricsAdvisorClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.AI.MetricsAdvisor.MetricsAdvisorClientsOptions options) { }
-        public virtual Azure.Response<string> AddFeedback(Azure.AI.MetricsAdvisor.Models.MetricFeedback feedback, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> AddFeedbackAsync(Azure.AI.MetricsAdvisor.Models.MetricFeedback feedback, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.MetricsAdvisor.Models.MetricFeedback> AddFeedback(Azure.AI.MetricsAdvisor.Models.MetricFeedback feedback, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.MetricsAdvisor.Models.MetricFeedback>> AddFeedbackAsync(Azure.AI.MetricsAdvisor.Models.MetricFeedback feedback, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.AI.MetricsAdvisor.Models.AnomalyAlert> GetAlerts(string alertConfigurationId, Azure.AI.MetricsAdvisor.GetAlertsOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.AI.MetricsAdvisor.Models.AnomalyAlert> GetAlertsAsync(string alertConfigurationId, Azure.AI.MetricsAdvisor.GetAlertsOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.AI.MetricsAdvisor.Models.MetricFeedback> GetAllFeedback(string metricId, Azure.AI.MetricsAdvisor.GetAllFeedbackOptions options = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -229,14 +229,14 @@ public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.AI.MetricsA
         public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.AI.MetricsAdvisor.MetricsAdvisorKeyCredential credential, Azure.AI.MetricsAdvisor.MetricsAdvisorClientsOptions options) { }
         public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
         public MetricsAdvisorAdministrationClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.AI.MetricsAdvisor.MetricsAdvisorClientsOptions options) { }
-        public virtual Azure.Response<string> CreateAlertConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> CreateAlertConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> CreateDataFeed(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> CreateDataFeedAsync(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> CreateDetectionConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> CreateDetectionConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> CreateHook(Azure.AI.MetricsAdvisor.Models.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> CreateHookAsync(Azure.AI.MetricsAdvisor.Models.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration> CreateAlertConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration>> CreateAlertConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyAlertConfiguration alertConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.MetricsAdvisor.Models.DataFeed> CreateDataFeed(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.MetricsAdvisor.Models.DataFeed>> CreateDataFeedAsync(Azure.AI.MetricsAdvisor.Models.DataFeed dataFeed, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration> CreateDetectionConfiguration(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration>> CreateDetectionConfigurationAsync(Azure.AI.MetricsAdvisor.Models.AnomalyDetectionConfiguration detectionConfiguration, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.MetricsAdvisor.Models.NotificationHook> CreateHook(Azure.AI.MetricsAdvisor.Models.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.MetricsAdvisor.Models.NotificationHook>> CreateHookAsync(Azure.AI.MetricsAdvisor.Models.NotificationHook hook, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response DeleteAlertConfiguration(string alertConfigurationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> DeleteAlertConfigurationAsync(string alertConfigurationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response DeleteDataFeed(string dataFeedId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs
index 6917e563aaed..38b63db45c40 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorAdministrationClient.cs
@@ -272,12 +272,12 @@ Page<DataFeed> NextPageFunc(string nextLink, int? pageSizeHint)
         /// <param name="dataFeed">Specifies how the created <see cref="DataFeed"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created feed.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="DataFeed"/> instance
+        /// containing information about the created data feed.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="dataFeed"/>, <paramref name="dataFeed"/>.Name, <paramref name="dataFeed"/>.DataSource, <paramref name="dataFeed"/>.Granularity, <paramref name="dataFeed"/>.Schema, <paramref name="dataFeed"/>.IngestionSettings, or <paramref name="dataFeed"/>.IngestionSettings.IngestionStartTime is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="dataFeed"/>.Name is empty.</exception>
-        public virtual async Task<Response<string>> CreateDataFeedAsync(DataFeed dataFeed, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<DataFeed>> CreateDataFeedAsync(DataFeed dataFeed, CancellationToken cancellationToken = default)
         {
             ValidateDataFeedToCreate(dataFeed, nameof(dataFeed));
 
@@ -289,7 +289,17 @@ public virtual async Task<Response<string>> CreateDataFeedAsync(DataFeed dataFee
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateDataFeedHeaders> response = await _serviceRestClient.CreateDataFeedAsync(dataFeedDetail, cancellationToken).ConfigureAwait(false);
 
                 string dataFeedId = ClientCommon.GetDataFeedId(response.Headers.Location);
-                return Response.FromValue(dataFeedId, response.GetRawResponse());
+
+                try
+                {
+                    var createdDataFeed = await GetDataFeedAsync(dataFeedId, cancellationToken).ConfigureAwait(false);
+
+                    return Response.FromValue(createdDataFeed, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The data feed has been created successfully, but the client failed to fetch its data. Data feed ID: {dataFeedId}", ex);
+                }
             }
             catch (Exception ex)
             {
@@ -304,12 +314,12 @@ public virtual async Task<Response<string>> CreateDataFeedAsync(DataFeed dataFee
         /// <param name="dataFeed">Specifies how the created <see cref="DataFeed"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c> instance
-        /// containing the ID of the newly created feed.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="DataFeed"/> instance
+        /// containing information about the created data feed.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="dataFeed"/>, <paramref name="dataFeed"/>.Name, <paramref name="dataFeed"/>.DataSource, <paramref name="dataFeed"/>.Granularity, <paramref name="dataFeed"/>.Schema, <paramref name="dataFeed"/>.IngestionSettings, or <paramref name="dataFeed"/>.IngestionSettings.IngestionStartTime is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="dataFeed"/>.Name is empty.</exception>
-        public virtual Response<string> CreateDataFeed(DataFeed dataFeed, CancellationToken cancellationToken = default)
+        public virtual Response<DataFeed> CreateDataFeed(DataFeed dataFeed, CancellationToken cancellationToken = default)
         {
             ValidateDataFeedToCreate(dataFeed, nameof(dataFeed));
 
@@ -321,7 +331,17 @@ public virtual Response<string> CreateDataFeed(DataFeed dataFeed, CancellationTo
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateDataFeedHeaders> response = _serviceRestClient.CreateDataFeed(dataFeedDetail, cancellationToken);
 
                 string dataFeedId = ClientCommon.GetDataFeedId(response.Headers.Location);
-                return Response.FromValue(dataFeedId, response.GetRawResponse());
+
+                try
+                {
+                    var createdDataFeed = GetDataFeed(dataFeedId, cancellationToken);
+
+                    return Response.FromValue(createdDataFeed, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The data feed has been created successfully, but the client failed to fetch its data. Data feed ID: {dataFeedId}", ex);
+                }
             }
             catch (Exception ex)
             {
@@ -701,12 +721,12 @@ private static void ValidateDataFeedToCreate(DataFeed dataFeed, string paramName
         /// <param name="detectionConfiguration">Specifies how the created <see cref="AnomalyDetectionConfiguration"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created configuration.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is an <see cref="AnomalyDetectionConfiguration"/>
+        /// instance containing information about the created configuration.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="detectionConfiguration"/>, <paramref name="detectionConfiguration"/>.MetricId, <paramref name="detectionConfiguration"/>.Name, or <paramref name="detectionConfiguration"/>.WholeSeriesDetectionConditions is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="detectionConfiguration"/>.MetricId or <paramref name="detectionConfiguration"/>.Name is empty.</exception>
-        public virtual async Task<Response<string>> CreateDetectionConfigurationAsync(AnomalyDetectionConfiguration detectionConfiguration, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<AnomalyDetectionConfiguration>> CreateDetectionConfigurationAsync(AnomalyDetectionConfiguration detectionConfiguration, CancellationToken cancellationToken = default)
         {
             ValidateDetectionConfigurationToCreate(detectionConfiguration, nameof(detectionConfiguration));
 
@@ -718,7 +738,16 @@ public virtual async Task<Response<string>> CreateDetectionConfigurationAsync(An
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateAnomalyDetectionConfigurationHeaders> response = await _serviceRestClient.CreateAnomalyDetectionConfigurationAsync(detectionConfiguration, cancellationToken).ConfigureAwait(false);
                 string detectionConfigurationId = ClientCommon.GetAnomalyDetectionConfigurationId(response.Headers.Location);
 
-                return Response.FromValue(detectionConfigurationId, response.GetRawResponse());
+                try
+                {
+                    var createdConfig = await GetDetectionConfigurationAsync(detectionConfigurationId, cancellationToken).ConfigureAwait(false);
+
+                    return Response.FromValue(createdConfig, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The configuration has been created successfully, but the client failed to fetch its data. Configuration ID: {detectionConfigurationId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -733,12 +762,12 @@ public virtual async Task<Response<string>> CreateDetectionConfigurationAsync(An
         /// <param name="detectionConfiguration">Specifies how the created <see cref="AnomalyDetectionConfiguration"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created configuration.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is an <see cref="AnomalyDetectionConfiguration"/>
+        /// instance containing information about the created configuration.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="detectionConfiguration"/>, <paramref name="detectionConfiguration"/>.MetricId, <paramref name="detectionConfiguration"/>.Name, or <paramref name="detectionConfiguration"/>.WholeSeriesDetectionConditions is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="detectionConfiguration"/>.MetricId or <paramref name="detectionConfiguration"/>.Name is empty.</exception>
-        public virtual Response<string> CreateDetectionConfiguration(AnomalyDetectionConfiguration detectionConfiguration, CancellationToken cancellationToken = default)
+        public virtual Response<AnomalyDetectionConfiguration> CreateDetectionConfiguration(AnomalyDetectionConfiguration detectionConfiguration, CancellationToken cancellationToken = default)
         {
             ValidateDetectionConfigurationToCreate(detectionConfiguration, nameof(detectionConfiguration));
 
@@ -750,7 +779,16 @@ public virtual Response<string> CreateDetectionConfiguration(AnomalyDetectionCon
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateAnomalyDetectionConfigurationHeaders> response = _serviceRestClient.CreateAnomalyDetectionConfiguration(detectionConfiguration, cancellationToken);
                 string detectionConfigurationId = ClientCommon.GetAnomalyDetectionConfigurationId(response.Headers.Location);
 
-                return Response.FromValue(detectionConfigurationId, response.GetRawResponse());
+                try
+                {
+                    var createdConfig = GetDetectionConfiguration(detectionConfigurationId, cancellationToken);
+
+                    return Response.FromValue(createdConfig, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The configuration has been created successfully, but the client failed to fetch its data. Configuration ID: {detectionConfigurationId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -1027,12 +1065,12 @@ private static void ValidateDetectionConfigurationToCreate(AnomalyDetectionConfi
         /// <param name="alertConfiguration">Specifies how the created <see cref="AnomalyAlertConfiguration"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created configuration.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is an <see cref="AnomalyAlertConfiguration"/>
+        /// instance containing information about the created configuration.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="alertConfiguration"/> or <paramref name="alertConfiguration"/>.Name is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="alertConfiguration"/>.Name is empty.</exception>
-        public virtual async Task<Response<string>> CreateAlertConfigurationAsync(AnomalyAlertConfiguration alertConfiguration, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<AnomalyAlertConfiguration>> CreateAlertConfigurationAsync(AnomalyAlertConfiguration alertConfiguration, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(alertConfiguration, nameof(alertConfiguration));
             Argument.AssertNotNullOrEmpty(alertConfiguration.Name, $"{nameof(alertConfiguration)}.{nameof(alertConfiguration.Name)}");
@@ -1045,7 +1083,16 @@ public virtual async Task<Response<string>> CreateAlertConfigurationAsync(Anomal
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateAnomalyAlertingConfigurationHeaders> response = await _serviceRestClient.CreateAnomalyAlertingConfigurationAsync(alertConfiguration, cancellationToken).ConfigureAwait(false);
                 string alertConfigurationId = ClientCommon.GetAnomalyAlertConfigurationId(response.Headers.Location);
 
-                return Response.FromValue(alertConfigurationId, response.GetRawResponse());
+                try
+                {
+                    var createdConfig = await GetAlertConfigurationAsync(alertConfigurationId, cancellationToken).ConfigureAwait(false);
+
+                    return Response.FromValue(createdConfig, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The configuration has been created successfully, but the client failed to fetch its data. Configuration ID: {alertConfigurationId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -1060,12 +1107,12 @@ public virtual async Task<Response<string>> CreateAlertConfigurationAsync(Anomal
         /// <param name="alertConfiguration">Specifies how the created <see cref="AnomalyAlertConfiguration"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created configuration.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is an <see cref="AnomalyAlertConfiguration"/>
+        /// instance containing information about the created configuration.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="alertConfiguration"/> or <paramref name="alertConfiguration"/>.Name is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="alertConfiguration"/>.Name is empty.</exception>
-        public virtual Response<string> CreateAlertConfiguration(AnomalyAlertConfiguration alertConfiguration, CancellationToken cancellationToken = default)
+        public virtual Response<AnomalyAlertConfiguration> CreateAlertConfiguration(AnomalyAlertConfiguration alertConfiguration, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(alertConfiguration, nameof(alertConfiguration));
             Argument.AssertNotNullOrEmpty(alertConfiguration.Name, $"{nameof(alertConfiguration)}.{nameof(alertConfiguration.Name)}");
@@ -1078,7 +1125,16 @@ public virtual Response<string> CreateAlertConfiguration(AnomalyAlertConfigurati
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateAnomalyAlertingConfigurationHeaders> response = _serviceRestClient.CreateAnomalyAlertingConfiguration(alertConfiguration, cancellationToken);
                 string alertConfigurationId = ClientCommon.GetAnomalyAlertConfigurationId(response.Headers.Location);
 
-                return Response.FromValue(alertConfigurationId, response.GetRawResponse());
+                try
+                {
+                    var createdConfig = GetAlertConfiguration(alertConfigurationId, cancellationToken);
+
+                    return Response.FromValue(createdConfig, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The configuration has been created successfully, but the client failed to fetch its data. Configuration ID: {alertConfigurationId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -1347,12 +1403,12 @@ public virtual Response DeleteAlertConfiguration(string alertConfigurationId, Ca
         /// <param name="hook">Specifies how the created <see cref="NotificationHook"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created hook.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="NotificationHook"/>
+        /// instance containing information about the created hook.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="hook"/> is null; or <paramref name="hook"/> is an <see cref="EmailNotificationHook"/> and <paramref name="hook"/>.EmailsToAlert is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="hook"/> is an <see cref="EmailNotificationHook"/> and <paramref name="hook"/>.EmailsToAlert is empty.</exception>
-        public virtual async Task<Response<string>> CreateHookAsync(NotificationHook hook, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NotificationHook>> CreateHookAsync(NotificationHook hook, CancellationToken cancellationToken = default)
         {
             ValidateHookToCreate(hook, nameof(hook));
 
@@ -1364,7 +1420,16 @@ public virtual async Task<Response<string>> CreateHookAsync(NotificationHook hoo
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateHookHeaders> response = await _serviceRestClient.CreateHookAsync(hook, cancellationToken).ConfigureAwait(false);
                 string hookId = ClientCommon.GetHookId(response.Headers.Location);
 
-                return Response.FromValue(hookId, response.GetRawResponse());
+                try
+                {
+                    var createdHook = await GetHookAsync(hookId, cancellationToken).ConfigureAwait(false);
+
+                    return Response.FromValue(createdHook, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The hook has been created successfully, but the client failed to fetch its data. Hook ID: {hookId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -1379,12 +1444,12 @@ public virtual async Task<Response<string>> CreateHookAsync(NotificationHook hoo
         /// <param name="hook">Specifies how the created <see cref="NotificationHook"/> should be configured.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created hook.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="NotificationHook"/>
+        /// instance containing information about the created hook.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="hook"/> is null; or <paramref name="hook"/> is an <see cref="EmailNotificationHook"/> and <paramref name="hook"/>.EmailsToAlert is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="hook"/> is an <see cref="EmailNotificationHook"/> and <paramref name="hook"/>.EmailsToAlert is empty.</exception>
-        public virtual Response<string> CreateHook(NotificationHook hook, CancellationToken cancellationToken = default)
+        public virtual Response<NotificationHook> CreateHook(NotificationHook hook, CancellationToken cancellationToken = default)
         {
             ValidateHookToCreate(hook, nameof(hook));
 
@@ -1396,7 +1461,16 @@ public virtual Response<string> CreateHook(NotificationHook hook, CancellationTo
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateHookHeaders> response = _serviceRestClient.CreateHook(hook, cancellationToken);
                 string hookId = ClientCommon.GetHookId(response.Headers.Location);
 
-                return Response.FromValue(hookId, response.GetRawResponse());
+                try
+                {
+                    var createdHook = GetHook(hookId, cancellationToken);
+
+                    return Response.FromValue(createdHook, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The hook has been created successfully, but the client failed to fetch its data. Hook ID: {hookId}", ex);
+                }
             }
             catch (Exception e)
             {
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorClient.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorClient.cs
index 8f24057044c7..ba0886d6d043 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorClient.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/MetricsAdvisorClient.cs
@@ -670,11 +670,11 @@ Page<MetricFeedback> NextPageFunc(string nextLink, int? pageSizeHint)
         /// <param name="feedback">The <see cref="MetricFeedback"/> to be created.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created feedback.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="MetricFeedback"/>
+        /// containing information about the newly added feedback.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="feedback"/> is null.</exception>
-        public virtual async Task<Response<string>> AddFeedbackAsync(MetricFeedback feedback, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<MetricFeedback>> AddFeedbackAsync(MetricFeedback feedback, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(feedback, nameof(feedback));
 
@@ -686,7 +686,16 @@ public virtual async Task<Response<string>> AddFeedbackAsync(MetricFeedback feed
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateMetricFeedbackHeaders> response = await _serviceRestClient.CreateMetricFeedbackAsync(feedback, cancellationToken).ConfigureAwait(false);
                 string feedbackId = ClientCommon.GetFeedbackId(response.Headers.Location);
 
-                return Response.FromValue(feedbackId, response.GetRawResponse());
+                try
+                {
+                    var addedFeedback = await GetFeedbackAsync(feedbackId, cancellationToken).ConfigureAwait(false);
+
+                    return Response.FromValue(addedFeedback, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The feedback has been added successfully, but the client failed to fetch its data. Feedback ID: {feedbackId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -701,11 +710,11 @@ public virtual async Task<Response<string>> AddFeedbackAsync(MetricFeedback feed
         /// <param name="feedback">The <see cref="MetricFeedback"/> to be created.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <c>string</c>
-        /// containing the ID of the newly created feedback.
+        /// A <see cref="Response{T}"/> containing the result of the operation. The result is a <see cref="MetricFeedback"/>
+        /// containing information about the newly added feedback.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="feedback"/> is null.</exception>
-        public virtual Response<string> AddFeedback(MetricFeedback feedback, CancellationToken cancellationToken = default)
+        public virtual Response<MetricFeedback> AddFeedback(MetricFeedback feedback, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(feedback, nameof(feedback));
 
@@ -717,7 +726,16 @@ public virtual Response<string> AddFeedback(MetricFeedback feedback, Cancellatio
                 ResponseWithHeaders<AzureCognitiveServiceMetricsAdvisorRestAPIOpenAPIV2CreateMetricFeedbackHeaders> response = _serviceRestClient.CreateMetricFeedback(feedback, cancellationToken);
                 string feedbackId = ClientCommon.GetFeedbackId(response.Headers.Location);
 
-                return Response.FromValue(feedbackId, response.GetRawResponse());
+                try
+                {
+                    var addedFeedback = GetFeedback(feedbackId, cancellationToken);
+
+                    return Response.FromValue(addedFeedback, response.GetRawResponse());
+                }
+                catch (Exception ex)
+                {
+                    throw new RequestFailedException($"The feedback has been added successfully, but the client failed to fetch its data. Feedback ID: {feedbackId}", ex);
+                }
             }
             catch (Exception e)
             {
@@ -732,7 +750,7 @@ public virtual Response<string> AddFeedback(MetricFeedback feedback, Cancellatio
         /// <param name="feedbackId">The ID of the <see cref="MetricFeedback"/>.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the created <see cref="MetricFeedback"/>s.
+        /// A <see cref="Response{T}"/> containing the requested <see cref="MetricFeedback"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="feedbackId"/> is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="feedbackId"/> is empty or not a valid GUID.</exception>
@@ -760,7 +778,7 @@ public virtual async Task<Response<MetricFeedback>> GetFeedbackAsync(string feed
         /// <param name="feedbackId">The ID of the <see cref="MetricFeedback"/>.</param>
         /// <param name="cancellationToken">A <see cref="CancellationToken"/> controlling the request lifetime.</param>
         /// <returns>
-        /// A <see cref="Response{T}"/> containing the created <see cref="MetricFeedback"/>s.
+        /// A <see cref="Response{T}"/> containing the requested <see cref="MetricFeedback"/>.
         /// </returns>
         /// <exception cref="ArgumentNullException"><paramref name="feedbackId"/> is null.</exception>
         /// <exception cref="ArgumentException"><paramref name="feedbackId"/> is empty or not a valid GUID.</exception>
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeed.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeed.cs
index 6eb646731b1b..04534ad7f826 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeed.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/src/Models/DataFeed/DataFeed.cs
@@ -48,7 +48,7 @@ internal DataFeed(DataFeedDetail dataFeedDetail)
         /// <summary>
         /// The unique identifier of this <see cref="DataFeed"/>. Set by the service.
         /// </summary>
-        public string Id { get; }
+        public string Id { get; internal set; }
 
         /// <summary>
         /// The current ingestion status of this <see cref="DataFeed"/>.
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableAlertConfiguration.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableAlertConfiguration.cs
index b5c7ae9ff878..d2c3b989c1fa 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableAlertConfiguration.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableAlertConfiguration.cs
@@ -47,11 +47,12 @@ private DisposableAlertConfiguration(MetricsAdvisorAdministrationClient adminCli
         /// <returns>A <see cref="DisposableAlertConfiguration"/> instance from which the ID of the created configuration can be obtained.</returns>
         public static async Task<DisposableAlertConfiguration> CreateAlertConfigurationAsync(MetricsAdvisorAdministrationClient adminClient, AnomalyAlertConfiguration alertConfiguration)
         {
-            string configId = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
+            AnomalyAlertConfiguration createdConfig = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
 
-            Assert.That(configId, Is.Not.Null.And.Not.Empty);
+            Assert.That(createdConfig, Is.Not.Null);
+            Assert.That(createdConfig.Id, Is.Not.Null.And.Not.Empty);
 
-            return new DisposableAlertConfiguration(adminClient, configId);
+            return new DisposableAlertConfiguration(adminClient, createdConfig.Id);
         }
 
         /// <summary>
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataFeed.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataFeed.cs
index 533757840375..7ca582d7bdda 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataFeed.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDataFeed.cs
@@ -47,11 +47,12 @@ private DisposableDataFeed(MetricsAdvisorAdministrationClient adminClient, strin
         /// <returns>A <see cref="DisposableDataFeed"/> instance from which the ID of the created data feed can be obtained.</returns>
         public static async Task<DisposableDataFeed> CreateDataFeedAsync(MetricsAdvisorAdministrationClient adminClient, DataFeed dataFeed)
         {
-            string dataFeedId = await adminClient.CreateDataFeedAsync(dataFeed);
+            DataFeed createdDataFeed = await adminClient.CreateDataFeedAsync(dataFeed);
 
-            Assert.That(dataFeedId, Is.Not.Null.And.Not.Empty);
+            Assert.That(createdDataFeed, Is.Not.Null);
+            Assert.That(createdDataFeed.Id, Is.Not.Null.And.Not.Empty);
 
-            return new DisposableDataFeed(adminClient, dataFeedId);
+            return new DisposableDataFeed(adminClient, createdDataFeed.Id);
         }
 
         /// <summary>
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDetectionConfiguration.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDetectionConfiguration.cs
index 505077b03c57..2085874a0ed3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDetectionConfiguration.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableDetectionConfiguration.cs
@@ -47,11 +47,12 @@ private DisposableDetectionConfiguration(MetricsAdvisorAdministrationClient admi
         /// <returns>A <see cref="DisposableDetectionConfiguration"/> instance from which the ID of the created configuration can be obtained.</returns>
         public static async Task<DisposableDetectionConfiguration> CreateDetectionConfigurationAsync(MetricsAdvisorAdministrationClient adminClient, AnomalyDetectionConfiguration detectionConfiguration)
         {
-            string configId = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
+            AnomalyDetectionConfiguration createdConfig = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
 
-            Assert.That(configId, Is.Not.Null.And.Not.Empty);
+            Assert.That(createdConfig, Is.Not.Null);
+            Assert.That(createdConfig.Id, Is.Not.Null.And.Not.Empty);
 
-            return new DisposableDetectionConfiguration(adminClient, configId);
+            return new DisposableDetectionConfiguration(adminClient, createdConfig.Id);
         }
 
         /// <summary>
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableNotificationHook.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableNotificationHook.cs
index e4af59a987e7..2dc54c4991e9 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableNotificationHook.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/DisposableNotificationHook.cs
@@ -47,11 +47,12 @@ private DisposableNotificationHook(MetricsAdvisorAdministrationClient adminClien
         /// <returns>A <see cref="DisposableNotificationHook"/> instance from which the ID of the created hook can be obtained.</returns>
         public static async Task<DisposableNotificationHook> CreateHookAsync(MetricsAdvisorAdministrationClient adminClient, NotificationHook hook)
         {
-            string hookId = await adminClient.CreateHookAsync(hook);
+            NotificationHook createdHook = await adminClient.CreateHookAsync(hook);
 
-            Assert.That(hookId, Is.Not.Null.And.Not.Empty);
+            Assert.That(createdHook, Is.Not.Null);
+            Assert.That(createdHook.Id, Is.Not.Null.And.Not.Empty);
 
-            return new DisposableNotificationHook(adminClient, hookId);
+            return new DisposableNotificationHook(adminClient, createdHook.Id);
         }
 
         /// <summary>
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyAlertConfigurationLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyAlertConfigurationLiveTests.cs
index 094b992cc692..322d3077ed75 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyAlertConfigurationLiveTests.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyAlertConfigurationLiveTests.cs
@@ -931,7 +931,8 @@ public async Task DeleteAlertConfiguration(bool useTokenCredential)
 
             try
             {
-                configId = await adminClient.CreateAlertConfigurationAsync(configToCreate);
+                AnomalyAlertConfiguration createdConfig = await adminClient.CreateAlertConfigurationAsync(configToCreate);
+                configId = createdConfig.Id;
 
                 Assert.That(configId, Is.Not.Null.And.Not.Empty);
             }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyDetectionConfigurationLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyDetectionConfigurationLiveTests.cs
index 3aec697fd4de..c913b74cae2f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyDetectionConfigurationLiveTests.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/AnomalyDetectionConfigurationLiveTests.cs
@@ -932,7 +932,8 @@ public async Task DeleteDetectionConfiguration(bool useTokenCredential)
 
             try
             {
-                configId = await adminClient.CreateDetectionConfigurationAsync(configToCreate);
+                AnomalyDetectionConfiguration createdConfig = await adminClient.CreateDetectionConfigurationAsync(configToCreate);
+                configId = createdConfig.Id;
 
                 Assert.That(configId, Is.Not.Null.And.Not.Empty);
             }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs
index 82ca7b71a238..87d3d3ca4b05 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/DataFeedLiveTests.cs
@@ -2051,7 +2051,8 @@ public async Task DeleteDataFeed(bool useTokenCredential)
 
             try
             {
-                dataFeedId = await adminClient.CreateDataFeedAsync(dataFeedToCreate);
+                DataFeed createdDataFeed = await adminClient.CreateDataFeedAsync(dataFeedToCreate);
+                dataFeedId = createdDataFeed.Id;
 
                 Assert.That(dataFeedId, Is.Not.Null.And.Not.Empty);
             }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/NotificationHookLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/NotificationHookLiveTests.cs
index e91a0e38b91c..24aac6d52580 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/NotificationHookLiveTests.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorAdministrationClient/NotificationHookLiveTests.cs
@@ -653,7 +653,8 @@ public async Task DeleteNotificationHook(bool useTokenCredential)
 
             try
             {
-                hookId = await adminClient.CreateHookAsync(hookToCreate);
+                NotificationHook createdHook = await adminClient.CreateHookAsync(hookToCreate);
+                hookId = createdHook.Id;
 
                 Assert.That(hookId, Is.Not.Null.And.Not.Empty);
             }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorClient/MetricFeedbackLiveTests.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorClient/MetricFeedbackLiveTests.cs
index 44db829c5080..9c0a754583c9 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorClient/MetricFeedbackLiveTests.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/MetricsAdvisorClient/MetricFeedbackLiveTests.cs
@@ -38,13 +38,9 @@ public async Task AddAndGetAnomalyFeedbackWithMinimumSetup(bool useTokenCredenti
 
             var feedbackToAdd = new MetricAnomalyFeedback(MetricId, filter, CreatedFeedbackStartTime, CreatedFeedbackEndTime, AnomalyValue.AutoDetect);
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            Assert.That(feedbackId, Is.Not.Null);
-
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
-
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.Anomaly));
 
@@ -73,13 +69,9 @@ public async Task AddAndGetAnomalyFeedbackWithOptionalDetectionConfigurationFilt
                 AnomalyDetectionConfigurationId = DetectionConfigurationId
             };
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
-
-            Assert.That(feedbackId, Is.Not.Null);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
-
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.Anomaly));
 
@@ -105,13 +97,9 @@ public async Task AddAndGetChangePointFeedback()
 
             var feedbackToAdd = new MetricChangePointFeedback(MetricId, filter, CreatedFeedbackStartTime, CreatedFeedbackEndTime, ChangePointValue.AutoDetect);
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
-
-            Assert.That(feedbackId, Is.Not.Null);
-
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.ChangePoint));
 
@@ -142,13 +130,9 @@ public async Task AddAndGetCommentFeedbackWithMinimumSetup()
 
             var feedbackToAdd = new MetricCommentFeedback(MetricId, filter, comment);
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            Assert.That(feedbackId, Is.Not.Null);
-
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
-
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.Comment));
 
@@ -178,13 +162,9 @@ public async Task AddAndGetCommentFeedbackWithOptionalTimeFilters()
                 EndTime = CreatedFeedbackEndTime
             };
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
-
-            Assert.That(feedbackId, Is.Not.Null);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
-
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.Comment));
 
@@ -210,13 +190,9 @@ public async Task AddAndGetPeriodFeedback()
 
             var feedbackToAdd = new MetricPeriodFeedback(MetricId, filter, PeriodType.AutoDetect, periodValue);
 
-            string feedbackId = await client.AddFeedbackAsync(feedbackToAdd);
-
-            Assert.That(feedbackId, Is.Not.Null);
-
-            MetricFeedback addedFeedback = await client.GetFeedbackAsync(feedbackId);
+            MetricFeedback addedFeedback = await client.AddFeedbackAsync(feedbackToAdd);
 
-            ValidateMetricFeedback(addedFeedback, feedbackId);
+            ValidateMetricFeedback(addedFeedback);
 
             Assert.That(addedFeedback.Type, Is.EqualTo(FeedbackType.Period));
 
@@ -353,10 +329,10 @@ public async Task GetAllFeedbackWithOptionalFeedbackFilter()
             Assert.That(feedbackCount, Is.GreaterThan(0));
         }
 
-        private void ValidateMetricFeedback(MetricFeedback feedback, string expectedFeedbackId)
+        private void ValidateMetricFeedback(MetricFeedback feedback)
         {
             Assert.That(feedback, Is.Not.Null);
-            Assert.That(feedback.Id, Is.EqualTo(expectedFeedbackId));
+            Assert.That(feedback.Id, Is.Not.Null.And.Not.Empty);
             Assert.That(feedback.MetricId, Is.EqualTo(MetricId));
             Assert.That(feedback.UserPrincipal, Is.Not.Null.And.Not.Empty);
 
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample01_DataFeedCrudOperations.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample01_DataFeedCrudOperations.cs
index 70a18468e778..e5385f64ea8d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample01_DataFeedCrudOperations.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample01_DataFeedCrudOperations.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Azure.AI.MetricsAdvisor.Administration;
 using Azure.AI.MetricsAdvisor.Models;
@@ -49,21 +48,37 @@ public async Task CreateAndDeleteDataFeedAsync()
                 IngestionStartTime = DateTimeOffset.Parse("2020-01-01T00:00:00Z")
             };
 
-            Response<string> response = await adminClient.CreateDataFeedAsync(dataFeed);
+            Response<DataFeed> response = await adminClient.CreateDataFeedAsync(dataFeed);
 
-            string dataFeedId = response.Value;
+            DataFeed createdDataFeed = response.Value;
 
-            Console.WriteLine($"Data feed ID: {dataFeedId}");
-            #endregion
+            Console.WriteLine($"Data feed ID: {createdDataFeed.Id}");
+            Console.WriteLine($"Data feed status: {createdDataFeed.Status.Value}");
+            Console.WriteLine($"Data feed created time: {createdDataFeed.CreatedTime.Value}");
+
+            Console.WriteLine($"Data feed administrators:");
+            foreach (string admin in createdDataFeed.Administrators)
+            {
+                Console.WriteLine($" - {admin}");
+            }
+
+            Console.WriteLine($"Metric IDs:");
+            foreach (DataFeedMetric metric in createdDataFeed.Schema.MetricColumns)
+            {
+                Console.WriteLine($" - {metric.MetricName}: {metric.MetricId}");
+            }
 
-            // Only the ID of the data feed is known at this point. You can perform another service
-            // call to GetDataFeedAsync or GetDataFeed to get more information, such as status, created
-            // time, the list of administrators, or the metric IDs.
+            Console.WriteLine($"Dimension columns:");
+            foreach (DataFeedDimension dimension in createdDataFeed.Schema.DimensionColumns)
+            {
+                Console.WriteLine($" - {dimension.DimensionName}");
+            }
+            #endregion
 
             // Delete the created data feed to clean up the Metrics Advisor resource. Do not perform this
             // step if you intend to keep using the data feed.
 
-            await adminClient.DeleteDataFeedAsync(dataFeedId);
+            await adminClient.DeleteDataFeedAsync(createdDataFeed.Id);
         }
 
         [Test]
@@ -78,9 +93,6 @@ public async Task GetDataFeedAsync()
 
             string dataFeedId = DataFeedId;
 
-            #region Snippet:GetDataFeedAsync
-            //@@ string dataFeedId = "<dataFeedId>";
-
             Response<DataFeed> response = await adminClient.GetDataFeedAsync(dataFeedId);
 
             DataFeed dataFeed = response.Value;
@@ -99,7 +111,6 @@ public async Task GetDataFeedAsync()
             {
                 Console.WriteLine($" - {metric.MetricName}: {metric.MetricId}");
             }
-            #endregion
 
             Console.WriteLine($"Dimension columns:");
             foreach (DataFeedDimension dimension in dataFeed.Schema.DimensionColumns)
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample03_DetectionConfigurationCrudOperations.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample03_DetectionConfigurationCrudOperations.cs
index ff9eb344335d..ad54bb03169d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample03_DetectionConfigurationCrudOperations.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample03_DetectionConfigurationCrudOperations.cs
@@ -48,17 +48,17 @@ public async Task CreateAndDeleteDetectionConfigurationAsync()
 
             detectCondition.CrossConditionsOperator = DetectionConditionsOperator.Or;
 
-            Response<string> response = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
+            Response<AnomalyDetectionConfiguration> response = await adminClient.CreateDetectionConfigurationAsync(detectionConfiguration);
 
-            string detectionConfigurationId = response.Value;
+            AnomalyDetectionConfiguration createdDetectionConfiguration = response.Value;
 
-            Console.WriteLine($"Anomaly detection configuration ID: {detectionConfigurationId}");
+            Console.WriteLine($"Anomaly detection configuration ID: {createdDetectionConfiguration.Id}");
             #endregion
 
             // Delete the created anomaly detection configuration to clean up the Metrics Advisor resource.
             // Do not perform this step if you intend to keep using the configuration.
 
-            await adminClient.DeleteDetectionConfigurationAsync(detectionConfigurationId);
+            await adminClient.DeleteDetectionConfigurationAsync(createdDetectionConfiguration.Id);
         }
 
         [Test]
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample04_HookCrudOperations.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample04_HookCrudOperations.cs
index 23803ec6b223..86b1cfaca08d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample04_HookCrudOperations.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample04_HookCrudOperations.cs
@@ -34,17 +34,17 @@ public async Task CreateAndDeleteHookAsync()
             emailHook.EmailsToAlert.Add("email1@sample.com");
             emailHook.EmailsToAlert.Add("email2@sample.com");
 
-            Response<string> response = await adminClient.CreateHookAsync(emailHook);
+            Response<NotificationHook> response = await adminClient.CreateHookAsync(emailHook);
 
-            string hookId = response.Value;
+            NotificationHook createdHook = response.Value;
 
-            Console.WriteLine($"Hook ID: {hookId}");
+            Console.WriteLine($"Hook ID: {createdHook.Id}");
             #endregion
 
             // Delete the created hook to clean up the Metrics Advisor resource. Do not perform this
             // step if you intend to keep using the hook.
 
-            await adminClient.DeleteHookAsync(hookId);
+            await adminClient.DeleteHookAsync(createdHook.Id);
         }
 
         [Test]
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample05_AlertConfigurationCrudOperations.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample05_AlertConfigurationCrudOperations.cs
index 17047409573a..f887938f91ed 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample05_AlertConfigurationCrudOperations.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample05_AlertConfigurationCrudOperations.cs
@@ -44,17 +44,17 @@ public async Task CreateAndDeleteAlertConfigurationAsync()
 
             alertConfiguration.MetricAlertConfigurations.Add(metricAlertConfiguration);
 
-            Response<string> response = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
+            Response<AnomalyAlertConfiguration> response = await adminClient.CreateAlertConfigurationAsync(alertConfiguration);
 
-            string alertConfigurationId = response.Value;
+            AnomalyAlertConfiguration createdAlertConfiguration = response.Value;
 
-            Console.WriteLine($"Alert configuration ID: {alertConfigurationId}");
+            Console.WriteLine($"Alert configuration ID: {createdAlertConfiguration.Id}");
             #endregion
 
             // Delete the anomaly alert configuration to clean up the Metrics Advisor resource. Do not
             // perform this step if you intend to keep using the configuration.
 
-            await adminClient.DeleteAlertConfigurationAsync(alertConfigurationId);
+            await adminClient.DeleteAlertConfigurationAsync(createdAlertConfiguration.Id);
         }
 
         [Test]
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample10_FeedbackCrudOperations.cs b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample10_FeedbackCrudOperations.cs
index 01a62899a720..a1e0000bd237 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample10_FeedbackCrudOperations.cs
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/Samples/Sample10_FeedbackCrudOperations.cs
@@ -35,11 +35,11 @@ public async Task AddFeedbackAsync()
 
             var anomalyFeedback = new MetricAnomalyFeedback(metricId, filter, startTime, endTime, AnomalyValue.NotAnomaly);
 
-            Response<string> response = await client.AddFeedbackAsync(anomalyFeedback);
+            Response<MetricFeedback> response = await client.AddFeedbackAsync(anomalyFeedback);
 
-            string feedbackId = response.Value;
+            MetricFeedback addedFeedback = response.Value;
 
-            Console.WriteLine($"Feedback ID: {feedbackId}");
+            Console.WriteLine($"Feedback ID: {addedFeedback.Id}");
         }
 
         [Test]
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurations.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurations.json
index 6b1ba68800df..34e4be8f29ee 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurations.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurations.json
@@ -8,10 +8,10 @@
         "Content-Length": "415",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8dc21357dc19b1419e5963bdcebb0deb-81f12e0d8e02804f-00",
+        "traceparent": "00-ec5d509ab279b54e9604fafda4d478ab-40b14e558895d441-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0bd7bcf3a83a0bef03cdc015db3f9a65",
@@ -43,27 +43,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c5ddeb98-d6f9-4e1f-a0a1-d0dbb5518871",
+        "apim-request-id": "0ebca538-6862-4ef0-bc17-650a3e245495",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:27:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1899ab0d-5833-4209-9d8f-fb7e055df0db",
+        "Date": "Fri, 05 Feb 2021 17:52:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c1648595-393f-4770-8ad5-7d56b1400718",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "200",
-        "X-Request-ID": "c5ddeb98-d6f9-4e1f-a0a1-d0dbb5518871"
+        "x-envoy-upstream-service-time": "310",
+        "X-Request-ID": "0ebca538-6862-4ef0-bc17-650a3e245495"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1899ab0d-5833-4209-9d8f-fb7e055df0db",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c1648595-393f-4770-8ad5-7d56b1400718",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-895c3abb14b2ff4ba76d933f3a4ca3f4-865af4c9bf1fd44c-00",
+        "traceparent": "00-ec5d509ab279b54e9604fafda4d478ab-9d4161c76e6e1249-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1b99e95263bf7c8b16b41db9fef765a1",
@@ -72,17 +72,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "77d718bc-4a70-46cb-995c-a17c806b6c2f",
+        "apim-request-id": "39bcac45-3761-4607-9762-3a4f6aa1183c",
         "Content-Length": "586",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:27:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "10213",
-        "X-Request-ID": "77d718bc-4a70-46cb-995c-a17c806b6c2f"
+        "x-envoy-upstream-service-time": "253",
+        "X-Request-ID": "39bcac45-3761-4607-9762-3a4f6aa1183c"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "1899ab0d-5833-4209-9d8f-fb7e055df0db",
+        "anomalyAlertingConfigurationId": "c1648595-393f-4770-8ad5-7d56b1400718",
         "name": "configRUbHcTl2",
         "description": "",
         "crossMetricsOperator": "XOR",
@@ -112,30 +112,87 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1899ab0d-5833-4209-9d8f-fb7e055df0db",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c1648595-393f-4770-8ad5-7d56b1400718",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2ced7661c7629d4ca4d09eef1fd8a2b4-354dca4c57cb3f4e-00",
+        "traceparent": "00-f573c7504149a74bb3f6f44618490f77-1b232ae0c1cca144-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "922cfe452c5ed4e78f2a22a55492480a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "54ac5f79-db2a-4644-b607-a71ee60148e0",
+        "Content-Length": "586",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:31 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "3733",
+        "X-Request-ID": "54ac5f79-db2a-4644-b607-a71ee60148e0"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "c1648595-393f-4770-8ad5-7d56b1400718",
+        "name": "configRUbHcTl2",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true,
+            "valueFilter": {
+              "upper": 20.0,
+              "direction": "Up",
+              "triggerForMissing": false
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "valueFilter": {
+              "lower": 10.0,
+              "direction": "Down",
+              "triggerForMissing": false
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c1648595-393f-4770-8ad5-7d56b1400718",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-baa5b97bd27d734b87ede5a84196463b-36df7bd7ebda8748-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1f8c5904f60c9000305af4868a360d0c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fb371ce7-63ab-47b9-babf-e8d042ca97c4",
+        "apim-request-id": "893c0ddc-c316-4b34-8ab2-c7f5e03bb903",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:27:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "5244",
-        "X-Request-ID": "fb371ce7-63ab-47b9-babf-e8d042ca97c4"
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "893c0ddc-c316-4b34-8ab2-c7f5e03bb903"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurationsAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurationsAsync.json
index 9c21727c6cd2..d17045250f77 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurationsAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithMultipleMetricConfigurationsAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "415",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5d94bad53cd30d4ca4f716c5b40944cf-ce177debef2cd744-00",
+        "traceparent": "00-c4c32d22b1d29645b2973e5dd5190ad2-c36afe13fa45c74e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9c53efbbd99947cdf9cbfa628f01f571",
@@ -43,27 +43,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c6ec527c-1fdd-4808-a994-364febedfc1a",
+        "apim-request-id": "705025c8-c71b-4def-b76c-c4a80c6e5d40",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:16 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/acd3e4e4-ffac-4236-ae56-4f77a4599b03",
+        "Date": "Fri, 05 Feb 2021 17:52:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3394e032-9777-4c82-89f1-29aa010ef577",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "119",
-        "X-Request-ID": "c6ec527c-1fdd-4808-a994-364febedfc1a"
+        "x-envoy-upstream-service-time": "126",
+        "X-Request-ID": "705025c8-c71b-4def-b76c-c4a80c6e5d40"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/acd3e4e4-ffac-4236-ae56-4f77a4599b03",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3394e032-9777-4c82-89f1-29aa010ef577",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c4bca05a84e894fb43134356fa3a4e8-3ee89e5525e74443-00",
+        "traceparent": "00-c4c32d22b1d29645b2973e5dd5190ad2-4d4d794f99374f41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "4d52fdfaf7a88a9e2977f5270179bf77",
@@ -72,17 +72,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "15c084f5-4ab3-4bb1-a669-09273952daee",
+        "apim-request-id": "0f406827-4848-419f-96c4-230720cd4211",
         "Content-Length": "586",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "93",
-        "X-Request-ID": "15c084f5-4ab3-4bb1-a669-09273952daee"
+        "x-envoy-upstream-service-time": "87",
+        "X-Request-ID": "0f406827-4848-419f-96c4-230720cd4211"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "acd3e4e4-ffac-4236-ae56-4f77a4599b03",
+        "anomalyAlertingConfigurationId": "3394e032-9777-4c82-89f1-29aa010ef577",
         "name": "configtP7ePBS1",
         "description": "",
         "crossMetricsOperator": "XOR",
@@ -112,30 +112,87 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/acd3e4e4-ffac-4236-ae56-4f77a4599b03",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3394e032-9777-4c82-89f1-29aa010ef577",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d7c8cca93327cd40b5518f026ea6d6bb-b07e4dee9b16d54b-00",
+        "traceparent": "00-345843426b916b40a50faedb7c862f3f-2186cbbec74f224e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "49f336d7665629a5f7703d234871214a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "3ef600e0-32c8-4560-a445-11258c5c93a5",
+        "Content-Length": "586",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "88",
+        "X-Request-ID": "3ef600e0-32c8-4560-a445-11258c5c93a5"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "3394e032-9777-4c82-89f1-29aa010ef577",
+        "name": "configtP7ePBS1",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true,
+            "valueFilter": {
+              "upper": 20.0,
+              "direction": "Up",
+              "triggerForMissing": false
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "valueFilter": {
+              "lower": 10.0,
+              "direction": "Down",
+              "triggerForMissing": false
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3394e032-9777-4c82-89f1-29aa010ef577",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b765d5ea4cd1c345b490f42efd880384-9c7eaf78d10a6044-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5004424d862ec34251c87221e4a5467f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0ee9c8e8-267f-4777-866e-7eed2591a5bd",
+        "apim-request-id": "1fc63aff-c228-4866-b25a-4fcbc966d8b4",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "129",
-        "X-Request-ID": "0ee9c8e8-267f-4777-866e-7eed2591a5bd"
+        "x-envoy-upstream-service-time": "122",
+        "X-Request-ID": "1fc63aff-c228-4866-b25a-4fcbc966d8b4"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembers.json
index 13b2c73d60da..53b4fd491d8a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembers.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-30d7628760615b429f0ea013bf5ece4b-d658d770f5d4e045-00",
+        "traceparent": "00-6c1ead3e60076849af0f51fa7e28783e-c54211bf1ff0464c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6c2e4c3c49b1f0f9f6281f083be8def1",
@@ -26,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5a81dfcf-f38d-4dba-ba24-6f3dfb6acd91",
+        "apim-request-id": "079d5f79-d481-4707-a8ff-82536724ea44",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a78186d5-bd7e-4c45-b851-2b0b8a37600a",
+        "Date": "Fri, 05 Feb 2021 17:52:39 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2bde8c84-4610-4b5e-a358-6f80245a0fdd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "857",
-        "X-Request-ID": "5a81dfcf-f38d-4dba-ba24-6f3dfb6acd91"
+        "x-envoy-upstream-service-time": "6235",
+        "X-Request-ID": "079d5f79-d481-4707-a8ff-82536724ea44"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2bde8c84-4610-4b5e-a358-6f80245a0fdd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6c1ead3e60076849af0f51fa7e28783e-fd92c8cbcc93f445-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "03ec1029e02f878bc06fdbc287833173",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ce5305e0-1ea5-4d15-899e-783fef32ca94",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "ce5305e0-1ea5-4d15-899e-783fef32ca94"
+      },
+      "ResponseBody": {
+        "hookId": "2bde8c84-4610-4b5e-a358-6f80245a0fdd",
+        "hookName": "hookVhcyeEA7",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks",
       "RequestMethod": "POST",
@@ -45,13 +91,13 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0bc726b71448bd49bfe4e305806ab9d2-942c38b9f67efb43-00",
+        "traceparent": "00-70cc4ff46b1bee408d2fd431dc301b0e-bbe5785240819d45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "03ec1029e02f878bc06fdbc287833173",
+        "x-ms-client-request-id": "15e82801f7d1f0ee5d870e895db36342",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -63,17 +109,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5dc16b5f-dc69-415a-8f68-682c341f02b3",
+        "apim-request-id": "58645348-3d58-4440-a25c-e8f21b8e6b6e",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/286ce586-9979-4c91-85ff-d1bac0529dfb",
+        "Date": "Fri, 05 Feb 2021 17:52:40 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c4b08d7f-94aa-432e-946a-fa524ec528ac",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "707",
-        "X-Request-ID": "5dc16b5f-dc69-415a-8f68-682c341f02b3"
+        "x-envoy-upstream-service-time": "823",
+        "X-Request-ID": "58645348-3d58-4440-a25c-e8f21b8e6b6e"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c4b08d7f-94aa-432e-946a-fa524ec528ac",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-70cc4ff46b1bee408d2fd431dc301b0e-90ae143d90886142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "097a556339675b8ac0a6ac426e376972",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "551fb272-01cd-4a88-866c-8f00e7ace8c0",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:40 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "551fb272-01cd-4a88-866c-8f00e7ace8c0"
+      },
+      "ResponseBody": {
+        "hookId": "c4b08d7f-94aa-432e-946a-fa524ec528ac",
+        "hookName": "hookgCRgOMal",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -82,21 +174,21 @@
         "Content-Length": "596",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cdcf2d0735737d47b52bb20f0e04ee73-38549aaa66365d4a-00",
+        "traceparent": "00-521066b6c0e4f646a3bc2638e9d40f44-40305e224f363842-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "890e875db35d426363557a0967398a5b",
+        "x-ms-client-request-id": "a7a6fb2102d10c2a0b995e3109270bc8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configVE8u702e",
+        "name": "config3oyTAJJN",
         "description": "This hook was created to test the .NET client.",
         "hookIds": [
-          "a78186d5-bd7e-4c45-b851-2b0b8a37600a",
-          "286ce586-9979-4c91-85ff-d1bac0529dfb"
+          "2bde8c84-4610-4b5e-a358-6f80245a0fdd",
+          "c4b08d7f-94aa-432e-946a-fa524ec528ac"
         ],
         "metricAlertingConfigurations": [
           {
@@ -123,51 +215,51 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0e110de6-6e3a-49f7-afea-e448037b458f",
+        "apim-request-id": "3cc4eb73-abdc-4bb9-a7cf-503047a7ec42",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:02 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b50958c0-37b8-41d1-9589-bb0b7d672c87",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "X-Request-ID": "0e110de6-6e3a-49f7-afea-e448037b458f"
+        "x-envoy-upstream-service-time": "206",
+        "X-Request-ID": "3cc4eb73-abdc-4bb9-a7cf-503047a7ec42"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b50958c0-37b8-41d1-9589-bb0b7d672c87",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-224455926cfd64418cf26aecc7390d29-fee8b4dc58cf3646-00",
+        "traceparent": "00-521066b6c0e4f646a3bc2638e9d40f44-ed635aec743fe34d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "42aca6c0376e7269f6ac061300c91f31",
+        "x-ms-client-request-id": "2b558d9dac4b25821e9c92b0ad504299",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "27e9b664-8f47-4037-86d3-bd88e8ba8937",
+        "apim-request-id": "ea64650f-65f0-4f49-acc4-a6c64b327234",
         "Content-Length": "698",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "88",
-        "X-Request-ID": "27e9b664-8f47-4037-86d3-bd88e8ba8937"
+        "x-envoy-upstream-service-time": "100",
+        "X-Request-ID": "ea64650f-65f0-4f49-acc4-a6c64b327234"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "b50958c0-37b8-41d1-9589-bb0b7d672c87",
-        "name": "configVE8u702e",
+        "anomalyAlertingConfigurationId": "a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
+        "name": "config3oyTAJJN",
         "description": "This hook was created to test the .NET client.",
         "hookIds": [
-          "a78186d5-bd7e-4c45-b851-2b0b8a37600a",
-          "286ce586-9979-4c91-85ff-d1bac0529dfb"
+          "2bde8c84-4610-4b5e-a358-6f80245a0fdd",
+          "c4b08d7f-94aa-432e-946a-fa524ec528ac"
         ],
         "metricAlertingConfigurations": [
           {
@@ -195,86 +287,146 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b50958c0-37b8-41d1-9589-bb0b7d672c87",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6ff2cc166139d343ae9ea15cf8c0553d-672e84200a6a254c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6be74936e292be8a7c9f36d4d83769cf",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7b85e616-0de4-4d56-844d-0bb39376eb0f",
+        "Content-Length": "698",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "90",
+        "X-Request-ID": "7b85e616-0de4-4d56-844d-0bb39376eb0f"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
+        "name": "config3oyTAJJN",
+        "description": "This hook was created to test the .NET client.",
+        "hookIds": [
+          "2bde8c84-4610-4b5e-a358-6f80245a0fdd",
+          "c4b08d7f-94aa-432e-946a-fa524ec528ac"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a01120b4-2a8d-4c28-bd2d-e5505fe0fcdd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a8777907d6ae64790c5c76fa6e51e20-0ddb9a201985f946-00",
+        "traceparent": "00-588ab4e63e66794894e6dffabb0703fe-9cd9c4819cd63948-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a7a6fb2102d10c2a0b995e3109270bc8",
+        "x-ms-client-request-id": "72753ea1f37375e57980893570795fbb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "267c4b91-2d51-4570-b155-f406c46d8a74",
+        "apim-request-id": "fbabdafe-9eb4-44bd-8781-6fbd79075299",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "96",
-        "X-Request-ID": "267c4b91-2d51-4570-b155-f406c46d8a74"
+        "x-envoy-upstream-service-time": "114",
+        "X-Request-ID": "fbabdafe-9eb4-44bd-8781-6fbd79075299"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/286ce586-9979-4c91-85ff-d1bac0529dfb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c4b08d7f-94aa-432e-946a-fa524ec528ac",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2a666f970c4f934d98403734005f6762-fc6399a39cf0ce49-00",
+        "traceparent": "00-2905dffd2b345f44821a022335e69697-ce2d210de649134d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2b558d9dac4b25821e9c92b0ad504299",
+        "x-ms-client-request-id": "c0fbc4569f40bb350297aeab76ad4de7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b9386e99-f5e5-4191-af1e-c66506bc7b52",
+        "apim-request-id": "42d52801-e42f-4b47-84e5-4c8ddf964826",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "177",
-        "X-Request-ID": "b9386e99-f5e5-4191-af1e-c66506bc7b52"
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "42d52801-e42f-4b47-84e5-4c8ddf964826"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a78186d5-bd7e-4c45-b851-2b0b8a37600a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2bde8c84-4610-4b5e-a358-6f80245a0fdd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cbac6cfa5e5cda4c9468473b956b3503-4144ee4ede5d5a45-00",
+        "traceparent": "00-605709acc6408e4498c3f57082ea0988-875a7543f908f34b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6be74936e292be8a7c9f36d4d83769cf",
+        "x-ms-client-request-id": "6e0fc332cfda42266372f21258544e02",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5b4c0921-9616-4bc8-bd68-eb8ca3da0c54",
+        "apim-request-id": "cede296f-1329-4d97-8721-06447ec21359",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "186",
-        "X-Request-ID": "5b4c0921-9616-4bc8-bd68-eb8ca3da0c54"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "cede296f-1329-4d97-8721-06447ec21359"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembersAsync.json
index 6b13dfe7baf3..5018199860ec 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithOptionalSingleMetricConfigurationMembersAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b5bbf828b9dff24f99454efb49e79653-f358ef3762848745-00",
+        "traceparent": "00-7f7de5a67794784ab531c07e2efdca9f-1492e49779749841-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "495704b88ec4916bd0f05e38f0568269",
@@ -26,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1a676057-f36a-47a1-9923-4f59275531df",
+        "apim-request-id": "54191688-c1c8-47f4-b876-a312e61d080a",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:17 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/79a3f140-2a30-4acc-8438-c79b5e166bfc",
+        "Date": "Fri, 05 Feb 2021 17:53:00 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/edf869a3-9e69-4454-a75a-aece7c23def7",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "652",
-        "X-Request-ID": "1a676057-f36a-47a1-9923-4f59275531df"
+        "x-envoy-upstream-service-time": "947",
+        "X-Request-ID": "54191688-c1c8-47f4-b876-a312e61d080a"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/edf869a3-9e69-4454-a75a-aece7c23def7",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-7f7de5a67794784ab531c07e2efdca9f-e158aa450893494e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cd50283ff6b9348d46029618c90c039e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "146cf4ad-7a3a-4bbc-a92d-2aad9db97f71",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:01 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "146cf4ad-7a3a-4bbc-a92d-2aad9db97f71"
+      },
+      "ResponseBody": {
+        "hookId": "edf869a3-9e69-4454-a75a-aece7c23def7",
+        "hookName": "hookV8Nrq89J",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks",
       "RequestMethod": "POST",
@@ -45,13 +91,13 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-323f5c635d229a41a87f16d073d90d4a-10a74c28d61f4041-00",
+        "traceparent": "00-76b4576f94e8354baece99402c2ebdd4-4c6a17b2a3edb84a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cd50283ff6b9348d46029618c90c039e",
+        "x-ms-client-request-id": "1cdf98d0872d3345a570091e3279930b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -63,17 +109,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "8593d901-f464-4a37-bd13-5c86c9bea9be",
+        "apim-request-id": "694c2c4f-a42c-4bb7-ba88-251ccdc5fe9a",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5b3c2468-0345-4799-976c-dbb5b6e0da0e",
+        "Date": "Fri, 05 Feb 2021 17:53:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/05730c14-0754-4927-979f-babd55e99a49",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "655",
-        "X-Request-ID": "8593d901-f464-4a37-bd13-5c86c9bea9be"
+        "x-envoy-upstream-service-time": "818",
+        "X-Request-ID": "694c2c4f-a42c-4bb7-ba88-251ccdc5fe9a"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/05730c14-0754-4927-979f-babd55e99a49",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-76b4576f94e8354baece99402c2ebdd4-bacb148ee7b26341-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "3066d198c508c184762203c2f752c8c4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "40ff4af2-7151-4c21-a77a-a2083321b1f1",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "40ff4af2-7151-4c21-a77a-a2083321b1f1"
+      },
+      "ResponseBody": {
+        "hookId": "05730c14-0754-4927-979f-babd55e99a49",
+        "hookName": "hookghHUkSkB",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -82,21 +174,21 @@
         "Content-Length": "596",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c8a59d3f9659764f9a0bdf15de7b0d83-a38b4428ec4de74a-00",
+        "traceparent": "00-0ef1ade512e58a49abec55f24fbbc109-603d1c0c09be154d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1e0970a579320b9398d1663008c584c1",
+        "x-ms-client-request-id": "49271de36feccc026e8a80f7a5d3960b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configvPRezZUI",
+        "name": "configkH1QfClp",
         "description": "This hook was created to test the .NET client.",
         "hookIds": [
-          "79a3f140-2a30-4acc-8438-c79b5e166bfc",
-          "5b3c2468-0345-4799-976c-dbb5b6e0da0e"
+          "edf869a3-9e69-4454-a75a-aece7c23def7",
+          "05730c14-0754-4927-979f-babd55e99a49"
         ],
         "metricAlertingConfigurations": [
           {
@@ -123,51 +215,51 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "483b664f-ac45-4759-9ec3-11b830b12cd3",
+        "apim-request-id": "e75efa1b-24bf-4427-8518-741e88907daf",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f0b40ced-ac9b-40b6-8784-79546d84f1ec",
+        "Date": "Fri, 05 Feb 2021 17:53:02 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "150",
-        "X-Request-ID": "483b664f-ac45-4759-9ec3-11b830b12cd3"
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "e75efa1b-24bf-4427-8518-741e88907daf"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f0b40ced-ac9b-40b6-8784-79546d84f1ec",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ff818bc160d6ef46a6f77f8d55145845-ef90e5e29efd8044-00",
+        "traceparent": "00-0ef1ade512e58a49abec55f24fbbc109-70d8706391fa884b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c203227652f7c4c8ecbf675877663bb7",
+        "x-ms-client-request-id": "0ba61d138383533ba7453273113b9431",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b189b786-1bf2-4e70-95c1-3c5e9143d548",
+        "apim-request-id": "ee3174a9-feec-40a8-be4b-5208549e2352",
         "Content-Length": "698",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "92",
-        "X-Request-ID": "b189b786-1bf2-4e70-95c1-3c5e9143d548"
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "ee3174a9-feec-40a8-be4b-5208549e2352"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "f0b40ced-ac9b-40b6-8784-79546d84f1ec",
-        "name": "configvPRezZUI",
+        "anomalyAlertingConfigurationId": "2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
+        "name": "configkH1QfClp",
         "description": "This hook was created to test the .NET client.",
         "hookIds": [
-          "79a3f140-2a30-4acc-8438-c79b5e166bfc",
-          "5b3c2468-0345-4799-976c-dbb5b6e0da0e"
+          "edf869a3-9e69-4454-a75a-aece7c23def7",
+          "05730c14-0754-4927-979f-babd55e99a49"
         ],
         "metricAlertingConfigurations": [
           {
@@ -195,86 +287,146 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f0b40ced-ac9b-40b6-8784-79546d84f1ec",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d37437e046328d40b4faec5225be715e-5ecc1c7206b6b14f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "eb4dae963b9d07d41f37536dd1d01e19",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ae1f27eb-05d9-4294-ae50-300f81d84485",
+        "Content-Length": "698",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "90",
+        "X-Request-ID": "ae1f27eb-05d9-4294-ae50-300f81d84485"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
+        "name": "configkH1QfClp",
+        "description": "This hook was created to test the .NET client.",
+        "hookIds": [
+          "edf869a3-9e69-4454-a75a-aece7c23def7",
+          "05730c14-0754-4927-979f-babd55e99a49"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2919ce9b-dfb4-4d4e-92b8-e9aaae954e9e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-10c45944846c114c89a66fc6409ee7bf-4806731b0318af45-00",
+        "traceparent": "00-56eaed0ad8589f449d409b09d94b8596-f8aa68b1aececd41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "49271de36feccc026e8a80f7a5d3960b",
+        "x-ms-client-request-id": "59445c282fbf5f34e2d3a1a73d8ebb33",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9b43cf25-33ed-488c-88e3-1750627a3400",
+        "apim-request-id": "45ae2b33-13d9-423f-b264-4f857846669a",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "97",
-        "X-Request-ID": "9b43cf25-33ed-488c-88e3-1750627a3400"
+        "x-envoy-upstream-service-time": "110",
+        "X-Request-ID": "45ae2b33-13d9-423f-b264-4f857846669a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5b3c2468-0345-4799-976c-dbb5b6e0da0e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/05730c14-0754-4927-979f-babd55e99a49",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d0ba3eebe53aff46a7f00b3b8727ada7-e058e88386702b4e-00",
+        "traceparent": "00-97d20fcce28279498df63927bc462b60-1d6843687fc81f4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0ba61d138383533ba7453273113b9431",
+        "x-ms-client-request-id": "f7614ef6aa86d76e499feb4c30ce82d7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9896c469-9c48-4ffd-8c69-31539c852f8a",
+        "apim-request-id": "c2e2e2a2-29fd-459c-b96b-780dd023e8e3",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "161",
-        "X-Request-ID": "9896c469-9c48-4ffd-8c69-31539c852f8a"
+        "x-envoy-upstream-service-time": "196",
+        "X-Request-ID": "c2e2e2a2-29fd-459c-b96b-780dd023e8e3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/79a3f140-2a30-4acc-8438-c79b5e166bfc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/edf869a3-9e69-4454-a75a-aece7c23def7",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-372bf9bf1d6d4f459fa003d5d9c6ea3d-171730d2b069eb4f-00",
+        "traceparent": "00-78be7a2f3b504f46bd2acaee4ff03f15-175154c099bb894b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "eb4dae963b9d07d41f37536dd1d01e19",
+        "x-ms-client-request-id": "b54a18263af666727aed09c99a2cc991",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5f516b9b-8c31-4b9a-b663-fb96ca098641",
+        "apim-request-id": "50f67728-106e-40d0-b375-1a8d7bd5275c",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "182",
-        "X-Request-ID": "5f516b9b-8c31-4b9a-b663-fb96ca098641"
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "50f67728-106e-40d0-b375-1a8d7bd5275c"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScope.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScope.json
index 40eeeb5cf7f9..03edcbc2e95f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScope.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScope.json
@@ -8,10 +8,10 @@
         "Content-Length": "232",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d31d4d878495764780c3c44c66491fa3-95ac427904dd8844-00",
+        "traceparent": "00-dfda9eb5a8a30e4dab0c1431330e38e3-9effd487cafb1546-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b445f7e4ac579422b261a2b83c18cefc",
@@ -34,27 +34,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "44f71589-a78f-4b74-87a4-9eb8190e6dc2",
+        "apim-request-id": "85f6f9c5-3243-434a-9f8e-1c2edd99bbde",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:03 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c8ee1b62-5942-43d0-8994-3af1bbd62996",
+        "Date": "Fri, 05 Feb 2021 17:52:42 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "X-Request-ID": "44f71589-a78f-4b74-87a4-9eb8190e6dc2"
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "85f6f9c5-3243-434a-9f8e-1c2edd99bbde"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c8ee1b62-5942-43d0-8994-3af1bbd62996",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f9ef74cc0db6d04b8e36a40cb865d577-0d7f82e7f1b5d941-00",
+        "traceparent": "00-dfda9eb5a8a30e4dab0c1431330e38e3-b982b40f5405df45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "75420facd7f99819ab512aeb99d432b9",
@@ -63,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8090385a-315d-46e2-aba1-1f8bb3b9b13f",
+        "apim-request-id": "8f5a6967-50e0-4dca-81c4-6f6c96c394fd",
         "Content-Length": "347",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "102",
-        "X-Request-ID": "8090385a-315d-46e2-aba1-1f8bb3b9b13f"
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "8f5a6967-50e0-4dca-81c4-6f6c96c394fd"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "c8ee1b62-5942-43d0-8994-3af1bbd62996",
+        "anomalyAlertingConfigurationId": "ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
         "name": "configCpHBcSmG",
         "description": "",
         "hookIds": [],
@@ -92,30 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c8ee1b62-5942-43d0-8994-3af1bbd62996",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d56e7352abbd8944a681776719a13022-0b8edd5c1332c545-00",
+        "traceparent": "00-d2e02a694114de4f8b84bb2e37e0f396-2f0be0c5fb0a554c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d942bc757aea71c30cbf5e4622befb1a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f9392c6a-5ee6-4368-b95a-8232601eba3d",
+        "Content-Length": "347",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:42 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "104",
+        "X-Request-ID": "f9392c6a-5ee6-4368-b95a-8232601eba3d"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
+        "name": "configCpHBcSmG",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "Dimension",
+            "negationOperation": false,
+            "dimensionAnomalyScope": {
+              "dimension": {
+                "city": "Delhi"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ae83ceed-4ace-4bd9-b38d-3c1a7c8daa12",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ccba1c73f81cfa4e9facf2870b233155-ac4f6a611ff87345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b14fb8e69cfc0d79ddac08068136fade",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e9897a04-f7be-4f89-b7f7-25d3b48332fb",
+        "apim-request-id": "e23dfaa4-692d-4255-8e84-d8ac1183da98",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "89",
-        "X-Request-ID": "e9897a04-f7be-4f89-b7f7-25d3b48332fb"
+        "x-envoy-upstream-service-time": "114",
+        "X-Request-ID": "e23dfaa4-692d-4255-8e84-d8ac1183da98"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScopeAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScopeAsync.json
index 9ab48918295c..9aecbd1ac948 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScopeAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithSeriesGroupScopeAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "232",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0ab04c9b8d833b4d86c00421336ed2a2-326d9bbbed665b49-00",
+        "traceparent": "00-d337533e6d86e9419a7018d0709e2770-516217be549e354c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bca4cb4e370f4adce81c5398b92e5b5e",
@@ -34,27 +34,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5090a445-50ac-48df-91a2-b7d1e0aca9ff",
+        "apim-request-id": "246a065c-82ed-42fc-832a-a7f269033bfc",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:20 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fd20169e-25fe-4055-85f7-b0600bc7f96c",
+        "Date": "Fri, 05 Feb 2021 17:53:03 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "X-Request-ID": "5090a445-50ac-48df-91a2-b7d1e0aca9ff"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "246a065c-82ed-42fc-832a-a7f269033bfc"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fd20169e-25fe-4055-85f7-b0600bc7f96c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fa63f1984b40234685974284d1dd98f5-f4182c7cfa4b6842-00",
+        "traceparent": "00-d337533e6d86e9419a7018d0709e2770-7d470e80cb8c334d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "11aca2138e4a4caac898e4954fa51a60",
@@ -63,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "14d95770-43c6-4722-b0c0-f3a0086e980e",
+        "apim-request-id": "c0374a7f-a73b-4fec-94fd-8ba211c52c40",
         "Content-Length": "347",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "87",
-        "X-Request-ID": "14d95770-43c6-4722-b0c0-f3a0086e980e"
+        "x-envoy-upstream-service-time": "99",
+        "X-Request-ID": "c0374a7f-a73b-4fec-94fd-8ba211c52c40"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "fd20169e-25fe-4055-85f7-b0600bc7f96c",
+        "anomalyAlertingConfigurationId": "1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
         "name": "configInSGyQiJ",
         "description": "",
         "hookIds": [],
@@ -92,30 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fd20169e-25fe-4055-85f7-b0600bc7f96c",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-80817cd59357dd41a848cd9012d3af97-9b45744648776d44-00",
+        "traceparent": "00-91e8716b34d63640866c6426c50ea57d-bacdca9fd528404e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d490af8642c63bcb6ecca9046984fc4b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9dafc9c6-eab3-4d46-8f8f-f7c7142ae6b7",
+        "Content-Length": "347",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "100",
+        "X-Request-ID": "9dafc9c6-eab3-4d46-8f8f-f7c7142ae6b7"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
+        "name": "configInSGyQiJ",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "Dimension",
+            "negationOperation": false,
+            "dimensionAnomalyScope": {
+              "dimension": {
+                "city": "Delhi"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1b2a291d-5ba4-4a67-a86f-d2a4ee319c2e",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5b3b4bd6603f7c468ef88e1c368aae2f-595e381ea7c76047-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "747754bc9be6bfea2158f3765346fa43",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e4e6ce6a-5fac-45fe-a1fc-31a9f37d9cef",
+        "apim-request-id": "832cb28c-513f-416f-a1d4-475f4baa1488",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "96",
-        "X-Request-ID": "e4e6ce6a-5fac-45fe-a1fc-31a9f37d9cef"
+        "x-envoy-upstream-service-time": "111",
+        "X-Request-ID": "832cb28c-513f-416f-a1d4-475f4baa1488"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScope.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScope.json
index 7247bc7e835a..cc8355e9f2d6 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScope.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScope.json
@@ -8,10 +8,10 @@
         "Content-Length": "231",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4ae6bb44d3400c4dbd8585b1b9a2a91c-031d8579e4966749-00",
+        "traceparent": "00-35dcce10f691e54fbd17dc11366d2179-bdc305abb72f874a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f73903b0ce09111b4025e817eb4e3e2e",
@@ -34,27 +34,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "48505a81-5f2d-4c5a-90cd-b055026aafdb",
+        "apim-request-id": "1bf1d23e-4aed-489b-ac7a-9fab3178979e",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3a91cd4e-5668-4c47-ba59-1f200c059585",
+        "Date": "Fri, 05 Feb 2021 17:52:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/bf1e1800-4945-4ca0-bb89-c21bb6993f37",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "118",
-        "X-Request-ID": "48505a81-5f2d-4c5a-90cd-b055026aafdb"
+        "x-envoy-upstream-service-time": "113",
+        "X-Request-ID": "1bf1d23e-4aed-489b-ac7a-9fab3178979e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3a91cd4e-5668-4c47-ba59-1f200c059585",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/bf1e1800-4945-4ca0-bb89-c21bb6993f37",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0bac609427c96c48888b0f9041f612ac-08878538a2e77746-00",
+        "traceparent": "00-35dcce10f691e54fbd17dc11366d2179-9723314851291847-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "032d37b14d7ebbff6a1d927a1e88c82a",
@@ -63,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9bae164b-423c-4a3f-8855-fbae85d1b092",
+        "apim-request-id": "5bfb21df-1f9d-4de2-aa50-115b4ab688f4",
         "Content-Length": "346",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "110",
-        "X-Request-ID": "9bae164b-423c-4a3f-8855-fbae85d1b092"
+        "x-envoy-upstream-service-time": "111",
+        "X-Request-ID": "5bfb21df-1f9d-4de2-aa50-115b4ab688f4"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "3a91cd4e-5668-4c47-ba59-1f200c059585",
+        "anomalyAlertingConfigurationId": "bf1e1800-4945-4ca0-bb89-c21bb6993f37",
         "name": "configcUJctDmU",
         "description": "",
         "hookIds": [],
@@ -92,30 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3a91cd4e-5668-4c47-ba59-1f200c059585",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/bf1e1800-4945-4ca0-bb89-c21bb6993f37",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-479526ae6c1d9d468b3f0d8f0a45a3a7-f3a313cf7451334b-00",
+        "traceparent": "00-635a534d81754c4ea433088998d10165-5b41b8690df0aa4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c91ca633ef75a9a75c5faa0f56b5fea4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "afd0c926-ba05-44b4-985c-b4f39f8044df",
+        "Content-Length": "346",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:43 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "107",
+        "X-Request-ID": "afd0c926-ba05-44b4-985c-b4f39f8044df"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "bf1e1800-4945-4ca0-bb89-c21bb6993f37",
+        "name": "configcUJctDmU",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "TopN",
+            "negationOperation": false,
+            "topNAnomalyScope": {
+              "top": 30,
+              "period": 20,
+              "minTopCount": 10
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/bf1e1800-4945-4ca0-bb89-c21bb6993f37",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-151601bd25ed4a4eaf18836846a1507f-a854f08226a31644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cce2b5751e7262d9037e8cec3ba1f3b7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5cb84571-df06-466a-b30e-efd2df097825",
+        "apim-request-id": "90d41a57-62a4-4989-9178-7edb3aac16c1",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "108",
-        "X-Request-ID": "5cb84571-df06-466a-b30e-efd2df097825"
+        "x-envoy-upstream-service-time": "109",
+        "X-Request-ID": "90d41a57-62a4-4989-9178-7edb3aac16c1"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScopeAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScopeAsync.json
index 877bf54b4a21..6414d80a62ec 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScopeAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithTopNScopeAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "231",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-47aee0b88b068a41b3a4060fef408918-ef4d9bac4831fe45-00",
+        "traceparent": "00-d13a0f64cd1769459bd89788a9555df7-8638889d632ca44a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c4b4dfc18a3c2ad0b022f2785de7a0f5",
@@ -34,27 +34,27 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0b711bd4-b828-4597-8404-184777532bdb",
+        "apim-request-id": "cd361c61-4f20-495b-ac63-038487cbcfd0",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:20 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a89a555b-e117-4162-9549-5af48c8ade00",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "120",
-        "X-Request-ID": "0b711bd4-b828-4597-8404-184777532bdb"
+        "x-envoy-upstream-service-time": "112",
+        "X-Request-ID": "cd361c61-4f20-495b-ac63-038487cbcfd0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a89a555b-e117-4162-9549-5af48c8ade00",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4cfa03d03ad5954baf94292631f0822f-90ca0342daf5e541-00",
+        "traceparent": "00-d13a0f64cd1769459bd89788a9555df7-6215123923cb0747-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5392b0d9389b56ca2b410b6336d0bddd",
@@ -63,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e8e7bf38-16b7-47d2-a0b6-339230eb45ff",
+        "apim-request-id": "8198b74c-6505-46c0-9961-7fcdc2b4bd0d",
         "Content-Length": "346",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "80",
-        "X-Request-ID": "e8e7bf38-16b7-47d2-a0b6-339230eb45ff"
+        "x-envoy-upstream-service-time": "125",
+        "X-Request-ID": "8198b74c-6505-46c0-9961-7fcdc2b4bd0d"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "a89a555b-e117-4162-9549-5af48c8ade00",
+        "anomalyAlertingConfigurationId": "a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
         "name": "configscgv9Oyh",
         "description": "",
         "hookIds": [],
@@ -92,30 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a89a555b-e117-4162-9549-5af48c8ade00",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1078df63586a054c9d416b4d6983e9dc-395529ec72cb9043-00",
+        "traceparent": "00-cf226d5ca722bc40a82e8a668857e9dc-0434eba3cc35094b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "df8d3641c0aa3b0ec8a053ccd484094c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "311d9f01-563c-463f-ac41-85b8cbb5cee6",
+        "Content-Length": "346",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "86",
+        "X-Request-ID": "311d9f01-563c-463f-ac41-85b8cbb5cee6"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
+        "name": "configscgv9Oyh",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "TopN",
+            "negationOperation": false,
+            "topNAnomalyScope": {
+              "top": 30,
+              "period": 20,
+              "minTopCount": 10
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/a5f9e89b-ae5b-4c97-bb21-6d159eeb07e1",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-45a9bb16fc71a1449b667c44915e6812-ba746901a8992f44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "2d21bb611a2188d1145e99fa7e6cf3e0",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4c5ac50f-d044-45da-bedb-4b46f2e3cec1",
+        "apim-request-id": "d4bff2a6-afd9-4b5b-8b32-222b9dca6905",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "103",
-        "X-Request-ID": "4c5ac50f-d044-45da-bedb-4b46f2e3cec1"
+        "x-envoy-upstream-service-time": "113",
+        "X-Request-ID": "d4bff2a6-afd9-4b5b-8b32-222b9dca6905"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False).json
index 52ebefd1fd01..34e1972c47fa 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "171",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-147ac23fc1b14e42af82599e7f493bb1-1324955054c4024d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-eb36bfa634ba9b4f93afe585a77a9353-e864ab3f06e1bf4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d28ee219cc50a62d312372ef51ad5912",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0172d1a6-1174-409a-841c-9d814fdd12c8",
+        "apim-request-id": "b22c7c90-17ef-4546-88ec-4998e1098646",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7bf7372a-8539-463c-aff5-6c80b26b82c4",
+        "Date": "Fri, 05 Feb 2021 17:52:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "124",
-        "x-request-id": "0172d1a6-1174-409a-841c-9d814fdd12c8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "b22c7c90-17ef-4546-88ec-4998e1098646"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7bf7372a-8539-463c-aff5-6c80b26b82c4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ed4d413ea55caf47a705ce21420738e3-070274d3b6d89a4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-eb36bfa634ba9b4f93afe585a77a9353-a795865a69eb6940-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fb4f2be40eb16f54ed2c411bd5c7add5",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "22352e42-20b3-4f98-a7b0-f2a43b5edcd0",
+        "apim-request-id": "5ea61185-3d9c-4161-b2cc-bac6090f8dc7",
         "Content-Length": "286",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "129",
-        "x-request-id": "22352e42-20b3-4f98-a7b0-f2a43b5edcd0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "93",
+        "X-Request-ID": "5ea61185-3d9c-4161-b2cc-bac6090f8dc7"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "7bf7372a-8539-463c-aff5-6c80b26b82c4",
+        "anomalyAlertingConfigurationId": "529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
         "name": "configBWFDTI5K",
         "description": "",
         "hookIds": [],
@@ -76,27 +82,71 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7bf7372a-8539-463c-aff5-6c80b26b82c4",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e0d37efca15b7542b6e1f3b6f916f70f-30861a75e87aad48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3a46c6010aafb848a0820bf5ea3d1183-70e93ec62aa61b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7c409f3914abdd93f8b5b5692f268212",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ddf18b27-3b06-4477-871f-436055d7e238",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:53 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "ddf18b27-3b06-4477-871f-436055d7e238"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
+        "name": "configBWFDTI5K",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/529bc28f-9a0c-4801-a5ac-9ebe53c9f1f8",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-82488c404fa9cd449b1394c3d860e059-18a77a95190e6747-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "783efb7804250a008d1fe5248a11d06a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d36f0456-9d96-4175-b99d-49c1c5f163cf",
+        "apim-request-id": "4a9addd1-9d6c-408a-ae23-85c5e724452a",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "130",
-        "x-request-id": "d36f0456-9d96-4175-b99d-49c1c5f163cf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "121",
+        "X-Request-ID": "4a9addd1-9d6c-408a-ae23-85c5e724452a"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False)Async.json
index b737b31faa9c..c48daafb66ba 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "171",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-daaa6d3650db0044aa3e0bfa61867491-5418e510bb414d4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2740d677f4b43a4bba54ba82e26d9cb4-9e24dc40dfaf3041-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6c05e891ad99e3f2aaa010c902014a37",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f9d820a9-6ed0-4116-8813-4da9d6a96d05",
+        "apim-request-id": "03c6a5a6-5843-474c-a56b-7aa4baea966b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f9f8fe2f-7a3b-4820-88e1-7144c4c07bc7",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1bb8281e-0a75-4284-b6c9-094dcc58bbab",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "116",
-        "x-request-id": "f9d820a9-6ed0-4116-8813-4da9d6a96d05"
+        "X-Request-ID": "03c6a5a6-5843-474c-a56b-7aa4baea966b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f9f8fe2f-7a3b-4820-88e1-7144c4c07bc7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1bb8281e-0a75-4284-b6c9-094dcc58bbab",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7aa04d9d9a3b7e4e8aa4581756c8c28a-687bc44766437242-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2740d677f4b43a4bba54ba82e26d9cb4-e2134794190aa84d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bd9536f24e125a77b73dd10c13c039ce",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fe8155c4-613f-4d48-9918-b5531204c1fe",
+        "apim-request-id": "e9f36990-7a68-4581-967f-6f5cbb82d5b2",
         "Content-Length": "286",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "83",
-        "x-request-id": "fe8155c4-613f-4d48-9918-b5531204c1fe"
+        "X-Request-ID": "e9f36990-7a68-4581-967f-6f5cbb82d5b2"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "f9f8fe2f-7a3b-4820-88e1-7144c4c07bc7",
+        "anomalyAlertingConfigurationId": "1bb8281e-0a75-4284-b6c9-094dcc58bbab",
         "name": "configVozWhYXK",
         "description": "",
         "hookIds": [],
@@ -76,27 +82,71 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/f9f8fe2f-7a3b-4820-88e1-7144c4c07bc7",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1bb8281e-0a75-4284-b6c9-094dcc58bbab",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5e586e5cc0747d49ad99c4ef382295dd-684498434e895545-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-59d2e7fe0db83046b53a2ae4a89eb75f-1da4b4c7863cc142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "56f986d4c98e36576b28598314f001da",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9f0a0e0b-333b-40fe-b3d7-447be5da822c",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "9f0a0e0b-333b-40fe-b3d7-447be5da822c"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "1bb8281e-0a75-4284-b6c9-094dcc58bbab",
+        "name": "configVozWhYXK",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1bb8281e-0a75-4284-b6c9-094dcc58bbab",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cf9ed5713671d1469508176b0ebeebbc-a2f54b03a0a03e41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "fd7c40bf92c5425470abb45cdbe6cfea",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3b113729-c6f6-49bf-bde0-4a7fa55d75b6",
+        "apim-request-id": "0544311c-3ed5-46f9-b1a2-c6f66cbe014f",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "120",
-        "x-request-id": "3b113729-c6f6-49bf-bde0-4a7fa55d75b6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "91",
+        "X-Request-ID": "0544311c-3ed5-46f9-b1a2-c6f66cbe014f"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True).json
index 1d8da63b0269..5c4bdeb91468 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "171",
         "Content-Type": "application/json",
-        "traceparent": "00-e10340d660b8624cb89fd41304307d7d-98a5179e0ad73c48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5b9027a45a3e6e4c9a7393cacfe4cc90-73bdd33cd0fca04a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "4b50290ef58247e362f5d598bf15eb99",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,45 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2932ecc6-132a-44f9-8b46-8fb78c8c77b5",
+        "apim-request-id": "3df3dee8-1ca5-439e-898c-a3a129e48865",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:36 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c938c66e-73f5-4ab9-aa74-2d989f02e762",
+        "Date": "Fri, 05 Feb 2021 17:52:51 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/e7f0782b-be7c-4789-b605-93b53ef5055e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "3070",
-        "x-request-id": "2932ecc6-132a-44f9-8b46-8fb78c8c77b5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "3df3dee8-1ca5-439e-898c-a3a129e48865"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c938c66e-73f5-4ab9-aa74-2d989f02e762",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/e7f0782b-be7c-4789-b605-93b53ef5055e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4a8061edcdfa344d944133c2c74d4100-b2e8dfe6d0c1764d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5b9027a45a3e6e4c9a7393cacfe4cc90-91a52ad6a83f544e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "a4bd9802bdca7679d3645c425ca73982",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "28f4153d-e014-4bfe-9cc4-76ba5ffb273d",
+        "apim-request-id": "c76ab821-42c8-48cf-96e9-9c04babe5e96",
         "Content-Length": "286",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:36 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "279",
-        "x-request-id": "28f4153d-e014-4bfe-9cc4-76ba5ffb273d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "140",
+        "X-Request-ID": "c76ab821-42c8-48cf-96e9-9c04babe5e96"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "c938c66e-73f5-4ab9-aa74-2d989f02e762",
+        "anomalyAlertingConfigurationId": "e7f0782b-be7c-4789-b605-93b53ef5055e",
         "name": "config20SWrjvv",
         "description": "",
         "hookIds": [],
@@ -74,26 +80,69 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/c938c66e-73f5-4ab9-aa74-2d989f02e762",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/e7f0782b-be7c-4789-b605-93b53ef5055e",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-af3a4042284a384d8476c760e5adc69d-8d1192dd7a7b6b43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4539f84f5c3de34097be2e4088cb82fb-14eafd7fbb273f44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "c3c20d000600a30b5d95107825917eec",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9c92f12e-9c0a-4a19-906e-a699756c0a00",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "242",
+        "X-Request-ID": "9c92f12e-9c0a-4a19-906e-a699756c0a00"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "e7f0782b-be7c-4789-b605-93b53ef5055e",
+        "name": "config20SWrjvv",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/e7f0782b-be7c-4789-b605-93b53ef5055e",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-494c40ba024d104b934c97cc290b1953-d4afd9091b86a645-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "35bd04cf194351d5afd9771d99a0ebbb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "37834e4b-e3e7-4aae-b911-7f4bceac0794",
+        "apim-request-id": "fca71814-560d-4753-a0f5-6201c694ccde",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "962",
-        "x-request-id": "37834e4b-e3e7-4aae-b911-7f4bceac0794"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "59",
+        "X-Request-ID": "fca71814-560d-4753-a0f5-6201c694ccde"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True)Async.json
index fb6acb16b0e6..a7fe450b607b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/CreateAndGetAlertConfigurationWithWholeSeriesScope(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "171",
         "Content-Type": "application/json",
-        "traceparent": "00-b60e36fcb01f3541886be39c4f3a682c-8e49fdc2de39b94e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2b991c4f24316043aa877989d5904160-fec99d0888163b46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "97236ec6aa5d3611e3b5616329e39190",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,85 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7fee5c4b-d630-49cd-b136-e3924f947477",
+        "apim-request-id": "bab8986d-d6f3-496e-8723-e541410460a7",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/de312017-d565-4be2-aed6-86762d10c65c",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "60",
-        "x-request-id": "7fee5c4b-d630-49cd-b136-e3924f947477"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "59",
+        "X-Request-ID": "bab8986d-d6f3-496e-8723-e541410460a7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/de312017-d565-4be2-aed6-86762d10c65c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-d6d3aadf3e2f924b8c3ba5774fab958f-df774287c0e95b4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2b991c4f24316043aa877989d5904160-b8a3a245287f8040-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "831de2b6ae445c9e08738dc4245fa266",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7f6ca1bf-12d9-4fcd-be0b-14c05883d58e",
+        "apim-request-id": "1f66e4b4-fdc2-4119-8ce6-4d64fa914656",
         "Content-Length": "286",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "31",
+        "X-Request-ID": "1f66e4b4-fdc2-4119-8ce6-4d64fa914656"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
+        "name": "configl70tMng4",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-334bd2345fa9ac44930bb907f27f7bb9-2daba49eeb25c74c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "199190b114dbababf7e72d25978e2e5c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "73eb76d9-b6d2-44d6-b6b5-abcb845e3f2d",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "34",
-        "x-request-id": "7f6ca1bf-12d9-4fcd-be0b-14c05883d58e"
+        "X-Request-ID": "73eb76d9-b6d2-44d6-b6b5-abcb845e3f2d"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "de312017-d565-4be2-aed6-86762d10c65c",
+        "anomalyAlertingConfigurationId": "cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
         "name": "configl70tMng4",
         "description": "",
         "hookIds": [],
@@ -74,26 +120,29 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/de312017-d565-4be2-aed6-86762d10c65c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/cf3c41ca-3f69-49a8-88a4-2c3bfce08679",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-7b8292e83530854e9877c8a9421a0db8-68d53ba6b1e4504f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "199190b114dbababf7e72d25978e2e5c",
+        "traceparent": "00-81bedd3841107946bb87a7dea9b2317b-8d9f7fd95c9eb747-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "50b42bca0d5d17edd0c78ee91d4d1184",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cee3a185-8fc2-4059-9f17-a2c321df3fb4",
+        "apim-request-id": "15f5f7a4-033d-435d-96e8-bdb405cda6b1",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "46",
-        "x-request-id": "cee3a185-8fc2-4059-9f17-a2c321df3fb4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "44",
+        "X-Request-ID": "15f5f7a4-033d-435d-96e8-bdb405cda6b1"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False).json
index 9cf84b04dbb4..35d1d762e3a1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False).json
@@ -8,14 +8,17 @@
         "Content-Length": "171",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-39a5aa9aeddbaa409974238fa10317f2-70662f3853ce044b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ac3e04f10576fe43a21350e3a27f6238-5bdf7ab48babc44a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9ff5d74238cc803d2cce996cd6d34728",
+        "x-ms-client-request-id": "e6e3c0caa688d0d75d6ab7e13a2bba6b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configsUChpHC2",
+        "name": "configrxUEaA6u",
         "hookIds": [],
         "metricAlertingConfigurations": [
           {
@@ -26,69 +29,116 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "bb1588af-b42e-4167-b3e6-18e2c9a3fd23",
+        "apim-request-id": "068f65ef-25b6-41be-bbd9-1bfb725f7516",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:00 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/9618b166-c4fc-4ffa-8a64-2e3951e838da",
+        "Date": "Fri, 05 Feb 2021 18:37:52 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fe7f13a3-d0ee-496a-800c-6e2d9a423993",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "123",
-        "x-request-id": "bb1588af-b42e-4167-b3e6-18e2c9a3fd23"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "068f65ef-25b6-41be-bbd9-1bfb725f7516"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/9618b166-c4fc-4ffa-8a64-2e3951e838da",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fe7f13a3-d0ee-496a-800c-6e2d9a423993",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ac3e04f10576fe43a21350e3a27f6238-cb73030c600f2842-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7a63e284bbbe335262599329b091c0e5",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ee843f89-23e1-4656-94bb-1c426482c477",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "134",
+        "X-Request-ID": "ee843f89-23e1-4656-94bb-1c426482c477"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "fe7f13a3-d0ee-496a-800c-6e2d9a423993",
+        "name": "configrxUEaA6u",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fe7f13a3-d0ee-496a-800c-6e2d9a423993",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5ae4def6c258444a83fa89ce9dd45e21-972cabfc37ba3241-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f9b36f50526c5b468675170b75dd75fe-3508df76254eed49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a1794ec541487dd3e9b4f2a906fb9137",
+        "x-ms-client-request-id": "204819c93d534653e36768995d308773",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b253bace-4bc3-4306-bd74-6841f9578d12",
+        "apim-request-id": "0b613f4a-aa7e-4447-83d8-eb3070fdee3d",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:00 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "111",
-        "x-request-id": "b253bace-4bc3-4306-bd74-6841f9578d12"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "0b613f4a-aa7e-4447-83d8-eb3070fdee3d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/9618b166-c4fc-4ffa-8a64-2e3951e838da",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/fe7f13a3-d0ee-496a-800c-6e2d9a423993",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c13805f5633e3a469ce25749f76db6be-b6f0874a91a7fc43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f7de2d3ba9133f49b251adb4060e67fe-f106b39bbf18ce4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "971711cabfb06649f5258ecdb24f0226",
+        "x-ms-client-request-id": "78553300bc910e9f6db0842e13ae20cc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "9fafc240-10f1-4459-95ad-3d94e7c242e3",
+        "apim-request-id": "43aed9b6-c5ac-43d6-8e29-1240df8bf6d7",
         "Content-Length": "123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:15:00 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "69",
-        "x-request-id": "9fafc240-10f1-4459-95ad-3d94e7c242e3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "81",
+        "X-Request-ID": "43aed9b6-c5ac-43d6-8e29-1240df8bf6d7"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyAlertingConfiguration. TraceId: 5ee799ac-ff46-416b-9ed3-30f7c4e0ffe4"
+        "message": "Not found this AnomalyAlertingConfiguration. TraceId: 86ee1c65-d4c9-4725-abaa-52fb150177c9"
       }
     }
   ],
@@ -97,6 +147,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1563543712"
+    "RandomSeed": "1299320323"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False)Async.json
index 2003b645847e..67d58fb32c33 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(False)Async.json
@@ -8,14 +8,17 @@
         "Content-Length": "171",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-56c6c09c5af6404c94b966dcc4123282-02ec92759524a44f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a069379a9b9ed84fb5754519f2a07c9e-203ccfd9c431b242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f790259472215d0349a3c4dde9b1398a",
+        "x-ms-client-request-id": "a7b3e8bb6c9e31aef9c42fef4fe0a079",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "config2uxnFFBF",
+        "name": "configfi5lgmxY",
         "hookIds": [],
         "metricAlertingConfigurations": [
           {
@@ -26,69 +29,116 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6d1b4e5a-bea9-49f1-b4d8-719e89277fd6",
+        "apim-request-id": "74f821e4-032c-412a-b972-106bbeed2e4e",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:07 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3ab96833-67ca-41af-baf7-4b6a0b63bc6b",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/86304639-baa7-4afe-b78e-a81edfcf7535",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "115",
-        "x-request-id": "6d1b4e5a-bea9-49f1-b4d8-719e89277fd6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "106",
+        "X-Request-ID": "74f821e4-032c-412a-b972-106bbeed2e4e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3ab96833-67ca-41af-baf7-4b6a0b63bc6b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/86304639-baa7-4afe-b78e-a81edfcf7535",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a069379a9b9ed84fb5754519f2a07c9e-d00ed82441907540-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e092e16427401beb0e24314108275949",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1625694f-4b22-4e85-9796-650cd9858a69",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "97",
+        "X-Request-ID": "1625694f-4b22-4e85-9796-650cd9858a69"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "86304639-baa7-4afe-b78e-a81edfcf7535",
+        "name": "configfi5lgmxY",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/86304639-baa7-4afe-b78e-a81edfcf7535",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f67f7ef65f5e4443bdd95df869a65a3c-033bcbd120000548-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d074ef3280345440a65c80e0746b8232-be9ff8f05df25848-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "edf1b65e0edb93db09858949bd83abae",
+        "x-ms-client-request-id": "d4dfb3dbe11086ddc9fa2876ba507d3e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0df00b0d-ee13-44a2-bca6-0cd958de3fed",
+        "apim-request-id": "e1b17278-6e6f-4d61-80d4-fab970a7c1e4",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:07 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "98",
-        "x-request-id": "0df00b0d-ee13-44a2-bca6-0cd958de3fed"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "106",
+        "X-Request-ID": "e1b17278-6e6f-4d61-80d4-fab970a7c1e4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3ab96833-67ca-41af-baf7-4b6a0b63bc6b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/86304639-baa7-4afe-b78e-a81edfcf7535",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f43d7472a7cd9d428e377671ddbe10cf-d431e581baac5046-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5b72f19f672c2c4f997746d5945f98c7-6254767f5aeed840-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7dfd3bd8b06fe191205121a6f9e6ba93",
+        "x-ms-client-request-id": "acda030b3ca39406fd97997a3b6d29d1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "994fb498-56f5-4348-936c-5fe7b1cc56de",
+        "apim-request-id": "93ced8b3-7146-4a8e-95b5-17b44aca6ba2",
         "Content-Length": "123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:15:08 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "69",
-        "x-request-id": "994fb498-56f5-4348-936c-5fe7b1cc56de"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "95",
+        "X-Request-ID": "93ced8b3-7146-4a8e-95b5-17b44aca6ba2"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyAlertingConfiguration. TraceId: fc480222-dd8f-40e5-b56d-6758e8a7a0d0"
+        "message": "Not found this AnomalyAlertingConfiguration. TraceId: a564e2f4-385e-48a5-a701-08387bbdcc2c"
       }
     }
   ],
@@ -97,6 +147,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1650484151"
+    "RandomSeed": "299212543"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True).json
index 9d0d317fe00b..2e641f1a06f2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True).json
@@ -8,13 +8,16 @@
         "Authorization": "Sanitized",
         "Content-Length": "171",
         "Content-Type": "application/json",
-        "traceparent": "00-543683d87905ba47b2b720e61fc0d33b-6506150754c85b4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "49e42a47b986162b5a914d9bb48c2eed",
+        "traceparent": "00-6a730ae3c2f8584bbb02c5fbd70a730d-d7e9a82b235d3145-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "7c0eac40c3715a884cf2b66d97ef9292",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configrhEIkenj",
+        "name": "configH8ckEiVW",
         "hookIds": [],
         "metricAlertingConfigurations": [
           {
@@ -25,73 +28,119 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b4135447-4dff-4df9-82ed-0a68bfe790a1",
+        "apim-request-id": "6fe1ca31-5f60-4b69-8ccd-26cee732a9bd",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/971c67ba-849e-4ffe-ba0a-ade2ad44966e",
+        "Date": "Fri, 05 Feb 2021 18:37:49 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3f14b5c5-5d7c-4af4-bde8-1c3170780c9b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "194",
-        "x-request-id": "b4135447-4dff-4df9-82ed-0a68bfe790a1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "249",
+        "X-Request-ID": "6fe1ca31-5f60-4b69-8ccd-26cee732a9bd"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/971c67ba-849e-4ffe-ba0a-ade2ad44966e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3f14b5c5-5d7c-4af4-bde8-1c3170780c9b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-6a730ae3c2f8584bbb02c5fbd70a730d-f266de6894691442-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "e09a8c8258ecb451eb6d130973148bce",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1dfb8cfe-f8a1-469d-9adf-f49d54b12218",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:51 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1129",
+        "X-Request-ID": "1dfb8cfe-f8a1-469d-9adf-f49d54b12218"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "3f14b5c5-5d7c-4af4-bde8-1c3170780c9b",
+        "name": "configH8ckEiVW",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3f14b5c5-5d7c-4af4-bde8-1c3170780c9b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4749b9fede771545bba17dfef821e231-91a9996cb3b35b4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "db56131897cc92f45e5a634eeb76dcef",
+        "traceparent": "00-d38778ace6f0084c82b4e7cd4b5cfd4a-325c086e990c5e44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "0af14a222fbaf7db0adb34b41ede209b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a6c4b931-ca0d-4430-837a-5ecc5374a665",
+        "apim-request-id": "1b4121fc-c1c5-4d26-b153-b893a2e89f3a",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:59 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "a6c4b931-ca0d-4430-837a-5ecc5374a665"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "648",
+        "X-Request-ID": "1b4121fc-c1c5-4d26-b153-b893a2e89f3a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/971c67ba-849e-4ffe-ba0a-ade2ad44966e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3f14b5c5-5d7c-4af4-bde8-1c3170780c9b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-59ab2e842cae004a9d7b62904c2c6a24-fa4335e8f672dd46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "50617b01f9a9f789a15d88603d05ed52",
+        "traceparent": "00-940b08c50720a546a4a443d78b8ef517-1387ca039fec6848-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "f716575c3ec1e8b55a599104af7fe638",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "0fc404ed-4ae2-4fcf-ae0a-679a9a9d178f",
+        "apim-request-id": "1337acc7-d7b0-4d43-8c7b-5353d0559129",
         "Content-Length": "123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:14:59 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "313",
-        "x-request-id": "0fc404ed-4ae2-4fcf-ae0a-679a9a9d178f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "59",
+        "X-Request-ID": "1337acc7-d7b0-4d43-8c7b-5353d0559129"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyAlertingConfiguration. TraceId: 775221f4-47a4-45fe-b2dd-b655c29f5f4e"
+        "message": "Not found this AnomalyAlertingConfiguration. TraceId: e9b999af-f37a-4f4b-b162-31f9d9359465"
       }
     }
   ],
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "2102019244"
+    "RandomSeed": "338458776"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True)Async.json
index c2520bc7d1c6..fee5e89db03a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/DeleteAlertConfiguration(True)Async.json
@@ -8,13 +8,16 @@
         "Authorization": "Sanitized",
         "Content-Length": "171",
         "Content-Type": "application/json",
-        "traceparent": "00-3b772693efee02429903a603b0181549-65392a1c2466134e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "d47b4268b29c67acc618b38070805b95",
+        "traceparent": "00-64238480b3e1084f95b523df373261b9-ea80ede3f8273c42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "18f0da8d0489c225006f2c8a99189c33",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configCCysdj7O",
+        "name": "configR8n3wtAJ",
         "hookIds": [],
         "metricAlertingConfigurations": [
           {
@@ -25,73 +28,119 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ef07cca8-072b-4d42-abe3-f66db72d44bb",
+        "apim-request-id": "bb287ca8-9335-44b0-b8f2-4da3acddb274",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:07 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/da7a6177-b4db-43de-86b5-e2f798b43eac",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2873e8ec-913c-4473-850b-f52b8168070b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "66",
-        "x-request-id": "ef07cca8-072b-4d42-abe3-f66db72d44bb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "80",
+        "X-Request-ID": "bb287ca8-9335-44b0-b8f2-4da3acddb274"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/da7a6177-b4db-43de-86b5-e2f798b43eac",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2873e8ec-913c-4473-850b-f52b8168070b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-64238480b3e1084f95b523df373261b9-662d15fa46f4e248-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "0a6401a0b16683bcdd607e49b5af7228",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "824d6693-4c70-4b78-85df-c33f243258d8",
+        "Content-Length": "286",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "37",
+        "X-Request-ID": "824d6693-4c70-4b78-85df-c33f243258d8"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "2873e8ec-913c-4473-850b-f52b8168070b",
+        "name": "configR8n3wtAJ",
+        "description": "",
+        "hookIds": [],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2873e8ec-913c-4473-850b-f52b8168070b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-8bb7e3bedc282543b6170c7e29e7fa29-1a389167efce8141-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "b35807a6fdef510d09f3f393fad723a4",
+        "traceparent": "00-54d62efc197faa4cb5b2dd5f6d683319-b501b38bc0142d42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "89d33ffad526c2813660adead601b3ff",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7d4e2b04-2e57-4207-a1f0-f4fb930b92bc",
+        "apim-request-id": "bf4b1169-7153-40bd-bb70-573ff8efca35",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:07 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "59",
-        "x-request-id": "7d4e2b04-2e57-4207-a1f0-f4fb930b92bc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "57",
+        "X-Request-ID": "bf4b1169-7153-40bd-bb70-573ff8efca35"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/da7a6177-b4db-43de-86b5-e2f798b43eac",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/2873e8ec-913c-4473-850b-f52b8168070b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-a5dbc950eec7e94ab65aa264ee9f93b5-4ce5398d1bdee44b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "fd64eef108603e3c5cfa00f0f562d480",
+        "traceparent": "00-27ee1efcef35a649af1a1eff071da52b-7d8360eaaf9b6e4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "79f5f8d2ffafdc901e6c3b2886dc0c51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "bb2dd546-ba20-40ae-bb94-8b674125ca59",
+        "apim-request-id": "c851569f-4c9d-41ac-a0e7-747b581a135a",
         "Content-Length": "123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:15:07 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "bb2dd546-ba20-40ae-bb94-8b674125ca59"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "24",
+        "X-Request-ID": "c851569f-4c9d-41ac-a0e7-747b581a135a"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyAlertingConfiguration. TraceId: 90ff1445-bd50-440a-9a5a-7d48491ca50a"
+        "message": "Not found this AnomalyAlertingConfiguration. TraceId: 47bfa123-bfee-44c9-8099-4d538f1e1ca8"
       }
     }
   ],
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "1994596996"
+    "RandomSeed": "515053879"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstance.json
index 176051a702f4..820d64416b1a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstance.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5e07b9eae2ac3445a362d5d436f3fd6b-d2cb6c92a19efe47-00",
+        "traceparent": "00-1e6a9658a8e8c24680caacee513d721a-c6a52f91da031a44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "71cb7994c6b66edb15b6c05fb26f5f00",
@@ -26,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f35d3a5e-f048-4e6b-a0e3-fc8fd545dfdb",
+        "apim-request-id": "4c492ec4-23d2-459b-8251-1c581f327f7e",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:08 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c1da0726-7bfa-4871-bc2e-fac3a9155168",
+        "Date": "Fri, 05 Feb 2021 17:52:44 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/46b3e81a-d751-492e-9a04-9dd22362258b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "3374",
-        "X-Request-ID": "f35d3a5e-f048-4e6b-a0e3-fc8fd545dfdb"
+        "x-envoy-upstream-service-time": "927",
+        "X-Request-ID": "4c492ec4-23d2-459b-8251-1c581f327f7e"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/46b3e81a-d751-492e-9a04-9dd22362258b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1e6a9658a8e8c24680caacee513d721a-903d9c871f527c4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f83099cd0736aec9c97e424d6b55d724",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "3b2c90d4-2ba8-494d-8d24-93b15d008b39",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:45 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "3b2c90d4-2ba8-494d-8d24-93b15d008b39"
+      },
+      "ResponseBody": {
+        "hookId": "46b3e81a-d751-492e-9a04-9dd22362258b",
+        "hookName": "hookXsKZvjKB",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -45,20 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a5ecb2a20d73aa42abb78a36c32f7d57-dcf6c9d51a83b64a-00",
+        "traceparent": "00-be7f490a64a16d49a2d6152cb18b272f-58d503fe20c72b44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4d427ec9556b24d783eccd93a0a70fda",
+        "x-ms-client-request-id": "dbe4b46228cf782afa4579da951b668d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configDti0qANK",
+        "name": "configb28BWxSJ",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "c1da0726-7bfa-4871-bc2e-fac3a9155168"
+          "46b3e81a-d751-492e-9a04-9dd22362258b"
         ],
         "metricAlertingConfigurations": [
           {
@@ -90,51 +136,51 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7ae30875-fb93-4550-bdb5-59252e1be162",
+        "apim-request-id": "adee8909-d279-479e-a709-f33374589908",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1e4a904f-99c0-4d3b-96bf-791244957af1",
+        "Date": "Fri, 05 Feb 2021 17:52:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "X-Request-ID": "7ae30875-fb93-4550-bdb5-59252e1be162"
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "adee8909-d279-479e-a709-f33374589908"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1e4a904f-99c0-4d3b-96bf-791244957af1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e3b568f922e73d489d9685e9ed266200-661bfc81ac67b443-00",
+        "traceparent": "00-be7f490a64a16d49a2d6152cb18b272f-2f28020913825c49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dbe4b46228cf782afa4579da951b668d",
+        "x-ms-client-request-id": "38a71db08d84c003df9cdcc5a1cc6025",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "836bfb8c-ca48-40f1-8d75-83a931666883",
+        "apim-request-id": "36631891-d98a-4d5f-a961-c71033a6f26c",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "X-Request-ID": "836bfb8c-ca48-40f1-8d75-83a931666883"
+        "x-envoy-upstream-service-time": "99",
+        "X-Request-ID": "36631891-d98a-4d5f-a961-c71033a6f26c"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "1e4a904f-99c0-4d3b-96bf-791244957af1",
-        "name": "configDti0qANK",
+        "anomalyAlertingConfigurationId": "d10cfa64-1e30-4580-9dbe-9f68356764cc",
+        "name": "configb28BWxSJ",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "c1da0726-7bfa-4871-bc2e-fac3a9155168"
+          "46b3e81a-d751-492e-9a04-9dd22362258b"
         ],
         "metricAlertingConfigurations": [
           {
@@ -167,24 +213,89 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1e4a904f-99c0-4d3b-96bf-791244957af1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e09e7fc4d8ea5e4792dfb9e0841a9472-e88ec722bc440647-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8195568aee22a1de53ca5225dbfd8f68",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "8dd1862d-66b4-40e2-824f-eaa0589a6c7f",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:45 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "8dd1862d-66b4-40e2-824f-eaa0589a6c7f"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "d10cfa64-1e30-4580-9dbe-9f68356764cc",
+        "name": "configb28BWxSJ",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "46b3e81a-d751-492e-9a04-9dd22362258b"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "709",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a737322f4ffe4840b9de11cd2098747c-6e385665c51ece4a-00",
+        "traceparent": "00-f4e9b743e4cb1140963ab99c247989bb-7df9133c88e8c14d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "38a71db08d84c003df9cdcc5a1cc6025",
+        "x-ms-client-request-id": "83e24086d600d556b123fb334c65d72e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configDti0qANK",
+        "name": "configb28BWxSJ",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -223,46 +334,46 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "63e84189-8e78-4bdd-95f7-b8f9f3c7cfca",
+        "apim-request-id": "9f9fdc8e-a2ba-4e27-9100-5dba452023da",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "121",
-        "X-Request-ID": "63e84189-8e78-4bdd-95f7-b8f9f3c7cfca"
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "9f9fdc8e-a2ba-4e27-9100-5dba452023da"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1e4a904f-99c0-4d3b-96bf-791244957af1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b671f4b42106564eb2a2c8e936467d80-d1c2724a7d514a4f-00",
+        "traceparent": "00-08f40d5b9caee648aff3bda06fd9aca5-8176153f4cb24043-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8195568aee22a1de53ca5225dbfd8f68",
+        "x-ms-client-request-id": "3e4f54e4e485c26a3e06e5b93bdde4e2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b10cbcba-6142-4e5a-8934-6e25103b66de",
+        "apim-request-id": "877ceee4-3aa4-4389-8d02-db7a2ebf73b3",
         "Content-Length": "785",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "86",
-        "X-Request-ID": "b10cbcba-6142-4e5a-8934-6e25103b66de"
+        "x-envoy-upstream-service-time": "97",
+        "X-Request-ID": "877ceee4-3aa4-4389-8d02-db7a2ebf73b3"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "1e4a904f-99c0-4d3b-96bf-791244957af1",
-        "name": "configDti0qANK",
+        "anomalyAlertingConfigurationId": "d10cfa64-1e30-4580-9dbe-9f68356764cc",
+        "name": "configb28BWxSJ",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -301,58 +412,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1e4a904f-99c0-4d3b-96bf-791244957af1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d10cfa64-1e30-4580-9dbe-9f68356764cc",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6c0fc65890b1a24d8c50e964cf40ac09-12944735bcd0fa42-00",
+        "traceparent": "00-4528d68733d2dc4cab049a0b619c74f8-22c9a49d7961044b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "83e24086d600d556b123fb334c65d72e",
+        "x-ms-client-request-id": "603e740ddde9b32400c0d0fef2ab55ed",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5ab61c42-ca25-4027-a010-1594e80e31e5",
+        "apim-request-id": "5f08544d-1752-446b-8662-84d405d06b85",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "112",
-        "X-Request-ID": "5ab61c42-ca25-4027-a010-1594e80e31e5"
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "5f08544d-1752-446b-8662-84d405d06b85"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c1da0726-7bfa-4871-bc2e-fac3a9155168",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/46b3e81a-d751-492e-9a04-9dd22362258b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-db89a67537ce7b4b987de4e4f090b0c9-d28b1785c712e346-00",
+        "traceparent": "00-4f77043028340140851f935ac2faef41-5c1bd93a0f14034f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3e4f54e4e485c26a3e06e5b93bdde4e2",
+        "x-ms-client-request-id": "874124f250ada1e2d62044faf09c99d3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c716f9d2-4de8-4d9d-95f6-ca6ccaf8bff9",
+        "apim-request-id": "cfa0f2c3-575a-4019-a9b9-d3d165c9d560",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "X-Request-ID": "c716f9d2-4de8-4d9d-95f6-ca6ccaf8bff9"
+        "x-envoy-upstream-service-time": "197",
+        "X-Request-ID": "cfa0f2c3-575a-4019-a9b9-d3d165c9d560"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstanceAsync.json
index 5b4f183ce760..ce66ac813e54 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndGetInstanceAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bbc8382037325f4e93f78a20fd40054c-754b4cba33562043-00",
+        "traceparent": "00-d7d8911877c93040bf1b271d3bd51522-e6f800fbd32ad240-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1c8a0c386da02e79c403cc2b5065d1a8",
@@ -26,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "25a92f35-c5ec-49db-bc69-379ec16d7b27",
+        "apim-request-id": "d404f035-a4f3-4ef0-8780-2b9898f7d70a",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/894de0a3-56db-44ab-af03-ea3223fa27eb",
+        "Date": "Fri, 05 Feb 2021 17:53:06 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5640f2ea-9f59-4d2b-867d-f575d20dbbc1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "904",
-        "X-Request-ID": "25a92f35-c5ec-49db-bc69-379ec16d7b27"
+        "x-envoy-upstream-service-time": "799",
+        "X-Request-ID": "d404f035-a4f3-4ef0-8780-2b9898f7d70a"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5640f2ea-9f59-4d2b-867d-f575d20dbbc1",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d7d8911877c93040bf1b271d3bd51522-0c3cf76b7372e846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "46c0b5d63b98f772c156eb529877c8be",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ab440fd5-c3eb-48ec-9101-d72ba1eaee5d",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:06 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "ab440fd5-c3eb-48ec-9101-d72ba1eaee5d"
+      },
+      "ResponseBody": {
+        "hookId": "5640f2ea-9f59-4d2b-867d-f575d20dbbc1",
+        "hookName": "hookw4cgJZAG",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -45,20 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-37e5a9392cc13e409733739669aa0618-cf9665c85de0c241-00",
+        "traceparent": "00-7b39244ed73fed4d835db6170f5920a4-30c2c8375a9a4b45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "52eb56c17798bec810c3f7f019df1d53",
+        "x-ms-client-request-id": "0fd4e100f899b70bbd58eb388638fffc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configsvjeElq2",
+        "name": "configfKQJczgV",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "894de0a3-56db-44ab-af03-ea3223fa27eb"
+          "5640f2ea-9f59-4d2b-867d-f575d20dbbc1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -90,51 +136,51 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "fc850474-ca89-4222-933a-b505ffd02d17",
+        "apim-request-id": "6f2ff1db-e481-4344-9c21-f1cb078127d9",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
+        "Date": "Fri, 05 Feb 2021 17:53:06 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "fc850474-ca89-4222-933a-b505ffd02d17"
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "6f2ff1db-e481-4344-9c21-f1cb078127d9"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1bb20132e382784a8738582eabc178b4-9af2e9b921b4934c-00",
+        "traceparent": "00-7b39244ed73fed4d835db6170f5920a4-943c6deec7ef3040-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0fd4e100f899b70bbd58eb388638fffc",
+        "x-ms-client-request-id": "495a929927814c963a0d1b8d6ee08ff6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "80071005-c7f5-4512-9a96-3cef76c9e5c8",
+        "apim-request-id": "132787a1-0487-4812-abad-30af8e7ac6a6",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "X-Request-ID": "80071005-c7f5-4512-9a96-3cef76c9e5c8"
+        "x-envoy-upstream-service-time": "100",
+        "X-Request-ID": "132787a1-0487-4812-abad-30af8e7ac6a6"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
-        "name": "configsvjeElq2",
+        "anomalyAlertingConfigurationId": "814fe014-b1d6-4b11-b378-91afded08741",
+        "name": "configfKQJczgV",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "894de0a3-56db-44ab-af03-ea3223fa27eb"
+          "5640f2ea-9f59-4d2b-867d-f575d20dbbc1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -167,24 +213,89 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b4ea98ba3dd51a469374c8941aac21f3-871098dda8c7e74a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b7456d986367c85e4b3394408b9038d7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "dd9f8810-32cc-4b8f-8d40-4e0f0abc8acd",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "105",
+        "X-Request-ID": "dd9f8810-32cc-4b8f-8d40-4e0f0abc8acd"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "814fe014-b1d6-4b11-b378-91afded08741",
+        "name": "configfKQJczgV",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "5640f2ea-9f59-4d2b-867d-f575d20dbbc1"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "709",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-56a7257474e7cc4491fbf54c709b5f99-8875fb2cd3440444-00",
+        "traceparent": "00-346cf0c29b058940b619fa5e6e9d03b5-95379cd23f7b764d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "495a929927814c963a0d1b8d6ee08ff6",
+        "x-ms-client-request-id": "8656fac4d485d9d14b87d48cdd7d49dc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configsvjeElq2",
+        "name": "configfKQJczgV",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -223,46 +334,46 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b98edf0a-deb4-4e05-b6f7-288184243890",
+        "apim-request-id": "3afbd478-5d8b-4443-8b58-9f155cbc5cfe",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "X-Request-ID": "b98edf0a-deb4-4e05-b6f7-288184243890"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "3afbd478-5d8b-4443-8b58-9f155cbc5cfe"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d6cebe82190b034497d6483782b2fdf3-cdf15b5ffcf0bb49-00",
+        "traceparent": "00-b72df48a0d686f48ba054b26477a2f8b-cdbd508345277848-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b7456d986367c85e4b3394408b9038d7",
+        "x-ms-client-request-id": "19a0f4c948f336943491fd4d9355c0aa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9f73b7d9-2495-48f3-bb93-9e1fbaa8f814",
+        "apim-request-id": "fc5420b5-6598-4f82-b837-be1e48e7323f",
         "Content-Length": "785",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "98",
-        "X-Request-ID": "9f73b7d9-2495-48f3-bb93-9e1fbaa8f814"
+        "x-envoy-upstream-service-time": "97",
+        "X-Request-ID": "fc5420b5-6598-4f82-b837-be1e48e7323f"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
-        "name": "configsvjeElq2",
+        "anomalyAlertingConfigurationId": "814fe014-b1d6-4b11-b378-91afded08741",
+        "name": "configfKQJczgV",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -301,58 +412,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ba3a1685-ef31-40bd-a99f-f7ba435d1c38",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/814fe014-b1d6-4b11-b378-91afded08741",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0d14da856c9a1941bd4f6f40edca1fd6-9d85a901d8913c49-00",
+        "traceparent": "00-4aa50382baa094408020560b645a474c-4c2f6a1ff1840241-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8656fac4d485d9d14b87d48cdd7d49dc",
+        "x-ms-client-request-id": "73c943d5088ac4719b6c6bdf8fd2ebcd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e094860a-5ce3-4d75-8e3f-834f13ade23d",
+        "apim-request-id": "9d6fbb73-bf8b-41c2-8239-6fc62c6931ff",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "126",
-        "X-Request-ID": "e094860a-5ce3-4d75-8e3f-834f13ade23d"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "9d6fbb73-bf8b-41c2-8239-6fc62c6931ff"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/894de0a3-56db-44ab-af03-ea3223fa27eb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5640f2ea-9f59-4d2b-867d-f575d20dbbc1",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f75c3c2c503b314a921ee727e431d39c-3eaf6efbac904745-00",
+        "traceparent": "00-64b3702971b29747a296c37f1996cb02-e149a0ea2561914e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201221.1",
-          "(.NET Core 4.6.29321.03; Microsoft Windows 10.0.19042 )"
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "19a0f4c948f336943491fd4d9355c0aa",
+        "x-ms-client-request-id": "9676b7ea1ef07ce4652052f3d68346f5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2049399c-b8fe-4c1e-90c2-1beda656d587",
+        "apim-request-id": "235b0299-e209-4395-ac86-71462a9e6488",
         "Content-Length": "0",
-        "Date": "Tue, 22 Dec 2020 02:28:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "194",
-        "X-Request-ID": "2049399c-b8fe-4c1e-90c2-1beda656d587"
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "235b0299-e209-4395-ac86-71462a9e6488"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstance.json
index ab88c8a87bd8..f28ecc513f25 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-673fb7683fc1ce41ba33f958b3ef224a-2e172e93f4e12b4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4da04d6a1ec6954693ad64e1c91892bd-d149ef5aa8cd3048-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a557d9a5886b8b49d9e6860c22d9efaa",
         "x-ms-return-client-request-id": "true"
@@ -23,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "463d6c94-a83b-4ca2-9d61-c8fed530a086",
+        "apim-request-id": "d832d810-2c38-4a09-9da1-edd32b4c1004",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:48 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/06c6de31-97a5-41c1-96b4-7799fd55825b",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/38bfe9ab-d82b-4364-96b6-b837cbacfbea",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1050",
-        "x-request-id": "463d6c94-a83b-4ca2-9d61-c8fed530a086"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "905",
+        "X-Request-ID": "d832d810-2c38-4a09-9da1-edd32b4c1004"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/38bfe9ab-d82b-4364-96b6-b837cbacfbea",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4da04d6a1ec6954693ad64e1c91892bd-560ac1352dbfde49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "2df41a353b765ef32ef1fb11b10c557f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1ada7942-711a-4e0f-85ac-ff579506f62d",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "1ada7942-711a-4e0f-85ac-ff579506f62d"
+      },
+      "ResponseBody": {
+        "hookId": "38bfe9ab-d82b-4364-96b6-b837cbacfbea",
+        "hookName": "hook1XKyQJGU",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -42,17 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5a92f8a1a89f3640875f9817f29c664c-703438688f93ad41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d797105bccc16b4cba9cf4311650d856-ca0bfb4cfea2cc4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "11fbf12e0cb17f55394128b5481353f6",
+        "x-ms-client-request-id": "511b448603ad05a24938456bfa66886a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configASxi3Wsh",
+        "name": "configOCaR9Htx",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "06c6de31-97a5-41c1-96b4-7799fd55825b"
+          "38bfe9ab-d82b-4364-96b6-b837cbacfbea"
         ],
         "metricAlertingConfigurations": [
           {
@@ -84,29 +136,97 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dbf6cc71-6912-41bf-b88b-f26eae2618c6",
+        "apim-request-id": "c97f1c66-ea44-471e-bcd9-f18584b06380",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/dec16400-6bff-45e3-88bd-9cd3151e0c7a",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3c26f4d8-ee22-442a-9374-7201d9a89300",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1999",
-        "x-request-id": "dbf6cc71-6912-41bf-b88b-f26eae2618c6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "c97f1c66-ea44-471e-bcd9-f18584b06380"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/dec16400-6bff-45e3-88bd-9cd3151e0c7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3c26f4d8-ee22-442a-9374-7201d9a89300",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d797105bccc16b4cba9cf4311650d856-450f536f48461e42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7a77f8e6388ccdda9106d3e0b13a6121",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "028386ca-e1d8-46f8-a881-830fe1587684",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "95",
+        "X-Request-ID": "028386ca-e1d8-46f8-a881-830fe1587684"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "3c26f4d8-ee22-442a-9374-7201d9a89300",
+        "name": "configOCaR9Htx",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "38bfe9ab-d82b-4364-96b6-b837cbacfbea"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3c26f4d8-ee22-442a-9374-7201d9a89300",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "659",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-354b965793db6547bd0d57a67ca3b304-693586a67e3ec14d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7636a4011078684fbed28a13d8e016a7-320ed61e6206c644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "511b448603ad05a24938456bfa66886a",
+        "x-ms-client-request-id": "32a7fdc6a21f2bb04ef6c778c6e985d2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -147,43 +267,46 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e1ec7688-ca6c-44c4-9d77-dd39cca289ad",
+        "apim-request-id": "555fb321-acd4-48c2-861e-8c4beabb4c46",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "315",
-        "x-request-id": "e1ec7688-ca6c-44c4-9d77-dd39cca289ad"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "555fb321-acd4-48c2-861e-8c4beabb4c46"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/dec16400-6bff-45e3-88bd-9cd3151e0c7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3c26f4d8-ee22-442a-9374-7201d9a89300",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5b2a3314b464ba4a953b3e54710cc968-cac7faaac6ab7d41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b2dd73dc5561b845965e57d948b240c0-233e9d1dca2b0b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7a77f8e6388ccdda9106d3e0b13a6121",
+        "x-ms-client-request-id": "50cfbeb8d99b4d696a4ec0a730c1530f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "36bc4638-00c9-4116-b6d2-6f00cd129991",
+        "apim-request-id": "463fb3a9-c8a5-4e3c-9c72-be48a1c2f664",
         "Content-Length": "785",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:14:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "180",
-        "x-request-id": "36bc4638-00c9-4116-b6d2-6f00cd129991"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "93",
+        "X-Request-ID": "463fb3a9-c8a5-4e3c-9c72-be48a1c2f664"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "dec16400-6bff-45e3-88bd-9cd3151e0c7a",
-        "name": "configASxi3Wsh",
+        "anomalyAlertingConfigurationId": "3c26f4d8-ee22-442a-9374-7201d9a89300",
+        "name": "configOCaR9Htx",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -222,52 +345,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/dec16400-6bff-45e3-88bd-9cd3151e0c7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/3c26f4d8-ee22-442a-9374-7201d9a89300",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-61f3e9f8a64b384cb82fb769fb4390f8-d38777bbae455340-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9d726651086562459968cc636ac78205-9c7fde0279757846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "32a7fdc6a21f2bb04ef6c778c6e985d2",
+        "x-ms-client-request-id": "fca523d755bf444a474c2c96706106a7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ace857f0-bb5e-4e24-be8d-49ff9b3f4eb8",
+        "apim-request-id": "0a80d48a-1181-4f43-b0a6-40475ff7030f",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "ace857f0-bb5e-4e24-be8d-49ff9b3f4eb8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "126",
+        "X-Request-ID": "0a80d48a-1181-4f43-b0a6-40475ff7030f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/06c6de31-97a5-41c1-96b4-7799fd55825b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/38bfe9ab-d82b-4364-96b6-b837cbacfbea",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-60e02918b4f7fd4a8a83e2a3b5e8e376-b050079e21f94340-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e7691808e3578d46834e12084b7b5c59-febff554f8decd48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "50cfbeb8d99b4d696a4ec0a730c1530f",
+        "x-ms-client-request-id": "f3280081116bed869459c8d0e109fa8c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "faf92a56-e5dd-4671-b2ad-87f4c64c0995",
+        "apim-request-id": "08fd60c9-28aa-4156-b684-70957c59be85",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:14:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "211",
-        "x-request-id": "faf92a56-e5dd-4671-b2ad-87f4c64c0995"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "08fd60c9-28aa-4156-b684-70957c59be85"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstanceAsync.json
index d642d1dbb147..f32226ef0cea 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithEveryMemberAndNewInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fafc0ac0d5de6c41b50630b6ef213669-fcfdd1480e091940-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5a8bf810e9f90348a48dd71f1a5ca91d-efb23d1950ba734e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "355a31a13708170ff784b197e1af996c",
         "x-ms-return-client-request-id": "true"
@@ -23,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "86ab1347-8324-436c-9e67-67d8ff59b7f6",
+        "apim-request-id": "12a1e385-c65c-4edc-afc4-2d6bd97cb50d",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:02 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/63606e17-d495-47a6-b622-a8d58ea37d4c",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6be35c7b-035d-4ed1-8ea3-69847307046b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1161",
-        "x-request-id": "86ab1347-8324-436c-9e67-67d8ff59b7f6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "802",
+        "X-Request-ID": "12a1e385-c65c-4edc-afc4-2d6bd97cb50d"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6be35c7b-035d-4ed1-8ea3-69847307046b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5a8bf810e9f90348a48dd71f1a5ca91d-15bb171c567f864c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "3ac42aa89f8d242c055cca6dfc56fbdc",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "90565ad3-2034-492b-a26e-f1df81d5cf6c",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "90565ad3-2034-492b-a26e-f1df81d5cf6c"
+      },
+      "ResponseBody": {
+        "hookId": "6be35c7b-035d-4ed1-8ea3-69847307046b",
+        "hookName": "hookOdTqGNa9",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -42,17 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-24053019141a734aaf27075259f8641d-685fba65d8aa5d46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-816eac122ccb7d4b91bd99de8c6d008f-7c18e5ee5abcee4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6dca5c0556fcdcfb26ae9d4b89da29bc",
+        "x-ms-client-request-id": "2ea15abfcfad535727b63fc807e1bf02",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "confignSIYRHjo",
+        "name": "configL2kQR2yP",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "63606e17-d495-47a6-b622-a8d58ea37d4c"
+          "6be35c7b-035d-4ed1-8ea3-69847307046b"
         ],
         "metricAlertingConfigurations": [
           {
@@ -84,29 +136,97 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "888dae21-f861-45f4-9942-c4cceeb1f08d",
+        "apim-request-id": "9eaa28e3-0237-4a5c-8969-b1e79d97da18",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:02 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d9f049d5-b544-41e6-ad7e-363057657d07",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/850f64e4-a3f3-45f5-852c-56ba90cc9458",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "x-request-id": "888dae21-f861-45f4-9942-c4cceeb1f08d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "129",
+        "X-Request-ID": "9eaa28e3-0237-4a5c-8969-b1e79d97da18"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d9f049d5-b544-41e6-ad7e-363057657d07",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/850f64e4-a3f3-45f5-852c-56ba90cc9458",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-816eac122ccb7d4b91bd99de8c6d008f-0fbb587232956445-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ab2f3605a26ca01b89d57132114ee3cd",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0de7911b-b294-42ad-b093-54d2600eea5e",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "0de7911b-b294-42ad-b093-54d2600eea5e"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "850f64e4-a3f3-45f5-852c-56ba90cc9458",
+        "name": "configL2kQR2yP",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "6be35c7b-035d-4ed1-8ea3-69847307046b"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/850f64e4-a3f3-45f5-852c-56ba90cc9458",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "659",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4fef0cde1ef8564da8b0454f6a732a88-1278949bbf92cb48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-358f8a1d57b75145ba78ea8e4a9f4dea-bd7803dfe3d68e43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2ea15abfcfad535727b63fc807e1bf02",
+        "x-ms-client-request-id": "337a0700fefd3677047745451732d445",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -147,43 +267,46 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0a704b17-3019-4280-809d-21491047248b",
+        "apim-request-id": "25d979a2-6367-4a68-af48-48da3bc962dc",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "135",
-        "x-request-id": "0a704b17-3019-4280-809d-21491047248b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "128",
+        "X-Request-ID": "25d979a2-6367-4a68-af48-48da3bc962dc"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d9f049d5-b544-41e6-ad7e-363057657d07",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/850f64e4-a3f3-45f5-852c-56ba90cc9458",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-21b5663e551d9442baae45a37524fbca-24242642e523414d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-faab0e87fa12984796f91e09e981e22a-b5d6cc74287c5d4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ab2f3605a26ca01b89d57132114ee3cd",
+        "x-ms-client-request-id": "52469bef7daa1d4f3e00a4d75d2541d8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a1d93488-29fe-41dc-b825-73069986ef26",
+        "apim-request-id": "a2c11d1f-7feb-41bf-beeb-d18543187fa7",
         "Content-Length": "785",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 04 Feb 2021 21:15:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "86",
-        "x-request-id": "a1d93488-29fe-41dc-b825-73069986ef26"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "81",
+        "X-Request-ID": "a2c11d1f-7feb-41bf-beeb-d18543187fa7"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "d9f049d5-b544-41e6-ad7e-363057657d07",
-        "name": "confignSIYRHjo",
+        "anomalyAlertingConfigurationId": "850f64e4-a3f3-45f5-852c-56ba90cc9458",
+        "name": "configL2kQR2yP",
         "description": "This hook was created to test the .NET client.",
         "crossMetricsOperator": "AND",
         "hookIds": [],
@@ -222,52 +345,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d9f049d5-b544-41e6-ad7e-363057657d07",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/850f64e4-a3f3-45f5-852c-56ba90cc9458",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9f2c77862862734a86a94b7653208dac-8406707340dc3243-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c87b5e88a4cbf445912d7cbe9e1a1396-3aed9f08e56e9d42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "337a0700fefd3677047745451732d445",
+        "x-ms-client-request-id": "ffc871d28c660604bef9a7f45cd68856",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b58a35c8-6900-414b-b979-da477d19ab5a",
+        "apim-request-id": "e1720505-fc81-411b-87ad-b460906e60a8",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "x-request-id": "b58a35c8-6900-414b-b979-da477d19ab5a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "e1720505-fc81-411b-87ad-b460906e60a8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/63606e17-d495-47a6-b622-a8d58ea37d4c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6be35c7b-035d-4ed1-8ea3-69847307046b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3206fac251857c4f9ccd1c94418adfbe-26cd7e3bb197324d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210204.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3e11b01cb01e77479f191f716f322096-ae658597abb19d4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "52469bef7daa1d4f3e00a4d75d2541d8",
+        "x-ms-client-request-id": "76432c0090088222b85cf4fd599fd8df",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b875d9c3-6f6e-4031-b792-90caaa5f61e8",
+        "apim-request-id": "065a398f-cfb2-48f3-affd-099f95d7e907",
         "Content-Length": "0",
-        "Date": "Thu, 04 Feb 2021 21:15:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "189",
-        "x-request-id": "b875d9c3-6f6e-4031-b792-90caaa5f61e8"
+        "X-Request-ID": "065a398f-cfb2-48f3-affd-099f95d7e907"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False).json
index ec20f3777f40..bc42328b254c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c3566a1db7e20741a81abbb7a3d706fd-f5c59cec04b0ad40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-afe1176b41387642b310ca2cb2e78e4e-52d4885956f98d46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0eac34b02a06755ca73d87eef4c377d2",
         "x-ms-return-client-request-id": "true"
@@ -23,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "482e1545-12e0-44f0-8fca-12410050392a",
+        "apim-request-id": "3f3205a1-f680-4744-a2f1-432767eca603",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/fc8c18dd-405b-4489-ac33-b10de6820eb7",
+        "Date": "Fri, 05 Feb 2021 17:52:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5590d944-58fb-488e-93cd-e96819b77b39",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1263",
-        "x-request-id": "482e1545-12e0-44f0-8fca-12410050392a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "711",
+        "X-Request-ID": "3f3205a1-f680-4744-a2f1-432767eca603"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5590d944-58fb-488e-93cd-e96819b77b39",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-afe1176b41387642b310ca2cb2e78e4e-0231ec0ee9e6a241-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "92f6ab81f4abd4e4fd4dfa4fbc5c5053",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6b71948a-f1c7-4ba0-9a43-3ab648cc458b",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "6b71948a-f1c7-4ba0-9a43-3ab648cc458b"
+      },
+      "ResponseBody": {
+        "hookId": "5590d944-58fb-488e-93cd-e96819b77b39",
+        "hookName": "hookLf6AQTOw",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -42,17 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7197ceaff23d6948a9a3addd80ea39f1-3e4410d5b1bef64d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e5c6e89946734d40bbf9e3c39631d886-5676e19aeae5d94c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4ffa4dfd5cbc53506071fb202799671a",
+        "x-ms-client-request-id": "6c028a76d878df88cf3f3ac31bd590bc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configE2anWXtc",
+        "name": "configriK93wQE",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "fc8c18dd-405b-4489-ac33-b10de6820eb7"
+          "5590d944-58fb-488e-93cd-e96819b77b39"
         ],
         "metricAlertingConfigurations": [
           {
@@ -84,48 +136,116 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dc615048-dae3-4526-a923-1f8170ae0ef7",
+        "apim-request-id": "e1982c97-7602-4e37-aa64-03ff9b87b989",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b35b9855-77a7-4050-8cb3-17d46c466c0c",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "dc615048-dae3-4526-a923-1f8170ae0ef7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "e1982c97-7602-4e37-aa64-03ff9b87b989"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b35b9855-77a7-4050-8cb3-17d46c466c0c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e3b811dd3850c6419a4147e13e30e88c-d8fa85b18013e243-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e5c6e89946734d40bbf9e3c39631d886-cf7a0dd93b491040-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6c028a76d878df88cf3f3ac31bd590bc",
+        "x-ms-client-request-id": "b910d84f0d2f4bb8ed338d82c856aae7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a82a66a4-21dd-4ca2-9762-11d52268db51",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "86",
+        "X-Request-ID": "a82a66a4-21dd-4ca2-9762-11d52268db51"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "7d6b4502-a83d-4202-a61f-4285a558d6c0",
+        "name": "configriK93wQE",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "5590d944-58fb-488e-93cd-e96819b77b39"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0e314fd83b8a7a48a16a68788fa30168-89a0d4b728f2ac48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "211cdc4478f1245bc41b807c218c378b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4d382c9d-6be9-4f54-b9cd-f8451c78243e",
+        "apim-request-id": "e3dc7d1f-3da1-417d-bbf3-f0b5ebbb1d49",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "116",
-        "x-request-id": "4d382c9d-6be9-4f54-b9cd-f8451c78243e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "85",
+        "X-Request-ID": "e3dc7d1f-3da1-417d-bbf3-f0b5ebbb1d49"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "b35b9855-77a7-4050-8cb3-17d46c466c0c",
-        "name": "configE2anWXtc",
+        "anomalyAlertingConfigurationId": "7d6b4502-a83d-4202-a61f-4285a558d6c0",
+        "name": "configriK93wQE",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "fc8c18dd-405b-4489-ac33-b10de6820eb7"
+          "5590d944-58fb-488e-93cd-e96819b77b39"
         ],
         "metricAlertingConfigurations": [
           {
@@ -158,25 +278,28 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b35b9855-77a7-4050-8cb3-17d46c466c0c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "690",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1a3e22659c98594aae28ecd2229906b8-5cc3f37cd49d854a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-07603ec01b0ac7439aa15bdb8428ff14-81fce346405c2b40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b910d84f0d2f4bb8ed338d82c856aae7",
+        "x-ms-client-request-id": "4fd13ee1ad8869ead1b77e444a051679",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configE2anWXtc",
+        "name": "configriK93wQE",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "fc8c18dd-405b-4489-ac33-b10de6820eb7"
+          "5590d944-58fb-488e-93cd-e96819b77b39"
         ],
         "metricAlertingConfigurations": [
           {
@@ -209,47 +332,50 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e7b1c1d5-df8c-45f0-a46d-92a1c524654f",
+        "apim-request-id": "26f40e20-52bd-4dec-8468-4d2112c624a1",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "189",
-        "x-request-id": "e7b1c1d5-df8c-45f0-a46d-92a1c524654f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "131",
+        "X-Request-ID": "26f40e20-52bd-4dec-8468-4d2112c624a1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b35b9855-77a7-4050-8cb3-17d46c466c0c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cad0aa11393728468e911ab07f99b392-86ff3567ecb65b49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c5a682a7f625d0409fd851931e2e1d9d-d3108952f1dae945-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "211cdc4478f1245bc41b807c218c378b",
+        "x-ms-client-request-id": "3f7e53956fb9d7ca7cecf4148d3c2961",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "233b9646-9f6d-4906-8db3-bbd0ae5a6634",
+        "apim-request-id": "177d260a-51ed-4a00-97ad-3e76e5457165",
         "Content-Length": "766",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "102",
-        "x-request-id": "233b9646-9f6d-4906-8db3-bbd0ae5a6634"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "83",
+        "X-Request-ID": "177d260a-51ed-4a00-97ad-3e76e5457165"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "b35b9855-77a7-4050-8cb3-17d46c466c0c",
-        "name": "configE2anWXtc",
+        "anomalyAlertingConfigurationId": "7d6b4502-a83d-4202-a61f-4285a558d6c0",
+        "name": "configriK93wQE",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "fc8c18dd-405b-4489-ac33-b10de6820eb7"
+          "5590d944-58fb-488e-93cd-e96819b77b39"
         ],
         "metricAlertingConfigurations": [
           {
@@ -282,52 +408,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b35b9855-77a7-4050-8cb3-17d46c466c0c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/7d6b4502-a83d-4202-a61f-4285a558d6c0",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-912fb1b05471b94e8120183bb4a21d61-338564920ffaab4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-079f370e753d8749b370b6596cf737f0-3fd2a0058b25394d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4fd13ee1ad8869ead1b77e444a051679",
+        "x-ms-client-request-id": "89a102fc5a84965ef2b34f3af917d9bf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e0eb1fd4-7e29-41fb-8403-70e02aacd57c",
+        "apim-request-id": "95b8440e-c154-46dc-bab0-191b2304e54e",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "e0eb1fd4-7e29-41fb-8403-70e02aacd57c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "95b8440e-c154-46dc-bab0-191b2304e54e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/fc8c18dd-405b-4489-ac33-b10de6820eb7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5590d944-58fb-488e-93cd-e96819b77b39",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ae3465f19f33de46a2b4ca7426684530-64f5df07c5d73948-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-838acc50caa39144bc1169d7609e7d31-c194967eec100d48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3f7e53956fb9d7ca7cecf4148d3c2961",
+        "x-ms-client-request-id": "cde60604f70d71d174fad39cb9d5dc94",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6d76981e-2884-4211-b882-cd771518b2b9",
+        "apim-request-id": "841e909f-21e6-4027-a6a5-d94504443789",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "192",
-        "x-request-id": "6d76981e-2884-4211-b882-cd771518b2b9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "841e909f-21e6-4027-a6a5-d94504443789"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False)Async.json
index d8a3ca032673..f6b26afcda94 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9b87a024d2f72247b1269baebf8834c5-3bd2fbd47140e44d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-69cec5b754bcaf4bb3a4000b6b4bbca0-3ffcaba439b28546-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cd4527f2f900ceb648a31ba495547ca8",
         "x-ms-return-client-request-id": "true"
@@ -23,17 +26,63 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5d0c6953-48ca-4ff5-b84c-b7e2ce80c21b",
+        "apim-request-id": "a39a6cac-fcfc-46a8-82f4-85f14c36ddff",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/87b53248-e91c-4db9-81bc-42eef9932a3d",
+        "Date": "Fri, 05 Feb 2021 17:53:14 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6ce1b338-a1fc-4345-ad95-2b6a19df44c1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "959",
-        "x-request-id": "5d0c6953-48ca-4ff5-b84c-b7e2ce80c21b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "848",
+        "X-Request-ID": "a39a6cac-fcfc-46a8-82f4-85f14c36ddff"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6ce1b338-a1fc-4345-ad95-2b6a19df44c1",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-69cec5b754bcaf4bb3a4000b6b4bbca0-b7b9c2d5fea8c943-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6258edc09dc37747a155e47c972c2332",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "81f370f8-3df4-4c59-993c-2c6d0c259f5e",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:14 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "81f370f8-3df4-4c59-993c-2c6d0c259f5e"
+      },
+      "ResponseBody": {
+        "hookId": "6ce1b338-a1fc-4345-ad95-2b6a19df44c1",
+        "hookName": "hookEmq5K89I",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -42,17 +91,20 @@
         "Content-Length": "648",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f02801db1d76db43b2f152b85141b615-72b06f8cfa82774e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ef3453b226c1984f8f50ddbf5980379c-a936b1fdf6bcfd42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7ce455a12c97322346b4eb938e946f1a",
+        "x-ms-client-request-id": "2ccfdcd193e5e24edc945874c974d154",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "config3H7BxYs7",
+        "name": "configTFFIyV0C",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "87b53248-e91c-4db9-81bc-42eef9932a3d"
+          "6ce1b338-a1fc-4345-ad95-2b6a19df44c1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -84,48 +136,116 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "59510125-bd54-4693-b4cc-ab97f441e8ae",
+        "apim-request-id": "582e64d3-d60a-4df8-8c43-c9bf912b05a2",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b90698e9-6340-49cd-9a7d-d938d5d240bf",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "184",
-        "x-request-id": "59510125-bd54-4693-b4cc-ab97f441e8ae"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "582e64d3-d60a-4df8-8c43-c9bf912b05a2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b90698e9-6340-49cd-9a7d-d938d5d240bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fcd3914b6b346346aee2a2465b78d3ae-9744e95422659348-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ef3453b226c1984f8f50ddbf5980379c-07b999fb152e2949-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2ccfdcd193e5e24edc945874c974d154",
+        "x-ms-client-request-id": "aa2bcddf3a151b377fe95ee168e9192c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "15a80f02-9db5-4490-930c-3145e0536c79",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "107",
+        "X-Request-ID": "15a80f02-9db5-4490-930c-3145e0536c79"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "d599faa5-fccb-4e45-8ff0-d1982621c742",
+        "name": "configTFFIyV0C",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "6ce1b338-a1fc-4345-ad95-2b6a19df44c1"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-dd8c69f2227eb84abef3835f8dcc0123-68a783f7e12bd943-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e7903e7d1bcd0d9207029f02d4af69d1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5cc84231-8e99-4342-b076-5bea77f9f24d",
+        "apim-request-id": "73abdc32-8b9b-4b6f-8887-f1732a0814e6",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "87",
-        "x-request-id": "5cc84231-8e99-4342-b076-5bea77f9f24d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "112",
+        "X-Request-ID": "73abdc32-8b9b-4b6f-8887-f1732a0814e6"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "b90698e9-6340-49cd-9a7d-d938d5d240bf",
-        "name": "config3H7BxYs7",
+        "anomalyAlertingConfigurationId": "d599faa5-fccb-4e45-8ff0-d1982621c742",
+        "name": "configTFFIyV0C",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "87b53248-e91c-4db9-81bc-42eef9932a3d"
+          "6ce1b338-a1fc-4345-ad95-2b6a19df44c1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -158,25 +278,28 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b90698e9-6340-49cd-9a7d-d938d5d240bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "690",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-167dab564bad35428d0d83775debb907-8131219d41834f4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-046a7c287787784e9a08b5db3f75eeb0-d407ad972832cd48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "aa2bcddf3a151b377fe95ee168e9192c",
+        "x-ms-client-request-id": "c1b396e2c5689604a4b3acfb356d79f2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "config3H7BxYs7",
+        "name": "configTFFIyV0C",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "87b53248-e91c-4db9-81bc-42eef9932a3d"
+          "6ce1b338-a1fc-4345-ad95-2b6a19df44c1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -209,47 +332,50 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "01aa2b6b-2391-4bff-bad5-5400c6a754b0",
+        "apim-request-id": "bec7cca9-2e6d-4578-a6a4-76ab8529036b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "01aa2b6b-2391-4bff-bad5-5400c6a754b0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "bec7cca9-2e6d-4578-a6a4-76ab8529036b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b90698e9-6340-49cd-9a7d-d938d5d240bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-19b3abcf6fa66f4495eb8d0d6ba65164-829e31c666df274f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-378cf974a493fa46bdceb1df2df833e3-0d9c34acefebab49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e7903e7d1bcd0d9207029f02d4af69d1",
+        "x-ms-client-request-id": "8af62b7be9e4c4873b1ea3139b3447d0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2bd7c725-ae3c-4839-a119-4fd67a1f29dd",
+        "apim-request-id": "24423a8b-4331-4e79-851c-0b78ad6f40ec",
         "Content-Length": "766",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "124",
-        "x-request-id": "2bd7c725-ae3c-4839-a119-4fd67a1f29dd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "109",
+        "X-Request-ID": "24423a8b-4331-4e79-851c-0b78ad6f40ec"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "b90698e9-6340-49cd-9a7d-d938d5d240bf",
-        "name": "config3H7BxYs7",
+        "anomalyAlertingConfigurationId": "d599faa5-fccb-4e45-8ff0-d1982621c742",
+        "name": "configTFFIyV0C",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "87b53248-e91c-4db9-81bc-42eef9932a3d"
+          "6ce1b338-a1fc-4345-ad95-2b6a19df44c1"
         ],
         "metricAlertingConfigurations": [
           {
@@ -282,52 +408,58 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/b90698e9-6340-49cd-9a7d-d938d5d240bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/d599faa5-fccb-4e45-8ff0-d1982621c742",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bddac97b3d6c7a4fb5ed57d580b831d8-cf04293b6891f944-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2221eb2b571c0943ad5a70a91bf1ba09-30b9cb2a81353b47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c1b396e2c5689604a4b3acfb356d79f2",
+        "x-ms-client-request-id": "d2fe8c805836b8c43afa43196e96d899",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8d0904d6-1319-46e4-b825-8fe1a4bc479e",
+        "apim-request-id": "b5ac4576-839e-40d7-be46-6ad61fd7124c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "x-request-id": "8d0904d6-1319-46e4-b825-8fe1a4bc479e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "b5ac4576-839e-40d7-be46-6ad61fd7124c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/87b53248-e91c-4db9-81bc-42eef9932a3d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6ce1b338-a1fc-4345-ad95-2b6a19df44c1",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b240e743034c2644907115849f16c48d-70a2c36463fa374f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6764c83a304e71418c476904709e86ee-027aaecb27f1f947-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8af62b7be9e4c4873b1ea3139b3447d0",
+        "x-ms-client-request-id": "a887ac89dfb8f9ed0fef854a21f1fb6f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1694aba9-ce12-4eb5-841b-0379c8e8bc73",
+        "apim-request-id": "5fb7a36e-f6cd-4f24-b829-4eb8ecf139a0",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "236",
-        "x-request-id": "1694aba9-ce12-4eb5-841b-0379c8e8bc73"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "182",
+        "X-Request-ID": "5fb7a36e-f6cd-4f24-b829-4eb8ecf139a0"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True).json
index b0c00720cc10..d8952402744d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "98",
         "Content-Type": "application/json",
-        "traceparent": "00-4dd3a87538390d4fa93512b1623b817d-c42a565fe1772d45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ea9120dd754eed4f9b506a007d56c8db-6fbf498bf5a3504d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "3961049ce589e693e0c78480b2e3f8fd",
         "x-ms-return-client-request-id": "true"
       },
@@ -22,17 +25,62 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f0adeb90-deff-4eaf-9787-7be24b7c8e1a",
+        "apim-request-id": "2d44217e-4d25-4f78-9aec-0e35044f530e",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ff3d00d3-7038-446b-b39d-f05eb1587d31",
+        "Date": "Fri, 05 Feb 2021 17:52:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7af9a1c7-71f8-4c53-b94f-aa91502da12c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "952",
-        "x-request-id": "f0adeb90-deff-4eaf-9787-7be24b7c8e1a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1358",
+        "X-Request-ID": "2d44217e-4d25-4f78-9aec-0e35044f530e"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7af9a1c7-71f8-4c53-b94f-aa91502da12c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-ea9120dd754eed4f9b506a007d56c8db-73b7fc738a8a284c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "bb24e6b1da50e3415a74ab92e457485b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f46c7056-1cb3-4819-bfba-6d143d1ba057",
+        "Content-Length": "317",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "82",
+        "X-Request-ID": "f46c7056-1cb3-4819-bfba-6d143d1ba057"
+      },
+      "ResponseBody": {
+        "hookId": "7af9a1c7-71f8-4c53-b94f-aa91502da12c",
+        "hookName": "hookNOAhi9yH",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -41,16 +89,19 @@
         "Authorization": "Sanitized",
         "Content-Length": "648",
         "Content-Type": "application/json",
-        "traceparent": "00-c9bd6fbaf06da84d818314fc3ee0bb47-8c2e0190ba28b341-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "92ab745a57e45b487039d0e9be4d9218",
+        "traceparent": "00-abee9aa2e1fb4c42aecdea6e1e774038-547f0d1e50c4894a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "7a7b2464a9c47851cfb384ee0bdfc7c1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configrfjAAr3b",
+        "name": "configW9S66YaR",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "ff3d00d3-7038-446b-b39d-f05eb1587d31"
+          "7af9a1c7-71f8-4c53-b94f-aa91502da12c"
         ],
         "metricAlertingConfigurations": [
           {
@@ -82,47 +133,114 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e2d42817-e1c0-441e-af8d-56fb85bf9a46",
+        "apim-request-id": "be6eff27-50e4-40ef-b9a9-cd92c50e741e",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1182562b-b950-4948-b44e-909c6778f016",
+        "Date": "Fri, 05 Feb 2021 17:52:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "79",
-        "x-request-id": "e2d42817-e1c0-441e-af8d-56fb85bf9a46"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "80",
+        "X-Request-ID": "be6eff27-50e4-40ef-b9a9-cd92c50e741e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1182562b-b950-4948-b44e-909c6778f016",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-6aee7e3cc9837f4a858152b7bb1cb7b5-55267e0cbb16a848-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "7a7b2464a9c47851cfb384ee0bdfc7c1",
+        "traceparent": "00-abee9aa2e1fb4c42aecdea6e1e774038-d19b3c718b607e41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "14de7dc2003a89017e290f78130e3e64",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d1c9e341-b1e2-426b-a500-48602138d779",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:52:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "38",
+        "X-Request-ID": "d1c9e341-b1e2-426b-a500-48602138d779"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "023d9881-1ca6-4e16-9722-202d31f2a89c",
+        "name": "configW9S66YaR",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "7af9a1c7-71f8-4c53-b94f-aa91502da12c"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-ff087cb932a7b54e927de33eef25521c-7f6bad7bccd35540-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "2b560c54c75fb11f2332c231d25a4f90",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "dc96530a-a8b9-4d48-8067-e13ab4168e53",
+        "apim-request-id": "deeab677-240e-4a17-a43b-4ce74cc11dae",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "37",
-        "x-request-id": "dc96530a-a8b9-4d48-8067-e13ab4168e53"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "33",
+        "X-Request-ID": "deeab677-240e-4a17-a43b-4ce74cc11dae"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "1182562b-b950-4948-b44e-909c6778f016",
-        "name": "configrfjAAr3b",
+        "anomalyAlertingConfigurationId": "023d9881-1ca6-4e16-9722-202d31f2a89c",
+        "name": "configW9S66YaR",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "ff3d00d3-7038-446b-b39d-f05eb1587d31"
+          "7af9a1c7-71f8-4c53-b94f-aa91502da12c"
         ],
         "metricAlertingConfigurations": [
           {
@@ -155,24 +273,27 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1182562b-b950-4948-b44e-909c6778f016",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "690",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-ca0ce5742c2f6c4c95b93bed0f4febca-d3a3b2b9a8e6c94a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "14de7dc2003a89017e290f78130e3e64",
+        "traceparent": "00-d2c9b0209f0eab4b8172f981e1e9c619-2702d20c1077804e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "41270e727d6e63de22f1fb9a99d865c0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configrfjAAr3b",
+        "name": "configW9S66YaR",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "ff3d00d3-7038-446b-b39d-f05eb1587d31"
+          "7af9a1c7-71f8-4c53-b94f-aa91502da12c"
         ],
         "metricAlertingConfigurations": [
           {
@@ -205,46 +326,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "de627157-fbc1-407a-801c-52ea99eeaac7",
+        "apim-request-id": "2126279b-bc2a-4a53-afce-de9bde2bc72d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "100",
-        "x-request-id": "de627157-fbc1-407a-801c-52ea99eeaac7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "87",
+        "X-Request-ID": "2126279b-bc2a-4a53-afce-de9bde2bc72d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1182562b-b950-4948-b44e-909c6778f016",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-0be3ffb17f733747b4bc5c0bcb2385b2-d11ae5c2ab454a4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "2b560c54c75fb11f2332c231d25a4f90",
+        "traceparent": "00-d52452731c12e947aa21cd0b0a5cd79c-582de2a737749643-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "ff9920749b89fb625e2df0073ed0b724",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "860ca4cd-5cdb-4304-92a3-728979d36da5",
+        "apim-request-id": "eab03d55-a9c1-434e-b26e-a0e20530f990",
         "Content-Length": "766",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "43",
-        "x-request-id": "860ca4cd-5cdb-4304-92a3-728979d36da5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "42",
+        "X-Request-ID": "eab03d55-a9c1-434e-b26e-a0e20530f990"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "1182562b-b950-4948-b44e-909c6778f016",
-        "name": "configrfjAAr3b",
+        "anomalyAlertingConfigurationId": "023d9881-1ca6-4e16-9722-202d31f2a89c",
+        "name": "configW9S66YaR",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "ff3d00d3-7038-446b-b39d-f05eb1587d31"
+          "7af9a1c7-71f8-4c53-b94f-aa91502da12c"
         ],
         "metricAlertingConfigurations": [
           {
@@ -277,50 +401,56 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/1182562b-b950-4948-b44e-909c6778f016",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/023d9881-1ca6-4e16-9722-202d31f2a89c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-a3bf19b179369342937e93b341a8d82e-bf0ab4ad490a5741-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "41270e727d6e63de22f1fb9a99d865c0",
+        "traceparent": "00-914dab86e81d214bb07ac457905a4a3a-c01e20ff8e60ed40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "04057fd9fde7d6f52ef3096dcc84174b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "42474adc-c3cf-415d-bcde-4cddf7f54297",
+        "apim-request-id": "4e1b2f76-ab56-4075-8665-475b3287dbb9",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "75",
-        "x-request-id": "42474adc-c3cf-415d-bcde-4cddf7f54297"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "65",
+        "X-Request-ID": "4e1b2f76-ab56-4075-8665-475b3287dbb9"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ff3d00d3-7038-446b-b39d-f05eb1587d31",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7af9a1c7-71f8-4c53-b94f-aa91502da12c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-7a80bb6ba2a71a4a8a2d01a3b0e02162-b8093de58657374e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "ff9920749b89fb625e2df0073ed0b724",
+        "traceparent": "00-741b3ddc43a8eb4693cadac18ba3f448-25cef2ab083bd046-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "b1bd01cd50c0d707ac2ce3408cd62551",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ca796422-889e-492b-94ab-913d7e2865e2",
+        "apim-request-id": "e71b44d3-b8ae-4a82-bc24-0420f726ce15",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:52:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "x-request-id": "ca796422-889e-492b-94ab-913d7e2865e2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "97",
+        "X-Request-ID": "e71b44d3-b8ae-4a82-bc24-0420f726ce15"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True)Async.json
index e46d0d4cc46a..61c5cba4cc11 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyAlertConfigurationLiveTests/UpdateAlertConfigurationWithMinimumSetupAndGetInstance(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "98",
         "Content-Type": "application/json",
-        "traceparent": "00-cc225638bf50ea4996736be556eacceb-a2abf2beb7994f47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-62d309d84a8c2d4c9b5c0b08b738af35-a911f7593601904b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "937228d49065cb80c284eaaaa58ee754",
         "x-ms-return-client-request-id": "true"
       },
@@ -22,17 +25,62 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c8defeaa-2bfe-4fe4-b642-e6081c91add7",
+        "apim-request-id": "91a7c4d6-6f69-464f-85ba-e2b45d818350",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/91152540-4485-4680-841a-41ca1ccfa5b2",
+        "Date": "Fri, 05 Feb 2021 17:53:12 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c0f44f98-6854-47e1-a8a3-2826a53b8eba",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1064",
-        "x-request-id": "c8defeaa-2bfe-4fe4-b642-e6081c91add7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1227",
+        "X-Request-ID": "91a7c4d6-6f69-464f-85ba-e2b45d818350"
       },
       "ResponseBody": []
     },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c0f44f98-6854-47e1-a8a3-2826a53b8eba",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-62d309d84a8c2d4c9b5c0b08b738af35-421ce63cd02fe54d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "77924656743a628448a1112d65ad933a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "8d95a441-2b64-4631-9e32-e9e3483eaca4",
+        "Content-Length": "317",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "84",
+        "X-Request-ID": "8d95a441-2b64-4631-9e32-e9e3483eaca4"
+      },
+      "ResponseBody": {
+        "hookId": "c0f44f98-6854-47e1-a8a3-2826a53b8eba",
+        "hookName": "hookWVuKaZlQ",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
     {
       "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations",
       "RequestMethod": "POST",
@@ -41,16 +89,19 @@
         "Authorization": "Sanitized",
         "Content-Length": "648",
         "Content-Type": "application/json",
-        "traceparent": "00-1ba7df713e6c2d4fb2777b5a24c9fcef-03ee7d62b81d5e47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "2d11a148ad653a937cb417cca872d9f1",
+        "traceparent": "00-c28c070ef7d63845972a0116820d2519-c7aa58d707d63b4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "d755fd5047c6f5cc0926f940f821615f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configzhU1w3f5",
+        "name": "configoHufqpvt",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "91152540-4485-4680-841a-41ca1ccfa5b2"
+          "c0f44f98-6854-47e1-a8a3-2826a53b8eba"
         ],
         "metricAlertingConfigurations": [
           {
@@ -82,47 +133,114 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d5d5a032-99fc-4be3-9b2e-14eb0c70da12",
+        "apim-request-id": "529c0236-b789-4a8d-a1db-0a2f734bf7d1",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "96",
-        "x-request-id": "d5d5a032-99fc-4be3-9b2e-14eb0c70da12"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "78",
+        "X-Request-ID": "529c0236-b789-4a8d-a1db-0a2f734bf7d1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-203e20e159bd754f936d473cdf0dd46c-0168b8364a44374b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "d755fd5047c6f5cc0926f940f821615f",
+        "traceparent": "00-c28c070ef7d63845972a0116820d2519-14ada25383005b4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "c34a10a4527f1565f0af2df1771babe4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "395fa879-defc-4f45-a90a-c69ec5f5a4a9",
+        "Content-Length": "767",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "44",
+        "X-Request-ID": "395fa879-defc-4f45-a90a-c69ec5f5a4a9"
+      },
+      "ResponseBody": {
+        "anomalyAlertingConfigurationId": "ab5b44c4-cca5-41c2-b7ba-6cf744660836",
+        "name": "configoHufqpvt",
+        "description": "",
+        "crossMetricsOperator": "XOR",
+        "hookIds": [
+          "c0f44f98-6854-47e1-a8a3-2826a53b8eba"
+        ],
+        "metricAlertingConfigurations": [
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": false,
+            "severityFilter": {
+              "minAlertSeverity": "Low",
+              "maxAlertSeverity": "Medium"
+            },
+            "snoozeFilter": {
+              "autoSnooze": 12,
+              "snoozeScope": "Series",
+              "onlyForSuccessive": true
+            },
+            "valueFilter": {
+              "lower": 10.0,
+              "upper": 20.0,
+              "direction": "Both",
+              "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+              "triggerForMissing": true
+            }
+          },
+          {
+            "anomalyDetectionConfigurationId": "fb5a6ed6-2b9e-4b72-8b0c-0046ead1c15c",
+            "anomalyScopeType": "All",
+            "negationOperation": true
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-953375b583b9964d9eb5e084c2d8a8bf-ddca69178c069b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "3d27a06cac1f019cd51b243fb453425a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "47c5847d-dd0c-464e-a6be-38d1e188bd3b",
+        "apim-request-id": "fe24ca11-dbdf-4797-af39-dc4a46d864ce",
         "Content-Length": "767",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "33",
-        "x-request-id": "47c5847d-dd0c-464e-a6be-38d1e188bd3b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "35",
+        "X-Request-ID": "fe24ca11-dbdf-4797-af39-dc4a46d864ce"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
-        "name": "configzhU1w3f5",
+        "anomalyAlertingConfigurationId": "ab5b44c4-cca5-41c2-b7ba-6cf744660836",
+        "name": "configoHufqpvt",
         "description": "",
         "crossMetricsOperator": "XOR",
         "hookIds": [
-          "91152540-4485-4680-841a-41ca1ccfa5b2"
+          "c0f44f98-6854-47e1-a8a3-2826a53b8eba"
         ],
         "metricAlertingConfigurations": [
           {
@@ -155,24 +273,27 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "690",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-ac48e49b006e97488462dbef1c04c3b3-9a07069ede5b7d42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "c34a10a4527f1565f0af2df1771babe4",
+        "traceparent": "00-09ce9234f9fc5b498cf3e7624e59b828-d0b906c61f5c0c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "9828b8521627fd729740e71619da7eee",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configzhU1w3f5",
+        "name": "configoHufqpvt",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "91152540-4485-4680-841a-41ca1ccfa5b2"
+          "c0f44f98-6854-47e1-a8a3-2826a53b8eba"
         ],
         "metricAlertingConfigurations": [
           {
@@ -205,46 +326,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ac5a6c18-b064-48b8-b1ac-0fdefd419944",
+        "apim-request-id": "d353479d-913d-4b38-ab88-983a2813c500",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "79",
-        "x-request-id": "ac5a6c18-b064-48b8-b1ac-0fdefd419944"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "103",
+        "X-Request-ID": "d353479d-913d-4b38-ab88-983a2813c500"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-47883f86f55c6d47bdc9295dd21caba5-47005b2b1fcad943-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "3d27a06cac1f019cd51b243fb453425a",
+        "traceparent": "00-1df6a0811d7f5e47b6a5a230c0e15292-0e47503164c43448-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "57d4157a23f9f73f7349ee632e26619d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8f082e4f-9784-4717-a35c-f7628ec6aed9",
+        "apim-request-id": "0ecde92c-98f3-4ea9-82e9-8a16592f307d",
         "Content-Length": "766",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "33",
-        "x-request-id": "8f082e4f-9784-4717-a35c-f7628ec6aed9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "34",
+        "X-Request-ID": "0ecde92c-98f3-4ea9-82e9-8a16592f307d"
       },
       "ResponseBody": {
-        "anomalyAlertingConfigurationId": "0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
-        "name": "configzhU1w3f5",
+        "anomalyAlertingConfigurationId": "ab5b44c4-cca5-41c2-b7ba-6cf744660836",
+        "name": "configoHufqpvt",
         "description": "",
         "crossMetricsOperator": "OR",
         "hookIds": [
-          "91152540-4485-4680-841a-41ca1ccfa5b2"
+          "c0f44f98-6854-47e1-a8a3-2826a53b8eba"
         ],
         "metricAlertingConfigurations": [
           {
@@ -277,50 +401,56 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/0c14080e-6e6e-4d13-b360-1e4b2b1abb0d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/alert/anomaly/configurations/ab5b44c4-cca5-41c2-b7ba-6cf744660836",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-cbe6d5e3ac7cb9478ebbe3596ebafb9d-c6f1e10fc699944f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "9828b8521627fd729740e71619da7eee",
+        "traceparent": "00-c43873f2f725d340984b407b3aa67db5-ede69bca3500db43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "be9ed26d12f356bc2d2aa6dfc585e7fa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a8940d58-4038-4081-b0a1-4ccaf3334a1a",
+        "apim-request-id": "128f9a21-d9de-4804-8650-74d9c7941dbe",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "75",
-        "x-request-id": "a8940d58-4038-4081-b0a1-4ccaf3334a1a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "69",
+        "X-Request-ID": "128f9a21-d9de-4804-8650-74d9c7941dbe"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/91152540-4485-4680-841a-41ca1ccfa5b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c0f44f98-6854-47e1-a8a3-2826a53b8eba",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-c4aadcbab69c9c418d5d40aeed896da4-86f9c8334fa67a4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "57d4157a23f9f73f7349ee632e26619d",
+        "traceparent": "00-7c594cfa455f8641af18fc035c88cc6d-4e5942e8b374374d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "9ec4359dea7e2e61783025de270fcf70",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "25ef1129-9380-4ce4-8677-0baa0de6bf34",
+        "apim-request-id": "186c85fd-0221-458f-b9c6-127b373c17cb",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "x-request-id": "25ef1129-9380-4ce4-8677-0baa0de6bf34"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "112",
+        "X-Request-ID": "186c85fd-0221-458f-b9c6-127b373c17cb"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditions.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditions.json
index 3480015ed800..91b20067f0ca 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditions.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditions.json
@@ -8,8 +8,11 @@
         "Content-Length": "426",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c5a29f0bd29adb488cda20ea63709fff-6cd8bd59f9250b4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8afd170b4e7de348a92052f70014a8b9-e63b603a81023c40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0bc4789bccb322b0369bcece4c32c53e",
         "x-ms-return-client-request-id": "true"
@@ -41,25 +44,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "be57db08-e352-4eaf-8f84-a8126c51102d",
+        "apim-request-id": "bacc79d6-cb3d-4232-bc7e-86584d0e115d",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:36 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/81dbc0dd-31fb-4672-9115-4b5142811366",
+        "Date": "Fri, 05 Feb 2021 17:53:16 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f976bc08-2d42-4b90-8b65-e73248a48625",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "396",
-        "x-request-id": "be57db08-e352-4eaf-8f84-a8126c51102d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "106",
+        "X-Request-ID": "bacc79d6-cb3d-4232-bc7e-86584d0e115d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/81dbc0dd-31fb-4672-9115-4b5142811366",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f976bc08-2d42-4b90-8b65-e73248a48625",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3815fd5319a18243821d22deed7646d9-583254228adc7544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8afd170b4e7de348a92052f70014a8b9-837f843c8708fb44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "aa0b8f680c11a3c82c12bda79522c490",
         "x-ms-return-client-request-id": "true"
@@ -67,17 +73,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c91f75e2-a928-4ce6-9da4-db8e97442deb",
+        "apim-request-id": "10d1f53f-69e9-45ad-895b-29560f7cbd22",
         "Content-Length": "600",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:36 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "x-request-id": "c91f75e2-a928-4ce6-9da4-db8e97442deb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "10d1f53f-69e9-45ad-895b-29560f7cbd22"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "81dbc0dd-31fb-4672-9115-4b5142811366",
+        "anomalyDetectionConfigurationId": "f976bc08-2d42-4b90-8b65-e73248a48625",
         "name": "configejov15li",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -107,27 +113,87 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/81dbc0dd-31fb-4672-9115-4b5142811366",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f976bc08-2d42-4b90-8b65-e73248a48625",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8f2f1e514d8fa04cb04f8fc560713f2d-df02db1a5b113443-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-35ea14a0f0423b4982e7c4a4c6e5fef4-9a3eab11aef1a546-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "664b44da747588b2904682c694040762",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4c2f4400-032a-4b50-8f93-d29ab046f72e",
+        "Content-Length": "600",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:16 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "110",
+        "X-Request-ID": "4c2f4400-032a-4b50-8f93-d29ab046f72e"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "f976bc08-2d42-4b90-8b65-e73248a48625",
+        "name": "configejov15li",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "AND",
+          "smartDetectionCondition": {
+            "sensitivity": 23.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 3,
+              "minRatio": 4.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 90.0,
+            "shiftPoint": 5,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f976bc08-2d42-4b90-8b65-e73248a48625",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8fdde7732216c84cbe5c7cdb818a9307-5100c0e250300b4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9e96f068b5038eaab021dfa10f098d14",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cf0b2ac5-9466-4770-906f-39517d8d43a9",
+        "apim-request-id": "237fe08f-29e4-486b-aafe-e5a658dbb9f8",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "5180",
-        "x-request-id": "cf0b2ac5-9466-4770-906f-39517d8d43a9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "116",
+        "X-Request-ID": "237fe08f-29e4-486b-aafe-e5a658dbb9f8"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditionsAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditionsAsync.json
index 7cdd8ff4e5c5..53d450c744af 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditionsAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithChangeAndSmartConditionsAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "426",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8ba1ccc415605f4e87d760d469d0289f-e845e2ba53d81546-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-24433cc3a442c54c8880c441f779a306-02e7a2c4965b6f40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2eb9b0784558b349a2be39346d2b6df2",
         "x-ms-return-client-request-id": "true"
@@ -41,25 +44,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dc8fa5a1-625d-4d37-bc10-44a0d6e6ae08",
+        "apim-request-id": "2d9eb6e6-cbac-44a3-8d6b-f8b8d8d072d6",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:47 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/01412cbc-e4db-4c41-9cd4-ddf88f3da916",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8ca451f7-d8ff-4c86-b154-aa1769eece5b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "dc8fa5a1-625d-4d37-bc10-44a0d6e6ae08"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "110",
+        "X-Request-ID": "2d9eb6e6-cbac-44a3-8d6b-f8b8d8d072d6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/01412cbc-e4db-4c41-9cd4-ddf88f3da916",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8ca451f7-d8ff-4c86-b154-aa1769eece5b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a7bf3f445418d4ab0b3a9cc1407c445-5dc847a60c5df146-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-24433cc3a442c54c8880c441f779a306-172c6faf295c164c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c71c9468b47051de6e07414f9cb4028c",
         "x-ms-return-client-request-id": "true"
@@ -67,17 +73,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4dc85aa4-3003-4f09-a8cc-fcef248a79e0",
+        "apim-request-id": "9475ec8b-9b9c-486f-aca6-653f2ec4cf74",
         "Content-Length": "600",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "92",
-        "x-request-id": "4dc85aa4-3003-4f09-a8cc-fcef248a79e0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "90",
+        "X-Request-ID": "9475ec8b-9b9c-486f-aca6-653f2ec4cf74"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "01412cbc-e4db-4c41-9cd4-ddf88f3da916",
+        "anomalyDetectionConfigurationId": "8ca451f7-d8ff-4c86-b154-aa1769eece5b",
         "name": "configl1Toi7c6",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -107,27 +113,87 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/01412cbc-e4db-4c41-9cd4-ddf88f3da916",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8ca451f7-d8ff-4c86-b154-aa1769eece5b",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fc624c44f93860458d4ba6bea56a5fba-80cee39ad4118b4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5fe7ca481dba474bbee04341c9a3c091-2eda4a8643b40a4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5269d12073c694c3965aef12da62dfbb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "79741882-e701-49f6-8102-a2f202d19e2c",
+        "Content-Length": "600",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "96",
+        "X-Request-ID": "79741882-e701-49f6-8102-a2f202d19e2c"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "8ca451f7-d8ff-4c86-b154-aa1769eece5b",
+        "name": "configl1Toi7c6",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "AND",
+          "smartDetectionCondition": {
+            "sensitivity": 23.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 3,
+              "minRatio": 4.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 90.0,
+            "shiftPoint": 5,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8ca451f7-d8ff-4c86-b154-aa1769eece5b",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-3e5bd5028b37344cbd722dcfdf7bc0cd-91323644d2896042-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "fe37145d93bcc357d167c05104f916ed",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5f7af60e-d342-48c4-a9b3-0134f848e469",
+        "apim-request-id": "c14c557f-ef93-45e0-88a3-c7f485540086",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "90",
-        "x-request-id": "5f7af60e-d342-48c4-a9b3-0134f848e469"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "100",
+        "X-Request-ID": "c14c557f-ef93-45e0-88a3-c7f485540086"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False).json
index 67cc3ce5f7da..c80f4bea5c2a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "291",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-351553c44e552b44a371333ecaa87e7a-e185bb88a50a1742-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ca2b2e11c3fc1543a96433384474ae63-7b85bfd7bea9d047-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2ca5d422939acf6a093597a0de17ece3",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "af7aefa6-e925-42dc-90df-e31b3c07753f",
+        "apim-request-id": "e47d2dca-1adf-497a-ac9b-3999475c4bf0",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:57 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/495df3fc-b451-4ba3-940f-0e501b9bb366",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d270cfb1-6dc5-4987-842f-fd233aff8617",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "93",
-        "x-request-id": "af7aefa6-e925-42dc-90df-e31b3c07753f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "108",
+        "X-Request-ID": "e47d2dca-1adf-497a-ac9b-3999475c4bf0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/495df3fc-b451-4ba3-940f-0e501b9bb366",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d270cfb1-6dc5-4987-842f-fd233aff8617",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ec7626d6efd98e4d9fafef55233f798d-dbf87129afdf024d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ca2b2e11c3fc1543a96433384474ae63-bb0c60b198d3ce41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f7a83aefa5903813c8031c7b55256c9d",
         "x-ms-return-client-request-id": "true"
@@ -57,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4218cf3c-b558-4ef6-bd76-feb9ce23d5fd",
+        "apim-request-id": "9601818c-0f73-4429-8603-b94760d1f75d",
         "Content-Length": "444",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "93",
-        "x-request-id": "4218cf3c-b558-4ef6-bd76-feb9ce23d5fd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "135",
+        "X-Request-ID": "9601818c-0f73-4429-8603-b94760d1f75d"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "495df3fc-b451-4ba3-940f-0e501b9bb366",
+        "anomalyDetectionConfigurationId": "d270cfb1-6dc5-4987-842f-fd233aff8617",
         "name": "configlTkH8fQx",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -86,27 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/495df3fc-b451-4ba3-940f-0e501b9bb366",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d270cfb1-6dc5-4987-842f-fd233aff8617",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-63c680b0e2ec134c8adcdd19dfb9f5ce-6d17406f6e0ebc48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a939fe5f55e81946972447fd799b4112-ddc987457ed3644f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e0b8500992af4c65d7bebcbcc27f79f1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e92501b3-cd5a-4f92-bf9c-df6f93f6f29a",
+        "Content-Length": "444",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "e92501b3-cd5a-4f92-bf9c-df6f93f6f29a"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "d270cfb1-6dc5-4987-842f-fd233aff8617",
+        "name": "configlTkH8fQx",
+        "description": "This hook was created to test the .NET client.",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d270cfb1-6dc5-4987-842f-fd233aff8617",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1e6826597f1ff047a81f0a943ea134f9-9d810c443b4f9440-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "fc837b7f493e7c91c06c639677ef7ae3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0dff058d-2fb2-4e8a-80ef-7ba9dfedfe68",
+        "apim-request-id": "164b9f8a-89d4-4fb9-986b-52f9e638b6c9",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "98",
-        "x-request-id": "0dff058d-2fb2-4e8a-80ef-7ba9dfedfe68"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "164b9f8a-89d4-4fb9-986b-52f9e638b6c9"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False)Async.json
index f80854c3ed3d..ed7466b256fc 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "291",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-79a99450583fd343b3d4c713471bc7ee-507818b85433d54f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-378065bac336b94c819b6bfcec82dd22-00a31ecbf114894e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b4e98f7b817bc1d3a392282cab35f636",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "eabf63ad-f5aa-46de-88cd-d794c8759592",
+        "apim-request-id": "6d79c7fb-546e-452e-9872-4e593d1efc1c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5bd42870-97b9-4178-9143-fb76d2f58ff4",
+        "Date": "Fri, 05 Feb 2021 17:53:31 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "100",
-        "x-request-id": "eabf63ad-f5aa-46de-88cd-d794c8759592"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "89",
+        "X-Request-ID": "6d79c7fb-546e-452e-9872-4e593d1efc1c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5bd42870-97b9-4178-9143-fb76d2f58ff4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0793933f455dcf4286e323df92ea4de0-9df20f578183eb40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-378065bac336b94c819b6bfcec82dd22-395f16bc26213d45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b8f0908ea2dd6c264f7c649735da41de",
         "x-ms-return-client-request-id": "true"
@@ -57,17 +63,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "456c63f4-4c37-4c0d-a751-acf40937c823",
+        "apim-request-id": "aa6c170b-5d7d-427b-8f5e-e7fc5c5c541a",
         "Content-Length": "444",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "106",
-        "x-request-id": "456c63f4-4c37-4c0d-a751-acf40937c823"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "aa6c170b-5d7d-427b-8f5e-e7fc5c5c541a"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "5bd42870-97b9-4178-9143-fb76d2f58ff4",
+        "anomalyDetectionConfigurationId": "9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
         "name": "configHYYpIhhd",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -86,27 +92,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5bd42870-97b9-4178-9143-fb76d2f58ff4",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c4ef21e0af2b244fa242f030f0f0727c-c75dd686495bbd41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cdb5535d88aae9428cd8db13634d082e-ec6c64ce78787549-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a7056a7e6e1494e78321ed250ed4312a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "70881445-9b72-453e-bf1b-1e8974d27dcc",
+        "Content-Length": "444",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:31 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "82",
+        "X-Request-ID": "70881445-9b72-453e-bf1b-1e8974d27dcc"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
+        "name": "configHYYpIhhd",
+        "description": "This hook was created to test the .NET client.",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/9f409bb6-15c2-48a4-82a3-4f95c4b011f6",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b9aea4332dee6f4984601391e4152619-e7fbfbe5b625414f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8dee57dc4ae7d8b8687d64fe1c3b8bc8",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ab53412b-1742-45e2-b158-625a75eaaf33",
+        "apim-request-id": "2bc1c48e-49ee-4c64-8731-35dfb2218a07",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "120",
-        "x-request-id": "ab53412b-1742-45e2-b158-625a75eaaf33"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "99",
+        "X-Request-ID": "2bc1c48e-49ee-4c64-8731-35dfb2218a07"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True).json
index 08943825d797..58d38a3d189f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "291",
         "Content-Type": "application/json",
-        "traceparent": "00-9b7ee18a971d0a4e9b77b630c0fe40a9-93525e3ce2241447-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-78b97f2f0dcf3547a71a123a19cecd44-551225a49b7dce4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "c4356899a592ddcf9fece7f6ab1d765a",
         "x-ms-return-client-request-id": "true"
       },
@@ -30,42 +33,45 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "37969fa5-c43f-42ea-bf88-c4e51ddd4300",
+        "apim-request-id": "9686f994-b069-4f2e-8ced-f2b174668c1c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:56 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/48cf18e2-d13c-4f66-af99-c1f3d736559e",
+        "Date": "Fri, 05 Feb 2021 17:53:21 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "48",
-        "x-request-id": "37969fa5-c43f-42ea-bf88-c4e51ddd4300"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "46",
+        "X-Request-ID": "9686f994-b069-4f2e-8ced-f2b174668c1c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/48cf18e2-d13c-4f66-af99-c1f3d736559e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-8dd2fb2f8df0d34f80ba94c506b91ea2-e61290466343674c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-78b97f2f0dcf3547a71a123a19cecd44-5a3d29e2730d5549-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "6b8e2df8a6197cb6e3175c37d4a3e2b9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a1ef25e4-e2ea-42a6-8834-e1d356efefeb",
+        "apim-request-id": "6dc0ea95-f033-4359-a404-f450ff24cedb",
         "Content-Length": "444",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "35",
-        "x-request-id": "a1ef25e4-e2ea-42a6-8834-e1d356efefeb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "30",
+        "X-Request-ID": "6dc0ea95-f033-4359-a404-f450ff24cedb"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "48cf18e2-d13c-4f66-af99-c1f3d736559e",
+        "anomalyDetectionConfigurationId": "1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
         "name": "configQemmjwy9",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -84,26 +90,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/48cf18e2-d13c-4f66-af99-c1f3d736559e",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-a28160336cb548408c19e9fb331d99ab-c350f5b6a8ed5d45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4cf8de0397e4d6468d1eb685dc009b53-88a8c07b06a20e44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "5b1c705022976292f82fb5c723f6595f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a70a96ac-3aca-46f4-b5ae-db48cc2875a1",
+        "Content-Length": "444",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "32",
+        "X-Request-ID": "a70a96ac-3aca-46f4-b5ae-db48cc2875a1"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
+        "name": "configQemmjwy9",
+        "description": "This hook was created to test the .NET client.",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/1b673ef7-1fcb-4ca5-a416-e80b19a774e0",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-06bd517cfb5a95428c940fd23b74141d-ab6a5b7e32039e41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "61403f80c620f231b2b9e17b489809fc",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cf0a5045-00bf-4fd7-afc2-7af3b766a70a",
+        "apim-request-id": "272e8e49-1d70-4606-bfaf-e73ddaea1d3f",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "50",
-        "x-request-id": "cf0a5045-00bf-4fd7-afc2-7af3b766a70a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "37",
+        "X-Request-ID": "272e8e49-1d70-4606-bfaf-e73ddaea1d3f"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True)Async.json
index 691b6ec9a6aa..dfc6bdb01f1b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithHardCondition(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "291",
         "Content-Type": "application/json",
-        "traceparent": "00-1121b2aeb5a3c14c979431ddffc244d2-4d3ca4f15f97bb42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f32fcfbb92c26e4bb59b3c7ff86ca764-1c3b7d1890c87f4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "5276d35ea2a106c36a74d272afe1b35e",
         "x-ms-return-client-request-id": "true"
       },
@@ -30,42 +33,45 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7355a537-f294-49cd-bf57-6a69c5fc7895",
+        "apim-request-id": "2acc1107-3e14-42e8-afae-b55723d25617",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:03 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/67225c68-095f-40f4-bb4a-173beb7abdfa",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "59",
-        "x-request-id": "7355a537-f294-49cd-bf57-6a69c5fc7895"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "38",
+        "X-Request-ID": "2acc1107-3e14-42e8-afae-b55723d25617"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/67225c68-095f-40f4-bb4a-173beb7abdfa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-21120b7ba0d28e42a5eedf9ff2558a05-0eb80dc5689f354a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f32fcfbb92c26e4bb59b3c7ff86ca764-0b5b0ba68a72a94f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "e45af92997dff9b0e1b806cf3021d8a8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2aed8f51-ba89-4537-b24c-0c2be1dab240",
+        "apim-request-id": "00d93321-a6bb-4180-9547-afc7ef4b22da",
         "Content-Length": "444",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "38",
-        "x-request-id": "2aed8f51-ba89-4537-b24c-0c2be1dab240"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "28",
+        "X-Request-ID": "00d93321-a6bb-4180-9547-afc7ef4b22da"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "67225c68-095f-40f4-bb4a-173beb7abdfa",
+        "anomalyDetectionConfigurationId": "3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
         "name": "configdCb4so5C",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -84,26 +90,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/67225c68-095f-40f4-bb4a-173beb7abdfa",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4e97a2bc43ee2f43a67066d781db4e83-8d6efdd8ff61194b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5869ce4501c1614e87f5271aa49a2ff4-f59e16725ee33449-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "36ca372504c55c094873752c6ac6f3e0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "8d274bf7-d1ee-47b0-b730-42d828556a9c",
+        "Content-Length": "444",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "35",
+        "X-Request-ID": "8d274bf7-d1ee-47b0-b730-42d828556a9c"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
+        "name": "configdCb4so5C",
+        "description": "This hook was created to test the .NET client.",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c2ee632-07fb-4bfb-8bd2-63980e5fe034",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-8f0d774fa99292438a8c18b6afbf0fd0-63f7cd376e72074e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "1a04e6213140c705237c71e99bf3d649",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "882f1dec-4275-4d5e-a774-e9aaf9686376",
+        "apim-request-id": "2dd346ee-dbb6-4231-be2e-8d51fb1f0ef6",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "43",
-        "x-request-id": "882f1dec-4275-4d5e-a774-e9aaf9686376"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "46",
+        "X-Request-ID": "2dd346ee-dbb6-4231-be2e-8d51fb1f0ef6"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditions.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditions.json
index 933b99f5fd5a..2b81ef202f1a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditions.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditions.json
@@ -8,8 +8,11 @@
         "Content-Length": "719",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8f5a41af0d23224997c0d5e5ef0ce5d4-0e39c9372137524a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e0c1796131348a47b126d39219c0e100-8df6a5733fba494a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c386218ff1b7ed8e80936ccca61372fe",
         "x-ms-return-client-request-id": "true"
@@ -17,25 +20,28 @@
       "RequestBody": "{\u0022name\u0022:\u0022config0dbZeJSe\u0022,\u0022metricId\u0022:\u002227e3015f-04fd-44ba-a20b-bc529a0aebae\u0022,\u0022wholeMetricConfiguration\u0022:{\u0022hardThresholdCondition\u0022:{\u0022lowerBound\u0022:10,\u0022upperBound\u0022:20,\u0022anomalyDetectorDirection\u0022:\u0022Both\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:1,\u0022minRatio\u0022:2}}},\u0022seriesOverrideConfigurations\u0022:[{\u0022series\u0022:{\u0022dimension\u0022:{\u0022city\u0022:\u0022Delhi\u0022,\u0022category\u0022:\u0022Handmade\u0022}},\u0022smartDetectionCondition\u0022:{\u0022sensitivity\u0022:30,\u0022anomalyDetectorDirection\u0022:\u0022Both\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:3,\u0022minRatio\u0022:4}}},{\u0022series\u0022:{\u0022dimension\u0022:{\u0022city\u0022:\u0022Koltaka\u0022,\u0022category\u0022:\u0022Grocery \u0026 Gourmet Food\u0022}},\u0022changeThresholdCondition\u0022:{\u0022changePercentage\u0022:40,\u0022shiftPoint\u0022:12,\u0022withinRange\u0022:false,\u0022anomalyDetectorDirection\u0022:\u0022Up\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:5,\u0022minRatio\u0022:6}}}]}",
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6732feb3-e803-4b54-a79c-46d9bd726766",
+        "apim-request-id": "b6e0337b-60fb-4477-af79-af0272b56a69",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c46413c0-3ff5-42f1-81e7-e6926459ba4b",
+        "Date": "Fri, 05 Feb 2021 17:53:17 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/fb5b5bf2-8818-4c41-a698-f372ff1bff87",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "208",
-        "x-request-id": "6732feb3-e803-4b54-a79c-46d9bd726766"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "b6e0337b-60fb-4477-af79-af0272b56a69"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c46413c0-3ff5-42f1-81e7-e6926459ba4b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/fb5b5bf2-8818-4c41-a698-f372ff1bff87",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-25c62de64cc0f54780a9d3bde6454881-06a76ee0a1f06443-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e0c1796131348a47b126d39219c0e100-f078ca1992cef240-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1d1bb5332930da790246cc2a904d34b8",
         "x-ms-return-client-request-id": "true"
@@ -43,17 +49,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2bec307d-12c2-4c00-a161-076db26f1ef6",
+        "apim-request-id": "cde98562-85c4-4a01-94f9-0869a728e4a5",
         "Content-Length": "865",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "2bec307d-12c2-4c00-a161-076db26f1ef6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "89",
+        "X-Request-ID": "cde98562-85c4-4a01-94f9-0869a728e4a5"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "c46413c0-3ff5-42f1-81e7-e6926459ba4b",
+        "anomalyDetectionConfigurationId": "fb5b5bf2-8818-4c41-a698-f372ff1bff87",
         "name": "config0dbZeJSe",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -108,27 +114,112 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c46413c0-3ff5-42f1-81e7-e6926459ba4b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/fb5b5bf2-8818-4c41-a698-f372ff1bff87",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c10a2ba96c25ac46a38efe90f0299eaa-eb209669e9c88344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2b881f0c99efd5448f36b5e1cb2ddc2b-56003f09369e444d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ed85cf0a6bed47aaf929d5ea546b7c39",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6a45e763-e99a-4279-a105-a23622d7447e",
+        "Content-Length": "865",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:17 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "6a45e763-e99a-4279-a105-a23622d7447e"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "fb5b5bf2-8818-4c41-a698-f372ff1bff87",
+        "name": "config0dbZeJSe",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "upperBound": 20.0,
+            "anomalyDetectorDirection": "Both",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          },
+          {
+            "series": {
+              "dimension": {
+                "city": "Koltaka",
+                "category": "Grocery \u0026 Gourmet Food"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/fb5b5bf2-8818-4c41-a698-f372ff1bff87",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9b23c9d14f502849873644db4dc213b5-f9fd41e3b194584c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8695fe6bf483657ea7acc07125635c32",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b99f02e8-63c7-4276-b89c-90567b5f1182",
+        "apim-request-id": "4d4fe126-3078-46ea-94db-f51be2b6d10d",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "93",
-        "x-request-id": "b99f02e8-63c7-4276-b89c-90567b5f1182"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "4d4fe126-3078-46ea-94db-f51be2b6d10d"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditionsAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditionsAsync.json
index d9f0a46143f1..e5adf341b817 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditionsAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesConditionsAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "719",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2a8ac9fd0a33e743bab186c7980ec37e-fb3117789226e64f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3112081f064715409307d96ec6e6ce93-b68f4d44fa2e8340-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "faafdc09586e1851afb018424d0af9ee",
         "x-ms-return-client-request-id": "true"
@@ -17,25 +20,28 @@
       "RequestBody": "{\u0022name\u0022:\u0022configqqScA538\u0022,\u0022metricId\u0022:\u002227e3015f-04fd-44ba-a20b-bc529a0aebae\u0022,\u0022wholeMetricConfiguration\u0022:{\u0022hardThresholdCondition\u0022:{\u0022lowerBound\u0022:10,\u0022upperBound\u0022:20,\u0022anomalyDetectorDirection\u0022:\u0022Both\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:1,\u0022minRatio\u0022:2}}},\u0022seriesOverrideConfigurations\u0022:[{\u0022series\u0022:{\u0022dimension\u0022:{\u0022city\u0022:\u0022Delhi\u0022,\u0022category\u0022:\u0022Handmade\u0022}},\u0022smartDetectionCondition\u0022:{\u0022sensitivity\u0022:30,\u0022anomalyDetectorDirection\u0022:\u0022Both\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:3,\u0022minRatio\u0022:4}}},{\u0022series\u0022:{\u0022dimension\u0022:{\u0022city\u0022:\u0022Koltaka\u0022,\u0022category\u0022:\u0022Grocery \u0026 Gourmet Food\u0022}},\u0022changeThresholdCondition\u0022:{\u0022changePercentage\u0022:40,\u0022shiftPoint\u0022:12,\u0022withinRange\u0022:false,\u0022anomalyDetectorDirection\u0022:\u0022Up\u0022,\u0022suppressCondition\u0022:{\u0022minNumber\u0022:5,\u0022minRatio\u0022:6}}}]}",
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "edcd71ba-d43f-46dd-a3cd-a281a61739a7",
+        "apim-request-id": "dec682fe-5ced-43ef-ae55-bcd34110d63e",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:48 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f7e80fea-a186-4534-96d4-d489c9bfad2d",
+        "Date": "Fri, 05 Feb 2021 17:53:26 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "x-request-id": "edcd71ba-d43f-46dd-a3cd-a281a61739a7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "dec682fe-5ced-43ef-ae55-bcd34110d63e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f7e80fea-a186-4534-96d4-d489c9bfad2d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1fc316646179de43b16cef18cbe68720-8e1dfc9c6398514b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3112081f064715409307d96ec6e6ce93-6f94489caa1bdb41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "650c83fac415315b08da84256ab01572",
         "x-ms-return-client-request-id": "true"
@@ -43,17 +49,99 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "eabd70f1-606d-4d82-8183-7c669b78a827",
+        "apim-request-id": "e8a7acc5-4352-4b2f-a9ff-4dd8feb9e8fa",
         "Content-Length": "865",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "110",
+        "X-Request-ID": "e8a7acc5-4352-4b2f-a9ff-4dd8feb9e8fa"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
+        "name": "configqqScA538",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "upperBound": 20.0,
+            "anomalyDetectorDirection": "Both",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          },
+          {
+            "series": {
+              "dimension": {
+                "city": "Koltaka",
+                "category": "Grocery \u0026 Gourmet Food"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9bc5aa41b831414094b74fd0640b0ac1-1dc618dc055e2941-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "75ad7adab95bc468e4620369e4304fd3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "217fdef4-5839-4f5d-9c6c-a350e2e29d24",
+        "Content-Length": "865",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:26 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "93",
-        "x-request-id": "eabd70f1-606d-4d82-8183-7c669b78a827"
+        "X-Request-ID": "217fdef4-5839-4f5d-9c6c-a350e2e29d24"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "f7e80fea-a186-4534-96d4-d489c9bfad2d",
+        "anomalyDetectionConfigurationId": "c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
         "name": "configqqScA538",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -108,27 +196,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/f7e80fea-a186-4534-96d4-d489c9bfad2d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c1e77155-61c1-4c70-9d56-f1c0d0b5cc9b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d897f258aea07b44a2729f47655b7295-2cb3a4d0b48d304a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c3031344c10fee44b3f5a43059c5f501-8e99ae49c603654c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "75ad7adab95bc468e4620369e4304fd3",
+        "x-ms-client-request-id": "f7234b3072b6455d807ef193d32caeff",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9f23b7f4-4862-4aa4-acaa-aec950e11cbd",
+        "apim-request-id": "d658b1db-0f5e-492c-8930-5cb44bfa2268",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "89",
-        "x-request-id": "9f23b7f4-4862-4aa4-acaa-aec950e11cbd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "d658b1db-0f5e-492c-8930-5cb44bfa2268"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditions.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditions.json
index 02ea30897aeb..83d0c3b1e480 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditions.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditions.json
@@ -8,8 +8,11 @@
         "Content-Length": "651",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-75a375a866c6914abf4525248966b1fe-287ba4eb980d5440-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c2cddb9cc94aea4cb7591ace1d5e4f0d-82a66f6172935146-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "656cd18a353425b4f8cddfbed51bef5d",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9120c776-7ed4-426c-8678-d862e88fa29d",
+        "apim-request-id": "0e06f162-fe71-4f2a-8de8-0050f64fa65f",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/13200537-e92e-4f6f-890c-cb5f4dc92b95",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "9120c776-7ed4-426c-8678-d862e88fa29d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "0e06f162-fe71-4f2a-8de8-0050f64fa65f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/13200537-e92e-4f6f-890c-cb5f4dc92b95",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f5cfde9d244c3941b928349421030ef9-f7d372c4b2cfef47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c2cddb9cc94aea4cb7591ace1d5e4f0d-ecdd69df522a3e42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ca077e7a316f2f42264717cd27d59ee3",
         "x-ms-return-client-request-id": "true"
@@ -90,17 +96,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "aa759d87-2c29-4873-bd71-c59ecd85bcaf",
+        "apim-request-id": "d72adcf1-499c-441a-a315-9af72ef19f97",
         "Content-Length": "787",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "89",
-        "x-request-id": "aa759d87-2c29-4873-bd71-c59ecd85bcaf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "96",
+        "X-Request-ID": "d72adcf1-499c-441a-a315-9af72ef19f97"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "13200537-e92e-4f6f-890c-cb5f4dc92b95",
+        "anomalyDetectionConfigurationId": "25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
         "name": "configYGaiVwzS",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -152,27 +158,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/13200537-e92e-4f6f-890c-cb5f4dc92b95",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-271c0474e6caac42b7d6ec4312b72422-6707df8397f4674a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6671e6c97f39534db9d053510bc2a5dd-6aafe435ce5ac742-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "64cf7d4b02a907eadefa1d905f0720f7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b83b1fa7-34f7-4604-b00c-014bae8777a9",
+        "Content-Length": "787",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "83",
+        "X-Request-ID": "b83b1fa7-34f7-4604-b00c-014bae8777a9"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
+        "name": "configYGaiVwzS",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Delhi"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          },
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/25b49fe6-44ec-4b20-be1e-1cc0d78e9b94",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9c16b08d8a10ff40bfea086ccef3307f-e30b957beb07254e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c71dfc98875c58e28e3d3fec1de6fe23",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "86258bdd-977a-41d0-8698-9f00af52b42a",
+        "apim-request-id": "085a7f49-7394-4449-a723-29a6f8866c65",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "100",
-        "x-request-id": "86258bdd-977a-41d0-8698-9f00af52b42a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "98",
+        "X-Request-ID": "085a7f49-7394-4449-a723-29a6f8866c65"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditionsAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditionsAsync.json
index b1be707a2128..f344cd62a7c8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditionsAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/CreateAndGetDetectionConfigurationWithSeriesGroupConditionsAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "651",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-92912c52b52dd1429d4f367fd4fd4ab8-0880101116fd7943-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-634ed3e0d1b7be4a8d059af3b6238742-152de4ef56813142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2042946b9f86aaeecd515698e28e6fc0",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c7b055fd-d15a-478c-9ed9-24066f47f0c2",
+        "apim-request-id": "b0466222-d412-431e-a282-9ada11359034",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2945069e-a078-4581-96e4-8dd0f02ff1fd",
+        "Date": "Fri, 05 Feb 2021 17:53:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7d8c07bb-2a31-43a8-bf16-3982ee821f58",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "x-request-id": "c7b055fd-d15a-478c-9ed9-24066f47f0c2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "b0466222-d412-431e-a282-9ada11359034"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2945069e-a078-4581-96e4-8dd0f02ff1fd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7d8c07bb-2a31-43a8-bf16-3982ee821f58",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c98b0cc912c89f4a93cc4a9b6b438746-5ca3ef59f250b747-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-634ed3e0d1b7be4a8d059af3b6238742-34d141c9abb93946-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7b6fed7b4fbe189d44864c1970c02ed4",
         "x-ms-return-client-request-id": "true"
@@ -90,17 +96,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4c68d0c0-81cd-4bbc-b42a-0ea0b5032e82",
+        "apim-request-id": "cbaa4494-bcbb-4383-9a55-515795fd3d4b",
         "Content-Length": "787",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "81",
-        "x-request-id": "4c68d0c0-81cd-4bbc-b42a-0ea0b5032e82"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "76",
+        "X-Request-ID": "cbaa4494-bcbb-4383-9a55-515795fd3d4b"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "2945069e-a078-4581-96e4-8dd0f02ff1fd",
+        "anomalyDetectionConfigurationId": "7d8c07bb-2a31-43a8-bf16-3982ee821f58",
         "name": "config1oRulW2B",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -152,27 +158,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2945069e-a078-4581-96e4-8dd0f02ff1fd",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7d8c07bb-2a31-43a8-bf16-3982ee821f58",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0c1bbcbf628a84479e0e3277edb935d3-3ba2cfce9300524f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b5628f51dfe0c7489108ba6fde62feac-278e768f50185e4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "03779df2644fb8bc7ba9e91de572a409",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "89eacfa8-2940-41fe-a68f-4008e01e8564",
+        "Content-Length": "787",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:27 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "85",
+        "X-Request-ID": "89eacfa8-2940-41fe-a68f-4008e01e8564"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "7d8c07bb-2a31-43a8-bf16-3982ee821f58",
+        "name": "config1oRulW2B",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Delhi"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          },
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7d8c07bb-2a31-43a8-bf16-3982ee821f58",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-7c26ea145f4ba44394c890ee9ad5542d-bf2085ceee233648-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9ada85b30afd1ba9f62adcff53d5390d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e345bc81-3157-48d2-b47a-75cfe4ee462b",
+        "apim-request-id": "85e5fcf3-791f-411a-8a7b-8f438d8cb30b",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "105",
-        "x-request-id": "e345bc81-3157-48d2-b47a-75cfe4ee462b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "85e5fcf3-791f-411a-8a7b-8f438d8cb30b"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False).json
index be7972c37d1b..5c6b85dc0cb7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False).json
@@ -8,14 +8,17 @@
         "Content-Length": "228",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a8e6e8c91063484fbdcc55e4f363cf6a-2edeed2b36ef4b43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2ef660d078d9c14ca6dd326650e3dff6-2e16bca9627d4e45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8d18843e7365897b2d52ed3cd96b2fb3",
+        "x-ms-client-request-id": "8518f2a35ac7af06061bf6f6648b803e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configOph2ZY2O",
+        "name": "configXnw1uvQU",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
         "wholeMetricConfiguration": {
           "hardThresholdCondition": {
@@ -30,69 +33,121 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c2c6ea2c-2e21-4d44-a591-723c63d0ca59",
+        "apim-request-id": "2c433f11-14e9-4b21-b8f4-577e5c7c4c75",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/973af069-27b0-4bce-ba83-060492da3f47",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3bc518e4-2437-4667-a990-eb4b8fca311d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "c2c6ea2c-2e21-4d44-a591-723c63d0ca59"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "117",
+        "X-Request-ID": "2c433f11-14e9-4b21-b8f4-577e5c7c4c75"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/973af069-27b0-4bce-ba83-060492da3f47",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3bc518e4-2437-4667-a990-eb4b8fca311d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-2ef660d078d9c14ca6dd326650e3dff6-df459cd040511c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6475b9c9c5f2bb55da0284ce14870b6f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "37dea4bf-2854-400d-ab1f-7f6ef94b87f5",
+        "Content-Length": "398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "88",
+        "X-Request-ID": "37dea4bf-2854-400d-ab1f-7f6ef94b87f5"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "3bc518e4-2437-4667-a990-eb4b8fca311d",
+        "name": "configXnw1uvQU",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3bc518e4-2437-4667-a990-eb4b8fca311d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1601d2227e2c98479369d10cb1fac082-9361c0a6e4dcee43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0b5928f25f7ff84fbb2a21754e44c98e-a004188dba9ce741-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cb2cd254b38dab8936d37b4354dfd5d5",
+        "x-ms-client-request-id": "ab496f48abaedbfc10485d6d9835d903",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8bea636a-701c-466c-bbe4-a038ad6bb021",
+        "apim-request-id": "e9fcdc5a-60e7-44db-a332-8cd5b2b69e39",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:59 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "109",
-        "x-request-id": "8bea636a-701c-466c-bbe4-a038ad6bb021"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "90",
+        "X-Request-ID": "e9fcdc5a-60e7-44db-a332-8cd5b2b69e39"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/973af069-27b0-4bce-ba83-060492da3f47",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3bc518e4-2437-4667-a990-eb4b8fca311d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-745321c66dadb3488466650aa7f05525-0ce3681c26794a44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-59fbed5e4114d54487cb6b4e7915cb64-bdccf3cb4affcb43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5cf38380fcfd9851126b46b566acb83b",
+        "x-ms-client-request-id": "151de37c9eabdd339d5dabc4d6389b7f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "d48f94cc-94ae-4149-a891-14aa549e1a36",
+        "apim-request-id": "5851dcdb-87e8-4ff1-b4a0-398372bf6590",
         "Content-Length": "124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:59 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "65",
-        "x-request-id": "d48f94cc-94ae-4149-a891-14aa549e1a36"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "75",
+        "X-Request-ID": "5851dcdb-87e8-4ff1-b4a0-398372bf6590"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyDetectionConfiguration. TraceId: 0f886683-f501-466b-a993-e83404eb7cef"
+        "message": "Not found this AnomalyDetectionConfiguration. TraceId: 75aecef3-b675-4492-86dd-bcd8942c3051"
       }
     }
   ],
@@ -101,6 +156,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1273656024"
+    "RandomSeed": "432103228"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False)Async.json
index bd6f57efeb86..d31080d0fe27 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(False)Async.json
@@ -8,14 +8,17 @@
         "Content-Length": "228",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e9894fd7f3c1fa4e94bbf6b9f0e7be1c-9576a84990288f4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0063580c10fa1a41945da06854c482d1-d5497ff84607b74b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b7d128fa4b5e3e025931a95530495450",
+        "x-ms-client-request-id": "bb24b4d748bf8a08391a66bb536f77d8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configrNW2fBBD",
+        "name": "configeKMxFIGD",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
         "wholeMetricConfiguration": {
           "hardThresholdCondition": {
@@ -30,69 +33,121 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6e5bd1e6-a57b-4d59-9758-8d0a62adc72f",
+        "apim-request-id": "116e98cf-0daa-4422-85cf-ef6816cba2de",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/abce9e85-fdb1-4aa4-bebb-b1aad6dc7899",
+        "Date": "Fri, 05 Feb 2021 18:37:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c184eef7-c6e2-463c-803e-bc034090de8b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "106",
-        "x-request-id": "6e5bd1e6-a57b-4d59-9758-8d0a62adc72f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "86",
+        "X-Request-ID": "116e98cf-0daa-4422-85cf-ef6816cba2de"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/abce9e85-fdb1-4aa4-bebb-b1aad6dc7899",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c184eef7-c6e2-463c-803e-bc034090de8b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0063580c10fa1a41945da06854c482d1-2fcc87a39cae1b4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "26480bf05c1a9984b50b2ad92a030bc7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a3b3bfba-29e2-4c2c-9af9-9fffe5c55041",
+        "Content-Length": "398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:58 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "85",
+        "X-Request-ID": "a3b3bfba-29e2-4c2c-9af9-9fffe5c55041"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "c184eef7-c6e2-463c-803e-bc034090de8b",
+        "name": "configeKMxFIGD",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c184eef7-c6e2-463c-803e-bc034090de8b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c9a394c2314264496f2861605c29caf-8bb31a5d7e9d0343-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9abfb0ea8f89dd40a52fecdae7dccdce-bf6e963f6d311045-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3133bcea942604637f99a04a6ee242c4",
+        "x-ms-client-request-id": "70189b4d403fb1d2cf0ff0a35dd45b78",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9403bc33-00d1-4499-ab1d-77cf81a37a15",
+        "apim-request-id": "4d4b1cc3-98e4-4b8a-88c3-0d95e6937b6c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "112",
-        "x-request-id": "9403bc33-00d1-4499-ab1d-77cf81a37a15"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "95",
+        "X-Request-ID": "4d4b1cc3-98e4-4b8a-88c3-0d95e6937b6c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/abce9e85-fdb1-4aa4-bebb-b1aad6dc7899",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c184eef7-c6e2-463c-803e-bc034090de8b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f075089565f2a8478ee5ea896d57ff18-8022202b95268148-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ea1f0f09cd95284abba5f2e526835b22-1acb1ccda6f83f4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a0f8825409af3cfff336f2b743370036",
+        "x-ms-client-request-id": "3f40ef8410e07aa72f8a06b31d2f5f36",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "4fbfe859-80e0-48e2-abac-33cc849a5831",
+        "apim-request-id": "3deb870f-72a5-49b9-90ab-154f8b870402",
         "Content-Length": "124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "71",
-        "x-request-id": "4fbfe859-80e0-48e2-abac-33cc849a5831"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "62",
+        "X-Request-ID": "3deb870f-72a5-49b9-90ab-154f8b870402"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyDetectionConfiguration. TraceId: 4e7ce6a5-3865-40da-a877-453acd981569"
+        "message": "Not found this AnomalyDetectionConfiguration. TraceId: a4f3cdd6-1a21-4c56-8fa3-fbe209324fd8"
       }
     }
   ],
@@ -101,6 +156,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1419054632"
+    "RandomSeed": "456922841"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True).json
index 5a98a334c4b0..112bedb711ad 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True).json
@@ -8,13 +8,16 @@
         "Authorization": "Sanitized",
         "Content-Length": "228",
         "Content-Type": "application/json",
-        "traceparent": "00-179e210467028042a2cd67c340b16a54-725a8b94f3205745-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "8a30f9bfa9920c4c93b36b3b5356d0a7",
+        "traceparent": "00-72271ed0d5df1b40b38e3e6690f0828c-dcf819cfcb741d44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "55b6153d670ac9a62252fe656f6acf3d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "configozjpC4Zo",
+        "name": "configbTwbcFKQ",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
         "wholeMetricConfiguration": {
           "hardThresholdCondition": {
@@ -29,73 +32,124 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c6d68378-843a-43e1-bad7-63077c7a465e",
+        "apim-request-id": "44bf09ed-d517-42f4-b7ab-9a727d3c8c1d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d3bce66f-3ddd-4d6d-8d46-30163b112589",
+        "Date": "Fri, 05 Feb 2021 18:37:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/cb940ca5-1d70-4689-a05b-1f8f8227a2fe",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "42",
-        "x-request-id": "c6d68378-843a-43e1-bad7-63077c7a465e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "50",
+        "X-Request-ID": "44bf09ed-d517-42f4-b7ab-9a727d3c8c1d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d3bce66f-3ddd-4d6d-8d46-30163b112589",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/cb940ca5-1d70-4689-a05b-1f8f8227a2fe",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-72271ed0d5df1b40b38e3e6690f0828c-4dd7b19d9ffd0541-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "699563792763290dfe7226068a7d2891",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "68a8bda4-09ac-41ac-871d-01694949b035",
+        "Content-Length": "398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "44",
+        "X-Request-ID": "68a8bda4-09ac-41ac-871d-01694949b035"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "cb940ca5-1d70-4689-a05b-1f8f8227a2fe",
+        "name": "configbTwbcFKQ",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/cb940ca5-1d70-4689-a05b-1f8f8227a2fe",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-c7c81aa7e087f848b3f672e7c8492667-44da143f6dfe6141-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "5107a6f7bf43124d06aa3e9027d7d4ed",
+        "traceparent": "00-da36474bc1ec7b478f52dec51f83a3b3-3267e23e57e77c42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "850582f492dec8c8adbaa9bafbf76bf1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "430029fa-02c9-4c93-b0ab-f3f79f36c26e",
+        "apim-request-id": "680c2403-3f95-4ec0-9351-1e38e878b73b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:57:58 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "42",
-        "x-request-id": "430029fa-02c9-4c93-b0ab-f3f79f36c26e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "45",
+        "X-Request-ID": "680c2403-3f95-4ec0-9351-1e38e878b73b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/d3bce66f-3ddd-4d6d-8d46-30163b112589",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/cb940ca5-1d70-4689-a05b-1f8f8227a2fe",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4d12ef0218268b449402a5c893ab28b9-c92c4b21e0995c48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "54006a826163d128a25627223121e42f",
+        "traceparent": "00-780a9f683881d1439244d60ccae09269-956aa4b0c079c04c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "23c0f0d96af016b9088d5698419f3fa4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "80010587-14ec-4807-b054-8f3b320573fe",
+        "apim-request-id": "93606f3b-e964-44a5-826d-b70b09b115a9",
         "Content-Length": "124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:57:58 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "20",
-        "x-request-id": "80010587-14ec-4807-b054-8f3b320573fe"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "23",
+        "X-Request-ID": "93606f3b-e964-44a5-826d-b70b09b115a9"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyDetectionConfiguration. TraceId: 207c7db0-96e5-48fe-b3a2-c13f8675378a"
+        "message": "Not found this AnomalyDetectionConfiguration. TraceId: ba6bfd35-ed43-4a54-aa9e-140f59dacfd4"
       }
     }
   ],
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "786547728"
+    "RandomSeed": "115733193"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True)Async.json
index 76a1c5473a45..1075bea3ffcd 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/DeleteDetectionConfiguration(True)Async.json
@@ -8,13 +8,16 @@
         "Authorization": "Sanitized",
         "Content-Length": "228",
         "Content-Type": "application/json",
-        "traceparent": "00-b439bac9c0f76c4eabea526442dc6b79-215adb9167245d43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "f0d0908630487d668b3c32c64c8b5e1e",
+        "traceparent": "00-8187a3f2f256de44a469edeb105ef787-ca7530ab024df044-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "9b24688b8a65f8e568f6ee14a48f6841",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
-        "name": "config6UY8ebSI",
+        "name": "configOnpIgiEu",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
         "wholeMetricConfiguration": {
           "hardThresholdCondition": {
@@ -29,73 +32,124 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "26e1b2ab-d3f3-4c1e-bb45-db14f60eddef",
+        "apim-request-id": "86bec4e0-4125-4cc2-9c75-84381c716e20",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5784e2d3-8ab7-496d-96f8-c50d6105f2d7",
+        "Date": "Fri, 05 Feb 2021 18:37:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/0cffa11f-c4ef-459e-93fa-1b640f034638",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "56",
-        "x-request-id": "26e1b2ab-d3f3-4c1e-bb45-db14f60eddef"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "45",
+        "X-Request-ID": "86bec4e0-4125-4cc2-9c75-84381c716e20"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5784e2d3-8ab7-496d-96f8-c50d6105f2d7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/0cffa11f-c4ef-459e-93fa-1b640f034638",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-8187a3f2f256de44a469edeb105ef787-93a1b4dd4268c84c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "2e2b78459314babcab01d66acd21b77a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ae409c1b-24c1-4e3f-b95e-072bd6d3d151",
+        "Content-Length": "398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:37:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "31",
+        "X-Request-ID": "ae409c1b-24c1-4e3f-b95e-072bd6d3d151"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "0cffa11f-c4ef-459e-93fa-1b640f034638",
+        "name": "configOnpIgiEu",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "hardThresholdCondition": {
+            "upperBound": 10.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [],
+        "seriesOverrideConfigurations": []
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/0cffa11f-c4ef-459e-93fa-1b640f034638",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-335bd77cf961624fb503b75438519e81-0d8a151038b2b04f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "e1ec802ed0963294ef535daea819f1a3",
+        "traceparent": "00-8295deead58b74479a4a6541eba61662-f77bdf49896dd544-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "fb34e9e27db061fbe23ee9f3bcf7d73b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "362bc373-255b-48be-88fd-e437fbfe160c",
+        "apim-request-id": "4a4711c3-075c-4313-91a1-16aab127ff0d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "41",
-        "x-request-id": "362bc373-255b-48be-88fd-e437fbfe160c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "43",
+        "X-Request-ID": "4a4711c3-075c-4313-91a1-16aab127ff0d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5784e2d3-8ab7-496d-96f8-c50d6105f2d7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/0cffa11f-c4ef-459e-93fa-1b640f034638",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4f96e897acbf9a4b8cfff1d4e99ed50a-1f8fbdba5bf34842-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "9d4600fafb29d77338cb05e3f360c652",
+        "traceparent": "00-ee65c5bb2455eb4f98d0ec78eb0e65a1-80dc0fa754ff9743-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "75839ce67b80f8c6ac69ef64b47a2a46",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "5a3324ae-862b-4165-b69d-5079741d7198",
+        "apim-request-id": "cf3e46a3-58e6-4528-bc1c-91508c1cd427",
         "Content-Length": "124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:37:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "21",
-        "x-request-id": "5a3324ae-862b-4165-b69d-5079741d7198"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "19",
+        "X-Request-ID": "cf3e46a3-58e6-4528-bc1c-91508c1cd427"
       },
       "ResponseBody": {
         "code": "Not Found",
-        "message": "Not found this AnomalyDetectionConfiguration. TraceId: 91be7220-af67-44c4-8de6-c4cf99f929f6"
+        "message": "Not found this AnomalyDetectionConfiguration. TraceId: ffd7ce25-bef9-4f00-aad3-114a438ca1d9"
       }
     }
   ],
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "1575895723"
+    "RandomSeed": "866127330"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstance.json
index edfbffb2f7e7..aec59aa0c9af 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "1027",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4fb09434c7d3e041ba2f3e6819aed086-6600c38af35fe242-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a10c417509f6864f967cad1b46530b2c-89e5e98303e17942-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cddb3212232f175056169054081564e5",
         "x-ms-return-client-request-id": "true"
@@ -86,25 +89,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "84d10140-87d7-4065-a7bf-004378a60db4",
+        "apim-request-id": "3615ac05-926f-411e-b77d-592226fe0855",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "194",
-        "x-request-id": "84d10140-87d7-4065-a7bf-004378a60db4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "3615ac05-926f-411e-b77d-592226fe0855"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-600de306a6eb1649a5c6467e3db5a089-6a7338e8310e5448-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a10c417509f6864f967cad1b46530b2c-085f02ca144cc642-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "561a8c7131e6eb9f0b3fd712a75628c9",
         "x-ms-return-client-request-id": "true"
@@ -112,17 +118,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "868d1047-11be-4ef7-a3d4-6b0fb55d98e1",
+        "apim-request-id": "304ed76e-b60b-4675-83cb-5c4bbab03b99",
         "Content-Length": "1137",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "109",
-        "x-request-id": "868d1047-11be-4ef7-a3d4-6b0fb55d98e1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "82",
+        "X-Request-ID": "304ed76e-b60b-4675-83cb-5c4bbab03b99"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+        "anomalyDetectionConfigurationId": "5131153c-6fac-4200-a412-86615b9cefb5",
         "name": "configt5YEufRG",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -195,17 +201,120 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0d75b09ddb23384b8a3720f889e0de2a-c77a267ce4e2924d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f36b5d1872c1f9cabd882e85fea44089",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4b9fce2c-6171-40da-872f-aeb55c34753d",
+        "Content-Length": "1137",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:19 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "4b9fce2c-6171-40da-872f-aeb55c34753d"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "5131153c-6fac-4200-a412-86615b9cefb5",
+        "name": "configt5YEufRG",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 50.0,
+            "shiftPoint": 15,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 7,
+              "minRatio": 8.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "855",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e7e2e8cf1bea2642bd5805710869b6f9-f0cc1cee2f16134c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02c4a810a6e6af4c8a1fce2172af0dc8-86cc0354fa94834b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f36b5d1872c1f9cabd882e85fea44089",
+        "x-ms-client-request-id": "625f3a980a7de04193f0c1f04c3d6fff",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -268,42 +377,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "583eb29d-1729-40c1-afb7-246e586c6a1e",
+        "apim-request-id": "fdaee3c2-0fe5-469c-9949-9cfbddb7b9c4",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "207",
-        "x-request-id": "583eb29d-1729-40c1-afb7-246e586c6a1e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "fdaee3c2-0fe5-469c-9949-9cfbddb7b9c4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cc8eaf935a607f48ba4fb82e9614aba8-067dc619b60df94d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-87f7348c2c0eca4dab78702fe40b4f60-c88fd7983a5e234b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "625f3a980a7de04193f0c1f04c3d6fff",
+        "x-ms-client-request-id": "ab3cc6ee70aafe23c121985e031aec66",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "41f11655-662e-42ac-8f9b-9490fdaa8e04",
+        "apim-request-id": "6b7455cd-a881-4639-801f-f0715c833c7b",
         "Content-Length": "994",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "110",
-        "x-request-id": "41f11655-662e-42ac-8f9b-9490fdaa8e04"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "91",
+        "X-Request-ID": "6b7455cd-a881-4639-801f-f0715c833c7b"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+        "anomalyDetectionConfigurationId": "5131153c-6fac-4200-a412-86615b9cefb5",
         "name": "configt5YEufRG",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -364,27 +476,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/20aa26b2-dac1-4c0c-8d70-42a78a0e7969",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5131153c-6fac-4200-a412-86615b9cefb5",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ca82e230b36d7842a3dd3473c5dd9f25-6217ad05ec3bf64a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-01c346378ca05e48b3fd51c9d8a4d5e9-d51a8122dede5248-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ab3cc6ee70aafe23c121985e031aec66",
+        "x-ms-client-request-id": "6d794efec5f60e4b1c8b60d0b0daad7f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4e092bf6-eeb9-4139-ba7f-85bf3fe55035",
+        "apim-request-id": "ba5f35ea-4373-4a66-9f08-448c08fdce2f",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "119",
-        "x-request-id": "4e092bf6-eeb9-4139-ba7f-85bf3fe55035"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "90",
+        "X-Request-ID": "ba5f35ea-4373-4a66-9f08-448c08fdce2f"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstanceAsync.json
index 26bee876e5f6..8cea497a9a61 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1027",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f2a87d9705341942ac91e9c5a15028e6-b935f567b8319f42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-44a9a393455ce74c93ccf4242512d8df-5b580c9b639e234d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "edb08ce32315171d922a6f4aa239f8af",
         "x-ms-return-client-request-id": "true"
@@ -86,25 +89,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b1dbca78-5b1c-4b08-9c76-a725d9be7174",
+        "apim-request-id": "859fa1ef-5af1-4edf-bb37-9344d07838d6",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:50 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "x-request-id": "b1dbca78-5b1c-4b08-9c76-a725d9be7174"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "859fa1ef-5af1-4edf-bb37-9344d07838d6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e86fabe31764f44e87617115f7219e19-196c039956f32344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-44a9a393455ce74c93ccf4242512d8df-ef21b05053cc284d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "8b50d4192ebb6255adc15fe9078a7224",
         "x-ms-return-client-request-id": "true"
@@ -112,17 +118,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d070b1dd-7615-482c-81d0-74bf67b0dd18",
+        "apim-request-id": "da767a5c-b60a-423d-9629-c5630c6eda1b",
         "Content-Length": "1137",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "88",
-        "x-request-id": "d070b1dd-7615-482c-81d0-74bf67b0dd18"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "89",
+        "X-Request-ID": "da767a5c-b60a-423d-9629-c5630c6eda1b"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+        "anomalyDetectionConfigurationId": "3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
         "name": "config4KPFfxG8",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -195,17 +201,120 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-eb3ab7cc815dfd4ba764234169540899-0c986fa801c2bf4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "2b1c96bfde0e4f6c8a5d4ef9aa5cd731",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7971fd11-bce2-4f34-9986-7d2fb08492dd",
+        "Content-Length": "1137",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "102",
+        "X-Request-ID": "7971fd11-bce2-4f34-9986-7d2fb08492dd"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
+        "name": "config4KPFfxG8",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 50.0,
+            "shiftPoint": 15,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 7,
+              "minRatio": 8.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "855",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-89ed8f723287fe4d8ba8098a09f9ddd6-94dcca03c6a96246-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f02b0ee5105e2c468317db0dcd7fa090-e4288336bd38524c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2b1c96bfde0e4f6c8a5d4ef9aa5cd731",
+        "x-ms-client-request-id": "5987d7f58805b509374e4054c3330f07",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -268,42 +377,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e74d08c2-fc5a-488c-8c1c-f0ea91c999d9",
+        "apim-request-id": "5b93a9ec-64b4-41c1-9981-a583ae87240e",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "e74d08c2-fc5a-488c-8c1c-f0ea91c999d9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "5b93a9ec-64b4-41c1-9981-a583ae87240e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fdd719a0cddac642b9a94505168a687c-aa207796dbf95f4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-352bd95c89ae564b917f3029d70e549e-101d98da936f2a45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5987d7f58805b509374e4054c3330f07",
+        "x-ms-client-request-id": "0c8b4bb7cd1d3aa16700015edf5bb751",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "674928f4-d665-41ea-802f-402f8869ef2b",
+        "apim-request-id": "96976b1f-ba08-4a81-b558-8fad60c6f3e5",
         "Content-Length": "994",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 16 Dec 2020 18:41:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "674928f4-d665-41ea-802f-402f8869ef2b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "81",
+        "X-Request-ID": "96976b1f-ba08-4a81-b558-8fad60c6f3e5"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+        "anomalyDetectionConfigurationId": "3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
         "name": "config4KPFfxG8",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -364,27 +476,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e94a86e8-9516-46d4-b6c9-47bc7afa3be6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3afbb735-04fc-4ef9-a64e-c8b79e9eaef3",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9abd1a364f425d4d812fa2346c80834a-0ec70c00b5a76d48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201215.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0800292f354b1645857358d018e5c9d4-ca8ba9c477ca5641-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0c8b4bb7cd1d3aa16700015edf5bb751",
+        "x-ms-client-request-id": "30f42ee91902361e8d67f4c09d188b57",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "77f25a76-5e6c-4fc7-b10c-f5b8bf8c0efd",
+        "apim-request-id": "6fbf4de6-1bb5-45f4-a14b-4ee0fd8b2b54",
         "Content-Length": "0",
-        "Date": "Wed, 16 Dec 2020 18:41:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "89",
-        "x-request-id": "77f25a76-5e6c-4fc7-b10c-f5b8bf8c0efd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "103",
+        "X-Request-ID": "6fbf4de6-1bb5-45f4-a14b-4ee0fd8b2b54"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstance.json
index c6f9669e2331..127e7b78d206 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "1027",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0d0527a3e7cdd84085c691780e7a0534-706967fd754e004a-00",
+        "traceparent": "00-b4b0256d530e994bbeba5d15ef5796ab-500fb5a03d5e1c4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -89,32 +89,132 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6ead3176-99ab-4879-af88-d19dff29571c",
+        "apim-request-id": "1a14e930-a164-48a5-a4be-9ac3fb0d078f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:09 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3ffcf9ed-f188-40ed-aa19-f6d6e20450c1",
+        "Date": "Fri, 05 Feb 2021 17:53:19 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "163",
-        "X-Request-ID": "6ead3176-99ab-4879-af88-d19dff29571c"
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "1a14e930-a164-48a5-a4be-9ac3fb0d078f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3ffcf9ed-f188-40ed-aa19-f6d6e20450c1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b4b0256d530e994bbeba5d15ef5796ab-ea509c5c190a6142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f8eb81e7581f7bf1d2bf97aaf9406e6a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0193d544-c52c-4e0b-8963-c69426cc2d7d",
+        "Content-Length": "1137",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:20 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "80",
+        "X-Request-ID": "0193d544-c52c-4e0b-8963-c69426cc2d7d"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
+        "name": "configF7X0zDkk",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 50.0,
+            "shiftPoint": 15,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 7,
+              "minRatio": 8.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "831",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3736e697a37689428f6da6389f76cd5c-85472ad7b99a1f46-00",
+        "traceparent": "00-037e8cbec5fb644fa15b89118e5ccea0-0deb26c32e4d7f4c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f8eb81e7581f7bf1d2bf97aaf9406e6a",
+        "x-ms-client-request-id": "5552c93a3bacd899e34012f071d5ca80",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -176,45 +276,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5b5f8e36-d4a4-4854-a65b-e70552a02be9",
+        "apim-request-id": "de9a973c-9404-454c-848b-4d9d4e32a117",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "183",
-        "X-Request-ID": "5b5f8e36-d4a4-4854-a65b-e70552a02be9"
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "de9a973c-9404-454c-848b-4d9d4e32a117"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3ffcf9ed-f188-40ed-aa19-f6d6e20450c1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0c2c371202390640a01c78a68e26eafc-ae6427c6481e4347-00",
+        "traceparent": "00-a6f5fa255827cb479247c409c2f18c89-b7b1054e6d6edd47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5552c93a3bacd899e34012f071d5ca80",
+        "x-ms-client-request-id": "7057a5e39470eb8fb4ef533892fb2366",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5aaaf7f6-561e-4eb1-9c96-69af846ea65b",
+        "apim-request-id": "d6883e5b-5659-433d-a2f2-dfbe56f2a9ad",
         "Content-Length": "994",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 19:39:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "112",
-        "X-Request-ID": "5aaaf7f6-561e-4eb1-9c96-69af846ea65b"
+        "x-envoy-upstream-service-time": "81",
+        "X-Request-ID": "d6883e5b-5659-433d-a2f2-dfbe56f2a9ad"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "3ffcf9ed-f188-40ed-aa19-f6d6e20450c1",
+        "anomalyDetectionConfigurationId": "8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
         "name": "configF7X0zDkk",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -275,30 +375,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3ffcf9ed-f188-40ed-aa19-f6d6e20450c1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/8d8edec0-c9b4-4de4-9c13-bff4da57f5a7",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-24c173cd1b5dc44998398c2c7c862c68-db1b97aa31980947-00",
+        "traceparent": "00-c6c1ae7122af4a47bb146b68f3b7a537-4b2ec8b723b6ed4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7057a5e39470eb8fb4ef533892fb2366",
+        "x-ms-client-request-id": "7cbb9efac15dac44e71214df45010afd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "856730d6-7060-4dc2-88fa-8056f6adfa63",
+        "apim-request-id": "d1fdd031-982c-4be4-b35a-3e0c9b869495",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "122",
-        "X-Request-ID": "856730d6-7060-4dc2-88fa-8056f6adfa63"
+        "x-envoy-upstream-service-time": "108",
+        "X-Request-ID": "d1fdd031-982c-4be4-b35a-3e0c9b869495"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstanceAsync.json
index cda9a99316a3..f3fc0568f629 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "1027",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-879e4d69d405aa4ea04de75a2aa8e721-93983f1b88a10c4d-00",
+        "traceparent": "00-796a4031b122814685b81af9a0836c00-b618e420aa466642-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -89,32 +89,132 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cf927d13-eb38-4c7e-b98a-d1694a57ce8d",
+        "apim-request-id": "bc422cfc-7b9c-4a7e-bde4-08d133e09549",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:11 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7fce7841-1217-4c5f-994e-73daa49b951c",
+        "Date": "Fri, 05 Feb 2021 17:53:29 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/82935ece-ca34-40a0-b2f8-6876ed65526b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "X-Request-ID": "cf927d13-eb38-4c7e-b98a-d1694a57ce8d"
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "bc422cfc-7b9c-4a7e-bde4-08d133e09549"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7fce7841-1217-4c5f-994e-73daa49b951c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/82935ece-ca34-40a0-b2f8-6876ed65526b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-796a4031b122814685b81af9a0836c00-b23123a19b8c2744-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c9ae2e3ae71e100488431ff580d93b49",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9e7a2c33-f894-4443-b03b-5899a7967764",
+        "Content-Length": "1137",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:29 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "103",
+        "X-Request-ID": "9e7a2c33-f894-4443-b03b-5899a7967764"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "82935ece-ca34-40a0-b2f8-6876ed65526b",
+        "name": "config5ENrcI0q",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          },
+          "changeThresholdCondition": {
+            "changePercentage": 50.0,
+            "shiftPoint": 15,
+            "anomalyDetectorDirection": "Both",
+            "withinRange": true,
+            "suppressCondition": {
+              "minNumber": 7,
+              "minRatio": 8.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/82935ece-ca34-40a0-b2f8-6876ed65526b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "831",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7ddafb74ae68434bb66cdd6f25cbf6c8-bf40556d22c1d643-00",
+        "traceparent": "00-745f897e8f77db4f93dabedf6ebc1492-6d2371fe071b8647-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c9ae2e3ae71e100488431ff580d93b49",
+        "x-ms-client-request-id": "af2650531617864bd64e4c6b902ac28f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -176,45 +276,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "15f7af1d-3c76-472a-a2a7-be74c7112df1",
+        "apim-request-id": "db13fc59-3617-4578-b589-d096245e2b65",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "X-Request-ID": "15f7af1d-3c76-472a-a2a7-be74c7112df1"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "db13fc59-3617-4578-b589-d096245e2b65"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7fce7841-1217-4c5f-994e-73daa49b951c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/82935ece-ca34-40a0-b2f8-6876ed65526b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e7b66e1761aaff4c88eddacc4dc80745-2468a0664434d044-00",
+        "traceparent": "00-b844c68c63b51d409efdab66883f2651-2ad1f46d4a7e344b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "af2650531617864bd64e4c6b902ac28f",
+        "x-ms-client-request-id": "1a5c1663b85f67b8401ac7b6fa57e4bf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c78ec96c-7405-4aca-a6ed-e3b5c1d2dcb2",
+        "apim-request-id": "2f774b9a-aeab-41e6-8d30-723bc1776718",
         "Content-Length": "994",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 19:39:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "88",
-        "X-Request-ID": "c78ec96c-7405-4aca-a6ed-e3b5c1d2dcb2"
+        "x-envoy-upstream-service-time": "106",
+        "X-Request-ID": "2f774b9a-aeab-41e6-8d30-723bc1776718"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "7fce7841-1217-4c5f-994e-73daa49b951c",
+        "anomalyDetectionConfigurationId": "82935ece-ca34-40a0-b2f8-6876ed65526b",
         "name": "config5ENrcI0q",
         "description": "This hook was created to test the .NET client.",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -275,30 +375,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/7fce7841-1217-4c5f-994e-73daa49b951c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/82935ece-ca34-40a0-b2f8-6876ed65526b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2cf7c6d0da1d654994cc5f5f9cdefd7c-0a40fd376e83744c-00",
+        "traceparent": "00-34ded3fc0d241e4ba1976a2ce8b6a9af-5ded2d921118ba41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1a5c1663b85f67b8401ac7b6fa57e4bf",
+        "x-ms-client-request-id": "89e66e3a28ec2352e228f3cf9b987f5d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c3b7827a-7cc8-4af8-9447-ed1a9465113b",
+        "apim-request-id": "0c8dbd42-df80-452b-88a7-7c8879caaa7d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 19:39:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "98",
-        "X-Request-ID": "c3b7827a-7cc8-4af8-9447-ed1a9465113b"
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "0c8dbd42-df80-452b-88a7-7c8879caaa7d"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False).json
index 5ee8816a1748..f69175c04ba7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "858",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-60ff83769604fc43869df4c2e809152d-c25fab5a8fad2a4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-627b60a85cf8e240bf2b2731fcbb0dc1-be6fa32a2c746e4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b0972cb3753e61bbd46851d3bb5ed2ea",
         "x-ms-return-client-request-id": "true"
@@ -76,25 +79,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "15658174-f1d9-41fe-8d7a-dda100355d38",
+        "apim-request-id": "6e2199a0-607b-469f-825c-92e92c16c942",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+        "Date": "Fri, 05 Feb 2021 17:53:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "15658174-f1d9-41fe-8d7a-dda100355d38"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "204",
+        "X-Request-ID": "6e2199a0-607b-469f-825c-92e92c16c942"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-000d93d86697fb48ad062b52c0dcb4fc-1f0aef08b8fd2b47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-627b60a85cf8e240bf2b2731fcbb0dc1-c518222ee5582e42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a148f39f3b06e0202a691c6e132ecf6c",
         "x-ms-return-client-request-id": "true"
@@ -102,17 +108,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "aaf8cc07-be25-4c85-a3e0-12aadea8bbd2",
+        "apim-request-id": "fdc26298-5be2-4f83-b536-2d7fe186106e",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "99",
-        "x-request-id": "aaf8cc07-be25-4c85-a3e0-12aadea8bbd2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "86",
+        "X-Request-ID": "fdc26298-5be2-4f83-b536-2d7fe186106e"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+        "anomalyDetectionConfigurationId": "34a4ca9b-e0d8-482d-b528-68d7feb50033",
         "name": "configS8dmYdfe",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -175,17 +181,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ebe782fd3e998745820041e40bffe0f6-a5d92de5e358e447-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c74f11023cc386bd75e7a1ffa1ccfc36",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "498c4f50-5e59-4477-8e8e-71c649b08ef7",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "498c4f50-5e59-4477-8e8e-71c649b08ef7"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "34a4ca9b-e0d8-482d-b528-68d7feb50033",
+        "name": "configS8dmYdfe",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "825",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dc1a85b9b274df449792b6d211a36c0b-f71a94931938924e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-83ab0b52aba93d42b166d0da17fff5fb-e50f5f4b938f6f40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c74f11023cc386bd75e7a1ffa1ccfc36",
+        "x-ms-client-request-id": "2766aaa5b40b779c0bb686d5584c4ea6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -250,42 +349,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1142e05b-e2cd-4c61-ba46-2411a8bf949a",
+        "apim-request-id": "6371f5ce-f92f-49f9-81a3-1eba7407e93d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "x-request-id": "1142e05b-e2cd-4c61-ba46-2411a8bf949a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "6371f5ce-f92f-49f9-81a3-1eba7407e93d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-224cdbae7935894f9251f517b6b260bc-dc1bc6d3bee12647-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a0e58522a024f54194874695af0cd513-ccfb735e3cf36b42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2766aaa5b40b779c0bb686d5584c4ea6",
+        "x-ms-client-request-id": "aad1e5990a0f622635c12c1f9a213e5e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a21db451-4f7f-4c92-b081-5a980d848f44",
+        "apim-request-id": "141378b7-0034-4a36-8582-30b1203d7588",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "90",
-        "x-request-id": "a21db451-4f7f-4c92-b081-5a980d848f44"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "91",
+        "X-Request-ID": "141378b7-0034-4a36-8582-30b1203d7588"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+        "anomalyDetectionConfigurationId": "34a4ca9b-e0d8-482d-b528-68d7feb50033",
         "name": "configS8dmYdfe",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -348,27 +450,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/c537d6aa-e4bc-44f7-a331-c251ed47aefa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/34a4ca9b-e0d8-482d-b528-68d7feb50033",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6b11c3da1fbaff4cb5386061341eab33-59ca1dad2310f142-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d96f1739822c974287e020df1c1c9868-35968a0cf2ae9b43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "aad1e5990a0f622635c12c1f9a213e5e",
+        "x-ms-client-request-id": "68c8e66ca7c84d6174d7bb0cb6e82e28",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "15b3db3c-36cd-4b81-9a89-95cd1bbf9444",
+        "apim-request-id": "136ceac6-27c2-4aff-94da-54cf0b4bd856",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "110",
-        "x-request-id": "15b3db3c-36cd-4b81-9a89-95cd1bbf9444"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "136ceac6-27c2-4aff-94da-54cf0b4bd856"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False)Async.json
index 311607d67eea..bb4ff6d3dc65 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "858",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fdf7dbd0a9163f45b0ea956344573707-2aea0adb04cf4647-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0c4b4f06fab91c4a937eea1390cc8e40-33669a70f5445949-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7840d24d9997aafc09851a1a4625dd06",
         "x-ms-return-client-request-id": "true"
@@ -76,25 +79,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9539c819-d7fe-4911-9b16-ecd6079585f1",
+        "apim-request-id": "7fa80aa2-b7e5-453b-ad13-49ad60692a00",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "196",
-        "x-request-id": "9539c819-d7fe-4911-9b16-ecd6079585f1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "7fa80aa2-b7e5-453b-ad13-49ad60692a00"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-360bba1d8e7bda4caab3782423dc8fcd-58809a4f1da40c4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0c4b4f06fab91c4a937eea1390cc8e40-918493bafc8d4440-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6762f3a7ddc97f158dba8de0aa87e4c6",
         "x-ms-return-client-request-id": "true"
@@ -102,17 +108,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "aa23270b-d947-45c6-b735-b72495a6b43a",
+        "apim-request-id": "014e98c7-37ee-444c-ab71-71afe57217b1",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "108",
-        "x-request-id": "aa23270b-d947-45c6-b735-b72495a6b43a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "95",
+        "X-Request-ID": "014e98c7-37ee-444c-ab71-71afe57217b1"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+        "anomalyDetectionConfigurationId": "5da7a71f-e69d-4567-8896-0ab411271768",
         "name": "config9OR03UcA",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -175,17 +181,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-bc5e18c91dd3804d893252efeba1f5e4-b6fd3c2ff01b7c49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7d0d97fca82252b1a8e59a24d042b9bb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7d2b9294-8fe5-435c-888d-897fa91e898b",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "105",
+        "X-Request-ID": "7d2b9294-8fe5-435c-888d-897fa91e898b"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "5da7a71f-e69d-4567-8896-0ab411271768",
+        "name": "config9OR03UcA",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "825",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bb2d48a38569bc4b9fd453d04f6c8a9e-c9b9bd1f2130cc4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-916422631efc424eb3f4ee4a42625aa2-e4387b27f4edbd40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7d0d97fca82252b1a8e59a24d042b9bb",
+        "x-ms-client-request-id": "ea9a610f0270707dbdc1ebdc0b1c0082",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -250,42 +349,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "66370a60-8a87-4165-91e2-60930f3b18bb",
+        "apim-request-id": "b91b0fab-ec6e-448c-b351-77a30367aef8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "198",
-        "x-request-id": "66370a60-8a87-4165-91e2-60930f3b18bb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "b91b0fab-ec6e-448c-b351-77a30367aef8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2b14e2cd3e541d4c8e42b9c365514fef-9b33772639d9ab42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e3e3cd6d54c9e442aed1610f7a6e469a-6c89b739f8400f43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ea9a610f0270707dbdc1ebdc0b1c0082",
+        "x-ms-client-request-id": "ae1d54a16017fee44210bfe442f0af4a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "83eafa7c-232a-4a91-bbc3-1191cfb14668",
+        "apim-request-id": "30ea6fb6-45e2-49d5-9c6d-999b7e0a7d39",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "109",
-        "x-request-id": "83eafa7c-232a-4a91-bbc3-1191cfb14668"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "99",
+        "X-Request-ID": "30ea6fb6-45e2-49d5-9c6d-999b7e0a7d39"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+        "anomalyDetectionConfigurationId": "5da7a71f-e69d-4567-8896-0ab411271768",
         "name": "config9OR03UcA",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -348,27 +450,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3c725987-c415-4aa8-b7c0-4f63e23fc6cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/5da7a71f-e69d-4567-8896-0ab411271768",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fec34d2592378541a105330d21c703ef-59d89d39e9599544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-874cde2a20fb004dab16089df97d07bf-1987f7e58aaf9142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ae1d54a16017fee44210bfe442f0af4a",
+        "x-ms-client-request-id": "48d0d201f9ecf9551a9dc061bdd5468c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5a40ae2a-1c2c-4c09-861e-c2c0a47270dd",
+        "apim-request-id": "11fcf185-5ad2-49ae-8074-6d5f74c52528",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "106",
-        "x-request-id": "5a40ae2a-1c2c-4c09-861e-c2c0a47270dd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "114",
+        "X-Request-ID": "11fcf185-5ad2-49ae-8074-6d5f74c52528"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True).json
index d309da6d3af2..2e51b6b3a53f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "858",
         "Content-Type": "application/json",
-        "traceparent": "00-ea2474ef370ef743bb97f32b6e0f6aef-c1166e7f20173e44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-63c018ec6a3cad4abccebca2682b1a5e-646bfa15c3f87742-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "18a3d941380a038cf555a18dc01b1d16",
         "x-ms-return-client-request-id": "true"
       },
@@ -75,42 +78,134 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1b2cf49b-1956-4ac5-8edd-ad998146094a",
+        "apim-request-id": "79884565-0e18-473d-a719-4a159f5c1ee5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:00 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+        "Date": "Fri, 05 Feb 2021 17:53:23 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "110",
-        "x-request-id": "1b2cf49b-1956-4ac5-8edd-ad998146094a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "140",
+        "X-Request-ID": "79884565-0e18-473d-a719-4a159f5c1ee5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-413c1718b2ef8147b0557617d1dd5377-ffe9faf755edb245-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-63c018ec6a3cad4abccebca2682b1a5e-08d3fd9fe9c0e141-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "faac52bf6e56e4ed880433800aa248b0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9d5cc94c-0a38-4e93-9af4-488071156ea6",
+        "apim-request-id": "a8c3862d-6c7c-4a28-a10c-6f366c571973",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:23 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "36",
+        "X-Request-ID": "a8c3862d-6c7c-4a28-a10c-6f366c571973"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
+        "name": "configvvfJ7FgJ",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-7baad86a22bfe34086c598bfeaedc15a-39b90f2664ac3345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "6cf73748e3df1c6fc794ead74b666df3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "45ee7b2b-8285-4c12-8ca1-c52d5356b594",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:00 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "32",
-        "x-request-id": "9d5cc94c-0a38-4e93-9af4-488071156ea6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "31",
+        "X-Request-ID": "45ee7b2b-8285-4c12-8ca1-c52d5356b594"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+        "anomalyDetectionConfigurationId": "10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
         "name": "configvvfJ7FgJ",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -173,16 +268,19 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "825",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-383c50f578b88f4b801d00346f6572c7-d0053d664c43e347-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "6cf73748e3df1c6fc794ead74b666df3",
+        "traceparent": "00-6a600b5e4b78ff468b82826f76852c80-42d570dd22e82741-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "e7a5604dde58d295ebbe9005050bf852",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -247,41 +345,44 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d2984e3a-60c9-4fb6-8557-8c7cfcca0214",
+        "apim-request-id": "2af08797-6618-4450-bff5-ad7ded0aff55",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "125",
-        "x-request-id": "d2984e3a-60c9-4fb6-8557-8c7cfcca0214"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "2af08797-6618-4450-bff5-ad7ded0aff55"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-5a4b269db52cf74a9485ee81ceed4572-5721c285e65fc143-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "e7a5604dde58d295ebbe9005050bf852",
+        "traceparent": "00-f7cd503aa410964699ece79a5684bbd1-27480534c73e2348-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "8844f00db124dc37e29032c283159822",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d2939287-727b-4759-8434-1954de2c499c",
+        "apim-request-id": "8c803017-b4f2-4920-8c34-1bb1d34f17ea",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "34",
-        "x-request-id": "d2939287-727b-4759-8434-1954de2c499c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "40",
+        "X-Request-ID": "8c803017-b4f2-4920-8c34-1bb1d34f17ea"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+        "anomalyDetectionConfigurationId": "10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
         "name": "configvvfJ7FgJ",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -344,26 +445,29 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/b6400efe-a9a8-46ec-9642-72d6dfdc16b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/10c36a3e-ccf8-4b0c-9eb6-357665473bc9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-236c59e42c788c4b940d84f327702433-4bce221a0d140a4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "8844f00db124dc37e29032c283159822",
+        "traceparent": "00-fa681e000a977441b7e61fd9eaeeb8f1-55e66920802f184c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "aa323f9661fc6a58a2248020536916bc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "94821f45-6700-43f7-9d44-4dca3722f367",
+        "apim-request-id": "84bbc051-6ea2-4b56-81a2-f770866ae997",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "41",
-        "x-request-id": "94821f45-6700-43f7-9d44-4dca3722f367"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "43",
+        "X-Request-ID": "84bbc051-6ea2-4b56-81a2-f770866ae997"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True)Async.json
index 0a26a15d2341..982be88b5e3c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndGetInstance(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "858",
         "Content-Type": "application/json",
-        "traceparent": "00-7e09dd87f1d0e344ba424526c4ac0012-3b7618f318c7d84d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5ea0463f5a0f71499e76e59cfb04ebca-ce050dccd0f67749-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "44d33fe48170c13acd1c9736f8c740a4",
         "x-ms-return-client-request-id": "true"
       },
@@ -75,42 +78,134 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b1b2bee7-901f-44f3-b7af-fe50f5bc4bb5",
+        "apim-request-id": "36339a97-d375-436e-ae69-51db0162278a",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:07 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/32fcc502-4d49-438f-b311-66eee9e8dcbd",
+        "Date": "Fri, 05 Feb 2021 17:53:31 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "126",
-        "x-request-id": "b1b2bee7-901f-44f3-b7af-fe50f5bc4bb5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "117",
+        "X-Request-ID": "36339a97-d375-436e-ae69-51db0162278a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/32fcc502-4d49-438f-b311-66eee9e8dcbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-b06fad1dfd4fc34e9887ccd0800cd86a-b1d535494627fa49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5ea0463f5a0f71499e76e59cfb04ebca-33254fbd972fdd4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "d39d34622047a701a03d2883ef74e60c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9b979b96-a2a6-46ed-bb46-0c646ab1dd91",
+        "apim-request-id": "5ea85e55-3397-44da-bd71-e682aca3c73b",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:32 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "35",
+        "X-Request-ID": "5ea85e55-3397-44da-bd71-e682aca3c73b"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
+        "name": "configNBUpfLc4",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-86b2ea814eec5c4ba57f483d01d27dff-9a0c9948c246a343-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "c05e864224bb2e35690bf15fe42179fe",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5e0e8a93-778b-4c42-95e1-8868f0a530ed",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "39",
-        "x-request-id": "9b979b96-a2a6-46ed-bb46-0c646ab1dd91"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "34",
+        "X-Request-ID": "5e0e8a93-778b-4c42-95e1-8868f0a530ed"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "32fcc502-4d49-438f-b311-66eee9e8dcbd",
+        "anomalyDetectionConfigurationId": "2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
         "name": "configNBUpfLc4",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -173,16 +268,19 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/32fcc502-4d49-438f-b311-66eee9e8dcbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "825",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-45284ee5cc973f4484cacbd6a4de5db3-2ec90e0ab90a9c45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "c05e864224bb2e35690bf15fe42179fe",
+        "traceparent": "00-2314affe81c81240b7b78dccd756d26e-817bff259724f843-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "0882138a8999c31c3d2ca43358b6d258",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -247,41 +345,44 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "56d99847-4fd7-4977-b772-0628ac495b80",
+        "apim-request-id": "86280457-4fe5-4a4c-8f9d-44e1ee109326",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "116",
-        "x-request-id": "56d99847-4fd7-4977-b772-0628ac495b80"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "86280457-4fe5-4a4c-8f9d-44e1ee109326"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/32fcc502-4d49-438f-b311-66eee9e8dcbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-7d053256e6d65e48904c7daf6132fa1f-3a0e4074dd50784f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "0882138a8999c31c3d2ca43358b6d258",
+        "traceparent": "00-d52fbc6a8cd86a4fbccc5bc94304a02d-60a9bc28a25bef45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "71f48b3580693de9ff6f693b2fa1c37e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "72816255-18b3-46af-8012-084051cea030",
+        "apim-request-id": "c3a66589-9b59-490f-939e-8d5334919866",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "36",
-        "x-request-id": "72816255-18b3-46af-8012-084051cea030"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "33",
+        "X-Request-ID": "c3a66589-9b59-490f-939e-8d5334919866"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "32fcc502-4d49-438f-b311-66eee9e8dcbd",
+        "anomalyDetectionConfigurationId": "2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
         "name": "configNBUpfLc4",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -344,26 +445,29 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/32fcc502-4d49-438f-b311-66eee9e8dcbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/2381388a-7b8d-4a06-b9ac-d4c0ba91791b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-c24076134f43fc40bbf011d2821fe7f1-725d48848fe98247-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "71f48b3580693de9ff6f693b2fa1c37e",
+        "traceparent": "00-2a788ab0b039df47b924e7dc3175d3c4-fd00d9de0523be44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "dbf829c4ddf2b9726a9a828f8001d5b3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5ea77871-83d5-4f99-88db-68229b622c56",
+        "apim-request-id": "3ceab68f-ad24-478a-a406-b2a1bd62e04f",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "57",
-        "x-request-id": "5ea77871-83d5-4f99-88db-68229b622c56"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "41",
+        "X-Request-ID": "3ceab68f-ad24-478a-a406-b2a1bd62e04f"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstance.json
index 739baa1c72f3..16ecb2d5e3ee 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "858",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-36753108367d8c4f948b8035a70e96fe-ea0c56055da8be40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d084e51e9dd015449e70dcb7eabf8527-c6e5d68dde54294d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "56597177bb9b6b2364bc5d0879ba1b82",
         "x-ms-return-client-request-id": "true"
@@ -76,29 +79,122 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7849d5fb-1414-4df3-bcb7-faa780c386e0",
+        "apim-request-id": "0c7f8731-9036-47ca-8e30-d661163e50b6",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:17 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/bb5ac1f0-4398-481c-bc6f-28f0abeff1b2",
+        "Date": "Fri, 05 Feb 2021 17:53:20 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/4e3efa3f-cb81-4941-b3f6-e941337d23ba",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "754",
-        "x-request-id": "7849d5fb-1414-4df3-bcb7-faa780c386e0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "0c7f8731-9036-47ca-8e30-d661163e50b6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/bb5ac1f0-4398-481c-bc6f-28f0abeff1b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/4e3efa3f-cb81-4941-b3f6-e941337d23ba",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d084e51e9dd015449e70dcb7eabf8527-2cd2687d608f6743-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b104856397e4ae918317ccc97defdbca",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "aea98d6b-9aed-416d-b0dd-ad71bad3483f",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:21 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "83",
+        "X-Request-ID": "aea98d6b-9aed-416d-b0dd-ad71bad3483f"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "4e3efa3f-cb81-4941-b3f6-e941337d23ba",
+        "name": "configg5UnOSqf",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/4e3efa3f-cb81-4941-b3f6-e941337d23ba",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "307",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-94e8e9bc1ff58c44805ed223e4a16c42-e25345266994f541-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-607bbdc3c687eb47a7806bf4c4979f19-70fbcbaa232b004b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b104856397e4ae918317ccc97defdbca",
+        "x-ms-client-request-id": "f7d1039bbc2e8c075029ddb65f119619",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -124,42 +220,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "28a5727a-db18-4807-a69c-e97cf0ef451f",
+        "apim-request-id": "9aa07a54-1055-484f-b4d9-bec23cd2303c",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "916",
-        "x-request-id": "28a5727a-db18-4807-a69c-e97cf0ef451f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "112",
+        "X-Request-ID": "9aa07a54-1055-484f-b4d9-bec23cd2303c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/bb5ac1f0-4398-481c-bc6f-28f0abeff1b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/4e3efa3f-cb81-4941-b3f6-e941337d23ba",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-342beee4bccfdb479b4838712c4a5451-f8b6704c6d373149-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cdb5da0bec05cd49ba8949f76673850c-1ef730b79f8ee54a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f7d1039bbc2e8c075029ddb65f119619",
+        "x-ms-client-request-id": "3ec3fe45587adf9ae0aad283ee59ee75",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0c7e1042-d884-4d99-91a9-f68870220e16",
+        "apim-request-id": "468ba0d9-d937-4335-8c88-cd9d5e518249",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "300",
-        "x-request-id": "0c7e1042-d884-4d99-91a9-f68870220e16"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "468ba0d9-d937-4335-8c88-cd9d5e518249"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "bb5ac1f0-4398-481c-bc6f-28f0abeff1b2",
+        "anomalyDetectionConfigurationId": "4e3efa3f-cb81-4941-b3f6-e941337d23ba",
         "name": "configg5UnOSqf",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -222,27 +321,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/bb5ac1f0-4398-481c-bc6f-28f0abeff1b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/4e3efa3f-cb81-4941-b3f6-e941337d23ba",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ce49d6247e613848b913d3772e5b7653-c371783288a19f47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-61ac2556f23a6948a267c1b85a6656dc-9285a1e1eeeeba42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3ec3fe45587adf9ae0aad283ee59ee75",
+        "x-ms-client-request-id": "756d93e123e9a7547e7760bbbada4f72",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fc4278c7-ec24-449d-a55a-b9c7bf5a3988",
+        "apim-request-id": "7302382f-ad87-47c0-ad71-f5013a6209bd",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "89",
-        "x-request-id": "fc4278c7-ec24-449d-a55a-b9c7bf5a3988"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "88",
+        "X-Request-ID": "7302382f-ad87-47c0-ad71-f5013a6209bd"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstanceAsync.json
index 2170010e2817..c53f8810c739 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/AnomalyDetectionConfigurationLiveTests/UpdateDetectionConfigurationWithMinimumSetupAndNewInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "858",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7f29ea9df886f541846f5ed30e42b44b-86878dbda74bab42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a89b6e19f4bd8940a9c896f0c21e70cd-9e8d02df56f4bd4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f102e9ac2e4a7735645446a392101d05",
         "x-ms-return-client-request-id": "true"
@@ -76,29 +79,122 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cdc1dd19-8c91-484f-98b1-2130c3580ae8",
+        "apim-request-id": "cebb4191-dd6e-4baf-a038-52102a114239",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e0c936b0-db39-4866-b9fe-246b252c20b2",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3de6d3d8-15c3-4e41-b64f-ea345119ab46",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "x-request-id": "cdc1dd19-8c91-484f-98b1-2130c3580ae8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "cebb4191-dd6e-4baf-a038-52102a114239"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e0c936b0-db39-4866-b9fe-246b252c20b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3de6d3d8-15c3-4e41-b64f-ea345119ab46",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a89b6e19f4bd8940a9c896f0c21e70cd-df9af57d7d80f346-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a20a71089792ee5bd1e0a6123636e598",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d195675d-4626-4557-9eba-3009aa13a7aa",
+        "Content-Length": "964",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "88",
+        "X-Request-ID": "d195675d-4626-4557-9eba-3009aa13a7aa"
+      },
+      "ResponseBody": {
+        "anomalyDetectionConfigurationId": "3de6d3d8-15c3-4e41-b64f-ea345119ab46",
+        "name": "configtkKIP1I7",
+        "description": "",
+        "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
+        "wholeMetricConfiguration": {
+          "conditionOperator": "OR",
+          "smartDetectionCondition": {
+            "sensitivity": 60.0,
+            "anomalyDetectorDirection": "Up",
+            "suppressCondition": {
+              "minNumber": 5,
+              "minRatio": 6.0
+            }
+          },
+          "hardThresholdCondition": {
+            "lowerBound": 10.0,
+            "anomalyDetectorDirection": "Down",
+            "suppressCondition": {
+              "minNumber": 1,
+              "minRatio": 2.0
+            }
+          }
+        },
+        "dimensionGroupOverrideConfigurations": [
+          {
+            "group": {
+              "dimension": {
+                "city": "Koltaka"
+              }
+            },
+            "changeThresholdCondition": {
+              "changePercentage": 40.0,
+              "shiftPoint": 12,
+              "anomalyDetectorDirection": "Up",
+              "withinRange": false,
+              "suppressCondition": {
+                "minNumber": 5,
+                "minRatio": 6.0
+              }
+            }
+          }
+        ],
+        "seriesOverrideConfigurations": [
+          {
+            "series": {
+              "dimension": {
+                "city": "Delhi",
+                "category": "Handmade"
+              }
+            },
+            "smartDetectionCondition": {
+              "sensitivity": 30.0,
+              "anomalyDetectorDirection": "Both",
+              "suppressCondition": {
+                "minNumber": 3,
+                "minRatio": 4.0
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3de6d3d8-15c3-4e41-b64f-ea345119ab46",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "307",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3cbbb201fdf1c94cacd153b45ce1b5e0-a92b4832d2bb734c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-74019a599e506d4e97a15a3691a1a348-3bf86ccf4ac12340-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a20a71089792ee5bd1e0a6123636e598",
+        "x-ms-client-request-id": "11d3ef3a105f4d9e9897942017640725",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -124,42 +220,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9add3064-7706-4b3c-99bf-d1290d7a746f",
+        "apim-request-id": "0d8d78fb-3314-4aaa-a239-120064b0fb83",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "101",
-        "x-request-id": "9add3064-7706-4b3c-99bf-d1290d7a746f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "0d8d78fb-3314-4aaa-a239-120064b0fb83"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e0c936b0-db39-4866-b9fe-246b252c20b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3de6d3d8-15c3-4e41-b64f-ea345119ab46",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c13646671d645c4596796374227d0b9d-264b671e68f9da46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f1ad1b14e7d5784d8e0e7841d470561a-7dbe5ac891cfaa4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "11d3ef3a105f4d9e9897942017640725",
+        "x-ms-client-request-id": "bf0f6e2b1dce14248d141f698822402e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d839342a-c580-49a3-b28f-19bf55b56728",
+        "apim-request-id": "e17c2534-12cc-4f44-83ca-0a380004d6be",
         "Content-Length": "964",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "94",
-        "x-request-id": "d839342a-c580-49a3-b28f-19bf55b56728"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "78",
+        "X-Request-ID": "e17c2534-12cc-4f44-83ca-0a380004d6be"
       },
       "ResponseBody": {
-        "anomalyDetectionConfigurationId": "e0c936b0-db39-4866-b9fe-246b252c20b2",
+        "anomalyDetectionConfigurationId": "3de6d3d8-15c3-4e41-b64f-ea345119ab46",
         "name": "configtkKIP1I7",
         "description": "",
         "metricId": "27e3015f-04fd-44ba-a20b-bc529a0aebae",
@@ -222,27 +321,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/e0c936b0-db39-4866-b9fe-246b252c20b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/enrichment/anomalyDetection/configurations/3de6d3d8-15c3-4e41-b64f-ea345119ab46",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-40bd7dbf7b59ae4ea2622e3981060590-f0f1de5542f0f14d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210203.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-95e311a000c90347b2a2f7ac7bea0942-291db7f22814764c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "bf0f6e2b1dce14248d141f698822402e",
+        "x-ms-client-request-id": "a268ad6f0b3df7a6d3bc09fb023ad66d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1c2d8be0-f3e9-4425-b09f-ac02ece53553",
+        "apim-request-id": "b35e8352-6cb1-4bfb-a08b-4c6880ba7bba",
         "Content-Length": "0",
-        "Date": "Wed, 03 Feb 2021 19:33:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "96",
-        "x-request-id": "1c2d8be0-f3e9-4425-b09f-ac02ece53553"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "b35e8352-6cb1-4bfb-a08b-4c6880ba7bba"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False).json
index dea9436d80a3..33b386bdf585 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8a64b03d483c2344a3005a201fc3306f-cf3e4a62d7ed7f48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-92cf2f71f1a9d64a884fa01932e2cea1-7419b399fca98b47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "960de25187b0c9dc7b91d3f003fcde80",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "640efdf0-92fb-449f-8ad0-d0fc249c8472",
+        "apim-request-id": "8db59724-616c-430f-a787-7b0b8cd6050c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:24 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1683c901-76a3-460f-9a34-af789f741784",
+        "Date": "Fri, 05 Feb 2021 17:56:39 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a9a2f6ab-4b88-4049-925a-8267970a9c0d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "487",
-        "x-request-id": "640efdf0-92fb-449f-8ad0-d0fc249c8472"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "432",
+        "X-Request-ID": "8db59724-616c-430f-a787-7b0b8cd6050c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1683c901-76a3-460f-9a34-af789f741784",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a9a2f6ab-4b88-4049-925a-8267970a9c0d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-30de0d35279f784496eb46670686ea2d-a2372a859e7f0c47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-92cf2f71f1a9d64a884fa01932e2cea1-a3c367fe31dfac44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "07e0653b80c8cad6418ec6f62298e230",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8399298a-0ac3-4e45-b8b3-490314935ac2",
+        "apim-request-id": "d8a023bb-39d5-47f8-92ba-d308769f18c1",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "190",
-        "x-request-id": "8399298a-0ac3-4e45-b8b3-490314935ac2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "d8a023bb-39d5-47f8-92ba-d308769f18c1"
       },
       "ResponseBody": {
-        "dataFeedId": "1683c901-76a3-460f-9a34-af789f741784",
+        "dataFeedId": "a9a2f6ab-4b88-4049-925a-8267970a9c0d",
         "dataFeedName": "dataFeed2N0mXplz",
         "metrics": [
           {
-            "metricId": "8cf5c2e0-8153-4a34-968d-c93327410297",
+            "metricId": "0a757d09-fe25-42f1-926c-d46bb28b73b0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:25Z",
+        "createdTime": "2021-02-05T17:56:40Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1683c901-76a3-460f-9a34-af789f741784",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a9a2f6ab-4b88-4049-925a-8267970a9c0d",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-59c0b8b90f4586488530bb7775182f87-923d3037a1f81b42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d7f688f0d073814889add3a15c923651-b9be295b0c2a3e48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2d50f82cd01559ff4562fa9c89706f9e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f685ae2b-64df-4ce2-a292-e61243b88955",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:40 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "f685ae2b-64df-4ce2-a292-e61243b88955"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a9a2f6ab-4b88-4049-925a-8267970a9c0d",
+        "dataFeedName": "dataFeed2N0mXplz",
+        "metrics": [
+          {
+            "metricId": "0a757d09-fe25-42f1-926c-d46bb28b73b0",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:40Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a9a2f6ab-4b88-4049-925a-8267970a9c0d",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-137cb030fbd93141a1128f929ea4d137-0e5c26cd8edc5c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "75bf75d456cad0430b425521c0e6a6e2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3453ba94-5bdf-4e2e-985e-16de7990c39f",
+        "apim-request-id": "bca0a90f-5bc6-42b3-92fa-5b6fbb9870a8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "394",
-        "x-request-id": "3453ba94-5bdf-4e2e-985e-16de7990c39f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "283",
+        "X-Request-ID": "bca0a90f-5bc6-42b3-92fa-5b6fbb9870a8"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:25.7541035-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:40.5083852-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False)Async.json
index 6f837dbc0159..77b4c5426929 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-76dfea2313760b43a07a27524fe77092-39509e8d0d10ac48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3a42690a33fb9e4aa001db947b396c9c-2e039a938577da46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bf6787e350cb73ea3769ee77c55d7d2c",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "161e92e2-2270-43aa-86d1-913d777c6cfa",
+        "apim-request-id": "c7b83070-6901-4343-966f-b8100613b0f5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:38 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d3658d6b-c6be-440e-b290-d1d0f83543e7",
+        "Date": "Fri, 05 Feb 2021 17:59:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "397",
-        "x-request-id": "161e92e2-2270-43aa-86d1-913d777c6cfa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "624",
+        "X-Request-ID": "c7b83070-6901-4343-966f-b8100613b0f5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d3658d6b-c6be-440e-b290-d1d0f83543e7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-65d83c4a236d1f4bb68d44399bb37aa1-0398f217d6b2e04e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3a42690a33fb9e4aa001db947b396c9c-d5f0c89b8f3beb40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "79fe5161952eb59ceeb9b890a595b36b",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "92157130-b878-411a-897e-fdd395f3c8cd",
+        "apim-request-id": "539b7c20-1c88-437a-b3c0-9d1f0d3729fb",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "167",
-        "x-request-id": "92157130-b878-411a-897e-fdd395f3c8cd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "539b7c20-1c88-437a-b3c0-9d1f0d3729fb"
       },
       "ResponseBody": {
-        "dataFeedId": "d3658d6b-c6be-440e-b290-d1d0f83543e7",
+        "dataFeedId": "b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
         "dataFeedName": "dataFeed4jeFaH09",
         "metrics": [
           {
-            "metricId": "953ad126-7956-4f72-9cbc-f9361f0d2c9d",
+            "metricId": "e7f6b423-66d3-4dd8-a821-718e15974be3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:38Z",
+        "createdTime": "2021-02-05T17:59:15Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d3658d6b-c6be-440e-b290-d1d0f83543e7",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c5abe3767a437b4582131ded6db8d2cf-af5c4596474e5d40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1824c25298a36945a4105a2892232a06-a74fe39bda205d4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "209375786de55d278d7c307802ef8726",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "fa9447a8-3b08-4b12-ad9a-472fa85fcba5",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:15 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "fa9447a8-3b08-4b12-ad9a-472fa85fcba5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
+        "dataFeedName": "dataFeed4jeFaH09",
+        "metrics": [
+          {
+            "metricId": "e7f6b423-66d3-4dd8-a821-718e15974be3",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:15Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7a9a786-f60b-43e7-85c0-a6c463dbb3ef",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-16e1f9a503ba0542ba455d491c648fcd-8171ac77c85d8a4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "27a6ad170d714dffebb1d0119859cda1",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c2d549d0-9bb7-4eae-89ba-2618725c6476",
+        "apim-request-id": "adb6b432-679a-4440-8bbb-aa8be5d988fa",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:39 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "289",
-        "x-request-id": "c2d549d0-9bb7-4eae-89ba-2618725c6476"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "351",
+        "X-Request-ID": "adb6b432-679a-4440-8bbb-aa8be5d988fa"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:39.0338824-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:16.1999146-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True).json
index 216d3c91d05d..ef755624325f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "284",
         "Content-Type": "application/json",
-        "traceparent": "00-af705df6fd9b214982180dbc30ed587f-8dbf5ddc8bfc8240-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7a27345cbe7af64c9729460f33674d2e-a11b21594dfce743-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "06930980e0303e7e5bbfaa7e5bb2f53a",
         "x-ms-return-client-request-id": "true"
       },
@@ -32,46 +35,49 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "64eaa15a-7e67-46f0-a3e3-241a8f30f19d",
+        "apim-request-id": "77257708-f008-4d8c-b6d0-8bf752b02e4f",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/92e10a29-5289-4428-86ae-a6bedfa5311c",
+        "Date": "Fri, 05 Feb 2021 17:56:37 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ccdd290b-0581-4f52-8e53-c4f2b676dff9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "706",
-        "x-request-id": "64eaa15a-7e67-46f0-a3e3-241a8f30f19d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "590",
+        "X-Request-ID": "77257708-f008-4d8c-b6d0-8bf752b02e4f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/92e10a29-5289-4428-86ae-a6bedfa5311c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ccdd290b-0581-4f52-8e53-c4f2b676dff9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-88423ff1ea49d044adb512959aa1565a-36b5830a65da0241-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7a27345cbe7af64c9729460f33674d2e-c7c546e4b3dc464e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "f48bf5b7234fbdfd517670c3d7370e7c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2ee8227a-00b4-4f1c-a8e9-1430fb3c7932",
+        "apim-request-id": "9931b66a-8298-4392-98c5-fbc4323c26b1",
         "Content-Length": "1038",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "85",
-        "x-request-id": "2ee8227a-00b4-4f1c-a8e9-1430fb3c7932"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "9931b66a-8298-4392-98c5-fbc4323c26b1"
       },
       "ResponseBody": {
-        "dataFeedId": "92e10a29-5289-4428-86ae-a6bedfa5311c",
+        "dataFeedId": "ccdd290b-0581-4f52-8e53-c4f2b676dff9",
         "dataFeedName": "dataFeedXs4S4CWD",
         "metrics": [
           {
-            "metricId": "daa55382-f5dc-4f86-8465-01192aafca2c",
+            "metricId": "c3b7fb74-9ba1-4235-a30a-b59a20ba16d3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:24Z",
+        "createdTime": "2021-02-05T17:56:38Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,32 +120,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/92e10a29-5289-4428-86ae-a6bedfa5311c",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ccdd290b-0581-4f52-8e53-c4f2b676dff9",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-ae443a12081d824da2d4e76e310268ad-ad282c8971dc324c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-04b7cd8794a4314c8b9e8ddb05603027-0568ba2e3d911f42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "fe8aa41680dff9b20ee1a06f2d5733c6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "72f36ca9-c881-492e-9bbe-af31bc5ed86c",
+        "Content-Length": "1038",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "910",
+        "X-Request-ID": "72f36ca9-c881-492e-9bbe-af31bc5ed86c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ccdd290b-0581-4f52-8e53-c4f2b676dff9",
+        "dataFeedName": "dataFeedXs4S4CWD",
+        "metrics": [
+          {
+            "metricId": "c3b7fb74-9ba1-4235-a30a-b59a20ba16d3",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:38Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ccdd290b-0581-4f52-8e53-c4f2b676dff9",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-d4b4e645595fb54d997872b551ec6226-6a818789880c1941-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "7203d5e29e435c3e0bd5b5b970bb6623",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d4d3944a-d60d-48a0-9b32-3cb7e8a27f65",
+        "apim-request-id": "962f86cc-e93d-4800-9633-f5ff6594bd95",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "252",
-        "x-request-id": "d4d3944a-d60d-48a0-9b32-3cb7e8a27f65"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "213",
+        "X-Request-ID": "962f86cc-e93d-4800-9633-f5ff6594bd95"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:24.4819129-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:39.4017448-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "RandomSeed": "529661973"
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True)Async.json
index 3b728cffa664..d1a370f5f5aa 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithMinimumSetup(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "284",
         "Content-Type": "application/json",
-        "traceparent": "00-09dd16a57ec9f94ca29f7d4c6b5cee86-5e12458ff2fff04c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-296890ab4947af4c9ab6a9dad818c8b4-29d04424fb191f4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "869b9914fe5403d29879afdb111d84bf",
         "x-ms-return-client-request-id": "true"
       },
@@ -32,46 +35,49 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9b99eacb-b594-4728-af65-7061fcdcc9d9",
+        "apim-request-id": "dc865dc8-f837-4e92-abd7-b67175d61cf8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/825cf134-db68-4153-a6f8-3ee9b2a3f428",
+        "Date": "Fri, 05 Feb 2021 17:59:12 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c9813332-618b-4a9b-b9e3-b1ad0d077a10",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1866",
-        "x-request-id": "9b99eacb-b594-4728-af65-7061fcdcc9d9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "503",
+        "X-Request-ID": "dc865dc8-f837-4e92-abd7-b67175d61cf8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/825cf134-db68-4153-a6f8-3ee9b2a3f428",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c9813332-618b-4a9b-b9e3-b1ad0d077a10",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-33828621c0191e429772d6906358e27e-2eec62b10cc2e04d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-296890ab4947af4c9ab6a9dad818c8b4-39c7ce13abc0b147-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "f90c6eb3170bdc1103ac4784e7ac835f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2c98b14e-82fe-4321-bc8c-7030bcefc984",
+        "apim-request-id": "f9e847bc-ac93-4859-871c-1d4bc8d042bb",
         "Content-Length": "1038",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "137",
-        "x-request-id": "2c98b14e-82fe-4321-bc8c-7030bcefc984"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "249",
+        "X-Request-ID": "f9e847bc-ac93-4859-871c-1d4bc8d042bb"
       },
       "ResponseBody": {
-        "dataFeedId": "825cf134-db68-4153-a6f8-3ee9b2a3f428",
+        "dataFeedId": "c9813332-618b-4a9b-b9e3-b1ad0d077a10",
         "dataFeedName": "dataFeedj0jLNAjX",
         "metrics": [
           {
-            "metricId": "e5cabe3f-9b6a-495b-ab26-a70786c1a827",
+            "metricId": "7b5db8ac-1ef9-4061-a781-5019a791683f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:37Z",
+        "createdTime": "2021-02-05T17:59:13Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,32 +120,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/825cf134-db68-4153-a6f8-3ee9b2a3f428",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c9813332-618b-4a9b-b9e3-b1ad0d077a10",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-d14ba02b6f2b4848963b8d2fa6e29394-261a7c5a9b92f341-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a04bf34efa19ea4796d3e4c5232e6600-5428d0da65bb6f4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "598efcc21ab9237b1ee1279c253bb44d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a8abf73c-f26d-4ad5-8128-6b73220fb7ab",
+        "Content-Length": "1038",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:14 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1257",
+        "X-Request-ID": "a8abf73c-f26d-4ad5-8128-6b73220fb7ab"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c9813332-618b-4a9b-b9e3-b1ad0d077a10",
+        "dataFeedName": "dataFeedj0jLNAjX",
+        "metrics": [
+          {
+            "metricId": "7b5db8ac-1ef9-4061-a781-5019a791683f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:13Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c9813332-618b-4a9b-b9e3-b1ad0d077a10",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-81cdd16c213eca40847f0a6ac8390e1f-d1fe7301367fab41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "423209f6d14bfd8b88bf83a7b74d1beb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cd1b7f64-9489-49ff-9469-eddfc69929ea",
+        "apim-request-id": "d32b581f-987a-431d-8b57-7e320f1f352b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "278",
-        "x-request-id": "cd1b7f64-9489-49ff-9469-eddfc69929ea"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "214",
+        "X-Request-ID": "d32b581f-987a-431d-8b57-7e320f1f352b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:38.0787737-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:14.8088488-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "RandomSeed": "483269164"
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembers.json
index 72529a15d89b..b93a35610c8d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1023",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a3fa6b04e8255748b3373fda28350e07-edc44ffa57fcaf4c-00",
+        "traceparent": "00-9248abf3b8bf8242877c0693a5737579-2bd572c5802c164e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -69,26 +69,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5f0871ab-e7c2-4a9b-af73-0aa3a81e9465",
+        "apim-request-id": "c058fba3-4b41-4de3-b1cd-706949b04e3a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/03ca2222-23ef-4227-8cd4-1f754a2a179b",
+        "Date": "Fri, 05 Feb 2021 17:53:37 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36976504-5d12-440f-bf94-d628e073629c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1159",
-        "X-Request-ID": "5f0871ab-e7c2-4a9b-af73-0aa3a81e9465"
+        "x-envoy-upstream-service-time": "897",
+        "X-Request-ID": "c058fba3-4b41-4de3-b1cd-706949b04e3a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/03ca2222-23ef-4227-8cd4-1f754a2a179b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36976504-5d12-440f-bf94-d628e073629c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1ed6d8e7b1d3b94d8567b3c6df5c416d-45b3a56e1e7af941-00",
+        "traceparent": "00-9248abf3b8bf8242877c0693a5737579-c5eb6c6e321dc040-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -98,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a1da987f-9099-4fd8-88a7-056acc1810a6",
+        "apim-request-id": "dc7bf752-7c5b-4ace-8a37-f82ed913c60d",
         "Content-Length": "1440",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "864",
-        "X-Request-ID": "a1da987f-9099-4fd8-88a7-056acc1810a6"
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "dc7bf752-7c5b-4ace-8a37-f82ed913c60d"
       },
       "ResponseBody": {
-        "dataFeedId": "03ca2222-23ef-4227-8cd4-1f754a2a179b",
+        "dataFeedId": "36976504-5d12-440f-bf94-d628e073629c",
         "dataFeedName": "dataFeedbwkJ4tg1",
         "metrics": [
           {
-            "metricId": "d3b10f52-3261-4c00-9cf4-b3f4af6eb354",
+            "metricId": "ea23c6f2-01e4-4519-994a-d0015218941e",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "46a9fdde-c66d-460d-9f97-2d8229243961",
+            "metricId": "ca1fccce-15e4-4c11-ac77-1f9e09e46193",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -161,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:18Z",
+        "createdTime": "2021-02-05T17:53:37Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -173,14 +173,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/03ca2222-23ef-4227-8cd4-1f754a2a179b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36976504-5d12-440f-bf94-d628e073629c",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eb3a5a09de94674c81a2a5e5f9722215-0452340892774849-00",
+        "traceparent": "00-fbf8ef2dd6655e4381e011530569cb5c-93d5aed38dc26042-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -188,21 +188,113 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d2236b45-b3e4-45f3-9164-d027372d049c",
+        "Content-Length": "1440",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:37 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "167",
+        "X-Request-ID": "d2236b45-b3e4-45f3-9164-d027372d049c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "36976504-5d12-440f-bf94-d628e073629c",
+        "dataFeedName": "dataFeedbwkJ4tg1",
+        "metrics": [
+          {
+            "metricId": "ea23c6f2-01e4-4519-994a-d0015218941e",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "ca1fccce-15e4-4c11-ac77-1f9e09e46193",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:37Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36976504-5d12-440f-bf94-d628e073629c",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-eb4a6409dccf8b449ad8597d20d057b8-93428e7838c6eb42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "31ea6179b711e622bff841fcf381a9b7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "43d57096-7ee8-4d0d-9628-b6abbe85123b",
+        "apim-request-id": "58bce339-2820-4788-892a-75709e3d061c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1137",
-        "X-Request-ID": "43d57096-7ee8-4d0d-9628-b6abbe85123b"
+        "x-envoy-upstream-service-time": "361",
+        "X-Request-ID": "58bce339-2820-4788-892a-75709e3d061c"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:19.9276097-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:38.0899975-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembersAsync.json
index 6aa668062bb1..d7eaf41d57fb 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureApplicationInsightsDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1023",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-640c77221dce1548b0a9fc5f6b2af7c1-a0e5df95fdd76e49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8e33c1a481de0f4d996f3a6953ff42d3-0eacb72bcb9a7149-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9acf4e3e24b889cdab8a8ea2f2a102cd",
         "x-ms-return-client-request-id": "true"
@@ -66,25 +69,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d211be91-370e-4345-88d4-2053a0190442",
+        "apim-request-id": "7c097429-0ba4-4e30-b5c4-e5a9e0f634e1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:32 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad5c4484-1259-4a7a-9a1a-fbaa56f500cb",
+        "Date": "Fri, 05 Feb 2021 17:56:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a0821f0-5fd6-42d2-b4a3-81339468e14f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "553",
-        "x-request-id": "d211be91-370e-4345-88d4-2053a0190442"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "726",
+        "X-Request-ID": "7c097429-0ba4-4e30-b5c4-e5a9e0f634e1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad5c4484-1259-4a7a-9a1a-fbaa56f500cb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a0821f0-5fd6-42d2-b4a3-81339468e14f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ff9adc2148d65747ae382a46235bb3d4-b0ab586cb1856e45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8e33c1a481de0f4d996f3a6953ff42d3-7983e5216d52cd4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f28d7b8b1f4f020bd4899c2737fd3420",
         "x-ms-return-client-request-id": "true"
@@ -92,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e04d49a8-dc08-403a-92ea-c5d951774bfc",
+        "apim-request-id": "92abd85e-df4f-4675-868f-d74fc91af637",
         "Content-Length": "1440",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "153",
-        "x-request-id": "e04d49a8-dc08-403a-92ea-c5d951774bfc"
+        "X-Request-ID": "92abd85e-df4f-4675-868f-d74fc91af637"
       },
       "ResponseBody": {
-        "dataFeedId": "ad5c4484-1259-4a7a-9a1a-fbaa56f500cb",
+        "dataFeedId": "8a0821f0-5fd6-42d2-b4a3-81339468e14f",
         "dataFeedName": "dataFeedshoTrmTc",
         "metrics": [
           {
-            "metricId": "f006ba82-04c6-4633-b315-c4f4e0ba2104",
+            "metricId": "f9b2131a-fd35-4078-b096-6a87632bb1f6",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "d12533bc-d094-4391-a42e-69fffd4f0410",
+            "metricId": "6d9ccd36-c37c-4d6c-a9d9-87da83581c12",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -155,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:32Z",
+        "createdTime": "2021-02-05T17:56:45Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -167,33 +173,128 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad5c4484-1259-4a7a-9a1a-fbaa56f500cb",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a0821f0-5fd6-42d2-b4a3-81339468e14f",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f6d0ab21356c304cbb728f0d83014e5c-7b8f54c64ee78e4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-67bb1c29cffc12479f1c98bdb10b3af0-f89efdde2a049146-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d7989347317ca8ab129a1157b6164b56",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "70c71938-c8af-439c-9029-b4f46a7cd800",
+        "Content-Length": "1440",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "178",
+        "X-Request-ID": "70c71938-c8af-439c-9029-b4f46a7cd800"
+      },
+      "ResponseBody": {
+        "dataFeedId": "8a0821f0-5fd6-42d2-b4a3-81339468e14f",
+        "dataFeedName": "dataFeedshoTrmTc",
+        "metrics": [
+          {
+            "metricId": "f9b2131a-fd35-4078-b096-6a87632bb1f6",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "6d9ccd36-c37c-4d6c-a9d9-87da83581c12",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:45Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a0821f0-5fd6-42d2-b4a3-81339468e14f",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-23d05e7c7821c443bf042d137608e560-90b854b56d7b3742-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0d8a0b3803b81ebf43cdc62f88a651ad",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9bf4e01e-349c-4fc7-be54-0cbe9e952085",
+        "apim-request-id": "65828714-5570-4dd2-ac0c-42da121bc5ea",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "375",
-        "x-request-id": "9bf4e01e-349c-4fc7-be54-0cbe9e952085"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "451",
+        "X-Request-ID": "65828714-5570-4dd2-ac0c-42da121bc5ea"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:32.5606554-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:46.5875729-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetup.json
index ee753c33ec0a..7c246b1e64fa 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f48d4643fa0d504ab82b41178050d2a5-c7c61f2302a85545-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dd128384e437a04cba5ee4260fa43045-bc5ae6930c0aed4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "25cee861222e2cbe4ade3e0df2ef31b9",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "575e1819-7049-4354-9d65-1c1aea4a301b",
+        "apim-request-id": "7eb8bd52-b17f-451d-a976-683538763f71",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:13 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30f59647-6050-4e6c-8231-49aa84a9479b",
+        "Date": "Fri, 05 Feb 2021 17:53:39 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "413",
-        "x-request-id": "575e1819-7049-4354-9d65-1c1aea4a301b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "619",
+        "X-Request-ID": "7eb8bd52-b17f-451d-a976-683538763f71"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30f59647-6050-4e6c-8231-49aa84a9479b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-062d91cced2ee245a1b81f46314878cb-8055daaa9be1f94c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dd128384e437a04cba5ee4260fa43045-67e0edc3d92ccd46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6631638b28554b8e083d6321060018e3",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "60039f50-7643-4fb7-8c33-f054df37b93e",
+        "apim-request-id": "b54c805c-0378-4e15-a6d1-1eb3e2c5727b",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "60039f50-7643-4fb7-8c33-f054df37b93e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "b54c805c-0378-4e15-a6d1-1eb3e2c5727b"
       },
       "ResponseBody": {
-        "dataFeedId": "30f59647-6050-4e6c-8231-49aa84a9479b",
+        "dataFeedId": "70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
         "dataFeedName": "dataFeedd2hzX6MV",
         "metrics": [
           {
-            "metricId": "07556dd0-22cb-4fb6-9016-be596ab65ea9",
+            "metricId": "3d7eb551-606d-4675-88cf-7ffd6b4c22a6",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:14Z",
+        "createdTime": "2021-02-05T17:53:39Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30f59647-6050-4e6c-8231-49aa84a9479b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c747d4f6efdfda438d609b8aaa0ec999-86e245bf0ffc264b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-40f699954469954d91410affd3077c04-85aee660137bcd4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "aa0212e15765dca1f4e529a65c31c08d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1b904f77-0814-4280-8902-36fb303ac964",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "1b904f77-0814-4280-8902-36fb303ac964"
+      },
+      "ResponseBody": {
+        "dataFeedId": "70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
+        "dataFeedName": "dataFeedd2hzX6MV",
+        "metrics": [
+          {
+            "metricId": "3d7eb551-606d-4675-88cf-7ffd6b4c22a6",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:39Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70dd6f76-b742-4c7a-b5d6-4ebea0b5f574",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-45fac806aeeda24d9264e923d57db929-569f193134ad8a4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "edd1e2e678cf392659821cf0be9d2649",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3fe3e4f0-3c07-4188-a2d5-20ea768c09d3",
+        "apim-request-id": "bd6e84d0-5a7d-4606-8a53-66d3f895d08f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "292",
-        "x-request-id": "3fe3e4f0-3c07-4188-a2d5-20ea768c09d3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "285",
+        "X-Request-ID": "bd6e84d0-5a7d-4606-8a53-66d3f895d08f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:14.7039710-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:39.9556086-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetupAsync.json
index 1b79d51523fa..9eb60df7b26a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8bb6729255bd8d438a26a75808da44cf-3d3cfbba3c5f0d4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-226373ae14e9214fb7fa54a72e3c4b20-b4e7c01f06a81b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "21650123f24e5f721791da4cdd315a58",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2c7a8eb5-f52a-48c4-836c-8e9ae14d388b",
+        "apim-request-id": "02059327-dc95-47f4-84df-06a1187f083e",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fc1c81c9-b1dc-475c-ad8e-92c2999944a9",
+        "Date": "Fri, 05 Feb 2021 17:56:47 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c60af0ed-11f0-4b81-81b7-b6b661398e97",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "531",
-        "x-request-id": "2c7a8eb5-f52a-48c4-836c-8e9ae14d388b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "443",
+        "X-Request-ID": "02059327-dc95-47f4-84df-06a1187f083e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fc1c81c9-b1dc-475c-ad8e-92c2999944a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c60af0ed-11f0-4b81-81b7-b6b661398e97",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a2cb1e538153dd46be7b7195f366a464-2bc5edfe47bd1841-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-226373ae14e9214fb7fa54a72e3c4b20-521aa7cb06e01b49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d346492191032dc11c39552bda8ee539",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0166b264-017d-4982-8096-a5bce942eb01",
+        "apim-request-id": "86170a66-01e3-4272-9cf2-31683bdf454e",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "144",
-        "x-request-id": "0166b264-017d-4982-8096-a5bce942eb01"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "86170a66-01e3-4272-9cf2-31683bdf454e"
       },
       "ResponseBody": {
-        "dataFeedId": "fc1c81c9-b1dc-475c-ad8e-92c2999944a9",
+        "dataFeedId": "c60af0ed-11f0-4b81-81b7-b6b661398e97",
         "dataFeedName": "dataFeed5smqy4PR",
         "metrics": [
           {
-            "metricId": "a05edcfe-0c03-482a-b2d3-0087c3340b7e",
+            "metricId": "360a0140-4d54-4d1c-b2f3-7bed3ef30ece",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:49Z",
+        "createdTime": "2021-02-05T17:56:47Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fc1c81c9-b1dc-475c-ad8e-92c2999944a9",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c60af0ed-11f0-4b81-81b7-b6b661398e97",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4f9fb305e78c3647a28aa2cbef5c8a4e-d437b748e044d040-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1745439fd12a9647a829794e1f56d82d-997b2bd33f88634c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d60a21d6e04f80c13426a8f6e101cfda",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b55d0b51-32f8-4e3b-8aed-fbe829924b6f",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:47 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "b55d0b51-32f8-4e3b-8aed-fbe829924b6f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c60af0ed-11f0-4b81-81b7-b6b661398e97",
+        "dataFeedName": "dataFeed5smqy4PR",
+        "metrics": [
+          {
+            "metricId": "360a0140-4d54-4d1c-b2f3-7bed3ef30ece",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:47Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c60af0ed-11f0-4b81-81b7-b6b661398e97",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6aacb78cf18e1a4393bd78b9c6f6ecb6-d6e0f1344b84d54b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ac5488b92c679260403704159d478489",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a6e5f66d-ea39-481c-81ac-416c0c598825",
+        "apim-request-id": "2a8f976f-44a1-4911-abad-fb83a1eb1670",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "299",
-        "x-request-id": "a6e5f66d-ea39-481c-81ac-416c0c598825"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "291",
+        "X-Request-ID": "2a8f976f-44a1-4911-abad-fb83a1eb1670"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:49.4761841-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:47.9262402-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembers.json
index 521286745cca..5ea6fa8b3270 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1007",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-75596b8e4ae1894f8090961e69938f0f-a473cbc414235c49-00",
+        "traceparent": "00-170cfe7e4b653c48b48bf2b92ae3970a-cb55335ceaf31e4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -68,26 +68,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1184389f-a04d-492b-bb46-80c0db2a8517",
+        "apim-request-id": "da5f99e5-8211-4d6e-8ad9-fedeca7565e3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:19:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4955b079-5488-47c5-b52b-d5c377272d24",
+        "Date": "Fri, 05 Feb 2021 17:53:41 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cfd836b8-3171-43ac-9072-8d2d2144b2b1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "755",
-        "X-Request-ID": "1184389f-a04d-492b-bb46-80c0db2a8517"
+        "x-envoy-upstream-service-time": "745",
+        "X-Request-ID": "da5f99e5-8211-4d6e-8ad9-fedeca7565e3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4955b079-5488-47c5-b52b-d5c377272d24",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cfd836b8-3171-43ac-9072-8d2d2144b2b1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8d72e227b729e9458b461128d8ddebe4-8eafbf728d3bb34b-00",
+        "traceparent": "00-170cfe7e4b653c48b48bf2b92ae3970a-39bd3b5d9077cc4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -97,27 +97,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1570e730-21a4-4c2c-9fe7-41aff0df8735",
+        "apim-request-id": "dca8aa17-9922-4eb0-955b-9baae5e23940",
         "Content-Length": "1424",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:19:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "X-Request-ID": "1570e730-21a4-4c2c-9fe7-41aff0df8735"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "dca8aa17-9922-4eb0-955b-9baae5e23940"
       },
       "ResponseBody": {
-        "dataFeedId": "4955b079-5488-47c5-b52b-d5c377272d24",
+        "dataFeedId": "cfd836b8-3171-43ac-9072-8d2d2144b2b1",
         "dataFeedName": "dataFeed1UfEswJZ",
         "metrics": [
           {
-            "metricId": "6585381b-545e-404b-a058-cc573eed9b3a",
+            "metricId": "683187e8-3db2-4f92-8c54-908c86fd193b",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "0a22d499-4d7c-4b80-a78c-27add27b984c",
+            "metricId": "d5f6c6f4-c6cc-4a0e-957d-0a80f6c71346",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -160,7 +160,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:19:31Z",
+        "createdTime": "2021-02-05T17:53:40Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -171,14 +171,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4955b079-5488-47c5-b52b-d5c377272d24",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cfd836b8-3171-43ac-9072-8d2d2144b2b1",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-42f59f276f2e3e49a7eeea9cc6b0b25f-c772714222f25e44-00",
+        "traceparent": "00-0e4655fc2b892848817525c34424d34e-2f12803f4fc4f242-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -186,21 +186,112 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "730c6ac1-04de-4d07-a42e-7b4e204455fa",
+        "Content-Length": "1424",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:41 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "730c6ac1-04de-4d07-a42e-7b4e204455fa"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cfd836b8-3171-43ac-9072-8d2d2144b2b1",
+        "dataFeedName": "dataFeed1UfEswJZ",
+        "metrics": [
+          {
+            "metricId": "683187e8-3db2-4f92-8c54-908c86fd193b",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "d5f6c6f4-c6cc-4a0e-957d-0a80f6c71346",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:40Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cfd836b8-3171-43ac-9072-8d2d2144b2b1",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d82f9d73b41b82468c59106cede73e7d-5584838af650e84c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "86ed20b9498ea436848d7cba262f8c60",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "986a825d-f7c4-4456-bad9-fedd98401399",
+        "apim-request-id": "e25d95c9-f570-4a3d-9270-4013d2527fee",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:19:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "366",
-        "X-Request-ID": "986a825d-f7c4-4456-bad9-fedd98401399"
+        "x-envoy-upstream-service-time": "352",
+        "X-Request-ID": "e25d95c9-f570-4a3d-9270-4013d2527fee"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:19:31.9145853-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:42.1728239-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembersAsync.json
index e743bda8a200..c0d6e5cf7f56 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureBlobDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1007",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b09dded6ef35ff4fb2fa273dc434fbdb-d81dc5e98cb5f44f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0e96738ce16e3c42a05e65e0cd917b43-f8553aa3a5e4c54b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "59c734a90281eda0a7f7c4cc27af8d8b",
         "x-ms-return-client-request-id": "true"
@@ -65,25 +68,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d612f874-badb-44a5-b249-018e7dbf2161",
+        "apim-request-id": "28847cb6-4b6e-4e5c-bdc2-cdbb94202c49",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:33 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3b534685-79a0-4688-a9a0-f1a29b388d73",
+        "Date": "Fri, 05 Feb 2021 17:56:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b638d0-ddd1-418f-ae79-d248a9330763",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "859",
-        "x-request-id": "d612f874-badb-44a5-b249-018e7dbf2161"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "633",
+        "X-Request-ID": "28847cb6-4b6e-4e5c-bdc2-cdbb94202c49"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3b534685-79a0-4688-a9a0-f1a29b388d73",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b638d0-ddd1-418f-ae79-d248a9330763",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6f1591a37d3c2248ad606ebb115bbce5-08908a4467d5a442-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0e96738ce16e3c42a05e65e0cd917b43-7ffb8f87797bac4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b6c6bb3b979a14821337bac1a3d3a4b5",
         "x-ms-return-client-request-id": "true"
@@ -91,27 +97,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7128e492-4e8b-4329-9213-d40eaf84fc33",
+        "apim-request-id": "13093c92-69c2-4104-9ee4-aeadb2e072d8",
         "Content-Length": "1424",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "7128e492-4e8b-4329-9213-d40eaf84fc33"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "131",
+        "X-Request-ID": "13093c92-69c2-4104-9ee4-aeadb2e072d8"
       },
       "ResponseBody": {
-        "dataFeedId": "3b534685-79a0-4688-a9a0-f1a29b388d73",
+        "dataFeedId": "30b638d0-ddd1-418f-ae79-d248a9330763",
         "dataFeedName": "dataFeedB0kvnc8e",
         "metrics": [
           {
-            "metricId": "c2f76e4e-134f-43b9-9acb-fe3ea2497beb",
+            "metricId": "30829a25-9445-4347-8603-295c0eb12edf",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "3ca836cc-1a3b-42c3-b438-b599386e9ccb",
+            "metricId": "b75bbef8-bd8a-455e-8937-da14cdca48f4",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -154,7 +160,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:33Z",
+        "createdTime": "2021-02-05T17:56:48Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -165,33 +171,127 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3b534685-79a0-4688-a9a0-f1a29b388d73",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b638d0-ddd1-418f-ae79-d248a9330763",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-504778dfa7dc9247b65edcf3a5103df9-8252f56e4977914e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-66130f55f68529438aa7cd87d9f20371-c1c70152ee0b024d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a74c58d39cc45c48069d663e86fb42cb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "292efc00-18e8-48b8-bcc7-def9f571a086",
+        "Content-Length": "1424",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:49 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "292efc00-18e8-48b8-bcc7-def9f571a086"
+      },
+      "ResponseBody": {
+        "dataFeedId": "30b638d0-ddd1-418f-ae79-d248a9330763",
+        "dataFeedName": "dataFeedB0kvnc8e",
+        "metrics": [
+          {
+            "metricId": "30829a25-9445-4347-8603-295c0eb12edf",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "b75bbef8-bd8a-455e-8937-da14cdca48f4",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:48Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b638d0-ddd1-418f-ae79-d248a9330763",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d6bf7561255eba45ac3306abe0bd3118-2c0e2ea89e9b794b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "68dacccff8fd1271b2b3464947df4ad3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9fd00aa8-b56c-493a-899b-70c1e0feab1d",
+        "apim-request-id": "387228a7-b367-4d17-8281-97ba736d8b30",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "421",
-        "x-request-id": "9fd00aa8-b56c-493a-899b-70c1e0feab1d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "311",
+        "X-Request-ID": "387228a7-b367-4d17-8281-97ba736d8b30"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:34.0777590-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:49.3553732-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetup.json
index 5bc934069c12..d3f7fd274974 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d30504d38d9a0f42afef34fb26672b8a-4d2953d8325b504f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4bbd7cc3acaca140bb233d3b88fc630e-20f23ea90db9b340-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f52479596ea1171cc557d9e838af19c2",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c77d7acb-4cb7-4789-8e6d-659d023b3c33",
+        "apim-request-id": "67a64ff4-1194-437a-8d7a-31f0734f8874",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:16 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5414f96f-13ac-4c12-98aa-e4b3f4b97cc6",
+        "Date": "Fri, 05 Feb 2021 17:53:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c86a5edd-f38c-48f9-801e-7f1f1f408dce",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "389",
-        "x-request-id": "c77d7acb-4cb7-4789-8e6d-659d023b3c33"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "711",
+        "X-Request-ID": "67a64ff4-1194-437a-8d7a-31f0734f8874"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5414f96f-13ac-4c12-98aa-e4b3f4b97cc6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c86a5edd-f38c-48f9-801e-7f1f1f408dce",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4bfafab572a5cc4e9f6bc9abae2368e7-0cb0aff5fa73194a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4bbd7cc3acaca140bb233d3b88fc630e-cbe02969d289324f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f0547685f89c2d83a195b2a5d6d35d19",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "deef037c-8299-4c33-a070-bd57b0943770",
+        "apim-request-id": "0e6586e8-a590-4667-a408-426eb2ba7d75",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "x-request-id": "deef037c-8299-4c33-a070-bd57b0943770"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "0e6586e8-a590-4667-a408-426eb2ba7d75"
       },
       "ResponseBody": {
-        "dataFeedId": "5414f96f-13ac-4c12-98aa-e4b3f4b97cc6",
+        "dataFeedId": "c86a5edd-f38c-48f9-801e-7f1f1f408dce",
         "dataFeedName": "dataFeedHOdXo243",
         "metrics": [
           {
-            "metricId": "74824b07-ee3d-426a-956e-3756d16c307c",
+            "metricId": "23517e41-85a5-4f46-9cb7-f495ee4df613",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:16Z",
+        "createdTime": "2021-02-05T17:53:43Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5414f96f-13ac-4c12-98aa-e4b3f4b97cc6",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c86a5edd-f38c-48f9-801e-7f1f1f408dce",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f03597a814edef40bc750621cc9b7ff1-45eb48412878b042-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0717d1cfd1cf2a4f8881b45bdb4f6de6-5eba57ed823da94d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cc9b22846cbf1a6a73ae9414577dc2c0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "92d70b3d-06b7-4901-9c7b-4ed1ba0cdd42",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:43 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "92d70b3d-06b7-4901-9c7b-4ed1ba0cdd42"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c86a5edd-f38c-48f9-801e-7f1f1f408dce",
+        "dataFeedName": "dataFeedHOdXo243",
+        "metrics": [
+          {
+            "metricId": "23517e41-85a5-4f46-9cb7-f495ee4df613",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:43Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c86a5edd-f38c-48f9-801e-7f1f1f408dce",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5abde9e612a95f459d64cbfc789623b4-5c353250f457794f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e9186d541b14603ff5f6540cbc7740f2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b7370169-95fc-477e-bb56-b7fdc3de2149",
+        "apim-request-id": "72886685-ec2a-4019-9a49-7a06abdd8613",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "308",
-        "x-request-id": "b7370169-95fc-477e-bb56-b7fdc3de2149"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "355",
+        "X-Request-ID": "72886685-ec2a-4019-9a49-7a06abdd8613"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:17.0467521-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:44.3183515-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetupAsync.json
index 5cd7a65699f3..56dc6fedb8b3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6ac7253d9394da48ac653b796582229a-5f64fda57953a84c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6d18a2dbef54b540baa6376ed1ce78b2-038781a8632e4e43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f1bb861b3fb34acf7f09750923f24259",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "249e731b-c612-4903-ac23-3675d948ee61",
+        "apim-request-id": "46e15664-933e-40db-a5dd-a0a05cc45c2f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/446d460f-1f73-4def-bd24-badb5fbc0002",
+        "Date": "Fri, 05 Feb 2021 17:56:54 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2f8491c-f447-40ec-a545-63be678fed67",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "505",
-        "x-request-id": "249e731b-c612-4903-ac23-3675d948ee61"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "5595",
+        "X-Request-ID": "46e15664-933e-40db-a5dd-a0a05cc45c2f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/446d460f-1f73-4def-bd24-badb5fbc0002",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2f8491c-f447-40ec-a545-63be678fed67",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8a7517c2392fea43bc8bff8831579d01-339d783499b0ff45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6d18a2dbef54b540baa6376ed1ce78b2-5e2a93ee66eec348-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5d575b1b634a0fb5b59ca4afa5602b71",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "39d8431a-027f-4399-a41d-d625d0562ad8",
+        "apim-request-id": "edbf9f9f-c4e3-4b0e-a5fa-613be7120a42",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "x-request-id": "39d8431a-027f-4399-a41d-d625d0562ad8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "edbf9f9f-c4e3-4b0e-a5fa-613be7120a42"
       },
       "ResponseBody": {
-        "dataFeedId": "446d460f-1f73-4def-bd24-badb5fbc0002",
+        "dataFeedId": "d2f8491c-f447-40ec-a545-63be678fed67",
         "dataFeedName": "dataFeediDiOE07z",
         "metrics": [
           {
-            "metricId": "8ae2c1ae-fc52-4587-8554-46b4d4a5eb6e",
+            "metricId": "1f8e939b-023f-47c5-a61c-d891984802d1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:51Z",
+        "createdTime": "2021-02-05T17:56:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/446d460f-1f73-4def-bd24-badb5fbc0002",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2f8491c-f447-40ec-a545-63be678fed67",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-05212e0af02b694f98a2bf274c01b8c4-8380510717faad40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9a954778f02db8469825ed8cd48b35aa-4ab2ca4b92532443-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "04a43297f5a9d397b3ef2465dc6bd30e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ca21ea26-9abd-4795-b9e7-915d41ba85fc",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "ca21ea26-9abd-4795-b9e7-915d41ba85fc"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d2f8491c-f447-40ec-a545-63be678fed67",
+        "dataFeedName": "dataFeediDiOE07z",
+        "metrics": [
+          {
+            "metricId": "1f8e939b-023f-47c5-a61c-d891984802d1",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:55Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2f8491c-f447-40ec-a545-63be678fed67",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-61714f9878fb334c9dfef28b56303f9f-077798888c80144d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a89b2227cfbcb779d0ab3c169b20a51e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8abd80ee-92af-4322-b8e7-304c6c1d0c30",
+        "apim-request-id": "7bc15556-42dc-4ce9-850b-159c597857ce",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "273",
-        "x-request-id": "8abd80ee-92af-4322-b8e7-304c6c1d0c30"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "308",
+        "X-Request-ID": "7bc15556-42dc-4ce9-850b-159c597857ce"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:52.1832883-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:55.6768076-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembers.json
index 2381b876ca1e..0df6cba9ab32 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1029",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-04d9cf1157b80a469f4037bd57800402-23c6cc322429354b-00",
+        "traceparent": "00-3ac74a578706c8418df7bd570f690846-7a5d8dcbbec4ec47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -69,26 +69,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "34864182-d665-4549-8fe8-ed0c17a41b20",
+        "apim-request-id": "497a0c4a-9278-4bdd-81e9-a83c4b3532f1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:21 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e7dc13c8-805e-495d-b4e2-f19a50e93ba2",
+        "Date": "Fri, 05 Feb 2021 17:53:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b86efbef-72fd-4351-a8fe-0b9763553f1d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1246",
-        "X-Request-ID": "34864182-d665-4549-8fe8-ed0c17a41b20"
+        "x-envoy-upstream-service-time": "765",
+        "X-Request-ID": "497a0c4a-9278-4bdd-81e9-a83c4b3532f1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e7dc13c8-805e-495d-b4e2-f19a50e93ba2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b86efbef-72fd-4351-a8fe-0b9763553f1d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-71645b0eef2ada42a1d57e50d3764fa0-5de8a29b13a9ad40-00",
+        "traceparent": "00-3ac74a578706c8418df7bd570f690846-1af0961e18886c49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -98,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "17811b7d-edfa-4d84-a031-c1e864698f1f",
+        "apim-request-id": "6a716652-17c2-4a3d-bb5b-a8d6e9f6bdd7",
         "Content-Length": "1446",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "X-Request-ID": "17811b7d-edfa-4d84-a031-c1e864698f1f"
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "6a716652-17c2-4a3d-bb5b-a8d6e9f6bdd7"
       },
       "ResponseBody": {
-        "dataFeedId": "e7dc13c8-805e-495d-b4e2-f19a50e93ba2",
+        "dataFeedId": "b86efbef-72fd-4351-a8fe-0b9763553f1d",
         "dataFeedName": "dataFeedbDb3DlWr",
         "metrics": [
           {
-            "metricId": "c6555090-e2aa-4da6-8a02-db1fabf68746",
+            "metricId": "a4ff3774-af93-40f4-8dc6-2142b8f01d32",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "4463cc0a-56a1-4561-a207-5b6ef76abfdd",
+            "metricId": "ca9eb3d0-f068-4559-902a-8a8be8669b69",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -161,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:22Z",
+        "createdTime": "2021-02-05T17:53:45Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -173,14 +173,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e7dc13c8-805e-495d-b4e2-f19a50e93ba2",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b86efbef-72fd-4351-a8fe-0b9763553f1d",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8c4ce146f3e9d344af89e3bbff0e14b9-47f91d81f191b640-00",
+        "traceparent": "00-3185b68f4b1e6b4f9d6d4f09dbb56faa-db7e5321cd00df4c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -188,21 +188,113 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0abd9d25-ef30-4a02-97f2-f1a333e94ad8",
+        "Content-Length": "1446",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:45 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "0abd9d25-ef30-4a02-97f2-f1a333e94ad8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b86efbef-72fd-4351-a8fe-0b9763553f1d",
+        "dataFeedName": "dataFeedbDb3DlWr",
+        "metrics": [
+          {
+            "metricId": "a4ff3774-af93-40f4-8dc6-2142b8f01d32",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "ca9eb3d0-f068-4559-902a-8a8be8669b69",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:45Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b86efbef-72fd-4351-a8fe-0b9763553f1d",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c5d671a588791547bbd18f497d915320-c28163d0dbfe524a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "845bb9539d45e69eeea9d6f5eaceb7ba",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b3749aa9-8383-4bee-a761-167b92dcdd5b",
+        "apim-request-id": "0ae89f63-e810-4d54-b816-13194eba1921",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "405",
-        "X-Request-ID": "b3749aa9-8383-4bee-a761-167b92dcdd5b"
+        "x-envoy-upstream-service-time": "463",
+        "X-Request-ID": "0ae89f63-e810-4d54-b816-13194eba1921"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:22.6851387-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:46.3690675-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembersAsync.json
index 00fa3abbcdaf..04bcb1ff4864 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureCosmosDbDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1029",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-16544ec38cd4c346a4da4c4c5cd9e420-a73c2798f1389e43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-421fad3f6624ba4ebed346bf802eec38-97b6b789c48f0446-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1db4a731d83ef4e0de60626b59ddb018",
         "x-ms-return-client-request-id": "true"
@@ -66,25 +69,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5edd4a6d-9d80-4fb3-aeb3-9fbf4a2f0463",
+        "apim-request-id": "815ebb23-ae5b-49e0-9fd3-120e22458a71",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfeb6435-736e-4962-86c3-aa52c4bb0b0b",
+        "Date": "Fri, 05 Feb 2021 17:56:56 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "5782",
-        "x-request-id": "5edd4a6d-9d80-4fb3-aeb3-9fbf4a2f0463"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "680",
+        "X-Request-ID": "815ebb23-ae5b-49e0-9fd3-120e22458a71"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfeb6435-736e-4962-86c3-aa52c4bb0b0b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-250f4bc5330adf4a9608a2ee315a72fe-35ee2e2453bd6f42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-421fad3f6624ba4ebed346bf802eec38-fa880ff2d094d748-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c8afadc15bfa34a75c7fd9941bdcd610",
         "x-ms-return-client-request-id": "true"
@@ -92,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d7400f24-9ccc-4376-ba82-ab4235ddafc0",
+        "apim-request-id": "0c01c24f-afdb-4ecf-8273-c4671061fefc",
         "Content-Length": "1446",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "146",
-        "x-request-id": "d7400f24-9ccc-4376-ba82-ab4235ddafc0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "0c01c24f-afdb-4ecf-8273-c4671061fefc"
       },
       "ResponseBody": {
-        "dataFeedId": "dfeb6435-736e-4962-86c3-aa52c4bb0b0b",
+        "dataFeedId": "10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
         "dataFeedName": "dataFeedpGfHCqUn",
         "metrics": [
           {
-            "metricId": "82521a30-2fd6-4cf9-8176-10bc0b064b8f",
+            "metricId": "d9247189-7bee-4ea5-872d-f12f8f13eee3",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "c9699cf7-427c-4525-ad1a-ffb8ca2bd32c",
+            "metricId": "77a3ae11-1630-46f8-b646-0d80d576b482",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -155,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:40Z",
+        "createdTime": "2021-02-05T17:56:56Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -167,33 +173,128 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfeb6435-736e-4962-86c3-aa52c4bb0b0b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6c5e562a388d4b42a7b2bbe87672ab43-7a44c95088f8fa49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-46471aff44fa914f98630450f007508f-83748031b7a79344-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9d9145c93e1cd7078d3ce4a911e26d74",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a0ba9e02-067e-4baa-b674-f9ad223bcaa3",
+        "Content-Length": "1446",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:56 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "a0ba9e02-067e-4baa-b674-f9ad223bcaa3"
+      },
+      "ResponseBody": {
+        "dataFeedId": "10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
+        "dataFeedName": "dataFeedpGfHCqUn",
+        "metrics": [
+          {
+            "metricId": "d9247189-7bee-4ea5-872d-f12f8f13eee3",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "77a3ae11-1630-46f8-b646-0d80d576b482",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:56Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/10d6a09b-3619-4cb0-bff3-c40bb26c4b4b",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d747a09e151b8746a538c48bd7db022a-d805bbb1ffcd3444-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9c9987f9410ad5d40080c1bfff4bd901",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f7da1c8a-0169-4645-8716-9ae27a97c6e4",
+        "apim-request-id": "24d7a257-35ba-47fc-a6fe-156cc44892d2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "344",
-        "x-request-id": "f7da1c8a-0169-4645-8716-9ae27a97c6e4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "382",
+        "X-Request-ID": "24d7a257-35ba-47fc-a6fe-156cc44892d2"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:40.5183375-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:57.1401323-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetup.json
index f591694bd1a8..181fdb16b0cb 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-255357e3a11048449182645f4ef3756f-ebd05219c9ad3b4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-83d104f41ef1604185d2bbaf366af78c-5074a5a5bb3c3f40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "4ca5efed474df635854c6c29003e9418",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "00b66d54-caa0-4b58-ba29-0ee90366a8ef",
+        "apim-request-id": "15227b3c-f1e4-4819-92ed-959d891e0f92",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7578f944-0df1-4eb4-9ea7-b0986f40da6c",
+        "Date": "Fri, 05 Feb 2021 17:53:47 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e9ee9489-e803-4f6a-8fd4-61464314fda9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "362",
-        "x-request-id": "00b66d54-caa0-4b58-ba29-0ee90366a8ef"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "724",
+        "X-Request-ID": "15227b3c-f1e4-4819-92ed-959d891e0f92"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7578f944-0df1-4eb4-9ea7-b0986f40da6c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e9ee9489-e803-4f6a-8fd4-61464314fda9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-09926cfc84bb1343acedd109f071335b-1eb736142cb0eb4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-83d104f41ef1604185d2bbaf366af78c-e82c7cdc237b6a40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "beb2e482c50a47648ea5aeb75491e3dc",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f728c274-7160-427f-8d48-c4d710069c18",
+        "apim-request-id": "f282d010-620c-4a17-9f3b-ea90230a6b92",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "x-request-id": "f728c274-7160-427f-8d48-c4d710069c18"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "f282d010-620c-4a17-9f3b-ea90230a6b92"
       },
       "ResponseBody": {
-        "dataFeedId": "7578f944-0df1-4eb4-9ea7-b0986f40da6c",
+        "dataFeedId": "e9ee9489-e803-4f6a-8fd4-61464314fda9",
         "dataFeedName": "dataFeedtKZcog90",
         "metrics": [
           {
-            "metricId": "1551556b-4f9f-48d4-9a89-f8c8f4efed1b",
+            "metricId": "56e96253-da43-423a-a493-303440c53149",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:18Z",
+        "createdTime": "2021-02-05T17:53:47Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7578f944-0df1-4eb4-9ea7-b0986f40da6c",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e9ee9489-e803-4f6a-8fd4-61464314fda9",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-be5e7ea7778789409dee3eaf129cf389-1fe26aff768ce84f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d44166f49c45284aa842a3c9617f3acb-7f02058569e87448-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0ae380259736e23b77de5e8e4623e990",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4cc5002f-6425-493d-8b1d-865374d90508",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:47 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "182",
+        "X-Request-ID": "4cc5002f-6425-493d-8b1d-865374d90508"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e9ee9489-e803-4f6a-8fd4-61464314fda9",
+        "dataFeedName": "dataFeedtKZcog90",
+        "metrics": [
+          {
+            "metricId": "56e96253-da43-423a-a493-303440c53149",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:47Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e9ee9489-e803-4f6a-8fd4-61464314fda9",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e8094c4353c87c4d830f63e14c038a25-c2611f0efa37cd4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5a3b1939778127968a5ebea7987ea2f3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "029e9823-d5fd-42e7-8966-eb08910b322a",
+        "apim-request-id": "7d9b87b0-9569-4df7-a824-3a89720c5faa",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "301",
-        "x-request-id": "029e9823-d5fd-42e7-8966-eb08910b322a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "362",
+        "X-Request-ID": "7d9b87b0-9569-4df7-a824-3a89720c5faa"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:19.6232544-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:48.5206276-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetupAsync.json
index 4e70b0bb56a0..6994ffeafedf 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-45958cfe57b97f4390e99c2132606634-ad0f6e5a08481e41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-83e904dd37fd044d90cd3916407b92f4-8220ce4ac0ff2249-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2709aab40aa61ea297e486cbbbdfa2f0",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c116395b-28e8-4435-a717-7026d77b56b3",
+        "apim-request-id": "7cade8b6-6907-4d00-86cf-f6adb96d658e",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44e2d350-6a53-4bd3-a5d4-74cd0493de92",
+        "Date": "Fri, 05 Feb 2021 17:56:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3be12112-b865-4d36-8c5a-67ef05f4db83",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "585",
-        "x-request-id": "c116395b-28e8-4435-a717-7026d77b56b3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "404",
+        "X-Request-ID": "7cade8b6-6907-4d00-86cf-f6adb96d658e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44e2d350-6a53-4bd3-a5d4-74cd0493de92",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3be12112-b865-4d36-8c5a-67ef05f4db83",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c3e29adb9c531846a28286d2c850e50d-cb5844076c88d741-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-83e904dd37fd044d90cd3916407b92f4-1bd7eb1b4550a048-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "019084ff66b044cc6584e47c26e5ca23",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d2bbff90-e19b-413d-a203-a7afd49a8bde",
+        "apim-request-id": "7f42b331-c623-4341-b917-4446f1e7d73e",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "d2bbff90-e19b-413d-a203-a7afd49a8bde"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "7f42b331-c623-4341-b917-4446f1e7d73e"
       },
       "ResponseBody": {
-        "dataFeedId": "44e2d350-6a53-4bd3-a5d4-74cd0493de92",
+        "dataFeedId": "3be12112-b865-4d36-8c5a-67ef05f4db83",
         "dataFeedName": "dataFeediicvSCTP",
         "metrics": [
           {
-            "metricId": "b0620674-a2b6-4f4d-aa12-177ba59b189d",
+            "metricId": "892526e9-9e9f-42e5-af1d-618a3f3c2a89",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:54Z",
+        "createdTime": "2021-02-05T17:56:57Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44e2d350-6a53-4bd3-a5d4-74cd0493de92",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3be12112-b865-4d36-8c5a-67ef05f4db83",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1799c0520fa4c34ba565edba93c84a70-81acf07c5e47334e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5ba4ff8ec8524040bd7e412b134d0fe7-8a004cfabfc00241-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b177d3ff45f0a837519a5743bb4435c3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "110cfdba-f549-411f-9cf0-336b2d0024c8",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "110cfdba-f549-411f-9cf0-336b2d0024c8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "3be12112-b865-4d36-8c5a-67ef05f4db83",
+        "dataFeedName": "dataFeediicvSCTP",
+        "metrics": [
+          {
+            "metricId": "892526e9-9e9f-42e5-af1d-618a3f3c2a89",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:57Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3be12112-b865-4d36-8c5a-67ef05f4db83",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-f2232dc580c72144bd33d9c3af08f493-b5eb2f3eb011c54a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7963dc2656214e97dec4c2212525f8b1",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1135dbdd-de7f-45ff-a7cd-93e08ac1b381",
+        "apim-request-id": "89f41172-e42e-4ee9-8a40-349527a055b9",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "315",
-        "x-request-id": "1135dbdd-de7f-45ff-a7cd-93e08ac1b381"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "285",
+        "X-Request-ID": "89f41172-e42e-4ee9-8a40-349527a055b9"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:55.3506059-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:58.3732487-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembers.json
index fbea21d53c15..881afc2d7841 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "981",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bff7ea2183c6de47bf8b9994c96d3f0d-f217483bec14d146-00",
+        "traceparent": "00-abf19573de03854390d5b3215dd13338-391ece1eede91345-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -67,26 +67,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "be4d1b6e-9418-46cd-accc-f81504732716",
+        "apim-request-id": "62b0de0f-1053-4f0e-873b-89f61b42b9a2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3dccf777-faf8-40b8-9d1a-98ab24830cc4",
+        "Date": "Fri, 05 Feb 2021 17:53:49 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "779",
-        "X-Request-ID": "be4d1b6e-9418-46cd-accc-f81504732716"
+        "x-envoy-upstream-service-time": "795",
+        "X-Request-ID": "62b0de0f-1053-4f0e-873b-89f61b42b9a2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3dccf777-faf8-40b8-9d1a-98ab24830cc4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b42f7f404c236648a93e74acfc63927d-181918b813899d47-00",
+        "traceparent": "00-abf19573de03854390d5b3215dd13338-190b48f246edc943-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -96,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8e288186-2cfa-4dac-b54f-70ad0d559304",
+        "apim-request-id": "09f8051e-031c-4e10-95fc-982f759a6e12",
         "Content-Length": "1398",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "X-Request-ID": "8e288186-2cfa-4dac-b54f-70ad0d559304"
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "09f8051e-031c-4e10-95fc-982f759a6e12"
       },
       "ResponseBody": {
-        "dataFeedId": "3dccf777-faf8-40b8-9d1a-98ab24830cc4",
+        "dataFeedId": "7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
         "dataFeedName": "dataFeedeKXWW1HR",
         "metrics": [
           {
-            "metricId": "c30748f7-69eb-43f4-b4bf-bb499cd81c94",
+            "metricId": "8c03403c-444c-421f-b032-d96832966969",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "2763ebbb-0755-45f3-911e-2fda51e1d70a",
+            "metricId": "090c6046-c8a6-44ce-a3b4-a154f87471ae",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -159,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:23Z",
+        "createdTime": "2021-02-05T17:53:49Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,14 +169,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3dccf777-faf8-40b8-9d1a-98ab24830cc4",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8f4b3aff85440841988dcb0d2e9eaa60-b56fe630502f7246-00",
+        "traceparent": "00-30b57e5756ab5d4aa3887a9c42e2f559-78c597cdfe7ba24e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -184,21 +184,111 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d508daa5-73a4-43b0-b5eb-3d74b52743bb",
+        "Content-Length": "1398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:50 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "d508daa5-73a4-43b0-b5eb-3d74b52743bb"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
+        "dataFeedName": "dataFeedeKXWW1HR",
+        "metrics": [
+          {
+            "metricId": "8c03403c-444c-421f-b032-d96832966969",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "090c6046-c8a6-44ce-a3b4-a154f87471ae",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:49Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7218fa28-4c7d-4ebc-9ca9-b6ed48667b28",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-2e5219176c2cf94a8c88c17a1773b3a2-97fb040b0689de4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c99f4a73e99a4c08d7a7f5da327c9472",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "751db2f0-7f19-4154-bdcc-e05b03c5ba18",
+        "apim-request-id": "f677ca32-8a63-498b-a853-3216b82094bc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "394",
-        "X-Request-ID": "751db2f0-7f19-4154-bdcc-e05b03c5ba18"
+        "x-envoy-upstream-service-time": "363",
+        "X-Request-ID": "f677ca32-8a63-498b-a853-3216b82094bc"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:24.1673473-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:51.2834837-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembersAsync.json
index 315d3685bf96..4a7622ff3e9f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataExplorerDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "981",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fdcdd5c9bdefa5458cf86d72fd19b596-ea2ae9f2c9e32145-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8e7d7f68ac2e6347b74a2d4e77bf6ce0-5152ae99c7cf0849-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e80e9cbd169ba9b340aea27e67f86572",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1c596c7c-d54a-4c7a-ba34-4af5602daf3a",
+        "apim-request-id": "e1fe7439-d22d-4842-bee3-bd327eb7b13a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:41 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/82ff0a3d-3ca5-45e4-aeb2-c043e69fc3b0",
+        "Date": "Fri, 05 Feb 2021 17:56:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "744",
-        "x-request-id": "1c596c7c-d54a-4c7a-ba34-4af5602daf3a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "665",
+        "X-Request-ID": "e1fe7439-d22d-4842-bee3-bd327eb7b13a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/82ff0a3d-3ca5-45e4-aeb2-c043e69fc3b0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-312bd364b0be224a9ae2eb8891d802dd-4d4313995b8e4244-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8e7d7f68ac2e6347b74a2d4e77bf6ce0-bddc5b2ead20cf49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "995a4a2935c6ccb57e97c69c71e6fa94",
         "x-ms-return-client-request-id": "true"
@@ -90,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "10585d3b-eece-4d73-a5bd-b8a933d179b7",
+        "apim-request-id": "5a6cf844-25c0-47a2-9aa3-8adb760a383a",
         "Content-Length": "1398",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "10585d3b-eece-4d73-a5bd-b8a933d179b7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "5a6cf844-25c0-47a2-9aa3-8adb760a383a"
       },
       "ResponseBody": {
-        "dataFeedId": "82ff0a3d-3ca5-45e4-aeb2-c043e69fc3b0",
+        "dataFeedId": "bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
         "dataFeedName": "dataFeedm7a4TvMx",
         "metrics": [
           {
-            "metricId": "65b5128a-ed5b-4c20-9d0c-7dc9cf3e6645",
+            "metricId": "fc4e7953-81ed-473b-a438-3a39aae40ccb",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "d6df0302-59fb-4612-9c4e-6bd8a237d20c",
+            "metricId": "58c72400-30cf-4029-95f4-e3dcec78e4d5",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -153,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:41Z",
+        "createdTime": "2021-02-05T17:56:59Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -163,33 +169,126 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/82ff0a3d-3ca5-45e4-aeb2-c043e69fc3b0",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-39454d1836de804f9e8a50a66c03d1fa-043df811b51e1443-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-20ca551945f6fb439712871469102acd-114734c9acafef44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "96c9a7e44dad54c16724ab1c108b8c60",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "194c738f-69d0-4d67-b681-4a347e73a99c",
+        "Content-Length": "1398",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "194c738f-69d0-4d67-b681-4a347e73a99c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
+        "dataFeedName": "dataFeedm7a4TvMx",
+        "metrics": [
+          {
+            "metricId": "fc4e7953-81ed-473b-a438-3a39aae40ccb",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "58c72400-30cf-4029-95f4-e3dcec78e4d5",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:59Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bee0f6f9-0dd6-4182-ba05-d01a598b59ae",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b10bb157ff732044a96ba4c5b428c727-d0c5fb94a2fcd647-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "708842237ad08840e74269044f163759",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "78701f1a-6196-47aa-8c80-0b2b58d8e720",
+        "apim-request-id": "1bf9d8f3-ca6e-4644-810d-3dd019812059",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "393",
-        "x-request-id": "78701f1a-6196-47aa-8c80-0b2b58d8e720"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "356",
+        "X-Request-ID": "1bf9d8f3-ca6e-4644-810d-3dd019812059"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:41.8968854-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:59.7513466-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetup.json
index 101fd64e593d..47c7a9ee06a6 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1fae491abfa08b4891d34543326de9b3-ae72fdc7426ee44f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7ec97ede96f13d4d9b43eae75e19bbb0-05d0badcfb871249-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "88f0b9f221610293c352d8c8cfd0265f",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d524a98a-7aad-43b6-b38b-76c65911e5c9",
+        "apim-request-id": "72884306-4d79-466e-b84e-6ff4dc089d7c",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:20 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89019838-bb87-456c-881c-b9c900c45b1f",
+        "Date": "Fri, 05 Feb 2021 17:53:51 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "343",
-        "x-request-id": "d524a98a-7aad-43b6-b38b-76c65911e5c9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "612",
+        "X-Request-ID": "72884306-4d79-466e-b84e-6ff4dc089d7c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89019838-bb87-456c-881c-b9c900c45b1f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3c53ef8579d01f468f1612c137f9a4e4-94c058b2470da441-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7ec97ede96f13d4d9b43eae75e19bbb0-a20a99c7681af448-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1a6983f8bdebc662b5c050014fdfa43e",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8966ba61-d9be-41bf-847e-0fb9a20e7e90",
+        "apim-request-id": "95c0987d-8f52-49f7-be83-42e834216169",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "8966ba61-d9be-41bf-847e-0fb9a20e7e90"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "95c0987d-8f52-49f7-be83-42e834216169"
       },
       "ResponseBody": {
-        "dataFeedId": "89019838-bb87-456c-881c-b9c900c45b1f",
+        "dataFeedId": "44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
         "dataFeedName": "dataFeedaIVu0iKo",
         "metrics": [
           {
-            "metricId": "a7fedbf2-f957-4e6d-899e-2716d8fcbf82",
+            "metricId": "3924a088-4ea8-42cc-a86c-00c2fbc2d97d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:21Z",
+        "createdTime": "2021-02-05T17:53:52Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,33 +124,111 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89019838-bb87-456c-881c-b9c900c45b1f",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a4a58d3f36eb234599043198cf1ea080-643733035b3fb14d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5f31a3b60d19054383bb204f32ade26a-52161066e361b844-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d717d001ee4671ddb86a2969208b2e8c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "77b1ddd4-09b8-4468-9069-3e262835c59f",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "198",
+        "X-Request-ID": "77b1ddd4-09b8-4468-9069-3e262835c59f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
+        "dataFeedName": "dataFeedaIVu0iKo",
+        "metrics": [
+          {
+            "metricId": "3924a088-4ea8-42cc-a86c-00c2fbc2d97d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:52Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44b0fedd-eaf2-45a5-9d59-07eb59a25df2",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-65dc9aab535ef048b682a0708c3a9bf6-ea72068f621d2c48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "535ca27c68603560562ad2a1d091b2e4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "983b42fd-5556-4ef8-b0d7-e9c2f1f953e2",
+        "apim-request-id": "613e0c35-55c7-495e-aecb-f70202e7d61a",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "264",
-        "x-request-id": "983b42fd-5556-4ef8-b0d7-e9c2f1f953e2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "314",
+        "X-Request-ID": "613e0c35-55c7-495e-aecb-f70202e7d61a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:22.0999707-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:53.1445237-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetupAsync.json
index 9160a7d7dff0..44c3e99517b4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3cfd77989cd27a4a9ffc4f17f93db15b-e34579466f1d374e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-65b403a5b5baef41a545c67ee7c05a6c-658cbfb6c974d240-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1c7b2d262ebf927575172457b65603ce",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "72e9dddb-6892-45b3-8d93-d431af1ffcfc",
+        "apim-request-id": "61cbd12b-8082-42f1-a3f7-d2fcaad562c7",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:57 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57bd9cb1-21e1-4d42-b02c-4978d97d9ecc",
+        "Date": "Fri, 05 Feb 2021 17:57:00 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b75610-c75b-493f-8c1b-4e4ace28d198",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "399",
-        "x-request-id": "72e9dddb-6892-45b3-8d93-d431af1ffcfc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "606",
+        "X-Request-ID": "61cbd12b-8082-42f1-a3f7-d2fcaad562c7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57bd9cb1-21e1-4d42-b02c-4978d97d9ecc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b75610-c75b-493f-8c1b-4e4ace28d198",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-75e7731a13582c47a55510fa6dbe7f88-c4e2a1c756028843-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-65b403a5b5baef41a545c67ee7c05a6c-0a1ec72090a80d4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2e14096ef149a4c86b142cf926f9f84e",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "eb1417c4-0138-4839-8cf9-324fb557602b",
+        "apim-request-id": "49324acf-64d7-4306-9ee1-d0cf1ffe6d33",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "x-request-id": "eb1417c4-0138-4839-8cf9-324fb557602b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "49324acf-64d7-4306-9ee1-d0cf1ffe6d33"
       },
       "ResponseBody": {
-        "dataFeedId": "57bd9cb1-21e1-4d42-b02c-4978d97d9ecc",
+        "dataFeedId": "71b75610-c75b-493f-8c1b-4e4ace28d198",
         "dataFeedName": "dataFeedYKYEr4N4",
         "metrics": [
           {
-            "metricId": "bd46304e-ab68-4774-863e-1978f7d79de9",
+            "metricId": "39efc18e-f64c-43fe-a590-6960d3d747b1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:57Z",
+        "createdTime": "2021-02-05T17:57:00Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,33 +124,111 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57bd9cb1-21e1-4d42-b02c-4978d97d9ecc",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b75610-c75b-493f-8c1b-4e4ace28d198",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a5c079c91fd1bd4baefc8b8d88255880-8a1c9349b2244840-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7416b7465b425a458f1c1683b02968e4-e1fa1297db1f7b41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5678b8a7d0148440a6fe5ce0fbb7ce1d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "227f6644-7736-48a8-a792-8434e488c84f",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:00 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "227f6644-7736-48a8-a792-8434e488c84f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "71b75610-c75b-493f-8c1b-4e4ace28d198",
+        "dataFeedName": "dataFeedYKYEr4N4",
+        "metrics": [
+          {
+            "metricId": "39efc18e-f64c-43fe-a590-6960d3d747b1",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:00Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b75610-c75b-493f-8c1b-4e4ace28d198",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-01f3d8591e611f4897761eace635a485-32477f49ee89954c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "52a09ca7f3b335a165d7b0ab027c6c7b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "564163bf-6f30-4d3f-b797-5b6c8e1a90da",
+        "apim-request-id": "e9c97b91-2306-4402-8a33-7c7c2b42dd6f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "267",
-        "x-request-id": "564163bf-6f30-4d3f-b797-5b6c8e1a90da"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "291",
+        "X-Request-ID": "e9c97b91-2306-4402-8a33-7c7c2b42dd6f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:57.8693254-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:01.2386227-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembers.json
index 39a86468ab7d..f9ee739cb889 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1068",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ce44c7e17f46344aaf218ef1a669966e-5eb3c093f692ef4b-00",
+        "traceparent": "00-9f8d1ee7438bac47b568e749cd0c1741-383067b19e12d048-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -70,26 +70,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7449ba10-e49e-4b69-bf7e-6a1247ce9518",
+        "apim-request-id": "6b087b03-4668-4d48-9b28-509919e53393",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:24 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdfbaa22-63d8-4edf-9769-529b9eb03eb4",
+        "Date": "Fri, 05 Feb 2021 17:53:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7b7275e-3762-46b2-a3cf-303538af6841",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "780",
-        "X-Request-ID": "7449ba10-e49e-4b69-bf7e-6a1247ce9518"
+        "x-envoy-upstream-service-time": "743",
+        "X-Request-ID": "6b087b03-4668-4d48-9b28-509919e53393"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdfbaa22-63d8-4edf-9769-529b9eb03eb4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7b7275e-3762-46b2-a3cf-303538af6841",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c468a0e07f06b04f9a72a22e237b659d-bc0e97f4bfff8c42-00",
+        "traceparent": "00-9f8d1ee7438bac47b568e749cd0c1741-384ca5e33687c649-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -99,27 +99,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cba96e40-e7f6-41a7-8eee-006d3457b781",
+        "apim-request-id": "48316737-99e0-4d28-b99f-b4d8fd4da50e",
         "Content-Length": "1485",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "X-Request-ID": "cba96e40-e7f6-41a7-8eee-006d3457b781"
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "48316737-99e0-4d28-b99f-b4d8fd4da50e"
       },
       "ResponseBody": {
-        "dataFeedId": "fdfbaa22-63d8-4edf-9769-529b9eb03eb4",
+        "dataFeedId": "a7b7275e-3762-46b2-a3cf-303538af6841",
         "dataFeedName": "dataFeed2ZTAxTdn",
         "metrics": [
           {
-            "metricId": "37b0f836-e235-4e27-8642-063239c2c841",
+            "metricId": "ecfd17dd-02ef-4d60-b12f-3ae2cddc424c",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "e05a3955-4911-4659-9dd2-b0778e1a7c75",
+            "metricId": "53b3b217-2bd5-462d-9f7f-793767b1bc12",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -162,7 +162,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:25Z",
+        "createdTime": "2021-02-05T17:53:54Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -175,14 +175,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdfbaa22-63d8-4edf-9769-529b9eb03eb4",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7b7275e-3762-46b2-a3cf-303538af6841",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4449b2063b3aac419a24317e719f3d95-be1c1dcabe2b6c4b-00",
+        "traceparent": "00-a73587a85eca3f469e35304e6093008f-e811b18bab268e4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -190,21 +190,114 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "db7264a1-19c7-45be-affc-20442350b5a6",
+        "Content-Length": "1485",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:53 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "db7264a1-19c7-45be-affc-20442350b5a6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a7b7275e-3762-46b2-a3cf-303538af6841",
+        "dataFeedName": "dataFeed2ZTAxTdn",
+        "metrics": [
+          {
+            "metricId": "ecfd17dd-02ef-4d60-b12f-3ae2cddc424c",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "53b3b217-2bd5-462d-9f7f-793767b1bc12",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:54Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7b7275e-3762-46b2-a3cf-303538af6841",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-03cdac24dcc18f49baa711e25ee563e8-9b4d670fa1b6814e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5b06fa6f8f770e10e3d81fbe8ac44aee",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "91fe1ed9-0c24-499e-bb4c-cb8b20f51a17",
+        "apim-request-id": "60c4cd3d-ff78-4b5e-85c7-77edd7f96727",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "433",
-        "X-Request-ID": "91fe1ed9-0c24-499e-bb4c-cb8b20f51a17"
+        "x-envoy-upstream-service-time": "344",
+        "X-Request-ID": "60c4cd3d-ff78-4b5e-85c7-77edd7f96727"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:25.5686413-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:54.8212442-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembersAsync.json
index 15e7934164d0..627dcde1dd0c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureDataLakeStorageGen2DataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1068",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-311a4fbad3206444a47ae7e0001777a4-9b7e93e2418ca44b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c6f8c524ac2e6340baa4418c75549421-be78a64c6e6c4b4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "dffee865c239b8cba4f76ee47ec25f26",
         "x-ms-return-client-request-id": "true"
@@ -67,25 +70,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "a80f9e30-521e-4b5c-990e-06446f40f633",
+        "apim-request-id": "a916e6c5-6c7c-438d-ad37-747c0fca31e0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e418d3d0-8cf4-41e5-800f-66d972ba27cc",
+        "Date": "Fri, 05 Feb 2021 17:57:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0263ad05-1f33-421e-ba4d-1598ff1bc821",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "498",
-        "x-request-id": "a80f9e30-521e-4b5c-990e-06446f40f633"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "659",
+        "X-Request-ID": "a916e6c5-6c7c-438d-ad37-747c0fca31e0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e418d3d0-8cf4-41e5-800f-66d972ba27cc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0263ad05-1f33-421e-ba4d-1598ff1bc821",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e3fb1af64c8c8646af430f951f63bb09-ab02c478006c3c47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c6f8c524ac2e6340baa4418c75549421-858a8e5ad120984b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a3968a613c1cd124c04d3e57af5eb91a",
         "x-ms-return-client-request-id": "true"
@@ -93,27 +99,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a17b5a70-5b3c-4494-b8de-1bc6aec9f3ee",
+        "apim-request-id": "56615511-809b-4b1e-8ae1-b7d8ac4c8158",
         "Content-Length": "1485",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "189",
-        "x-request-id": "a17b5a70-5b3c-4494-b8de-1bc6aec9f3ee"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "56615511-809b-4b1e-8ae1-b7d8ac4c8158"
       },
       "ResponseBody": {
-        "dataFeedId": "e418d3d0-8cf4-41e5-800f-66d972ba27cc",
+        "dataFeedId": "0263ad05-1f33-421e-ba4d-1598ff1bc821",
         "dataFeedName": "dataFeedyzWlsjAo",
         "metrics": [
           {
-            "metricId": "a521e7b2-a6a0-414e-a6e4-6af32ed635ca",
+            "metricId": "8e10c961-1ef7-4b97-9d1d-0d49224f24db",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "b12ef031-70ab-4824-8f9b-85610db69011",
+            "metricId": "d7e95651-27e6-4b69-92c6-406853937c65",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -156,7 +162,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:42Z",
+        "createdTime": "2021-02-05T17:57:02Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,33 +175,129 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e418d3d0-8cf4-41e5-800f-66d972ba27cc",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0263ad05-1f33-421e-ba4d-1598ff1bc821",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-46ceb7f8b9649f46af030cf5f65f1ba6-cf0e50cb8010f946-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c09e9a862451ae4baccf7f555d754e01-4a2aec9713cd2548-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "54fa63dadbb594d78f7887b74eda96dd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5f9b4242-211e-4f13-be5e-5d2b8d759bfc",
+        "Content-Length": "1485",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "5f9b4242-211e-4f13-be5e-5d2b8d759bfc"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0263ad05-1f33-421e-ba4d-1598ff1bc821",
+        "dataFeedName": "dataFeedyzWlsjAo",
+        "metrics": [
+          {
+            "metricId": "8e10c961-1ef7-4b97-9d1d-0d49224f24db",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "d7e95651-27e6-4b69-92c6-406853937c65",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:02Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0263ad05-1f33-421e-ba4d-1598ff1bc821",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e648f163d6d61e419dac0486b7ae6cc9-5b0f292ebd067f4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5d71ebc6cb2428a1c42d1fec83740946",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "99fdf028-73e0-4a7e-8ef8-87d195e07ef6",
+        "apim-request-id": "4e8524bc-87bb-40e6-b0aa-4bd8ac4fc893",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "383",
-        "x-request-id": "99fdf028-73e0-4a7e-8ef8-87d195e07ef6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "388",
+        "X-Request-ID": "4e8524bc-87bb-40e6-b0aa-4bd8ac4fc893"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:43.0855982-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:02.6877451-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetup.json
index e3f201812105..f1d23c3b091f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7e31f463895e244894c629778544a5dc-f144bb22f841234e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a740c574560fd47bf19c396baccc0c2-45f0298b31b0b146-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ba4f40bd0b5bc518535e7422a7238cfe",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0b5f0de0-7446-4e26-9689-c0f0aa6a62f7",
+        "apim-request-id": "c0f41d71-b874-42b0-bc37-8849873280e6",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4964f558-9f91-4f4f-8ee6-61dbf00ffe05",
+        "Date": "Fri, 05 Feb 2021 17:53:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca74edbf-8564-460f-9e97-5037a13f64fc",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "441",
-        "x-request-id": "0b5f0de0-7446-4e26-9689-c0f0aa6a62f7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "695",
+        "X-Request-ID": "c0f41d71-b874-42b0-bc37-8849873280e6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4964f558-9f91-4f4f-8ee6-61dbf00ffe05",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca74edbf-8564-460f-9e97-5037a13f64fc",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8a19fe3d22c8f6428a7e51c53c5f5074-5d3a5cbe1f30004d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a740c574560fd47bf19c396baccc0c2-067ab9de9f200646-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "da9ebcc421a22704c8d9f2d82ac7e21c",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9c25032c-d74f-43c6-88bd-2da1a9a568e8",
+        "apim-request-id": "ca8e2001-c41b-4c83-970c-211c7f93b080",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "195",
-        "x-request-id": "9c25032c-d74f-43c6-88bd-2da1a9a568e8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "ca8e2001-c41b-4c83-970c-211c7f93b080"
       },
       "ResponseBody": {
-        "dataFeedId": "4964f558-9f91-4f4f-8ee6-61dbf00ffe05",
+        "dataFeedId": "ca74edbf-8564-460f-9e97-5037a13f64fc",
         "dataFeedName": "dataFeedcORNKy6O",
         "metrics": [
           {
-            "metricId": "73b9a7d5-68ae-49ab-96ee-5291e98a0df7",
+            "metricId": "483bb745-162b-4a10-a45d-97ecb8428c4a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:24Z",
+        "createdTime": "2021-02-05T17:53:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4964f558-9f91-4f4f-8ee6-61dbf00ffe05",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca74edbf-8564-460f-9e97-5037a13f64fc",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-48e6b13581e71240bd1fed6896811303-a1dd7fcfe0258f48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4727f1a610f66942a8ec8dfa760f5c15-9674ca4c68fe9042-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7f29d261d5399d6bd4bcd23c884a0f22",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d99177f3-07d6-4fb4-a1ed-2d6977579b16",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "d99177f3-07d6-4fb4-a1ed-2d6977579b16"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ca74edbf-8564-460f-9e97-5037a13f64fc",
+        "dataFeedName": "dataFeedcORNKy6O",
+        "metrics": [
+          {
+            "metricId": "483bb745-162b-4a10-a45d-97ecb8428c4a",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:55Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca74edbf-8564-460f-9e97-5037a13f64fc",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-675b80aa46bfcb48848e4380b19a3010-e0014aca2d734546-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "99a04b9bb4cc9bc93b27f281183f9b8c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "13339c74-be93-42a8-93e5-297c3fdb7770",
+        "apim-request-id": "2042fe31-46d0-4c71-b132-3e9232a30f55",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "281",
-        "x-request-id": "13339c74-be93-42a8-93e5-297c3fdb7770"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "356",
+        "X-Request-ID": "2042fe31-46d0-4c71-b132-3e9232a30f55"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:24.8388351-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:56.7111604-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetupAsync.json
index 11754ba2dff8..97235347b1ab 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ccf0052f8c3cca42a8fc9b2834d74bb1-9fa19777f9a9da4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8845da937cd4ef46be446fde868b7b68-4793f02e4e14e442-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b26283fa3dd7ca67c4cdef3d3a8d7fed",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "4dbf74f4-9ee3-4927-87bc-8abbb0374793",
+        "apim-request-id": "5480e49a-0a1c-4d19-b432-4b49c8131ceb",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:59 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2802c3e2-cd93-485b-9f0a-387d236b4189",
+        "Date": "Fri, 05 Feb 2021 17:57:03 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bceff873-60f6-48ab-8927-61865fc058bb",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "492",
-        "x-request-id": "4dbf74f4-9ee3-4927-87bc-8abbb0374793"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "561",
+        "X-Request-ID": "5480e49a-0a1c-4d19-b432-4b49c8131ceb"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2802c3e2-cd93-485b-9f0a-387d236b4189",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bceff873-60f6-48ab-8927-61865fc058bb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f3d6628f3674b447857cda4103c6ae70-56001748f7ec1a4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8845da937cd4ef46be446fde868b7b68-0cf17f5b9d0e5341-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "013e23d4642d298a330851615a5bbe2c",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "416ff882-5480-4cc2-8277-3a7010dc2a5a",
+        "apim-request-id": "053d31cd-af1d-4f49-8f41-b6e7ec3cc98b",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "x-request-id": "416ff882-5480-4cc2-8277-3a7010dc2a5a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "053d31cd-af1d-4f49-8f41-b6e7ec3cc98b"
       },
       "ResponseBody": {
-        "dataFeedId": "2802c3e2-cd93-485b-9f0a-387d236b4189",
+        "dataFeedId": "bceff873-60f6-48ab-8927-61865fc058bb",
         "dataFeedName": "dataFeedLRU0DZ7s",
         "metrics": [
           {
-            "metricId": "caa0f8cc-fe0c-4bc9-9e04-afb171f3cea7",
+            "metricId": "428f3251-5fae-4623-8042-3781037b6574",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:59Z",
+        "createdTime": "2021-02-05T17:57:03Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2802c3e2-cd93-485b-9f0a-387d236b4189",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bceff873-60f6-48ab-8927-61865fc058bb",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8be968bc04df3f408080696f15b7b928-a547eae03a180f4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4784b374dc29a14ab9e1fba4f9369a8b-cecd29743a218b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "8e3283e08d84d79031c9f916cd92fa38",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6bc2a536-3bd7-4b1d-a325-c75c69befe79",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:03 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "6bc2a536-3bd7-4b1d-a325-c75c69befe79"
+      },
+      "ResponseBody": {
+        "dataFeedId": "bceff873-60f6-48ab-8927-61865fc058bb",
+        "dataFeedName": "dataFeedLRU0DZ7s",
+        "metrics": [
+          {
+            "metricId": "428f3251-5fae-4623-8042-3781037b6574",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:03Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bceff873-60f6-48ab-8927-61865fc058bb",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e53fd09041e6384bb965e8bffcc772c0-7c7a513d91c55c40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f58d279a9ce096b1f8387eceeb056f69",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5ff5be81-025d-42f1-9f8a-906220a8909d",
+        "apim-request-id": "fcf0b6b5-4be7-4b78-af00-93f77cfb3944",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "265",
-        "x-request-id": "5ff5be81-025d-42f1-9f8a-906220a8909d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "328",
+        "X-Request-ID": "fcf0b6b5-4be7-4b78-af00-93f77cfb3944"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:00.2251844-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:04.1816537-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembers.json
index 39a49dcab441..4f0ed25e1ef2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "990",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e57ea502fe06204989779b9074720d75-607cc3af216f0344-00",
+        "traceparent": "00-f4dc668eaa41ab40b817ae509a08b0d4-2671f38de8dec54f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -68,26 +68,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "315a4d6c-f884-4400-b0fb-f434a8aac470",
+        "apim-request-id": "19ce0121-e923-434b-851f-506162eb9356",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:26 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1524da4-4da4-4139-b994-3e2e52e4bfd9",
+        "Date": "Fri, 05 Feb 2021 17:53:56 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40e1d39e-4dbe-4481-8748-3e48c42514b5",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "726",
-        "X-Request-ID": "315a4d6c-f884-4400-b0fb-f434a8aac470"
+        "x-envoy-upstream-service-time": "700",
+        "X-Request-ID": "19ce0121-e923-434b-851f-506162eb9356"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1524da4-4da4-4139-b994-3e2e52e4bfd9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40e1d39e-4dbe-4481-8748-3e48c42514b5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-aadc28a73bbae04a9de1e778d65c229c-16fca46ee4bfe24a-00",
+        "traceparent": "00-f4dc668eaa41ab40b817ae509a08b0d4-787827fd7905b747-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -97,27 +97,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9b3d329f-5e1b-4765-b9de-6d9afe1cff7d",
+        "apim-request-id": "1c04131c-9159-4eb3-888f-0de589ca03b4",
         "Content-Length": "1407",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "X-Request-ID": "9b3d329f-5e1b-4765-b9de-6d9afe1cff7d"
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "1c04131c-9159-4eb3-888f-0de589ca03b4"
       },
       "ResponseBody": {
-        "dataFeedId": "b1524da4-4da4-4139-b994-3e2e52e4bfd9",
+        "dataFeedId": "40e1d39e-4dbe-4481-8748-3e48c42514b5",
         "dataFeedName": "dataFeedgoOWLhzw",
         "metrics": [
           {
-            "metricId": "43580e62-43bc-407b-99b1-8b6a324ed617",
+            "metricId": "18f2c906-5397-412b-8074-1de5dae48e6e",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "5db42991-4a65-4fb2-a4be-b8e69cf51d7e",
+            "metricId": "52dcf2d9-b59b-458c-a6e8-c85263323eff",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -160,7 +160,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:26Z",
+        "createdTime": "2021-02-05T17:53:57Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -171,14 +171,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1524da4-4da4-4139-b994-3e2e52e4bfd9",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40e1d39e-4dbe-4481-8748-3e48c42514b5",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c7c86cf8453f8541b4fe047d0100168e-0c071ba154d0664d-00",
+        "traceparent": "00-84f71e8e6669ab4ba5bec6329a2c61eb-67afc62f88d1b349-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -186,21 +186,112 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5287641f-30a4-4810-87c5-11793b6ce1e3",
+        "Content-Length": "1407",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:53:58 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "5287641f-30a4-4810-87c5-11793b6ce1e3"
+      },
+      "ResponseBody": {
+        "dataFeedId": "40e1d39e-4dbe-4481-8748-3e48c42514b5",
+        "dataFeedName": "dataFeedgoOWLhzw",
+        "metrics": [
+          {
+            "metricId": "18f2c906-5397-412b-8074-1de5dae48e6e",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "52dcf2d9-b59b-458c-a6e8-c85263323eff",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:57Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40e1d39e-4dbe-4481-8748-3e48c42514b5",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-77e590bcff3fa1469ffe6e2fb4cef6d0-638042c49248d247-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "90c5b598d784d17331a599344230d91c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1b9fe7bd-c040-433a-bd1f-2793297aadd6",
+        "apim-request-id": "20859dc9-5828-4c8d-ad0b-5dc12a9bc667",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:53:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "388",
-        "X-Request-ID": "1b9fe7bd-c040-433a-bd1f-2793297aadd6"
+        "x-envoy-upstream-service-time": "365",
+        "X-Request-ID": "20859dc9-5828-4c8d-ad0b-5dc12a9bc667"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:27.0106640-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:53:58.6567369-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembersAsync.json
index 24164dc75f99..77e8a3aa0a53 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetAzureTableDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "990",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-82e5c5b999668c44a5f9a79ee5cebd22-843075dcb16f1544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d4f8258d28678544bc5929fee32c1566-c6f0c83750f8cb48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "14dc436633c61796ce19383771675ea3",
         "x-ms-return-client-request-id": "true"
@@ -65,25 +68,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6524a66c-0c9a-43d5-9cd4-a05e2bd05754",
+        "apim-request-id": "8807a523-611e-4692-98e3-d5d3c51a4710",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da1fa268-3233-48ce-bcea-ed36e8a63ea4",
+        "Date": "Fri, 05 Feb 2021 17:57:04 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b76bbf04-4a63-432c-a706-c76b5385b4d9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "785",
-        "x-request-id": "6524a66c-0c9a-43d5-9cd4-a05e2bd05754"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "693",
+        "X-Request-ID": "8807a523-611e-4692-98e3-d5d3c51a4710"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da1fa268-3233-48ce-bcea-ed36e8a63ea4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b76bbf04-4a63-432c-a706-c76b5385b4d9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-288890ba20c20c418b35815f9b2a7c3d-acd6960c0a4f3c49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d4f8258d28678544bc5929fee32c1566-96c3b4d4a3d7b149-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3f967ef51b90d7390e7f116ccdaa8750",
         "x-ms-return-client-request-id": "true"
@@ -91,27 +97,118 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "077ded51-39e5-436c-9fc5-87ad6a8142ee",
+        "apim-request-id": "8ccc29ac-3c86-42be-8776-0b869398483b",
         "Content-Length": "1407",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "188",
+        "X-Request-ID": "8ccc29ac-3c86-42be-8776-0b869398483b"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b76bbf04-4a63-432c-a706-c76b5385b4d9",
+        "dataFeedName": "dataFeedMKSbBurZ",
+        "metrics": [
+          {
+            "metricId": "9b437244-2cb5-4057-a254-ab7b5164a970",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "120ef77d-9a05-4f2d-8fe3-c3a5025e3659",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:05Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b76bbf04-4a63-432c-a706-c76b5385b4d9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-11166c06d9c4474a8372bac17fb3340c-58324aecf57ecc4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0a3c3d6ac58d11657dbaf588b357e796",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b78d01f1-7086-41a5-905c-e0d00cc37eae",
+        "Content-Length": "1407",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "171",
-        "x-request-id": "077ded51-39e5-436c-9fc5-87ad6a8142ee"
+        "X-Request-ID": "b78d01f1-7086-41a5-905c-e0d00cc37eae"
       },
       "ResponseBody": {
-        "dataFeedId": "da1fa268-3233-48ce-bcea-ed36e8a63ea4",
+        "dataFeedId": "b76bbf04-4a63-432c-a706-c76b5385b4d9",
         "dataFeedName": "dataFeedMKSbBurZ",
         "metrics": [
           {
-            "metricId": "d85b6d2c-4f84-4160-950f-1978489b4db4",
+            "metricId": "9b437244-2cb5-4057-a254-ab7b5164a970",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "629610ef-7794-4ae5-91cb-7fbe7f9240d5",
+            "metricId": "120ef77d-9a05-4f2d-8fe3-c3a5025e3659",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -154,7 +251,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:44Z",
+        "createdTime": "2021-02-05T17:57:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -165,33 +262,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da1fa268-3233-48ce-bcea-ed36e8a63ea4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b76bbf04-4a63-432c-a706-c76b5385b4d9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0dc4e76e7312db45aa4ed3cf17eb3034-aac9c9aa39829545-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-240e447168ae7142b1bf373c934922c8-ec5eee2f0ab80444-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0a3c3d6ac58d11657dbaf588b357e796",
+        "x-ms-client-request-id": "b6616f08cc424a600a04064621294a24",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f51e6bc8-77be-4983-817e-c4d8f5a0ae9b",
+        "apim-request-id": "0a7d5a78-6613-4cde-b87d-6d8e11962ecd",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "383",
-        "x-request-id": "f51e6bc8-77be-4983-817e-c4d8f5a0ae9b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "423",
+        "X-Request-ID": "0a7d5a78-6613-4cde-b87d-6d8e11962ecd"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:44.5808954-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:05.6692600-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetup.json
index 44f10625dc41..b15a5ef6ca44 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9af39765e02f6441baabcf4cca9ca484-9129ef6943819946-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4f231f17ee7dde4a9c09bb40f0bada1b-63016959d2eddd44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "47bb13ef83b42a39dfd3b72ad8623d92",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "53b4f8a5-b47d-4c71-a2d1-b143b22e64ee",
+        "apim-request-id": "5054db2a-1311-4806-894e-381798a3d6f5",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:29 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b2f56f6a-143b-44e8-97df-5fe53534c010",
+        "Date": "Fri, 05 Feb 2021 17:53:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19f4e6a2-f1bc-48d6-b061-026011a97fda",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "2567",
-        "x-request-id": "53b4f8a5-b47d-4c71-a2d1-b143b22e64ee"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "609",
+        "X-Request-ID": "5054db2a-1311-4806-894e-381798a3d6f5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b2f56f6a-143b-44e8-97df-5fe53534c010",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19f4e6a2-f1bc-48d6-b061-026011a97fda",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-105144e7fb79fa4b980e70d006b60e3a-a90c9a09caa0684d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4f231f17ee7dde4a9c09bb40f0bada1b-8586bc9024f77c4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1986a5cf274fbe6bdd8c8586a6fcf6f3",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6f533167-0b98-455c-8a33-1f5fa42d608e",
+        "apim-request-id": "a44dc947-c474-4407-8d88-e52cf1afb93b",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "347",
-        "x-request-id": "6f533167-0b98-455c-8a33-1f5fa42d608e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "a44dc947-c474-4407-8d88-e52cf1afb93b"
       },
       "ResponseBody": {
-        "dataFeedId": "b2f56f6a-143b-44e8-97df-5fe53534c010",
+        "dataFeedId": "19f4e6a2-f1bc-48d6-b061-026011a97fda",
         "dataFeedName": "dataFeedNmL1hh6d",
         "metrics": [
           {
-            "metricId": "6373d1a2-96dd-4c6e-889e-595a6c2f2099",
+            "metricId": "d02f4177-b73b-4915-bfe9-b7db3f4e5d55",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:30Z",
+        "createdTime": "2021-02-05T17:53:59Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b2f56f6a-143b-44e8-97df-5fe53534c010",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19f4e6a2-f1bc-48d6-b061-026011a97fda",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9e2698e1795eb84a9c0b6a4f97b0c749-765cf73b3c1b364e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-516de1980a6e814594661a078bc3bc0c-680ded58f373c746-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "925117ff88fbe1c4e8b6147960e3e6d2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c6e6688d-7932-4e74-bef2-aa650c30055a",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:00 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "c6e6688d-7932-4e74-bef2-aa650c30055a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "19f4e6a2-f1bc-48d6-b061-026011a97fda",
+        "dataFeedName": "dataFeedNmL1hh6d",
+        "metrics": [
+          {
+            "metricId": "d02f4177-b73b-4915-bfe9-b7db3f4e5d55",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:53:59Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19f4e6a2-f1bc-48d6-b061-026011a97fda",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-fa08eaebb30d9545a1a60b761c367326-1764e0ba891c474a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "008823283ec5c8d7a7fd6a27fdb383e2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8ecf9ec0-ef8e-48fd-a726-55ec62aa401c",
+        "apim-request-id": "1b0b2faa-2340-47e4-8eeb-062a0db3ddc3",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1244",
-        "x-request-id": "8ecf9ec0-ef8e-48fd-a726-55ec62aa401c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "328",
+        "X-Request-ID": "1b0b2faa-2340-47e4-8eeb-062a0db3ddc3"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-05T17:16:31.2488462-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:00.9106499-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetupAsync.json
index a99223b4cae6..2d4650eec832 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-40f45572748bb64a99e2b325e02153cc-5c774a549cd6064d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-aadc30ac9faf7a47a68455d89c5ba634-04a5381380e8bb4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "803a41bc02b9197fad305d2a64fbce1d",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9620169c-cbf2-4018-8c4e-6f5c7a68288d",
+        "apim-request-id": "301b13c7-8172-4e46-ab46-e21b39def9dd",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:50 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5cb174d5-0fe5-4bad-8198-d0ee7bddc3a3",
+        "Date": "Fri, 05 Feb 2021 17:57:06 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0dc82979-8613-4dda-9aeb-150a15aaa5e0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "787",
-        "x-request-id": "9620169c-cbf2-4018-8c4e-6f5c7a68288d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "598",
+        "X-Request-ID": "301b13c7-8172-4e46-ab46-e21b39def9dd"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5cb174d5-0fe5-4bad-8198-d0ee7bddc3a3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0dc82979-8613-4dda-9aeb-150a15aaa5e0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-aec7cf5c3645024ab06fa80d44aa4a04-970e834a6ba45742-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-aadc30ac9faf7a47a68455d89c5ba634-eb0d73b48d16464b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "aea27b05bab7670b914670a7edc9730a",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "448c227f-db28-4278-8f59-0423903e4638",
+        "apim-request-id": "1da9ea60-10dc-4b84-babb-9eb6f50c8dc5",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "448c227f-db28-4278-8f59-0423903e4638"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "1da9ea60-10dc-4b84-babb-9eb6f50c8dc5"
       },
       "ResponseBody": {
-        "dataFeedId": "5cb174d5-0fe5-4bad-8198-d0ee7bddc3a3",
+        "dataFeedId": "0dc82979-8613-4dda-9aeb-150a15aaa5e0",
         "dataFeedName": "dataFeeddXPBUZuE",
         "metrics": [
           {
-            "metricId": "db03ce5f-2f44-4394-84aa-1c5a2992078b",
+            "metricId": "ca20cf8f-4100-428a-9a2f-fa401ca8dd83",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:50Z",
+        "createdTime": "2021-02-05T17:57:06Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5cb174d5-0fe5-4bad-8198-d0ee7bddc3a3",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0dc82979-8613-4dda-9aeb-150a15aaa5e0",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d3f34dc4f9bb624badcb461e6d270e07-3ec9d671e582ed4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0c19047a09989347ac4cf3a8280c21f4-2a914091817d3e4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a09abd499ef9b857dea19787ca178b48",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9f8e58c7-3acf-4e86-bec8-e13fdbd87731",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:06 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "9f8e58c7-3acf-4e86-bec8-e13fdbd87731"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0dc82979-8613-4dda-9aeb-150a15aaa5e0",
+        "dataFeedName": "dataFeeddXPBUZuE",
+        "metrics": [
+          {
+            "metricId": "ca20cf8f-4100-428a-9a2f-fa401ca8dd83",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:06Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0dc82979-8613-4dda-9aeb-150a15aaa5e0",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a1348300ff15094cbe077ad90680cd82-87a7830fbb8fef49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "dd28cbe68a67027435d2ee7292d72be3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "62847f29-f3f0-452d-9dd6-d916de5e15df",
+        "apim-request-id": "99a62363-021d-44a5-89d3-f8298899e2db",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "290",
-        "x-request-id": "62847f29-f3f0-452d-9dd6-d916de5e15df"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "319",
+        "X-Request-ID": "99a62363-021d-44a5-89d3-f8298899e2db"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-05T17:16:50.7757288-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:07.2588538-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembers.json
index 74a9fd06fc7c..b25a663284eb 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1016",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1f5e22ede2daf0468d4e4b9e51e14940-67dafd6f1172804e-00",
+        "traceparent": "00-3ffb8498d632a64db164c50de535a36f-693e6cac3d5a5040-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -69,26 +69,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cb7df967-17b5-4348-8033-76fb625146b8",
+        "apim-request-id": "734c8003-936c-46f7-9071-c44bc04b99d7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:27 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea89d266-07a1-4627-a8db-1e197e595a1b",
+        "Date": "Fri, 05 Feb 2021 17:54:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f652792c-2e6b-4fa1-beec-d6ca202a75a1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "928",
-        "X-Request-ID": "cb7df967-17b5-4348-8033-76fb625146b8"
+        "x-envoy-upstream-service-time": "507",
+        "X-Request-ID": "734c8003-936c-46f7-9071-c44bc04b99d7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea89d266-07a1-4627-a8db-1e197e595a1b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f652792c-2e6b-4fa1-beec-d6ca202a75a1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-305026f088f8584dbc03beaaa2f094f4-93eb1f0a79e7a545-00",
+        "traceparent": "00-3ffb8498d632a64db164c50de535a36f-5294d287d9301e42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -98,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c2251cdd-7e38-4a43-8e9a-268b3d3b3105",
+        "apim-request-id": "12dd389d-6a24-404e-aeb1-029ac5ca3500",
         "Content-Length": "1433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "135",
-        "X-Request-ID": "c2251cdd-7e38-4a43-8e9a-268b3d3b3105"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "12dd389d-6a24-404e-aeb1-029ac5ca3500"
       },
       "ResponseBody": {
-        "dataFeedId": "ea89d266-07a1-4627-a8db-1e197e595a1b",
+        "dataFeedId": "f652792c-2e6b-4fa1-beec-d6ca202a75a1",
         "dataFeedName": "dataFeedhbJW7QYR",
         "metrics": [
           {
-            "metricId": "092a98fb-61f7-495b-82a8-37ccb4386c9e",
+            "metricId": "b0772d70-3f27-4bc8-813b-51c53b4a581b",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "26e0fbea-28bd-4cce-b76c-f6f9607cbb58",
+            "metricId": "34405c5b-b177-4bc4-82b8-b09981a977c0",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -161,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:28Z",
+        "createdTime": "2021-02-05T17:54:01Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -173,14 +173,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea89d266-07a1-4627-a8db-1e197e595a1b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f652792c-2e6b-4fa1-beec-d6ca202a75a1",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-753681eddfd53d48983b14053e8f1be1-eca877abe8b0a44d-00",
+        "traceparent": "00-c869827dd3ceab4faa8a578b3385207c-15c98cfe4db07748-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -188,21 +188,113 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c98c1b45-3377-4675-90f8-9d6b6ffe29cb",
+        "Content-Length": "1433",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "c98c1b45-3377-4675-90f8-9d6b6ffe29cb"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f652792c-2e6b-4fa1-beec-d6ca202a75a1",
+        "dataFeedName": "dataFeedhbJW7QYR",
+        "metrics": [
+          {
+            "metricId": "b0772d70-3f27-4bc8-813b-51c53b4a581b",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "34405c5b-b177-4bc4-82b8-b09981a977c0",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:01Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f652792c-2e6b-4fa1-beec-d6ca202a75a1",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a705973eda0f454e9c3335239fcaaf7b-15c1671628ce3145-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9bcb6b27c1ee5236b3b0ec412b0afac2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "259feed1-57f9-4913-b340-0006c9bb9858",
+        "apim-request-id": "9cc4c1b9-2b24-49ba-8deb-d10b108b6e61",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "350",
-        "X-Request-ID": "259feed1-57f9-4913-b340-0006c9bb9858"
+        "x-envoy-upstream-service-time": "360",
+        "X-Request-ID": "9cc4c1b9-2b24-49ba-8deb-d10b108b6e61"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:28.5357858-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:02.5603469-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembersAsync.json
index f94fbc5a721b..611b33bb024c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetElasticsearchDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1016",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-20002eb2a49690458c7208a174e8db93-5959665e6a572844-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-69fadfcd7a88b543abf8081d36f86d16-5c606885ddd21f4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3909fd4e55f30a9aa785e1bb36e7b39c",
         "x-ms-return-client-request-id": "true"
@@ -66,25 +69,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "8b3fa665-74d3-4558-bafa-ddbbdf7c417d",
+        "apim-request-id": "33005b96-8ba0-4e74-a559-6f193276da91",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:45 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/648a2884-f7d4-40bf-b51e-388b99f6167f",
+        "Date": "Fri, 05 Feb 2021 17:57:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f02b5e6a-7eb9-431d-a071-004c0bbf5096",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "590",
-        "x-request-id": "8b3fa665-74d3-4558-bafa-ddbbdf7c417d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "664",
+        "X-Request-ID": "33005b96-8ba0-4e74-a559-6f193276da91"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/648a2884-f7d4-40bf-b51e-388b99f6167f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f02b5e6a-7eb9-431d-a071-004c0bbf5096",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e1d5efe68a7a1b4da5eb7a3912048a85-194c35e484e47940-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-69fadfcd7a88b543abf8081d36f86d16-b27fd58823ff6949-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f53c27492da1152d42d342afc31ea40c",
         "x-ms-return-client-request-id": "true"
@@ -92,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c1313851-6f76-4a1e-a123-a9a207e50c9c",
+        "apim-request-id": "03173232-4676-4753-adb2-b1630b9e5975",
         "Content-Length": "1433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "c1313851-6f76-4a1e-a123-a9a207e50c9c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "03173232-4676-4753-adb2-b1630b9e5975"
       },
       "ResponseBody": {
-        "dataFeedId": "648a2884-f7d4-40bf-b51e-388b99f6167f",
+        "dataFeedId": "f02b5e6a-7eb9-431d-a071-004c0bbf5096",
         "dataFeedName": "dataFeedjYFWDipg",
         "metrics": [
           {
-            "metricId": "318f6f3b-1baf-4525-943d-ea953d759d34",
+            "metricId": "9000c211-2564-4fb9-9a9b-55d211d17c28",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "d531d4e2-c695-4573-9d74-14acfa580be6",
+            "metricId": "010e07db-3826-45e9-8bc4-510f97545efc",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -155,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:45Z",
+        "createdTime": "2021-02-05T17:57:08Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -167,33 +173,128 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/648a2884-f7d4-40bf-b51e-388b99f6167f",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f02b5e6a-7eb9-431d-a071-004c0bbf5096",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eb317bfc96136740a5d547b455ab4612-1ba0ee809fd4fb4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bc7e6940b70ff640bd2fe887fcd04ba5-a5d42241918e2841-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "357356c832e57433690de79c0ed76146",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5a658403-00d7-486a-b2d7-9d834a12b2eb",
+        "Content-Length": "1433",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:08 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "5a658403-00d7-486a-b2d7-9d834a12b2eb"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f02b5e6a-7eb9-431d-a071-004c0bbf5096",
+        "dataFeedName": "dataFeedjYFWDipg",
+        "metrics": [
+          {
+            "metricId": "9000c211-2564-4fb9-9a9b-55d211d17c28",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "010e07db-3826-45e9-8bc4-510f97545efc",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:08Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f02b5e6a-7eb9-431d-a071-004c0bbf5096",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6fdb3eec4b0d51468d97ace6505d5dcf-8768376ef02df142-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "61fb884ef65a213fcff4f72012ea4788",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "009edd8c-47a2-44d9-9a94-78127b8f3abc",
+        "apim-request-id": "98613d9e-8617-4f8e-b5dd-0a689f6d397e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "415",
-        "x-request-id": "009edd8c-47a2-44d9-9a94-78127b8f3abc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "371",
+        "X-Request-ID": "98613d9e-8617-4f8e-b5dd-0a689f6d397e"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:45.8117013-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:08.7513610-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetup.json
index 910f445518d9..c2648d81368e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-938086b3681ec0449a8a20c4f814d243-0cecc5cc094ace4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-eb5105bf811bf2439aaa5c2dac2f77a8-0f89816aeb4b5c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d9add0a79ac9bdbedf8b1a7e617a23db",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d4435376-c49e-4db0-8af7-cf1bced11b15",
+        "apim-request-id": "eaf0c9f1-bea2-4f17-9507-6eca7231557b",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:28 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4e9bb7fb-afc6-40b3-a22d-1341c817b350",
+        "Date": "Fri, 05 Feb 2021 17:54:03 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/98b28774-1874-4d23-b089-b6818120d997",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "337",
-        "x-request-id": "d4435376-c49e-4db0-8af7-cf1bced11b15"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "399",
+        "X-Request-ID": "eaf0c9f1-bea2-4f17-9507-6eca7231557b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4e9bb7fb-afc6-40b3-a22d-1341c817b350",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/98b28774-1874-4d23-b089-b6818120d997",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ae0a6e2c176a1147bbe54c9b05447759-3b0f1fc9bdf11146-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-eb5105bf811bf2439aaa5c2dac2f77a8-9c8b9d1b6efc1842-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9eef0c604f1f347f9bf3abb4c62cfb0d",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "deb8df89-7d0f-43d3-80f9-25947e91f54e",
+        "apim-request-id": "9d9e5022-f8e6-41f7-bdb0-a274db10c179",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "143",
-        "x-request-id": "deb8df89-7d0f-43d3-80f9-25947e91f54e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "183",
+        "X-Request-ID": "9d9e5022-f8e6-41f7-bdb0-a274db10c179"
       },
       "ResponseBody": {
-        "dataFeedId": "4e9bb7fb-afc6-40b3-a22d-1341c817b350",
+        "dataFeedId": "98b28774-1874-4d23-b089-b6818120d997",
         "dataFeedName": "dataFeedqxHscn8K",
         "metrics": [
           {
-            "metricId": "bede0fef-128d-49ca-98ed-172cfd6a0df5",
+            "metricId": "95d27c97-705e-40d9-94d3-caacda178e94",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:29Z",
+        "createdTime": "2021-02-05T17:54:03Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4e9bb7fb-afc6-40b3-a22d-1341c817b350",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/98b28774-1874-4d23-b089-b6818120d997",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ebe786b8a0d2af47b36d36fafdb21269-e80efa6e0719d241-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e8bd31e1ebc68c46b2085e4b5b6fd09b-2e0ee3c0e3ec6c4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "af78bbec0c5c8100e0e49a2b78dce1ba",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "39dd7a10-cffc-4042-a386-6cc778570aa1",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:04 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "39dd7a10-cffc-4042-a386-6cc778570aa1"
+      },
+      "ResponseBody": {
+        "dataFeedId": "98b28774-1874-4d23-b089-b6818120d997",
+        "dataFeedName": "dataFeedqxHscn8K",
+        "metrics": [
+          {
+            "metricId": "95d27c97-705e-40d9-94d3-caacda178e94",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:03Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/98b28774-1874-4d23-b089-b6818120d997",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-dabf5e3f9395404fa0c73f7a8a6d2869-210aef9564aa0146-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c906c289943a583750783dd5ee09f6b3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ebfa4a31-d54b-4ef5-9db2-6286ef13be77",
+        "apim-request-id": "b79da0de-d726-4a36-83af-d2f36e839be9",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "275",
-        "x-request-id": "ebfa4a31-d54b-4ef5-9db2-6286ef13be77"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "339",
+        "X-Request-ID": "b79da0de-d726-4a36-83af-d2f36e839be9"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:30.1138046-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:04.3628058-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetupAsync.json
index f2b797f5847c..ac6a734c9617 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-858563a72a923649b13f516cdb0a2786-93137563ab045a40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4be31594fc82994898bedbdae98244cc-5d21d1ac48f0844d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3e695ab4904790ef120c9d7e9bc90eae",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ea246887-c21a-46b8-a07d-43814ff7566a",
+        "apim-request-id": "999c287c-7aea-467d-ad26-c3cc029da8e0",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:10 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/13508847-1065-4383-9e4d-f6dcd3c2aaca",
+        "Date": "Fri, 05 Feb 2021 17:57:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a4e406c8-2c28-480f-a874-2b22a6fb94ca",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "575",
-        "x-request-id": "ea246887-c21a-46b8-a07d-43814ff7566a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "662",
+        "X-Request-ID": "999c287c-7aea-467d-ad26-c3cc029da8e0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/13508847-1065-4383-9e4d-f6dcd3c2aaca",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a4e406c8-2c28-480f-a874-2b22a6fb94ca",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-39b1a543c672c34fbaea9298188df9cf-dc35a42008411a4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4be31594fc82994898bedbdae98244cc-acc0ac4cd821c24e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e0754bb2ef4317a540634e5eccf5d65f",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "53885fb6-5411-402b-b673-11b4907d6f75",
+        "apim-request-id": "6bb0c33b-bcab-47e0-8bdc-c0634d148691",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "53885fb6-5411-402b-b673-11b4907d6f75"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "6bb0c33b-bcab-47e0-8bdc-c0634d148691"
       },
       "ResponseBody": {
-        "dataFeedId": "13508847-1065-4383-9e4d-f6dcd3c2aaca",
+        "dataFeedId": "a4e406c8-2c28-480f-a874-2b22a6fb94ca",
         "dataFeedName": "dataFeedI4CG1f6C",
         "metrics": [
           {
-            "metricId": "b7ab8d1b-213e-4f44-b49c-5897c38371e8",
+            "metricId": "73c4d631-b622-405e-a1f0-3390601aecb9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:10Z",
+        "createdTime": "2021-02-05T17:57:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,33 +122,110 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/13508847-1065-4383-9e4d-f6dcd3c2aaca",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a4e406c8-2c28-480f-a874-2b22a6fb94ca",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-881c18286f05da4888319d028f8d71f2-bb1bd5058f166f43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dff071f97514624aaacdd80cdbfe8b51-0157ea7fb922f847-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3cc7bebb01aa7e619ace3fb3ff5ff262",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "62ff17b2-9f42-47e2-b0db-54291559c8c6",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "62ff17b2-9f42-47e2-b0db-54291559c8c6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a4e406c8-2c28-480f-a874-2b22a6fb94ca",
+        "dataFeedName": "dataFeedI4CG1f6C",
+        "metrics": [
+          {
+            "metricId": "73c4d631-b622-405e-a1f0-3390601aecb9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:09Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a4e406c8-2c28-480f-a874-2b22a6fb94ca",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4c5e65070bf5e048aeaad9bb2bb5aa48-7d58edfec0c87741-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6457d2eab99dc453b451fee34191c31c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d4bc807e-1c7e-4f6d-9cae-ad574adf1416",
+        "apim-request-id": "c6c8f1c9-d223-4cc8-a6ee-9e3da26bac04",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "302",
-        "x-request-id": "d4bc807e-1c7e-4f6d-9cae-ad574adf1416"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "349",
+        "X-Request-ID": "c6c8f1c9-d223-4cc8-a6ee-9e3da26bac04"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:11.2197965-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:10.2611551-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembers.json
index 91bd422a58c3..02610f4deb0b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1025",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fd0c48f2ac326448b5da429afd305e4a-cb3a2bb994be6142-00",
+        "traceparent": "00-23d92e857e5cda42b8662ea9ab0b5591-d688ca5ba14e574a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -69,26 +69,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "114003f3-7cf5-4a74-b94c-be5a83a2f00a",
+        "apim-request-id": "9f9236c6-cec8-43f9-8fae-5395f0f7c862",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:28 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0ec1cad0-2403-4ce6-a4c6-0ce3dcee46f2",
+        "Date": "Fri, 05 Feb 2021 17:54:05 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/37669564-f12d-48f5-8c36-224541732b25",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "734",
-        "X-Request-ID": "114003f3-7cf5-4a74-b94c-be5a83a2f00a"
+        "x-envoy-upstream-service-time": "529",
+        "X-Request-ID": "9f9236c6-cec8-43f9-8fae-5395f0f7c862"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0ec1cad0-2403-4ce6-a4c6-0ce3dcee46f2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/37669564-f12d-48f5-8c36-224541732b25",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-00d12dc1a0a01a40a22ea44a3eeb4705-4b8ac4a2f3460d4d-00",
+        "traceparent": "00-23d92e857e5cda42b8662ea9ab0b5591-2ce48ce47a4c7e44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -98,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "73d80b85-3471-4275-a76e-23c56bf2f1d3",
+        "apim-request-id": "cd1b5bf8-e648-41a1-855e-c13056d41165",
         "Content-Length": "1442",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "131",
-        "X-Request-ID": "73d80b85-3471-4275-a76e-23c56bf2f1d3"
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "cd1b5bf8-e648-41a1-855e-c13056d41165"
       },
       "ResponseBody": {
-        "dataFeedId": "0ec1cad0-2403-4ce6-a4c6-0ce3dcee46f2",
+        "dataFeedId": "37669564-f12d-48f5-8c36-224541732b25",
         "dataFeedName": "dataFeedyPGQ0r3c",
         "metrics": [
           {
-            "metricId": "ba2a5aae-ab64-4f12-85af-0fa5ba7e2e16",
+            "metricId": "879618dd-7ea2-4aa3-a963-23d3c1b0aad8",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "52fe2612-7ad2-4c50-b66e-f087a7b2e087",
+            "metricId": "a1c53402-3eaa-49d8-b2ca-a3b233efa385",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -161,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:29Z",
+        "createdTime": "2021-02-05T17:54:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -173,14 +173,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0ec1cad0-2403-4ce6-a4c6-0ce3dcee46f2",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/37669564-f12d-48f5-8c36-224541732b25",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5c8523acf66b1143b0b485eaca2def60-7dce958cb97ed14b-00",
+        "traceparent": "00-41a7746ff485f0458fc90d52b9c99812-432a0761a41dae47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -188,21 +188,113 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "01b65b0e-2f30-4834-adaa-8dd677882ffe",
+        "Content-Length": "1442",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "01b65b0e-2f30-4834-adaa-8dd677882ffe"
+      },
+      "ResponseBody": {
+        "dataFeedId": "37669564-f12d-48f5-8c36-224541732b25",
+        "dataFeedName": "dataFeedyPGQ0r3c",
+        "metrics": [
+          {
+            "metricId": "879618dd-7ea2-4aa3-a963-23d3c1b0aad8",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "a1c53402-3eaa-49d8-b2ca-a3b233efa385",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:05Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/37669564-f12d-48f5-8c36-224541732b25",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-2eb2cd7db8034a46848113213e0399b4-94546e7dd95cc745-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "bfcb0530c3debeee23e64bdbf77689f7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4d5e8f77-97d4-4c0e-b226-3b4e47ff4e56",
+        "apim-request-id": "82f17471-efb2-4e03-a7a6-5f13c715e1ab",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "359",
-        "X-Request-ID": "4d5e8f77-97d4-4c0e-b226-3b4e47ff4e56"
+        "x-envoy-upstream-service-time": "404",
+        "X-Request-ID": "82f17471-efb2-4e03-a7a6-5f13c715e1ab"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:29.9142435-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:05.9152160-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembersAsync.json
index 2681bbc7a828..6dfb99cbca9c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetHttpRequestDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1025",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-48354171c9c8cb439be9182eb684f93c-9111d187c6353746-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1463bccabcb27b4a81a2ef329c0f2648-81566723341d0a4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "72d6f41da8777ab252751f6bea27ac0b",
         "x-ms-return-client-request-id": "true"
@@ -66,25 +69,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e3414dc2-3aff-48aa-b80b-f9e221d79235",
+        "apim-request-id": "833c0f53-0e3a-4647-b3a2-9a28fbcc9644",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:46 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdee4956-d555-46e5-b1af-71b5a77428ee",
+        "Date": "Fri, 05 Feb 2021 17:57:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb3f427d-1937-42ac-8afc-a46cff028065",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "687",
-        "x-request-id": "e3414dc2-3aff-48aa-b80b-f9e221d79235"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "675",
+        "X-Request-ID": "833c0f53-0e3a-4647-b3a2-9a28fbcc9644"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdee4956-d555-46e5-b1af-71b5a77428ee",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb3f427d-1937-42ac-8afc-a46cff028065",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ddbddf80daf47642a9ca946ef841b2ac-6138aa1cbaf4a14c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1463bccabcb27b4a81a2ef329c0f2648-1c084e0eb8754540-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "75340af7a9c5efb82dd4b4bb8108d417",
         "x-ms-return-client-request-id": "true"
@@ -92,27 +98,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "631b4a17-ba84-4c91-8dac-557cd5b3c07c",
+        "apim-request-id": "5a922cfb-6d1f-46e7-aaf6-96e7a10844ec",
         "Content-Length": "1442",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "x-request-id": "631b4a17-ba84-4c91-8dac-557cd5b3c07c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "5a922cfb-6d1f-46e7-aaf6-96e7a10844ec"
       },
       "ResponseBody": {
-        "dataFeedId": "fdee4956-d555-46e5-b1af-71b5a77428ee",
+        "dataFeedId": "cb3f427d-1937-42ac-8afc-a46cff028065",
         "dataFeedName": "dataFeed4HARQp7I",
         "metrics": [
           {
-            "metricId": "6ca9685a-a6fc-487a-84e5-3f363e7ce45f",
+            "metricId": "9698bc9c-d4de-4703-b09b-f7a8cb4d9767",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "7149459b-f2d5-42a0-8c67-b90ab9878b4b",
+            "metricId": "cd0d80d9-1bba-4140-a8c3-69eccafa7481",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -155,7 +161,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:46Z",
+        "createdTime": "2021-02-05T17:57:11Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -167,33 +173,128 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fdee4956-d555-46e5-b1af-71b5a77428ee",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb3f427d-1937-42ac-8afc-a46cff028065",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bb7c5c0325d6bf4a8d63a8e92270895b-44f749bdce315843-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-67f1dd1885b0254ebc82d2c5d1194cdb-d2defb1e0fa6e14b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f277cf6a8511a6d3d9a8e678eb76351f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2fd6fa5a-f18b-4a29-971e-55ed976d2c98",
+        "Content-Length": "1442",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "2fd6fa5a-f18b-4a29-971e-55ed976d2c98"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cb3f427d-1937-42ac-8afc-a46cff028065",
+        "dataFeedName": "dataFeed4HARQp7I",
+        "metrics": [
+          {
+            "metricId": "9698bc9c-d4de-4703-b09b-f7a8cb4d9767",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "cd0d80d9-1bba-4140-a8c3-69eccafa7481",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:11Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb3f427d-1937-42ac-8afc-a46cff028065",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d02c03b12ee0f6428a3cd36b5ab2c529-628270d49f6b294a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "46702a6e337b73b43ce644a2f4f6f84a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2397e28b-5522-4d28-933c-df97722258d7",
+        "apim-request-id": "2d9b3ed7-ddc6-4df1-a467-2af74d91c92d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "405",
-        "x-request-id": "2397e28b-5522-4d28-933c-df97722258d7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "347",
+        "X-Request-ID": "2d9b3ed7-ddc6-4df1-a467-2af74d91c92d"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:47.2226510-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:11.7188281-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetup.json
index ca47ece3edd4..a66a6c3da4d2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a864958cca1fd44bd659c38062105e3-e4c7fe276f9c584b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3d134620862d484db9426878298d9394-8c06d29cfd27744d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "39198775628de4b0457a7cf82048cad4",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "91772c29-6e1a-4e22-8786-2ae93d40ec8d",
+        "apim-request-id": "07a58f3f-11f8-48c1-95f8-0c897415146b",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:32 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b78970-303d-4221-a3d4-a85e113d8f3a",
+        "Date": "Fri, 05 Feb 2021 17:54:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4a19649e-91db-4c85-aafb-fa70fd583247",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "342",
-        "x-request-id": "91772c29-6e1a-4e22-8786-2ae93d40ec8d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "695",
+        "X-Request-ID": "07a58f3f-11f8-48c1-95f8-0c897415146b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b78970-303d-4221-a3d4-a85e113d8f3a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4a19649e-91db-4c85-aafb-fa70fd583247",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8b0dbdbdc744ca4d8414ad656bc96e95-87c0bd5c53f74d46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3d134620862d484db9426878298d9394-01f08792498c9746-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "07c3e008aeb76cbd9c05a73a5f500455",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e8abbffb-cc07-4c6c-ae6d-521a110380e8",
+        "apim-request-id": "aaa192d7-9463-4160-8b98-d11cc3ac8677",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "144",
-        "x-request-id": "e8abbffb-cc07-4c6c-ae6d-521a110380e8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "aaa192d7-9463-4160-8b98-d11cc3ac8677"
       },
       "ResponseBody": {
-        "dataFeedId": "71b78970-303d-4221-a3d4-a85e113d8f3a",
+        "dataFeedId": "4a19649e-91db-4c85-aafb-fa70fd583247",
         "dataFeedName": "dataFeed6kEmVEdV",
         "metrics": [
           {
-            "metricId": "1e6ab3a5-4bb3-42e8-9a7a-806fe3bb05ec",
+            "metricId": "16910807-3712-44ef-8dfe-b9aeaf4e03ea",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:32Z",
+        "createdTime": "2021-02-05T17:54:07Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,33 +124,111 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/71b78970-303d-4221-a3d4-a85e113d8f3a",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4a19649e-91db-4c85-aafb-fa70fd583247",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e9d64bd9057a0b4bb96f99998c0d43a7-589ecd730d793d4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9c2232b2c2fbc24cb4feeaf8b0ec27b8-1a6f59699792b341-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "13e46612a7f1b7e60a4e8eacda346df1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0a15f552-6763-44b9-8283-b243585be379",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "0a15f552-6763-44b9-8283-b243585be379"
+      },
+      "ResponseBody": {
+        "dataFeedId": "4a19649e-91db-4c85-aafb-fa70fd583247",
+        "dataFeedName": "dataFeed6kEmVEdV",
+        "metrics": [
+          {
+            "metricId": "16910807-3712-44ef-8dfe-b9aeaf4e03ea",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:07Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4a19649e-91db-4c85-aafb-fa70fd583247",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-186d4eb56973084bbfdd5bf0a9b494ca-e39607fc6a4f0946-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ee065a919626c6eec9ad9d87ba7685f5",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "299a9a3c-e651-4ae0-a0a1-c6aa14e3e6f5",
+        "apim-request-id": "29a7305f-cee2-42e7-9704-58b5cd80cc2b",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "304",
-        "x-request-id": "299a9a3c-e651-4ae0-a0a1-c6aa14e3e6f5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "271",
+        "X-Request-ID": "29a7305f-cee2-42e7-9704-58b5cd80cc2b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:32.7922294-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:08.0784911-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetupAsync.json
index dae66635230a..176b8f90e193 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e59b8476bddc964589544fb3c16dc15b-8adf89b150cf7d4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6eaa14e7bae4574bad0c107c78192e2e-4fea988c2c847c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "33dbd026b45204c3db3f3bec96406f84",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "39557692-3326-4e84-baf7-1a0da95b913d",
+        "apim-request-id": "c9615e9c-ad78-4c92-9517-54d916237438",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:13 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0157f412-22cb-4aa4-84b1-af57b570dcff",
+        "Date": "Fri, 05 Feb 2021 17:57:12 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21704a0c-3ad9-4714-9795-848134e9aeff",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "410",
-        "x-request-id": "39557692-3326-4e84-baf7-1a0da95b913d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "604",
+        "X-Request-ID": "c9615e9c-ad78-4c92-9517-54d916237438"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0157f412-22cb-4aa4-84b1-af57b570dcff",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21704a0c-3ad9-4714-9795-848134e9aeff",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-10bf10e09c73e54a8cd06b3f3f4e6adf-8e52b0d729dc4047-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6eaa14e7bae4574bad0c107c78192e2e-c8bf56dde5279745-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0ee6d0217cdb77a046ff95dbc709048c",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7e579f9b-c1eb-4437-9e6f-2f224afe66e7",
+        "apim-request-id": "00aa2ad9-6b36-4d14-b45b-adf80521092e",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "207",
-        "x-request-id": "7e579f9b-c1eb-4437-9e6f-2f224afe66e7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "00aa2ad9-6b36-4d14-b45b-adf80521092e"
       },
       "ResponseBody": {
-        "dataFeedId": "0157f412-22cb-4aa4-84b1-af57b570dcff",
+        "dataFeedId": "21704a0c-3ad9-4714-9795-848134e9aeff",
         "dataFeedName": "dataFeed8h8ZRY0r",
         "metrics": [
           {
-            "metricId": "de58a501-7ad4-4c00-a980-4b8a80cf20e6",
+            "metricId": "a3401896-64f5-4029-8ad0-2d5fa9c66596",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:13Z",
+        "createdTime": "2021-02-05T17:57:12Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,33 +124,111 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0157f412-22cb-4aa4-84b1-af57b570dcff",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21704a0c-3ad9-4714-9795-848134e9aeff",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-48e6ec839145d94da5f75dc55edb9550-4f9c3b571517a445-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-17d4454af611904fbb0d78a83e455cb8-998b41a1a7df674c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "edc8a3818cce6d78f03256503ff08dbc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "62d498ac-5371-477c-9dbb-590bf88992c9",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:12 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "62d498ac-5371-477c-9dbb-590bf88992c9"
+      },
+      "ResponseBody": {
+        "dataFeedId": "21704a0c-3ad9-4714-9795-848134e9aeff",
+        "dataFeedName": "dataFeed8h8ZRY0r",
+        "metrics": [
+          {
+            "metricId": "a3401896-64f5-4029-8ad0-2d5fa9c66596",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:12Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21704a0c-3ad9-4714-9795-848134e9aeff",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4e4c37e6338ba44e8c2dbd5e122ebb10-93e43672d430664d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "3d949f6b563fa95d2f64ec531ee73dd2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a73555b4-ab42-44f7-8e8b-7085ff082dc0",
+        "apim-request-id": "c8c4d829-cf07-4463-aae5-47a31d218049",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "355",
-        "x-request-id": "a73555b4-ab42-44f7-8e8b-7085ff082dc0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "322",
+        "X-Request-ID": "c8c4d829-cf07-4463-aae5-47a31d218049"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:13.8150733-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:13.1429022-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembers.json
index b4ff66cd9a7f..fb3a3ffec7b8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "1034",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d570c0bc8535b04fbd5bccd143b5f8a5-7dd4b92050668c4c-00",
+        "traceparent": "00-31fbf154b3fc1544b5deb82c34be9bde-87f57db28afd5045-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -70,26 +70,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2d0114e4-d149-484b-b144-6707d195994a",
+        "apim-request-id": "aab4aabd-9b8f-4618-82df-d4a73ddb15bf",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:35 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5ffcff58-9238-4e82-88d4-981ae924c253",
+        "Date": "Fri, 05 Feb 2021 17:54:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f311379c-7e99-4a2e-ab72-1e639290ad36",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "5826",
-        "X-Request-ID": "2d0114e4-d149-484b-b144-6707d195994a"
+        "x-envoy-upstream-service-time": "671",
+        "X-Request-ID": "aab4aabd-9b8f-4618-82df-d4a73ddb15bf"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5ffcff58-9238-4e82-88d4-981ae924c253",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f311379c-7e99-4a2e-ab72-1e639290ad36",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-29653e1592ee5146b740451d2b43a251-d2336e541f984a49-00",
+        "traceparent": "00-31fbf154b3fc1544b5deb82c34be9bde-e0a6eb1484a48747-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -99,27 +99,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0afdc3ac-65e8-462a-ab36-30c91d80e953",
+        "apim-request-id": "54d4aa3f-9df2-4ce1-a159-ac7aa2eb08f6",
         "Content-Length": "1451",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "X-Request-ID": "0afdc3ac-65e8-462a-ab36-30c91d80e953"
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "54d4aa3f-9df2-4ce1-a159-ac7aa2eb08f6"
       },
       "ResponseBody": {
-        "dataFeedId": "5ffcff58-9238-4e82-88d4-981ae924c253",
+        "dataFeedId": "f311379c-7e99-4a2e-ab72-1e639290ad36",
         "dataFeedName": "dataFeedinA3Na3s",
         "metrics": [
           {
-            "metricId": "b855236b-cc1f-49b8-950d-848027390cee",
+            "metricId": "7c7b60f1-4877-4b98-b5f8-c2c6edb2cd6a",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "11d0d4aa-e3ac-45ce-a62e-1ed436602c99",
+            "metricId": "78dcf2ec-5a32-4b08-bc64-18fce530c760",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -162,7 +162,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:35Z",
+        "createdTime": "2021-02-05T17:54:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -175,14 +175,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5ffcff58-9238-4e82-88d4-981ae924c253",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f311379c-7e99-4a2e-ab72-1e639290ad36",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-958dd1b42da86744a825fb250bcc5df6-54c9d42de456cc4b-00",
+        "traceparent": "00-2f5f418809bb3a41ac2b83ad4f722ba3-aa35aa7360783a46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -190,21 +190,114 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "904cd87f-a6d5-47ce-a8a3-9019532dd454",
+        "Content-Length": "1451",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "904cd87f-a6d5-47ce-a8a3-9019532dd454"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f311379c-7e99-4a2e-ab72-1e639290ad36",
+        "dataFeedName": "dataFeedinA3Na3s",
+        "metrics": [
+          {
+            "metricId": "7c7b60f1-4877-4b98-b5f8-c2c6edb2cd6a",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "78dcf2ec-5a32-4b08-bc64-18fce530c760",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:09Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f311379c-7e99-4a2e-ab72-1e639290ad36",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-14f0cdc32ff2d4439e6e6f3f9cd4f73f-290041125994634f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "27b2d9bc4dceeffca2bcc4b1dde97265",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "92386180-68ce-4b9c-84fb-0a58b9dd41bc",
+        "apim-request-id": "cb887f63-f112-4304-8df3-f1967d525717",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "408",
-        "X-Request-ID": "92386180-68ce-4b9c-84fb-0a58b9dd41bc"
+        "x-envoy-upstream-service-time": "350",
+        "X-Request-ID": "cb887f63-f112-4304-8df3-f1967d525717"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:36.4160688-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:10.1252548-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembersAsync.json
index 2ecbdcc7056e..00eb04b5b676 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetInfluxDbDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "1034",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-04c72448140efa47910dabbaa4898ab7-dadcfdbc6a26c942-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4f424e16763b394980af5ddffe4799a1-377575a5268b994b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6252c472d46e4a19cdab563ce87e761a",
         "x-ms-return-client-request-id": "true"
@@ -67,25 +70,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1c33fc3c-8b30-42b4-be14-d19794de7a64",
+        "apim-request-id": "6a759add-04fe-472a-bd90-23d76cf05852",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:48 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8b482a09-d47a-4d2d-88c5-de5125d2cc19",
+        "Date": "Fri, 05 Feb 2021 17:57:13 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "801",
-        "x-request-id": "1c33fc3c-8b30-42b4-be14-d19794de7a64"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "673",
+        "X-Request-ID": "6a759add-04fe-472a-bd90-23d76cf05852"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8b482a09-d47a-4d2d-88c5-de5125d2cc19",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6c052b5406f5a34386a1e021199fa139-feb382f3467a4a4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4f424e16763b394980af5ddffe4799a1-923d23f692713e4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "54fddd90ef48400529fbfbfe7ae94084",
         "x-ms-return-client-request-id": "true"
@@ -93,27 +99,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "331da57a-ab9a-40e4-b7e0-8a9155eb6840",
+        "apim-request-id": "8dfa08c3-8fd7-4071-9f13-2a7f999f1989",
         "Content-Length": "1451",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "331da57a-ab9a-40e4-b7e0-8a9155eb6840"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "8dfa08c3-8fd7-4071-9f13-2a7f999f1989"
       },
       "ResponseBody": {
-        "dataFeedId": "8b482a09-d47a-4d2d-88c5-de5125d2cc19",
+        "dataFeedId": "221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
         "dataFeedName": "dataFeedby5qOJIr",
         "metrics": [
           {
-            "metricId": "875bcdc9-5f06-4e0b-9dbf-84878fb4b5bc",
+            "metricId": "2b90c2c8-9905-477b-b4e0-fd541d776caf",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "84bc9f5e-e353-40af-82b6-10b26df93630",
+            "metricId": "da91eec9-f7d5-442a-a866-d1f0056d6498",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -156,7 +162,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:48Z",
+        "createdTime": "2021-02-05T17:57:14Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,33 +175,129 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8b482a09-d47a-4d2d-88c5-de5125d2cc19",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ee7c09f57c667c45a8d1792534c55771-8e260a604d38be4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-20765e3008728047a8c8ab36615b6f38-dd532618cc903342-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "95e68dedd826cee89b6fe292722f9845",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6ae1596a-5d33-465e-848f-9ac71835bfbc",
+        "Content-Length": "1451",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "6ae1596a-5d33-465e-848f-9ac71835bfbc"
+      },
+      "ResponseBody": {
+        "dataFeedId": "221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
+        "dataFeedName": "dataFeedby5qOJIr",
+        "metrics": [
+          {
+            "metricId": "2b90c2c8-9905-477b-b4e0-fd541d776caf",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "da91eec9-f7d5-442a-a866-d1f0056d6498",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:14Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221b2ce1-6f6e-435a-a915-a5d0960a5a2c",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-bff637b3b406de4aa602cc3afa00fbe8-18456e61c97fd341-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "463eec5e7d4b830ebf123872d91acfe3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c2c0c7a2-0580-4a1c-97c7-5cb626f42d13",
+        "apim-request-id": "c3386ad5-11d2-4d6b-b986-76edcc7cf503",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "373",
-        "x-request-id": "c2c0c7a2-0580-4a1c-97c7-5cb626f42d13"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "348",
+        "X-Request-ID": "c3386ad5-11d2-4d6b-b986-76edcc7cf503"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:48.7679863-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:14.6188705-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetup.json
index e1e94acd9632..40cdbbfb65aa 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0ea79ade9d054942baf8ce702da43c71-eaba23e22f3d1444-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02ce8d4e247d2d488d0c84b9b6f5d416-d4a0d59acb5abd46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9bf606db83b880aa992126e2855fd3e8",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d9f2d080-b4dd-4df3-a1ff-5594576404c2",
+        "apim-request-id": "99ac2896-bee8-417d-9916-9519f88392dd",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:35 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/321c7732-0c9e-459e-861e-84b248318ac2",
+        "Date": "Fri, 05 Feb 2021 17:54:11 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "382",
-        "x-request-id": "d9f2d080-b4dd-4df3-a1ff-5594576404c2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "639",
+        "X-Request-ID": "99ac2896-bee8-417d-9916-9519f88392dd"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/321c7732-0c9e-459e-861e-84b248318ac2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8b5728cca0bcff4d9eeef5130982c2da-3300167517e5ed4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02ce8d4e247d2d488d0c84b9b6f5d416-83bd60c86a88b744-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "78d0e9ff3141d1fcffcd11775aadde18",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1d94dac6-f3c1-465b-b600-78875692a4a2",
+        "apim-request-id": "5669d8a6-4d5e-4e2d-b00f-7173981cd902",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "172",
-        "x-request-id": "1d94dac6-f3c1-465b-b600-78875692a4a2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "5669d8a6-4d5e-4e2d-b00f-7173981cd902"
       },
       "ResponseBody": {
-        "dataFeedId": "321c7732-0c9e-459e-861e-84b248318ac2",
+        "dataFeedId": "cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
         "dataFeedName": "dataFeedyg8MJgoL",
         "metrics": [
           {
-            "metricId": "c90868f3-41db-414e-b834-ec461712a0d0",
+            "metricId": "157d227b-092d-44ac-af00-08d0cec9c6c9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:35Z",
+        "createdTime": "2021-02-05T17:54:11Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/321c7732-0c9e-459e-861e-84b248318ac2",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8883b4252ba25245be5b0f093db86924-1e0d56ecd1179b47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2e3bc99c5e644b489485d856da2e255a-0afc7c434d300648-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "70e2da10a9f546dde2204739b5e80a23",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2354d5cf-fe64-4297-88a9-bc7dfcb8f1f4",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "135",
+        "X-Request-ID": "2354d5cf-fe64-4297-88a9-bc7dfcb8f1f4"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
+        "dataFeedName": "dataFeedyg8MJgoL",
+        "metrics": [
+          {
+            "metricId": "157d227b-092d-44ac-af00-08d0cec9c6c9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:11Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb684de6-d8ea-4ea0-826e-1edd8d25aa05",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-fa1fb7d298e91649805b8ef695b7dcae-0df009f84f87c247-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8ade28571f58a9040a259ceb723226eb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "479457a8-9886-47b3-a353-64d32542d857",
+        "apim-request-id": "cbab523d-8729-4fea-9ae6-c35c69ea0d4f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "310",
-        "x-request-id": "479457a8-9886-47b3-a353-64d32542d857"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "283",
+        "X-Request-ID": "cbab523d-8729-4fea-9ae6-c35c69ea0d4f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:35.7928177-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:11.9161833-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetupAsync.json
index 302c02160a5b..fa620138a66f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a5956f4ce8429042a6fb4d0badbd2c74-cbd2bbafb3d35e48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c3d71eb12054794aa68343bfbfc4a25d-d07becf3f8967f41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fcbdf8cb8134b06e7da54150c48e28e5",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "8bcd49da-327b-465e-943c-936a3d2aa5bf",
+        "apim-request-id": "4f64f50e-26d1-4817-a388-1b10e3d6f5a9",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:15 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9651d40a-5e5b-45d9-bcc8-dec822bc5c2e",
+        "Date": "Fri, 05 Feb 2021 17:57:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "369",
-        "x-request-id": "8bcd49da-327b-465e-943c-936a3d2aa5bf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "610",
+        "X-Request-ID": "4f64f50e-26d1-4817-a388-1b10e3d6f5a9"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9651d40a-5e5b-45d9-bcc8-dec822bc5c2e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-186f0e5cbd64eb419577e27e4ae270a9-d7d00f6968a3a742-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c3d71eb12054794aa68343bfbfc4a25d-ecf6e8312c0d9440-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6d95757c874fa5739ab0b4e74d44f7a6",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5e617770-c0bc-4b94-bfa0-5f2f52f894d6",
+        "apim-request-id": "ac14bbce-b22d-4a39-a5d6-af1cd265152a",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "x-request-id": "5e617770-c0bc-4b94-bfa0-5f2f52f894d6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "ac14bbce-b22d-4a39-a5d6-af1cd265152a"
       },
       "ResponseBody": {
-        "dataFeedId": "9651d40a-5e5b-45d9-bcc8-dec822bc5c2e",
+        "dataFeedId": "6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
         "dataFeedName": "dataFeed6s3qHA46",
         "metrics": [
           {
-            "metricId": "5c762881-299b-41ec-9dd2-e14e70855ce4",
+            "metricId": "d7c1c973-b11f-4c04-8e77-1a1dcd9a341d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:16Z",
+        "createdTime": "2021-02-05T17:57:15Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,33 +120,109 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9651d40a-5e5b-45d9-bcc8-dec822bc5c2e",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-82cd2ab2f0434041bad0aaa10568f223-a95c1caa4833534f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9b3b495b09aa3348b6d457d728b1c010-4a8eaee039ca2a46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e29fb69366359029096ed53e8388eb98",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f34492f7-82f6-4da1-bdd2-18b75fbee6ff",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:15 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "f34492f7-82f6-4da1-bdd2-18b75fbee6ff"
+      },
+      "ResponseBody": {
+        "dataFeedId": "6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
+        "dataFeedName": "dataFeed6s3qHA46",
+        "metrics": [
+          {
+            "metricId": "d7c1c973-b11f-4c04-8e77-1a1dcd9a341d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:15Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6fc54633-cb77-4aa9-a792-b6d9fdbd9ccf",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-88cc1a80c1a6ed4ab7913859ceac034a-3905a84a1df33c40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4bc14c26f104447084186184cd866338",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "73c1b405-7d8c-4dbe-8360-fb1461ab6fbb",
+        "apim-request-id": "fa1c0242-18c4-43b6-aa5f-9159dcf5e7d5",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "275",
-        "x-request-id": "73c1b405-7d8c-4dbe-8360-fb1461ab6fbb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "326",
+        "X-Request-ID": "fa1c0242-18c4-43b6-aa5f-9159dcf5e7d5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:16.9587267-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:16.0923050-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembers.json
index 63757898e59c..83cd1c5d5d70 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "997",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1156da473cd5ac448b25e361327e4446-227ab420520b6b47-00",
+        "traceparent": "00-2081a7e08bc6e04fac0658cd8b527759-74c96a186b40d046-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -68,26 +68,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5fd5a39b-0b62-4688-beff-06a00492af05",
+        "apim-request-id": "5017e30d-3cbf-423a-8695-4709c67d868d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:36 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/64235387-4451-4488-ac0a-9bdade4766e6",
+        "Date": "Fri, 05 Feb 2021 17:54:12 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7436653-2267-41e4-97c9-a00371fd0df6",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "840",
-        "X-Request-ID": "5fd5a39b-0b62-4688-beff-06a00492af05"
+        "x-envoy-upstream-service-time": "713",
+        "X-Request-ID": "5017e30d-3cbf-423a-8695-4709c67d868d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/64235387-4451-4488-ac0a-9bdade4766e6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7436653-2267-41e4-97c9-a00371fd0df6",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-92a000568c164a4995d10f021f7d6b54-86dd14deb1a13e49-00",
+        "traceparent": "00-2081a7e08bc6e04fac0658cd8b527759-c1f147f766565345-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -97,27 +97,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e3f53db0-7865-425b-b1e8-90fd7a7a42ae",
+        "apim-request-id": "721e2e0c-7412-4d6b-8d0f-cfb66f19f049",
         "Content-Length": "1414",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "170",
-        "X-Request-ID": "e3f53db0-7865-425b-b1e8-90fd7a7a42ae"
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "721e2e0c-7412-4d6b-8d0f-cfb66f19f049"
       },
       "ResponseBody": {
-        "dataFeedId": "64235387-4451-4488-ac0a-9bdade4766e6",
+        "dataFeedId": "f7436653-2267-41e4-97c9-a00371fd0df6",
         "dataFeedName": "dataFeedsR6T7Z02",
         "metrics": [
           {
-            "metricId": "72dbc44d-084e-4e0c-b18f-c0799742ef1f",
+            "metricId": "32a33458-ab17-4def-9d56-115776bb4553",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "f0f050aa-7cb9-46e1-bce9-bf2d9d1cf957",
+            "metricId": "42c4fdea-35a8-4232-b412-969852b53bef",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -160,7 +160,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:37Z",
+        "createdTime": "2021-02-05T17:54:12Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -171,14 +171,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/64235387-4451-4488-ac0a-9bdade4766e6",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7436653-2267-41e4-97c9-a00371fd0df6",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-77f26e026cec6449a03072132b9f0f2f-5b0a40ea25d3b546-00",
+        "traceparent": "00-ed88e65307c87d4883ec0d94a8b6a611-0b563ee0dab50d44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -186,21 +186,112 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "87ad7649-8370-488d-b8ae-74a3283847af",
+        "Content-Length": "1414",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "87ad7649-8370-488d-b8ae-74a3283847af"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f7436653-2267-41e4-97c9-a00371fd0df6",
+        "dataFeedName": "dataFeedsR6T7Z02",
+        "metrics": [
+          {
+            "metricId": "32a33458-ab17-4def-9d56-115776bb4553",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "42c4fdea-35a8-4232-b412-969852b53bef",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:12Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7436653-2267-41e4-97c9-a00371fd0df6",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-478ac94cd58bf649884e9a2e3eb31f19-6b7e6ca10e03184d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a1e76f14976d096d555b6a39f7e00daa",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ac60fbed-a7d3-4d53-bfbf-8f7c0247eeab",
+        "apim-request-id": "db1869da-879b-4150-9608-a016041afc93",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "360",
-        "X-Request-ID": "ac60fbed-a7d3-4d53-bfbf-8f7c0247eeab"
+        "x-envoy-upstream-service-time": "426",
+        "X-Request-ID": "db1869da-879b-4150-9608-a016041afc93"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:37.9800533-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:13.6083905-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembersAsync.json
index 08635732ab22..7e045b9b0608 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMongoDbDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "997",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-001dec671cb8d04aa2ca4a20edf7887f-6fa93a6b1490c645-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-60ff97644e66fa4c9b70d59ba88f4511-2096d61683e86143-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fc27be14c3879258a02f968a2d50ed27",
         "x-ms-return-client-request-id": "true"
@@ -65,25 +68,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7b041adf-05a1-42b5-b7ef-dc0e1e38e421",
+        "apim-request-id": "08b83c47-88c5-46f0-893a-8f19d7353b28",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cf2c045-fcfd-4b0c-9cbd-b84ced288cd6",
+        "Date": "Fri, 05 Feb 2021 17:57:16 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/db796fc0-75f2-443d-a3bf-ee819e976388",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "552",
-        "x-request-id": "7b041adf-05a1-42b5-b7ef-dc0e1e38e421"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "685",
+        "X-Request-ID": "08b83c47-88c5-46f0-893a-8f19d7353b28"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cf2c045-fcfd-4b0c-9cbd-b84ced288cd6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/db796fc0-75f2-443d-a3bf-ee819e976388",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a3becadd2b98c44ab44fb404d75e4f2-182c64eb0da0124f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-60ff97644e66fa4c9b70d59ba88f4511-94b93d4657c36547-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0b19e60ffedc993d8eb2bf5d48e86834",
         "x-ms-return-client-request-id": "true"
@@ -91,27 +97,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "55d54529-6909-4898-a7e9-a04a3dbacb5d",
+        "apim-request-id": "3e802e71-4467-49dd-94ed-6e9f7585780e",
         "Content-Length": "1414",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "144",
-        "x-request-id": "55d54529-6909-4898-a7e9-a04a3dbacb5d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "3e802e71-4467-49dd-94ed-6e9f7585780e"
       },
       "ResponseBody": {
-        "dataFeedId": "1cf2c045-fcfd-4b0c-9cbd-b84ced288cd6",
+        "dataFeedId": "db796fc0-75f2-443d-a3bf-ee819e976388",
         "dataFeedName": "dataFeedLS0fekdV",
         "metrics": [
           {
-            "metricId": "81ce6f0f-62d4-4273-9475-13e10f8258ca",
+            "metricId": "3530f8f2-8a23-4f88-8151-b152a9c0e071",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "9cffee9a-24b5-42b7-866b-d70b4932718d",
+            "metricId": "f4cc3729-f894-47cd-ba09-b89bbb5eab77",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -154,7 +160,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:49Z",
+        "createdTime": "2021-02-05T17:57:17Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -165,33 +171,127 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cf2c045-fcfd-4b0c-9cbd-b84ced288cd6",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/db796fc0-75f2-443d-a3bf-ee819e976388",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9cb470ec947ad74e9c6da46078407032-4be4b9ee17a6c74f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-69292aa595400e4388254ec2496bd32e-551aa8076c3f894d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cc62f72efeebda40a8930ed2bb234980",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0c6f86ab-71a4-46af-abe8-c9f09707e9d1",
+        "Content-Length": "1414",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:16 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "0c6f86ab-71a4-46af-abe8-c9f09707e9d1"
+      },
+      "ResponseBody": {
+        "dataFeedId": "db796fc0-75f2-443d-a3bf-ee819e976388",
+        "dataFeedName": "dataFeedLS0fekdV",
+        "metrics": [
+          {
+            "metricId": "3530f8f2-8a23-4f88-8151-b152a9c0e071",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "f4cc3729-f894-47cd-ba09-b89bbb5eab77",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:17Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/db796fc0-75f2-443d-a3bf-ee819e976388",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a04dd9019bf65c4da404180989c9d7d1-35daec9b63f9964c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "74af9e30628316d2818e6dd404fa49b8",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "720af540-e86b-44e7-b020-a70be47c63a0",
+        "apim-request-id": "b5052d1c-36b4-47a8-b533-8e09c59027a7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "385",
-        "x-request-id": "720af540-e86b-44e7-b020-a70be47c63a0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "368",
+        "X-Request-ID": "b5052d1c-36b4-47a8-b533-8e09c59027a7"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:50.0243857-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:17.6748621-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetup.json
index c80011ae9ee0..c36ba7c2fc51 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1591af28b129b14da2e0c500f4fdf548-38ed5ec9bed1db42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8f2cb3e9f4f7c74286615d8e5c68036b-bbb618a35874b344-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "db366ffc55d730732224fa145111fcfa",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ef666ff2-07bf-4c89-8028-41ea11150b3d",
+        "apim-request-id": "d431cf50-4f4c-41b8-8866-23debdc9b119",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4484fc1a-0b55-4783-87bd-51370873f4fe",
+        "Date": "Fri, 05 Feb 2021 17:54:14 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "442",
-        "x-request-id": "ef666ff2-07bf-4c89-8028-41ea11150b3d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "640",
+        "X-Request-ID": "d431cf50-4f4c-41b8-8866-23debdc9b119"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4484fc1a-0b55-4783-87bd-51370873f4fe",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a5e251e4388ff4438e36c8c7465003b0-7f91738c4162b94a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8f2cb3e9f4f7c74286615d8e5c68036b-68fe9661ca61fc44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "22363a4b72375fa8306ab3fa5d2e603d",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7f44854a-e9f8-4058-a58a-460df3d5c693",
+        "apim-request-id": "b2b5721e-198b-4eee-82d1-877357a9437a",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "172",
-        "x-request-id": "7f44854a-e9f8-4058-a58a-460df3d5c693"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "b2b5721e-198b-4eee-82d1-877357a9437a"
       },
       "ResponseBody": {
-        "dataFeedId": "4484fc1a-0b55-4783-87bd-51370873f4fe",
+        "dataFeedId": "ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
         "dataFeedName": "dataFeedza4Yw7iG",
         "metrics": [
           {
-            "metricId": "588c45f0-79c6-4bb9-99d6-9243693af9f3",
+            "metricId": "34351153-d25e-41ba-8d2c-00d96b28ad51",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:38Z",
+        "createdTime": "2021-02-05T17:54:14Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4484fc1a-0b55-4783-87bd-51370873f4fe",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-863b682178f6f643938de23ad2796c9f-92b9db51b7fa5f49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a8beb5b5167745468de6d1e6a63200aa-5517b13f97bb1a43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "51a8503a3715988ab7482f9749338553",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6dea6103-48e7-4126-8655-568414790d4d",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:14 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "190",
+        "X-Request-ID": "6dea6103-48e7-4126-8655-568414790d4d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
+        "dataFeedName": "dataFeedza4Yw7iG",
+        "metrics": [
+          {
+            "metricId": "34351153-d25e-41ba-8d2c-00d96b28ad51",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:14Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad7c9197-a3f3-4c69-a9a0-db17dfbbfa35",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-aa396758c4c19e4d8eda237c2b8103df-b922cec7ecb8c747-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5d6db32b63038a7fc7d7ab6da278d2f4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "77311ff5-e2f6-438a-b07e-39266c2aef97",
+        "apim-request-id": "0d2ab28c-ce0b-44a1-a970-9d9e466c6269",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "283",
-        "x-request-id": "77311ff5-e2f6-438a-b07e-39266c2aef97"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "395",
+        "X-Request-ID": "0d2ab28c-ce0b-44a1-a970-9d9e466c6269"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:38.4236877-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:15.2832726-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetupAsync.json
index ee98cc52b982..951abdff4d75 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-41048653241d1842a6294820ae2a6e7c-4d2c072cf064244e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0ff52dd2268f8c4d84c67d8b7fb37879-4cb654d269766643-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f525115a9d4ec8aea1d54865ba251f92",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "3503f862-22af-47c7-b0fb-5dbe77a8446f",
+        "apim-request-id": "54a556d6-a903-428e-996d-9c6cd9386104",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/611dd22f-28e0-44eb-a8b8-bc5bc5ef6707",
+        "Date": "Fri, 05 Feb 2021 17:57:18 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/787f1eab-272f-4a4c-8424-64f80f5e1e2e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "554",
-        "x-request-id": "3503f862-22af-47c7-b0fb-5dbe77a8446f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "582",
+        "X-Request-ID": "54a556d6-a903-428e-996d-9c6cd9386104"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/611dd22f-28e0-44eb-a8b8-bc5bc5ef6707",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/787f1eab-272f-4a4c-8424-64f80f5e1e2e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a01ec31429940c4a8b38175c604a0bcb-44aacc8018546e46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0ff52dd2268f8c4d84c67d8b7fb37879-cf468f80f2e26149-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e9ceadc05dfc141daacdfb9e5a8ae795",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "459a8bf0-4304-47a8-a6ab-7ad54db34a9f",
+        "apim-request-id": "2e6df53b-86b9-4bef-9849-ea6bc5c39e46",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "x-request-id": "459a8bf0-4304-47a8-a6ab-7ad54db34a9f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "2e6df53b-86b9-4bef-9849-ea6bc5c39e46"
       },
       "ResponseBody": {
-        "dataFeedId": "611dd22f-28e0-44eb-a8b8-bc5bc5ef6707",
+        "dataFeedId": "787f1eab-272f-4a4c-8424-64f80f5e1e2e",
         "dataFeedName": "dataFeedHQy38Sgs",
         "metrics": [
           {
-            "metricId": "7464f38f-7795-4975-8b63-730cc5c49b34",
+            "metricId": "10b93cce-368e-4167-a849-fa97cbbc5c4d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:19Z",
+        "createdTime": "2021-02-05T17:57:18Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/611dd22f-28e0-44eb-a8b8-bc5bc5ef6707",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/787f1eab-272f-4a4c-8424-64f80f5e1e2e",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fb095349a467ba4a8ca85c8b3c1d9b93-05125bc24be74549-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f5f3b2b3d95b8748bdcd72df93836b92-24a921af5540574b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a432c29229672b48f26efa5e7de8b725",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2a002617-5d7c-48f0-8b91-675122205af7",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "2a002617-5d7c-48f0-8b91-675122205af7"
+      },
+      "ResponseBody": {
+        "dataFeedId": "787f1eab-272f-4a4c-8424-64f80f5e1e2e",
+        "dataFeedName": "dataFeedHQy38Sgs",
+        "metrics": [
+          {
+            "metricId": "10b93cce-368e-4167-a849-fa97cbbc5c4d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:18Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/787f1eab-272f-4a4c-8424-64f80f5e1e2e",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-32e979f829bb2e46bd7ccabf96083db4-ba5b5ddbf4dd8f4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "fe6c0339e15afc2af4104b80a2106d16",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fa5d7b45-a0fb-4dcb-bd8f-3b2a0f851542",
+        "apim-request-id": "a5f1d6f6-fedb-4f05-a098-63837965092f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "269",
-        "x-request-id": "fa5d7b45-a0fb-4dcb-bd8f-3b2a0f851542"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "282",
+        "X-Request-ID": "a5f1d6f6-fedb-4f05-a098-63837965092f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:19.7192859-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:19.1954516-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembers.json
index 8fc7df8ad4f6..20f59b54cda5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "969",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b9a54c8a7ae6a844aa77be35304837a7-4e478177b698d044-00",
+        "traceparent": "00-5474e0c380065b4ba48349a09417b19c-6cd0a8b85af61d4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -67,26 +67,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "8281fc1a-d349-4af6-8331-75f212d41bbf",
+        "apim-request-id": "9c6bf132-37cb-4e7e-982e-463d2fe01659",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:39 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/144ab68e-55ca-406f-b5b6-58269584200f",
+        "Date": "Fri, 05 Feb 2021 17:54:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7dbe83e-8bcd-4050-b645-46a3b21e017e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "724",
-        "X-Request-ID": "8281fc1a-d349-4af6-8331-75f212d41bbf"
+        "x-envoy-upstream-service-time": "729",
+        "X-Request-ID": "9c6bf132-37cb-4e7e-982e-463d2fe01659"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/144ab68e-55ca-406f-b5b6-58269584200f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7dbe83e-8bcd-4050-b645-46a3b21e017e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2f9b3449b9a100478165503266562727-2533cfbc7e37ac4e-00",
+        "traceparent": "00-5474e0c380065b4ba48349a09417b19c-9166c16e5f407e4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -96,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cf0d3a7c-6c2b-4532-a97e-7392986dc4b1",
+        "apim-request-id": "cc7c4272-2d2b-44f0-ad7b-06d42844f3bd",
         "Content-Length": "1386",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:39 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "X-Request-ID": "cf0d3a7c-6c2b-4532-a97e-7392986dc4b1"
+        "x-envoy-upstream-service-time": "203",
+        "X-Request-ID": "cc7c4272-2d2b-44f0-ad7b-06d42844f3bd"
       },
       "ResponseBody": {
-        "dataFeedId": "144ab68e-55ca-406f-b5b6-58269584200f",
+        "dataFeedId": "b7dbe83e-8bcd-4050-b645-46a3b21e017e",
         "dataFeedName": "dataFeed4J2AWNot",
         "metrics": [
           {
-            "metricId": "7471a01d-3c5e-43df-9522-652032712e76",
+            "metricId": "61b6cc36-4ece-4eb9-9d41-64bd532dea6c",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "af4366a5-7c4d-4f16-8311-5b164b62d3f3",
+            "metricId": "b96def7d-083e-4717-9685-853d31229906",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -159,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:38Z",
+        "createdTime": "2021-02-05T17:54:16Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,14 +169,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/144ab68e-55ca-406f-b5b6-58269584200f",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7dbe83e-8bcd-4050-b645-46a3b21e017e",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3382483156b7824db710e7ec92a6b834-64707007d9226144-00",
+        "traceparent": "00-3f28bff6e44d0f428d55a842d5761b00-9053f17d876fe543-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -184,21 +184,111 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "8c1cd88c-9e90-4504-b350-f25111d4eab4",
+        "Content-Length": "1386",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:16 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "217",
+        "X-Request-ID": "8c1cd88c-9e90-4504-b350-f25111d4eab4"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b7dbe83e-8bcd-4050-b645-46a3b21e017e",
+        "dataFeedName": "dataFeed4J2AWNot",
+        "metrics": [
+          {
+            "metricId": "61b6cc36-4ece-4eb9-9d41-64bd532dea6c",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "b96def7d-083e-4717-9685-853d31229906",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:16Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7dbe83e-8bcd-4050-b645-46a3b21e017e",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a9bbc2f408f0a747867a8c35564526e3-b68a4cd5c583b846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8ecf0cb8e9b4a9ce33471f242b3ed99e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fed5a781-912b-425b-ba3f-2f93e5cfab21",
+        "apim-request-id": "e4f19dd9-251d-477b-86d1-64001155ccfa",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:39 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "390",
-        "X-Request-ID": "fed5a781-912b-425b-ba3f-2f93e5cfab21"
+        "x-envoy-upstream-service-time": "404",
+        "X-Request-ID": "e4f19dd9-251d-477b-86d1-64001155ccfa"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:39.2918875-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:17.1963555-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembersAsync.json
index b329c7d90339..50cc7903a5e3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetMySqlDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "969",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c58cd2fa30e983419eaf800fe0b2e8d4-74490be2cc1eac48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bbfc641c9ac6ea428775772fc645b4f3-400b8859f4fc9e44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9e702109323119494ec56a4f8b9494db",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7a14b77d-c578-4ec8-93a6-68b33960efb7",
+        "apim-request-id": "e1bc0990-0dec-4a2d-b76d-7c42ae2bd190",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:50 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0fb41bd2-d95c-410b-9e02-d643b3329218",
+        "Date": "Fri, 05 Feb 2021 17:57:19 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/49cefcb1-eac7-418d-a188-5a58757395aa",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "776",
-        "x-request-id": "7a14b77d-c578-4ec8-93a6-68b33960efb7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "666",
+        "X-Request-ID": "e1bc0990-0dec-4a2d-b76d-7c42ae2bd190"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0fb41bd2-d95c-410b-9e02-d643b3329218",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/49cefcb1-eac7-418d-a188-5a58757395aa",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-755764c47302c74eada458eca4769375-28a2b8f0caae6e4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bbfc641c9ac6ea428775772fc645b4f3-b7583b496575754d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "eba95d2cd342a5963911b433617ee200",
         "x-ms-return-client-request-id": "true"
@@ -90,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "dad9fed0-b9bb-4da3-9c77-7fa94dcdc80f",
+        "apim-request-id": "d6347e75-2474-4fb0-9b0b-ff2328f2bf1a",
         "Content-Length": "1386",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "x-request-id": "dad9fed0-b9bb-4da3-9c77-7fa94dcdc80f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "135",
+        "X-Request-ID": "d6347e75-2474-4fb0-9b0b-ff2328f2bf1a"
       },
       "ResponseBody": {
-        "dataFeedId": "0fb41bd2-d95c-410b-9e02-d643b3329218",
+        "dataFeedId": "49cefcb1-eac7-418d-a188-5a58757395aa",
         "dataFeedName": "dataFeedk7wnLUbS",
         "metrics": [
           {
-            "metricId": "c1c82ffc-52d1-4607-9181-0f1c4b2e806e",
+            "metricId": "af42dbbb-e30c-4e80-aa71-366fe66e0d59",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "bdec0693-b384-4141-9379-37a333d20f47",
+            "metricId": "3a2cc48c-a5a6-4a57-9a9a-7693c65f3d2c",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -153,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:50Z",
+        "createdTime": "2021-02-05T17:57:20Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -163,33 +169,126 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0fb41bd2-d95c-410b-9e02-d643b3329218",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/49cefcb1-eac7-418d-a188-5a58757395aa",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6ba09c294528aa429e0655f822d8111a-db406d3843206144-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-964e8eda0ebf8f44b4491f1bc670741c-b90d3ebaa27b0b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "30a15f015ea302b019442594bbcd9e12",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c4e43166-f0ff-4000-81d1-1fba012b97d8",
+        "Content-Length": "1386",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:19 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "c4e43166-f0ff-4000-81d1-1fba012b97d8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "49cefcb1-eac7-418d-a188-5a58757395aa",
+        "dataFeedName": "dataFeedk7wnLUbS",
+        "metrics": [
+          {
+            "metricId": "af42dbbb-e30c-4e80-aa71-366fe66e0d59",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "3a2cc48c-a5a6-4a57-9a9a-7693c65f3d2c",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:20Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/49cefcb1-eac7-418d-a188-5a58757395aa",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-530c96dc6c37664a843a1395383ada1c-7fb4934e79e5eb45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "913a2fb54e3d369d8bcb64207e15b8d0",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a95d613c-ea67-44d3-bdc6-a5f733bfd2a8",
+        "apim-request-id": "84af2aff-fde0-4add-8526-b5d65a07df05",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "350",
-        "x-request-id": "a95d613c-ea67-44d3-bdc6-a5f733bfd2a8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "381",
+        "X-Request-ID": "84af2aff-fde0-4add-8526-b5d65a07df05"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:51.4677813-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:20.6901321-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetup.json
index 8465801a7620..5db0055be730 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-645cce893166c64d925b3005a5c6f6d8-306d72cc570f6247-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b0d261ba6c0255499dcec98ff475063f-71ea4f7f209f5b43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "98b77380c20c8b2046aaf567a6528abc",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d5e5ea1c-9e80-44b8-adc9-924fe1ba9b57",
+        "apim-request-id": "14ad0112-c312-4b77-998d-a91e1bf2c8eb",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:39 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f7c4039-14a0-4d41-b2d7-0547178da18a",
+        "Date": "Fri, 05 Feb 2021 17:54:22 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8077e4bf-3cfa-4863-94c4-4f4572819aa0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "393",
-        "x-request-id": "d5e5ea1c-9e80-44b8-adc9-924fe1ba9b57"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "5458",
+        "X-Request-ID": "14ad0112-c312-4b77-998d-a91e1bf2c8eb"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f7c4039-14a0-4d41-b2d7-0547178da18a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8077e4bf-3cfa-4863-94c4-4f4572819aa0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-253865c9635f8049bcc89b8b29cfdd64-5d2b389bec850844-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b0d261ba6c0255499dcec98ff475063f-761a6921d592ef43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "756782ef1f2a06e4a0c80299f835a06c",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6e23ba69-9378-43ab-847c-4e18c633b1f1",
+        "apim-request-id": "333f788e-18e9-4656-8ba6-0bc19420f386",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "x-request-id": "6e23ba69-9378-43ab-847c-4e18c633b1f1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "333f788e-18e9-4656-8ba6-0bc19420f386"
       },
       "ResponseBody": {
-        "dataFeedId": "2f7c4039-14a0-4d41-b2d7-0547178da18a",
+        "dataFeedId": "8077e4bf-3cfa-4863-94c4-4f4572819aa0",
         "dataFeedName": "dataFeedKD0TRTZM",
         "metrics": [
           {
-            "metricId": "c6ddca6b-2ee6-41ce-90e8-c6d5f53d35ae",
+            "metricId": "d0971880-1721-4f40-ad97-3c6b416fc524",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:40Z",
+        "createdTime": "2021-02-05T17:54:23Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f7c4039-14a0-4d41-b2d7-0547178da18a",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8077e4bf-3cfa-4863-94c4-4f4572819aa0",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d20db77aff911840a96a26f12415cfc8-40af0e187063c840-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e8ec3d89e60cc147a1ee47437984b7ca-d719ca278e3a1041-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "31fac6e46d330136ea9e50f85e2fbbb8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f26b3437-1ae7-47e6-9fa0-44954b512dbc",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:23 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "f26b3437-1ae7-47e6-9fa0-44954b512dbc"
+      },
+      "ResponseBody": {
+        "dataFeedId": "8077e4bf-3cfa-4863-94c4-4f4572819aa0",
+        "dataFeedName": "dataFeedKD0TRTZM",
+        "metrics": [
+          {
+            "metricId": "d0971880-1721-4f40-ad97-3c6b416fc524",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:23Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8077e4bf-3cfa-4863-94c4-4f4572819aa0",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0e38af02e6e2e0478c3d6df112e27038-8f1c0e766104f94a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f1fb6953bb4e61d68fb0f843c0869310",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c444e92e-e202-4297-b682-09cf33cbb5d3",
+        "apim-request-id": "b65c4b27-d60e-4512-8d38-5b2ab942d174",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "318",
-        "x-request-id": "c444e92e-e202-4297-b682-09cf33cbb5d3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "312",
+        "X-Request-ID": "b65c4b27-d60e-4512-8d38-5b2ab942d174"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:40.6644264-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:24.0521597-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetupAsync.json
index 08b72ada87ed..fd99ccd39ede 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d89324c81d53e44eafc6ec8e1f69fe31-d7322c73d2139a45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-675b4d12c05a6f44832c88a1063f001a-6f76833e8ed2e94e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "be0730ff6b25735a3f3b4dbfe873d8f8",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "149a344b-8aea-41b6-affe-0e6664169506",
+        "apim-request-id": "a3edb987-b391-48aa-9b16-b3ac4da4d61f",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:21 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4aa0f9b2-cb8e-4959-9b2d-d1d670765a19",
+        "Date": "Fri, 05 Feb 2021 17:57:21 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9348a8aa-1bc0-4b9a-989b-764dda868786",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "637",
-        "x-request-id": "149a344b-8aea-41b6-affe-0e6664169506"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "579",
+        "X-Request-ID": "a3edb987-b391-48aa-9b16-b3ac4da4d61f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4aa0f9b2-cb8e-4959-9b2d-d1d670765a19",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9348a8aa-1bc0-4b9a-989b-764dda868786",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-41b0b8dc2cfd364cbe3ed8c022310250-ec506a8e34604444-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-675b4d12c05a6f44832c88a1063f001a-b5832b7a2ec4aa48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "4883521b697142f0fd8919aae6c6dab1",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f5d87e0f-bb54-4409-a78c-0a98094604a6",
+        "apim-request-id": "116975da-749d-4d39-8091-a9a1e7645c6c",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "x-request-id": "f5d87e0f-bb54-4409-a78c-0a98094604a6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "116975da-749d-4d39-8091-a9a1e7645c6c"
       },
       "ResponseBody": {
-        "dataFeedId": "4aa0f9b2-cb8e-4959-9b2d-d1d670765a19",
+        "dataFeedId": "9348a8aa-1bc0-4b9a-989b-764dda868786",
         "dataFeedName": "dataFeedFbuKx4l7",
         "metrics": [
           {
-            "metricId": "3d4063f2-0f7d-4f2a-8ee1-7074646955ab",
+            "metricId": "f69897d2-b7bb-41ba-a4ce-ca3096c9cb25",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:21Z",
+        "createdTime": "2021-02-05T17:57:21Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4aa0f9b2-cb8e-4959-9b2d-d1d670765a19",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9348a8aa-1bc0-4b9a-989b-764dda868786",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f1596509f5dcef48bfd18438c9fbb561-29b601dc0e921c46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bcbeadb4a16f4447b4d836708795231e-f5ae8f7a542e7548-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a109d5ad03ce49040caa7b4cc08a1201",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7193f7e3-823f-4ad3-bd7b-8d9112b7b69a",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:21 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "7193f7e3-823f-4ad3-bd7b-8d9112b7b69a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "9348a8aa-1bc0-4b9a-989b-764dda868786",
+        "dataFeedName": "dataFeedFbuKx4l7",
+        "metrics": [
+          {
+            "metricId": "f69897d2-b7bb-41ba-a4ce-ca3096c9cb25",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:21Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9348a8aa-1bc0-4b9a-989b-764dda868786",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-512c489f7a4e9042a181ad040b4e71b2-7e8942084867f941-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0c99a6f47c16953d40c4c09b51af8d79",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "79195693-a0a3-47a8-be5a-48394aa45a2e",
+        "apim-request-id": "1b3d7782-5b28-4344-9b8a-96abb7613ba7",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "284",
-        "x-request-id": "79195693-a0a3-47a8-be5a-48394aa45a2e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "351",
+        "X-Request-ID": "1b3d7782-5b28-4344-9b8a-96abb7613ba7"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:22.3507119-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:22.3739767-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembers.json
index 0a215ca568b8..53c8f20df64b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "974",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f52effba9d5b9e46b75603866359161a-04664684298daa4d-00",
+        "traceparent": "00-d8f1d4a643ebe04fba0174c1abf46372-9c0e73cc59abf84c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -67,26 +67,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "85f5d781-aa3b-4f22-a298-ac15afced41b",
+        "apim-request-id": "a75af511-79d4-4c3b-a868-58173c109aca",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1656f723-60cf-468b-b1e5-24ebd0a1bc55",
+        "Date": "Fri, 05 Feb 2021 17:54:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7b13a709-eda0-444d-8768-851e6ffb924f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "714",
-        "X-Request-ID": "85f5d781-aa3b-4f22-a298-ac15afced41b"
+        "x-envoy-upstream-service-time": "519",
+        "X-Request-ID": "a75af511-79d4-4c3b-a868-58173c109aca"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1656f723-60cf-468b-b1e5-24ebd0a1bc55",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7b13a709-eda0-444d-8768-851e6ffb924f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-466d511a7147194fba65f0e990aba630-8acad29589ae6947-00",
+        "traceparent": "00-d8f1d4a643ebe04fba0174c1abf46372-55ca583070355846-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -96,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b15d5331-d1cf-4863-a292-4e330569d133",
+        "apim-request-id": "5357c018-4630-4fd0-a692-3ab89eba24df",
         "Content-Length": "1391",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "X-Request-ID": "b15d5331-d1cf-4863-a292-4e330569d133"
+        "x-envoy-upstream-service-time": "167",
+        "X-Request-ID": "5357c018-4630-4fd0-a692-3ab89eba24df"
       },
       "ResponseBody": {
-        "dataFeedId": "1656f723-60cf-468b-b1e5-24ebd0a1bc55",
+        "dataFeedId": "7b13a709-eda0-444d-8768-851e6ffb924f",
         "dataFeedName": "dataFeedzyytIbjH",
         "metrics": [
           {
-            "metricId": "ce5ca500-052a-413e-b2fa-bf7b4da87d5d",
+            "metricId": "ea7c5c84-0328-4f2f-b57f-baf42f9fd8b8",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "f19d8173-2029-4c3b-a1cb-0fac4fed0953",
+            "metricId": "54be6568-6d01-47e7-9bea-c0236043200d",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -159,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:40Z",
+        "createdTime": "2021-02-05T17:54:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,14 +169,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1656f723-60cf-468b-b1e5-24ebd0a1bc55",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7b13a709-eda0-444d-8768-851e6ffb924f",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-52398f39fac0b04ab67fd01ffcab1271-f62f1612ff1e4941-00",
+        "traceparent": "00-fbb739d3f3a9664581910e859995e0b2-1074ac6cfc1d094a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -184,21 +184,111 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e1b8ae20-3a17-42a6-aa32-30a46c3f4ee9",
+        "Content-Length": "1391",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "e1b8ae20-3a17-42a6-aa32-30a46c3f4ee9"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7b13a709-eda0-444d-8768-851e6ffb924f",
+        "dataFeedName": "dataFeedzyytIbjH",
+        "metrics": [
+          {
+            "metricId": "ea7c5c84-0328-4f2f-b57f-baf42f9fd8b8",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "54be6568-6d01-47e7-9bea-c0236043200d",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:24Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7b13a709-eda0-444d-8768-851e6ffb924f",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b5980ea72e95ad4bb7b6a16fa257d99a-d6d81f84e1ed6349-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "66ac9de4902fbce6864974d2e6109b0c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8ec89ccb-6beb-47f3-8c70-cf815e4ff276",
+        "apim-request-id": "fafb4901-6985-40b4-b0a0-e16f542ae337",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "338",
-        "X-Request-ID": "8ec89ccb-6beb-47f3-8c70-cf815e4ff276"
+        "x-envoy-upstream-service-time": "421",
+        "X-Request-ID": "fafb4901-6985-40b4-b0a0-e16f542ae337"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:40.6839721-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:25.4601015-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembersAsync.json
index d0376f55e274..b6ea63f0cfc5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetPostgreSqlDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "974",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fbca9fb0e02d5146ac18607e74b6ea05-de9410eaae2dcd4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0342256982a7cb40b378adf1fd400a7d-90e522644d90dc4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fb5ff9a17356a5f50d9e9fbe2f10a2f4",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "567344d0-f1d0-487e-baea-976da75abd6d",
+        "apim-request-id": "591ea17d-07c7-4d98-a083-c27e71ed1fdd",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/441fbc43-d96e-4eac-b49b-390446c5f479",
+        "Date": "Fri, 05 Feb 2021 17:57:22 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd674c6b-08ea-4591-9b5d-b2740e732938",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "536",
-        "x-request-id": "567344d0-f1d0-487e-baea-976da75abd6d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "787",
+        "X-Request-ID": "591ea17d-07c7-4d98-a083-c27e71ed1fdd"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/441fbc43-d96e-4eac-b49b-390446c5f479",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd674c6b-08ea-4591-9b5d-b2740e732938",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1bd5a73156e74f429e0e325f8e0850ff-0744f1593928de4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0342256982a7cb40b378adf1fd400a7d-dea222c517f4b64c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "79ad770bba1d3760ff157f7ab63e5bf1",
         "x-ms-return-client-request-id": "true"
@@ -90,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4ccf9e8a-7d37-4549-96f4-39b035a64f65",
+        "apim-request-id": "12757cb2-1a6f-4f1f-9b6b-75480972f21a",
         "Content-Length": "1391",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "x-request-id": "4ccf9e8a-7d37-4549-96f4-39b035a64f65"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "178",
+        "X-Request-ID": "12757cb2-1a6f-4f1f-9b6b-75480972f21a"
       },
       "ResponseBody": {
-        "dataFeedId": "441fbc43-d96e-4eac-b49b-390446c5f479",
+        "dataFeedId": "cd674c6b-08ea-4591-9b5d-b2740e732938",
         "dataFeedName": "dataFeedffsJE0BR",
         "metrics": [
           {
-            "metricId": "252e99b1-ef43-4128-8824-83f01dc56723",
+            "metricId": "0c87dde2-a6c4-49ce-8cde-57b950117269",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "e4f52931-59bc-4428-be4c-bbf2a64df6d4",
+            "metricId": "8e9290f1-8504-450e-adad-3efa00e50430",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -153,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:52Z",
+        "createdTime": "2021-02-05T17:57:23Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -163,33 +169,126 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/441fbc43-d96e-4eac-b49b-390446c5f479",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd674c6b-08ea-4591-9b5d-b2740e732938",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5712f57e5b8e3541aa8da16b8a6eb419-6e747d9957bdf840-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3643f8406e12ed49a9cc0dc40e220a8a-af5f717fd086db4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "91dc330bf653f0a370bd5f171f7bbb25",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7081bcf2-c3d4-432b-9dc5-c7579be96c1f",
+        "Content-Length": "1391",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:23 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "7081bcf2-c3d4-432b-9dc5-c7579be96c1f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cd674c6b-08ea-4591-9b5d-b2740e732938",
+        "dataFeedName": "dataFeedffsJE0BR",
+        "metrics": [
+          {
+            "metricId": "0c87dde2-a6c4-49ce-8cde-57b950117269",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "8e9290f1-8504-450e-adad-3efa00e50430",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:23Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd674c6b-08ea-4591-9b5d-b2740e732938",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-200df91a9f38734fa0c7928defb920af-1e61918590d1c542-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a18eed9c9b7be7ff9927fc41f37aeecf",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "da64e319-058c-48c4-8f52-d8b76159e0f8",
+        "apim-request-id": "090f9f4d-7015-4652-a789-16c20d8c5be3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "397",
-        "x-request-id": "da64e319-058c-48c4-8f52-d8b76159e0f8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "414",
+        "X-Request-ID": "090f9f4d-7015-4652-a789-16c20d8c5be3"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:52.7379078-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:24.2222436-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetup.json
index b56e8b92cd7e..378757bcb1e7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d875017692ad3049830394d6cc6b9b7d-525c5bc55e414d47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-471f61839253374287ce2ed308f61ce7-ab95362fff476849-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d40148859c2d967d90b0611a76e41d05",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2a8c0b11-b565-458b-aa0f-9a063d52ede4",
+        "apim-request-id": "e7642426-2472-462f-9c36-0b5efc187a3e",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/65672f0e-3c4b-4ffc-bdcb-97482971f157",
+        "Date": "Fri, 05 Feb 2021 17:54:25 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f498cd40-90b2-41fc-a692-968831be9aa7",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "552",
-        "x-request-id": "2a8c0b11-b565-458b-aa0f-9a063d52ede4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "596",
+        "X-Request-ID": "e7642426-2472-462f-9c36-0b5efc187a3e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/65672f0e-3c4b-4ffc-bdcb-97482971f157",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f498cd40-90b2-41fc-a692-968831be9aa7",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-810e27c568295348a58ed0c23fdb0829-ce501ad50eb31440-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-471f61839253374287ce2ed308f61ce7-9f6b958bdc61e549-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d1242066140b85e2c8d8a4e3f38260cc",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ee65e1ee-8477-41b3-bbb8-453625effbac",
+        "apim-request-id": "6f33a21b-4b09-4c02-b22b-b014a6c5dd2a",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:40:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "ee65e1ee-8477-41b3-bbb8-453625effbac"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "6f33a21b-4b09-4c02-b22b-b014a6c5dd2a"
       },
       "ResponseBody": {
-        "dataFeedId": "65672f0e-3c4b-4ffc-bdcb-97482971f157",
+        "dataFeedId": "f498cd40-90b2-41fc-a692-968831be9aa7",
         "dataFeedName": "dataFeed1BwldVlA",
         "metrics": [
           {
-            "metricId": "dec77f41-a675-4eee-b199-fabb57d80a77",
+            "metricId": "e10a1550-1408-4bf5-ad12-ac02e1e273f9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:40:43Z",
+        "createdTime": "2021-02-05T17:54:26Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/65672f0e-3c4b-4ffc-bdcb-97482971f157",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f498cd40-90b2-41fc-a692-968831be9aa7",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8cd5e2a0e0d128488ae77b72525939f8-d1035c16ab6bd346-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-32713fb6342acf4abe7ffb86145378d6-fb5658c61625634c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f32f16adc34488cb2c2a11d3398201b5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b608aa17-4d06-409c-b794-374dec9f31c4",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:26 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "203",
+        "X-Request-ID": "b608aa17-4d06-409c-b794-374dec9f31c4"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f498cd40-90b2-41fc-a692-968831be9aa7",
+        "dataFeedName": "dataFeed1BwldVlA",
+        "metrics": [
+          {
+            "metricId": "e10a1550-1408-4bf5-ad12-ac02e1e273f9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:26Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f498cd40-90b2-41fc-a692-968831be9aa7",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1c28b7d295ace54d990a26534e84507f-e49f13798e9c1647-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ea1cf095ac2971a0657b0c55f89aa30d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e23f237d-33bb-4faa-9372-9de1a4d3e240",
+        "apim-request-id": "1def8526-8821-4642-b913-6c33599f6a89",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:40:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "360",
-        "x-request-id": "e23f237d-33bb-4faa-9372-9de1a4d3e240"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "342",
+        "X-Request-ID": "1def8526-8821-4642-b913-6c33599f6a89"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:40:43.5389144-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:27.3325882-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetupAsync.json
index 8bc65a7b2ac8..669b8a3c4431 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-86a49eb910fa094aa0480f575e5aea48-bad9dc0b53b1bf4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6f4a53b8f1ae524e9a8f91756b484aaa-483d3469dd065e40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9741f4e191901371827fc581ebed51c3",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "988304e2-0963-4671-88a0-74c97255a39b",
+        "apim-request-id": "ca095063-a904-4605-991e-2a2e64c11120",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:24 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/233787c9-fd1e-4be5-96f5-7ef38f7bcdf7",
+        "Date": "Fri, 05 Feb 2021 17:57:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd1b407f-456c-4218-8c9e-066643d3d39c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "375",
-        "x-request-id": "988304e2-0963-4671-88a0-74c97255a39b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "666",
+        "X-Request-ID": "ca095063-a904-4605-991e-2a2e64c11120"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/233787c9-fd1e-4be5-96f5-7ef38f7bcdf7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd1b407f-456c-4218-8c9e-066643d3d39c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b2ca19922e76b242ae6bfeebf8915219-f88934f15e39ea48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6f4a53b8f1ae524e9a8f91756b484aaa-e75fbb096f47fd4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "04540704237c07083e3d075e6568437f",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c7178012-c81b-49bd-9733-749644cfab77",
+        "apim-request-id": "7f805cb6-134e-4ff9-bb92-21c370c41299",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 29 Dec 2020 21:41:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "x-request-id": "c7178012-c81b-49bd-9733-749644cfab77"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "7f805cb6-134e-4ff9-bb92-21c370c41299"
       },
       "ResponseBody": {
-        "dataFeedId": "233787c9-fd1e-4be5-96f5-7ef38f7bcdf7",
+        "dataFeedId": "cd1b407f-456c-4218-8c9e-066643d3d39c",
         "dataFeedName": "dataFeed9GpqZKlc",
         "metrics": [
           {
-            "metricId": "55b44fb0-f034-473b-84a9-b05df5bc0b6b",
+            "metricId": "c8eb2e0b-0d8c-4a37-af5a-551ec8eaa484",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-29T21:41:24Z",
+        "createdTime": "2021-02-05T17:57:25Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,33 +118,108 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/233787c9-fd1e-4be5-96f5-7ef38f7bcdf7",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd1b407f-456c-4218-8c9e-066643d3d39c",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-45d394f9fc32d0469aee7897c6fb35b4-bde2ae31a59dc34c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-130fbbee4363d5439e05e495f1b7882a-c7c76e9679030546-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e8f6acb9b98cfcf59f699549ece6ca88",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4ac4877a-1de4-494f-a16a-244dcb8aba3e",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "4ac4877a-1de4-494f-a16a-244dcb8aba3e"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cd1b407f-456c-4218-8c9e-066643d3d39c",
+        "dataFeedName": "dataFeed9GpqZKlc",
+        "metrics": [
+          {
+            "metricId": "c8eb2e0b-0d8c-4a37-af5a-551ec8eaa484",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:25Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cd1b407f-456c-4218-8c9e-066643d3d39c",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ec5d4a1b90e62b4b90a973e791920601-bb8dfb84f35c9147-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6dd346d2ae23bebbeb3a59528913ae19",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "daf3d834-32d5-4d2a-b092-7a325b9abbfa",
+        "apim-request-id": "a10bd192-ef44-4afe-b275-74dea870302c",
         "Content-Length": "0",
-        "Date": "Tue, 29 Dec 2020 21:41:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "280",
-        "x-request-id": "daf3d834-32d5-4d2a-b092-7a325b9abbfa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "398",
+        "X-Request-ID": "a10bd192-ef44-4afe-b275-74dea870302c"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-29T13:41:25.3406545-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:25.7906725-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembers.json
index 52e4b0cdba91..a624151a88c0 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembers.json
@@ -8,9 +8,9 @@
         "Content-Length": "973",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-562256f83806af409963a8ecf385eb3f-8d7a7acd63bf6344-00",
+        "traceparent": "00-0222cf653328134fb842e8081d3c0718-5db8d03d45e5494f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -67,26 +67,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "396d40f5-96c0-4770-8521-ec63ca994608",
+        "apim-request-id": "234c8611-dda6-48ff-8baf-a02951ede579",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:41 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/97f0f9a9-491e-44cd-b508-e025a76cbac7",
+        "Date": "Fri, 05 Feb 2021 17:54:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "751",
-        "X-Request-ID": "396d40f5-96c0-4770-8521-ec63ca994608"
+        "x-envoy-upstream-service-time": "559",
+        "X-Request-ID": "234c8611-dda6-48ff-8baf-a02951ede579"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/97f0f9a9-491e-44cd-b508-e025a76cbac7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9855a72f65bef04987e46b201d6be34f-51ff27c8dcae2544-00",
+        "traceparent": "00-0222cf653328134fb842e8081d3c0718-b8566e443e46a543-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -96,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9ff9dd17-25c7-4c0c-a187-213306611928",
+        "apim-request-id": "dbc96430-bbee-43e9-980c-22115edad474",
         "Content-Length": "1390",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:21:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "X-Request-ID": "9ff9dd17-25c7-4c0c-a187-213306611928"
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "dbc96430-bbee-43e9-980c-22115edad474"
       },
       "ResponseBody": {
-        "dataFeedId": "97f0f9a9-491e-44cd-b508-e025a76cbac7",
+        "dataFeedId": "a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
         "dataFeedName": "dataFeed5atufFei",
         "metrics": [
           {
-            "metricId": "d925d511-9ad5-4a71-80a0-9f482cf737c7",
+            "metricId": "2e16b03d-c682-4d8c-8242-6489d419fdb7",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "49456360-ddaf-468b-ad65-c7591a4695c8",
+            "metricId": "06d1704e-a9dc-4b57-8b1b-55786352b5ed",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -159,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:21:41Z",
+        "createdTime": "2021-02-05T17:54:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -169,14 +169,14 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/97f0f9a9-491e-44cd-b508-e025a76cbac7",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-38d55fea48db6646b8ee4f8a53b2b666-46a35bfa3bd0784f-00",
+        "traceparent": "00-c2f6d274674d1446a0887d85a07a90ae-f1fd146627ef6c44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -184,21 +184,111 @@
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "39ad0efa-0948-40f4-bbbd-a86e3ca9a71d",
+        "Content-Length": "1390",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:27 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "39ad0efa-0948-40f4-bbbd-a86e3ca9a71d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
+        "dataFeedName": "dataFeed5atufFei",
+        "metrics": [
+          {
+            "metricId": "2e16b03d-c682-4d8c-8242-6489d419fdb7",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "06d1704e-a9dc-4b57-8b1b-55786352b5ed",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:28Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a59a503f-83bc-4691-9e6e-e41bbd6e24a0",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-70dcc99ed50c6d478c11474cf3e6aee0-a9228fcc9435a246-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e1405992cfe1a74a5bf8b407228be29d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4c294b6f-26d0-4ceb-8373-d8559fa617e4",
+        "apim-request-id": "9cb932ad-25cc-4736-94e5-32e6788bfa7e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:21:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "375",
-        "X-Request-ID": "4c294b6f-26d0-4ceb-8373-d8559fa617e4"
+        "x-envoy-upstream-service-time": "383",
+        "X-Request-ID": "9cb932ad-25cc-4736-94e5-32e6788bfa7e"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:21:42.0089784-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:28.8774705-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembersAsync.json
index c1934654be58..b9cceeef8f9a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/CreateAndGetSqlServerDataFeedWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "973",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-50ab6e70198c4b41b1de87045c9de514-f283cbc6d1cd6148-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e1fda5dfae295348b9366244396f8cad-259cda887df01645-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9534f4446271ed34e922df1675e21907",
         "x-ms-return-client-request-id": "true"
@@ -64,25 +67,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "12e79dbe-c946-4528-b9ee-c972c01ad840",
+        "apim-request-id": "3c0265cb-0f8f-4a53-81bd-fffbe0e2323e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:52 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0858ee7d-cf67-4975-bdda-d701c1d3df8a",
+        "Date": "Fri, 05 Feb 2021 17:57:25 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7adac25c-0b94-4288-952f-f54b54315b2d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "586",
-        "x-request-id": "12e79dbe-c946-4528-b9ee-c972c01ad840"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "478",
+        "X-Request-ID": "3c0265cb-0f8f-4a53-81bd-fffbe0e2323e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0858ee7d-cf67-4975-bdda-d701c1d3df8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7adac25c-0b94-4288-952f-f54b54315b2d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d1113310cffda84ebe1b1104c52cf836-5f0b9db51b244542-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e1fda5dfae295348b9366244396f8cad-095aa613eaccc445-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2fd5808ac9b1909764cc43d88a3d83a1",
         "x-ms-return-client-request-id": "true"
@@ -90,27 +96,27 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "88c66c15-9848-446d-af07-d6d9af58b545",
+        "apim-request-id": "559545e3-fdc4-4ce5-8c53-b0f11ce35d20",
         "Content-Length": "1390",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "x-request-id": "88c66c15-9848-446d-af07-d6d9af58b545"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "559545e3-fdc4-4ce5-8c53-b0f11ce35d20"
       },
       "ResponseBody": {
-        "dataFeedId": "0858ee7d-cf67-4975-bdda-d701c1d3df8a",
+        "dataFeedId": "7adac25c-0b94-4288-952f-f54b54315b2d",
         "dataFeedName": "dataFeedP9n9URW6",
         "metrics": [
           {
-            "metricId": "41cd9de6-8086-410e-8c0a-16d2e7862ef2",
+            "metricId": "62d5f241-e167-44e3-b14d-2e103ee6c7c9",
             "metricName": "cost",
             "metricDisplayName": "costDisplayName",
             "metricDescription": "costDescription"
           },
           {
-            "metricId": "bcce4f4a-9a13-4e64-8dfd-5b252f9f3102",
+            "metricId": "01f4b94b-1cc9-48a6-b165-2504056b9fbf",
             "metricName": "revenue",
             "metricDisplayName": "revenueDisplayName",
             "metricDescription": "revenueDescription"
@@ -153,7 +159,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:53Z",
+        "createdTime": "2021-02-05T17:57:26Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
         "dataSourceParameter": {
@@ -163,33 +169,126 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0858ee7d-cf67-4975-bdda-d701c1d3df8a",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7adac25c-0b94-4288-952f-f54b54315b2d",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9250b2166e55884eb0dcd62a09386eed-f39ddf4aba02674b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-018a896d0901864499faf93e7a823632-0db538ee12aa9e4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c6589d421c17f0f97de1835868666960",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5c8aff10-7203-4c68-923b-ecc2a27fbb52",
+        "Content-Length": "1390",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:27 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "5c8aff10-7203-4c68-923b-ecc2a27fbb52"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7adac25c-0b94-4288-952f-f54b54315b2d",
+        "dataFeedName": "dataFeedP9n9URW6",
+        "metrics": [
+          {
+            "metricId": "62d5f241-e167-44e3-b14d-2e103ee6c7c9",
+            "metricName": "cost",
+            "metricDisplayName": "costDisplayName",
+            "metricDescription": "costDescription"
+          },
+          {
+            "metricId": "01f4b94b-1cc9-48a6-b165-2504056b9fbf",
+            "metricName": "revenue",
+            "metricDisplayName": "revenueDisplayName",
+            "metricDescription": "revenueDescription"
+          }
+        ],
+        "dimension": [
+          {
+            "dimensionName": "category",
+            "dimensionDisplayName": "categoryDisplayName"
+          },
+          {
+            "dimensionName": "city",
+            "dimensionDisplayName": "city"
+          }
+        ],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "timestamp",
+        "startOffsetInSeconds": 1800,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Custom",
+        "granularityAmount": 1360,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "CustomValue",
+        "fillMissingPointValue": 45.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "This data feed was created to test the .NET client.",
+        "stopRetryAfterInSeconds": 600,
+        "minRetryIntervalInSeconds": 80,
+        "maxConcurrency": 5,
+        "viewMode": "Public",
+        "admins": [
+          "fake@admin.com",
+          "foo@contoso.com"
+        ],
+        "viewers": [
+          "fake@viewer.com"
+        ],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:26Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "https://fakeurl.com/%metric/%datafeed",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7adac25c-0b94-4288-952f-f54b54315b2d",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-53feea262366b54189c71e8986938b4d-b0e5446cf98c1d41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d0ff936d80a87ac35da331a41f5b62ac",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6ad2fd90-2f07-40b9-bc0a-6d82a5ea5613",
+        "apim-request-id": "76652a26-c67d-4414-9fff-e7d05a5e0779",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "431",
-        "x-request-id": "6ad2fd90-2f07-40b9-bc0a-6d82a5ea5613"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "392",
+        "X-Request-ID": "76652a26-c67d-4414-9fff-e7d05a5e0779"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:53.9864679-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:27.2351034-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False).json
index 2b7724c0d4ba..b572d7bc5128 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False).json
@@ -8,10 +8,13 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e8f3fb2b79916147bd11821c38e2393c-68116f3c1812cb44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dff0f3b40148b849a6489e43a280f4ab-1dffc41eb42b054d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "67d348e02d972942f8c2b559ee0427ab",
+        "x-ms-client-request-id": "25d0261ee6f7ad6aecad3753013c66fb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -20,7 +23,7 @@
           "query": "query"
         },
         "dataSourceType": "SqlServer",
-        "dataFeedName": "dataFeedHrv1im9C",
+        "dataFeedName": "dataFeed4ZLtksQ2",
         "granularityName": "Daily",
         "metrics": [
           {
@@ -31,65 +34,143 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6177c7ed-791a-4e10-a9af-7efc5edbb621",
+        "apim-request-id": "ce06728d-b1e2-40bf-814b-1c4981f5d9c5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:28 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ab742b15-1398-48fc-a7c4-3dcf69226f04",
+        "Date": "Fri, 05 Feb 2021 18:38:06 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8449b862-1e0b-4ba8-aea2-869d6fa0fd8b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "559",
-        "x-request-id": "6177c7ed-791a-4e10-a9af-7efc5edbb621"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "386",
+        "X-Request-ID": "ce06728d-b1e2-40bf-814b-1c4981f5d9c5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ab742b15-1398-48fc-a7c4-3dcf69226f04",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8449b862-1e0b-4ba8-aea2-869d6fa0fd8b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-dff0f3b40148b849a6489e43a280f4ab-2c08f270b7722a4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "3cdb020194a05ff915a2558e82126ecc",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1865a28a-664c-4aaf-a66c-27132bd7ac9f",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:06 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "1865a28a-664c-4aaf-a66c-27132bd7ac9f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "8449b862-1e0b-4ba8-aea2-869d6fa0fd8b",
+        "dataFeedName": "dataFeed4ZLtksQ2",
+        "metrics": [
+          {
+            "metricId": "834f0b6f-59e7-4414-b626-0e2e41802a0a",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T18:38:06Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8449b862-1e0b-4ba8-aea2-869d6fa0fd8b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bdf7c1e851851642ad2313e964cde881-78e91a44ab521646-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5caff97b1a2bc94db7ce46d0684c169a-4fed002d55cffd46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "984fac857201dbcd3b8f83335ba3f8e0",
+        "x-ms-client-request-id": "0e59fd23750171137446be96883ba379",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6699c04b-2028-4325-9c9b-dd810039708e",
+        "apim-request-id": "0e11459e-4031-4f12-959c-8e9196400edd",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:29 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "308",
-        "x-request-id": "6699c04b-2028-4325-9c9b-dd810039708e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "332",
+        "X-Request-ID": "0e11459e-4031-4f12-959c-8e9196400edd"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ab742b15-1398-48fc-a7c4-3dcf69226f04",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8449b862-1e0b-4ba8-aea2-869d6fa0fd8b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8e9cecf6ef83ab4a8a7fd0779d0c803d-9712586e61c6a146-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-01c83191b21d3d4e9ea51a8fd1994c6e-152d7645585c9f47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3b7cd2884bdfdccb74941718fefa80cd",
+        "x-ms-client-request-id": "a3d6faa2c25d8ab32d71105590dc2bda",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "1f1f420d-2bec-4d28-bbc0-08e1ec825e8c",
+        "apim-request-id": "62158a34-bb34-44f4-a309-04450ed04ebe",
         "Content-Length": "69",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:29 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "66",
-        "x-request-id": "1f1f420d-2bec-4d28-bbc0-08e1ec825e8c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "73",
+        "X-Request-ID": "62158a34-bb34-44f4-a309-04450ed04ebe"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -102,6 +183,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "68464677"
+    "RandomSeed": "1117181368"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False)Async.json
index ee88b492565c..304c516c22a1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(False)Async.json
@@ -8,10 +8,13 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-60ebe615a55f1e4f8c32025238b6da69-2adbda5fa1cb7c44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a21aaeb21b7fa24f8f302b1a3c52dfd4-3caf518a31c2e34b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "80d63b359f10dfe4f3bd5e50db3806e4",
+        "x-ms-client-request-id": "b490f63b1412534207b664710ffe0e16",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -20,7 +23,7 @@
           "query": "query"
         },
         "dataSourceType": "SqlServer",
-        "dataFeedName": "dataFeedMjZEzaS6",
+        "dataFeedName": "dataFeed74vbLJkI",
         "granularityName": "Daily",
         "metrics": [
           {
@@ -31,65 +34,143 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2d7ad0a7-1da0-4c51-a579-a6e290745805",
+        "apim-request-id": "7a40208d-6fc4-4520-8ab6-47a9f5e2e063",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:41 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59f18e6f-1a4b-46b3-ac9a-fda9d469947d",
+        "Date": "Fri, 05 Feb 2021 18:38:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fba9b62-cc8f-4597-830b-0c5c01369b94",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "585",
-        "x-request-id": "2d7ad0a7-1da0-4c51-a579-a6e290745805"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "415",
+        "X-Request-ID": "7a40208d-6fc4-4520-8ab6-47a9f5e2e063"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59f18e6f-1a4b-46b3-ac9a-fda9d469947d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fba9b62-cc8f-4597-830b-0c5c01369b94",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a21aaeb21b7fa24f8f302b1a3c52dfd4-c9ab4f9d82a4a645-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6fc81da1248b4244407e93a9d468d6bb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6749f9c3-6068-4d29-9b5a-60f2e83b06c2",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "6749f9c3-6068-4d29-9b5a-60f2e83b06c2"
+      },
+      "ResponseBody": {
+        "dataFeedId": "5fba9b62-cc8f-4597-830b-0c5c01369b94",
+        "dataFeedName": "dataFeed74vbLJkI",
+        "metrics": [
+          {
+            "metricId": "13269a38-07e6-463e-9248-c840ab6be914",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T18:38:10Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fba9b62-cc8f-4597-830b-0c5c01369b94",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6504051a3822fe4e836b46649a30e4b3-c5c5e9295e80094e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-340d2b934b036c45893811adda83e648-3ae7c2855f49424f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "af34881edcd1314dfccfa525e13a546a",
+        "x-ms-client-request-id": "16330851ba29eb26f41dd9c85ee90b39",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "abd33d44-26c5-41e3-b71a-afa2905aaa52",
+        "apim-request-id": "36742cb5-99d6-4a1c-8f19-44d08d7eda26",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:42 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "294",
-        "x-request-id": "abd33d44-26c5-41e3-b71a-afa2905aaa52"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "318",
+        "X-Request-ID": "36742cb5-99d6-4a1c-8f19-44d08d7eda26"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59f18e6f-1a4b-46b3-ac9a-fda9d469947d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fba9b62-cc8f-4597-830b-0c5c01369b94",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bffab1ffe01cfd4088fae7f14af38b4e-5547cd70e4b0cd47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5506f0457b2aad4a9b608bf8c66a8ba0-5492c53f8df44c4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f3a78a0c0c586bcd422bcee58ee640ab",
+        "x-ms-client-request-id": "398e1f04cbce16afb14d739381997e9f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "0051d5e4-b8d4-4a29-a822-49d8d24da0bb",
+        "apim-request-id": "7d0ed7e3-2c9c-4515-a9aa-d9c4d6a8d2e4",
         "Content-Length": "69",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:42 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "68",
-        "x-request-id": "0051d5e4-b8d4-4a29-a822-49d8d24da0bb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "59",
+        "X-Request-ID": "7d0ed7e3-2c9c-4515-a9aa-d9c4d6a8d2e4"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -102,6 +183,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "478749501"
+    "RandomSeed": "2145423686"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True).json
index 3e1e9155cf21..48c01f50ff69 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True).json
@@ -8,9 +8,12 @@
         "Authorization": "Sanitized",
         "Content-Length": "234",
         "Content-Type": "application/json",
-        "traceparent": "00-b36ff32ca14ecc459144b18bcf6e5585-63628a2f88ebf449-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "5b0768768ba3f75a62575722ab3537cb",
+        "traceparent": "00-f8578943612ace4080a008bf47756435-71e7be56e7c91d49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "bb38643e9b38a1919a1df7c1e6a67d2c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,7 +22,7 @@
           "query": "query"
         },
         "dataSourceType": "SqlServer",
-        "dataFeedName": "dataFeedQiyqzxMe",
+        "dataFeedName": "dataFeedbfmPyxvY",
         "granularityName": "Daily",
         "metrics": [
           {
@@ -30,63 +33,140 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "03ac8bfd-00a0-40a6-acdf-7318de67f528",
+        "apim-request-id": "29cb49a7-4775-4339-9868-be81156ecb5b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:27 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c424b93-a198-409d-8c55-35f7a6d8df8a",
+        "Date": "Fri, 05 Feb 2021 18:38:05 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dc30d7ed-b848-409b-9607-c57a8176d4e9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "883",
-        "x-request-id": "03ac8bfd-00a0-40a6-acdf-7318de67f528"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "590",
+        "X-Request-ID": "29cb49a7-4775-4339-9868-be81156ecb5b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c424b93-a198-409d-8c55-35f7a6d8df8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dc30d7ed-b848-409b-9607-c57a8176d4e9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-f8578943612ace4080a008bf47756435-200b6d10ef121441-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "fe111fafb7f80195a2fdf425fb52305e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7c84bd47-27e0-48e7-978a-43e5620abd4d",
+        "Content-Length": "988",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "104",
+        "X-Request-ID": "7c84bd47-27e0-48e7-978a-43e5620abd4d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "dc30d7ed-b848-409b-9607-c57a8176d4e9",
+        "dataFeedName": "dataFeedbfmPyxvY",
+        "metrics": [
+          {
+            "metricId": "487c8668-89f4-4b4a-9074-595a7c49ce73",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T18:38:05Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dc30d7ed-b848-409b-9607-c57a8176d4e9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-99657c4a78f3ee4cba582c2e25389453-d307f6ddafb79046-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "ed53de3a9bf3616c642ea84f75cbd465",
+        "traceparent": "00-6d1d6cada5e6504983e3b7654abd031e-e6ec783b7fcfae4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "8752c1ae1b59425b19e6cfb28ea0eb72",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "63f9ab94-a149-4c7e-bfa0-9785690ca01b",
+        "apim-request-id": "66fe0124-cfa6-41f6-813b-af58c594e8fe",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:28 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "215",
-        "x-request-id": "63f9ab94-a149-4c7e-bfa0-9785690ca01b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "217",
+        "X-Request-ID": "66fe0124-cfa6-41f6-813b-af58c594e8fe"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c424b93-a198-409d-8c55-35f7a6d8df8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dc30d7ed-b848-409b-9607-c57a8176d4e9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-74f0c08337174443a3ce45da6c866eff-ef810f547ee28249-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "3134f3710fe1d0a2ef8975f897affa6e",
+        "traceparent": "00-d62b41a76df8574b95346bf194ab6809-5da7397b24c0ff41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "a62128027596873ece37193aa76ca647",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "02539b8d-7fd6-49c8-80f8-97c0cf80b931",
+        "apim-request-id": "d39e0c27-d099-482a-81c9-99344ac8aa35",
         "Content-Length": "69",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:28 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "29",
-        "x-request-id": "02539b8d-7fd6-49c8-80f8-97c0cf80b931"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "12",
+        "X-Request-ID": "d39e0c27-d099-482a-81c9-99344ac8aa35"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -97,6 +177,6 @@
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "1930293648"
+    "RandomSeed": "676961562"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True)Async.json
index 7f604a15eff0..62c58cc7dc20 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/DeleteDataFeed(True)Async.json
@@ -8,9 +8,12 @@
         "Authorization": "Sanitized",
         "Content-Length": "234",
         "Content-Type": "application/json",
-        "traceparent": "00-37b8ed3ebbf0bc4fae575fa524b65afb-311464120e7ee447-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "18f6101557ae7840a8bc664a03f72f42",
+        "traceparent": "00-5eb7f2fc721a5a44a16b0fc7efdcecb2-9909d291c2d34541-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "612b51585f8951d7219d696557db242a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,7 +22,7 @@
           "query": "query"
         },
         "dataSourceType": "SqlServer",
-        "dataFeedName": "dataFeedQld2fqKd",
+        "dataFeedName": "dataFeedKpD8TrXI",
         "granularityName": "Daily",
         "metrics": [
           {
@@ -30,63 +33,140 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1bac20c9-9879-4ce6-8c04-37f811f065cf",
+        "apim-request-id": "06b99efe-59fc-4413-b4ad-65bc71ff8b34",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2490d57-6ff0-4d76-a0d7-bed2c99cbb46",
+        "Date": "Fri, 05 Feb 2021 18:35:00 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7dff6a8-c2b5-47a4-9a03-503935f37c10",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "552",
-        "x-request-id": "1bac20c9-9879-4ce6-8c04-37f811f065cf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "2159",
+        "X-Request-ID": "06b99efe-59fc-4413-b4ad-65bc71ff8b34"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2490d57-6ff0-4d76-a0d7-bed2c99cbb46",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7dff6a8-c2b5-47a4-9a03-503935f37c10",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-5eb7f2fc721a5a44a16b0fc7efdcecb2-62112a2b19a40943-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "cfecf5816d2a77c9e24f562796e94a47",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2af083cb-e747-49cd-beb8-f23b2222cea9",
+        "Content-Length": "988",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:35:00 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "256",
+        "X-Request-ID": "2af083cb-e747-49cd-beb8-f23b2222cea9"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f7dff6a8-c2b5-47a4-9a03-503935f37c10",
+        "dataFeedName": "dataFeedKpD8TrXI",
+        "metrics": [
+          {
+            "metricId": "84027cd0-d4c5-4fd0-9fc2-3f36569de6ac",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T18:35:00Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7dff6a8-c2b5-47a4-9a03-503935f37c10",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-246c852b9aec2c429c055e7647d394a8-272cdb4790ad9b49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "1be646d7b86746eeb5227828fd7ff908",
+        "traceparent": "00-116c2c33badd3a4daf8ba360bc0619fe-60ade2c4c8deb54b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "03790da47e258f9226d6d1e851b3d7b5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "24999c1a-7851-41de-bc7f-f5c91c7d0791",
+        "apim-request-id": "b299925c-1c46-4711-b716-02cd81bb47a5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:41 GMT",
+        "Date": "Fri, 05 Feb 2021 18:35:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "214",
-        "x-request-id": "24999c1a-7851-41de-bc7f-f5c91c7d0791"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "393",
+        "X-Request-ID": "b299925c-1c46-4711-b716-02cd81bb47a5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2490d57-6ff0-4d76-a0d7-bed2c99cbb46",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7dff6a8-c2b5-47a4-9a03-503935f37c10",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-799170fac678d2408da2d004a3a6d402-8c28e7e946ece349-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "6c79e16836d021dcb434f8e375ee0f1e",
+        "traceparent": "00-8f98ce685f9d034ca112b692e3809312-20dccb87b6c2694d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "035077ca4e2debbc88b37e3a09b0bb38",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "5b25c23f-aac7-4baa-9763-f176acb7386f",
+        "apim-request-id": "c337b518-fed8-4bc0-920c-2b1c276943c0",
         "Content-Length": "69",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:41 GMT",
+        "Date": "Fri, 05 Feb 2021 18:35:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "15",
-        "x-request-id": "5b25c23f-aac7-4baa-9763-f176acb7386f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "17",
+        "X-Request-ID": "c337b518-fed8-4bc0-920c-2b1c276943c0"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -97,6 +177,6 @@
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "380366579"
+    "RandomSeed": "1723525794"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstance.json
index 2e6043246ff7..97cf9b0da79f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1630a2b5dbbf7f479f0af1257a36b6ec-77600ff16c03ae49-00",
+        "traceparent": "00-dd2b99d0f5f21f4f89d0c1a041f8602f-f94909c9513c0140-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,26 +36,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "898fa0d1-1001-4c8e-814b-ba6bd125cf6f",
+        "apim-request-id": "cc1f02f8-0589-45f8-8c92-5c8ce60b181c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e200cbff-1b80-495c-af23-539cb6330442",
+        "Date": "Fri, 05 Feb 2021 17:54:29 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "927",
-        "X-Request-ID": "898fa0d1-1001-4c8e-814b-ba6bd125cf6f"
+        "x-envoy-upstream-service-time": "478",
+        "X-Request-ID": "cc1f02f8-0589-45f8-8c92-5c8ce60b181c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e200cbff-1b80-495c-af23-539cb6330442",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5faced0845ba5f4a93b6c63fdbbddcc2-ac647d5c7effac46-00",
+        "traceparent": "00-dd2b99d0f5f21f4f89d0c1a041f8602f-086622350a3bfa49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -65,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b0384244-df92-4a0f-a50e-bd5047db6bac",
+        "apim-request-id": "76cfcdc1-19e7-452b-8362-7386c5f2c8cb",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1226",
-        "X-Request-ID": "b0384244-df92-4a0f-a50e-bd5047db6bac"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "76cfcdc1-19e7-452b-8362-7386c5f2c8cb"
       },
       "ResponseBody": {
-        "dataFeedId": "e200cbff-1b80-495c-af23-539cb6330442",
+        "dataFeedId": "90585bea-62d1-4ee0-8841-533215598270",
         "dataFeedName": "dataFeedJ3xXSPId",
         "metrics": [
           {
-            "metricId": "5d87c9a5-95ac-48cc-800a-0310b47dbb86",
+            "metricId": "f19bb7c1-006a-4af0-a1ef-3d355c8ccc11",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -110,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:30Z",
+        "createdTime": "2021-02-05T17:54:29Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -122,20 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e200cbff-1b80-495c-af23-539cb6330442",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-2423c3122824f047932910acc4655caf-189e08b3fa828c4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "38e79a0396165a8ce192a49e4da9898d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4a35b4bc-601e-47b2-9a09-c29b16aace8c",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "4a35b4bc-601e-47b2-9a09-c29b16aace8c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "90585bea-62d1-4ee0-8841-533215598270",
+        "dataFeedName": "dataFeedJ3xXSPId",
+        "metrics": [
+          {
+            "metricId": "f19bb7c1-006a-4af0-a1ef-3d355c8ccc11",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:29Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "727",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7ebf1aba2fcabc4b92c98d7902b2eb78-bfd0275a6d6dc148-00",
+        "traceparent": "00-395ba69bd89c1e45a2078d157e02d677-0bcc3ae1dea87e4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "38e79a0396165a8ce192a49e4da9898d",
+        "x-ms-client-request-id": "3a70e3742c5374bea2816bedfde0cc08",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -171,49 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "02fca53f-1160-43cf-a994-f2ea11a1b715",
+        "apim-request-id": "3ced54e1-6c4d-48e9-9994-628b25e7d618",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "793",
-        "X-Request-ID": "02fca53f-1160-43cf-a994-f2ea11a1b715"
+        "x-envoy-upstream-service-time": "2423",
+        "X-Request-ID": "3ced54e1-6c4d-48e9-9994-628b25e7d618"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e200cbff-1b80-495c-af23-539cb6330442",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2915f5ed9c96234cba96ba1fb0ddea98-38aa13343477314d-00",
+        "traceparent": "00-a26fab39471e3d458bae583220ad1d01-b6b1de17d0543841-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3a70e3742c5374bea2816bedfde0cc08",
+        "x-ms-client-request-id": "c3809ead8491242bc1a8d3ef0060c6ad",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ab0dff5c-23c4-4b67-b741-c7f8be2569c3",
+        "apim-request-id": "c21d6b19-b88e-42f8-9871-b0fc9db690f8",
         "Content-Length": "1139",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "269",
-        "X-Request-ID": "ab0dff5c-23c4-4b67-b741-c7f8be2569c3"
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "c21d6b19-b88e-42f8-9871-b0fc9db690f8"
       },
       "ResponseBody": {
-        "dataFeedId": "e200cbff-1b80-495c-af23-539cb6330442",
+        "dataFeedId": "90585bea-62d1-4ee0-8841-533215598270",
         "dataFeedName": "dataFeedoAOYoy3P",
         "metrics": [
           {
-            "metricId": "5d87c9a5-95ac-48cc-800a-0310b47dbb86",
+            "metricId": "f19bb7c1-006a-4af0-a1ef-3d355c8ccc11",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -247,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:30Z",
+        "createdTime": "2021-02-05T17:54:29Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -259,36 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e200cbff-1b80-495c-af23-539cb6330442",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/90585bea-62d1-4ee0-8841-533215598270",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-73cbc9796cd55946a416ce4d3333cb66-7d4e998f1cfd414c-00",
+        "traceparent": "00-20dd65d45457984d999b48c77fc0a17f-7c2ac4b38f14df47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c3809ead8491242bc1a8d3ef0060c6ad",
+        "x-ms-client-request-id": "711d30890595d72edb7395952b9e5d01",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "77f8324a-22b9-4171-8deb-4f526495d7cd",
+        "apim-request-id": "b929efb3-f69e-4ba4-974d-8d64bd8b3788",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "341",
-        "X-Request-ID": "77f8324a-22b9-4171-8deb-4f526495d7cd"
+        "x-envoy-upstream-service-time": "319",
+        "X-Request-ID": "b929efb3-f69e-4ba4-974d-8d64bd8b3788"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:32.9608367-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:33.1637861-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstanceAsync.json
index fca0e6b36550..6e646a243606 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a19419e3c9c55640b28e0544f2903d6d-73124333bfaa4a4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-66636ae9dbc93b46ab1a6f7bb0a9894c-28533296e5f49e4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2a43565d5aa4e0dfa3428ca0e9d351b6",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ffc127a1-f750-41bb-a1db-965339494d98",
+        "apim-request-id": "076acc94-711f-4151-8e7e-d292f8dba707",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/00245112-e2b7-4fcd-b691-9a286189f14b",
+        "Date": "Fri, 05 Feb 2021 17:57:28 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "524",
-        "x-request-id": "ffc127a1-f750-41bb-a1db-965339494d98"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "452",
+        "X-Request-ID": "076acc94-711f-4151-8e7e-d292f8dba707"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/00245112-e2b7-4fcd-b691-9a286189f14b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ad1f970aec570646b3c4997d8ca94d3d-180a3488a2306942-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-66636ae9dbc93b46ab1a6f7bb0a9894c-8d7dbbf267e82345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "68fbb72db0167ecf7323ee9aa760fe33",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3b49b292-2d26-4e91-a77e-f8569c7d5581",
+        "apim-request-id": "215ca3be-d6d8-41b9-8c00-b75dba34dbcf",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "168",
-        "x-request-id": "3b49b292-2d26-4e91-a77e-f8569c7d5581"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "215ca3be-d6d8-41b9-8c00-b75dba34dbcf"
       },
       "ResponseBody": {
-        "dataFeedId": "00245112-e2b7-4fcd-b691-9a286189f14b",
+        "dataFeedId": "d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
         "dataFeedName": "dataFeedZ3Hd3Bor",
         "metrics": [
           {
-            "metricId": "c190f49e-7031-4a5e-a13e-d1a501495a6e",
+            "metricId": "7b10692f-6d87-41a0-b108-45b2bf96f065",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:54Z",
+        "createdTime": "2021-02-05T17:57:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/00245112-e2b7-4fcd-b691-9a286189f14b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-82e681455697a348bb63bd152fe9adb5-be9d445bc70c2c49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "321b31e1539fc0cd1418adcec5fd271a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "525da259-4bae-49d6-bfd5-7e5a308ec7b5",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:28 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "525da259-4bae-49d6-bfd5-7e5a308ec7b5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
+        "dataFeedName": "dataFeedZ3Hd3Bor",
+        "metrics": [
+          {
+            "metricId": "7b10692f-6d87-41a0-b108-45b2bf96f065",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:28Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "727",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-20544ad599db5b41b625fe199fbc6e69-6bd79e9bdc8a164b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bd51bf1737f9cb43aa14443c2ec86785-5d1df5432488f449-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "321b31e1539fc0cd1418adcec5fd271a",
+        "x-ms-client-request-id": "79967a6d6deaaca487c4b7816c443943",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0a79f5cc-d916-4957-ab7a-0198bede5c09",
+        "apim-request-id": "03aaf3f6-3577-4ce5-ae2a-82438e20134d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "600",
-        "x-request-id": "0a79f5cc-d916-4957-ab7a-0198bede5c09"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "769",
+        "X-Request-ID": "03aaf3f6-3577-4ce5-ae2a-82438e20134d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/00245112-e2b7-4fcd-b691-9a286189f14b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-63479e4e9aae1f458a0b87fa5dec14af-115b3abcc086ac4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e50eef35c285f848aa23f3c966aba076-80630b30eb95af4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "79967a6d6deaaca487c4b7816c443943",
+        "x-ms-client-request-id": "b7bf58431fb8da16ea3a54fe0201b975",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fe17084b-4818-400b-ba3f-0bc04d42f5e8",
+        "apim-request-id": "c93d868a-6fd9-4c41-99a2-9d68145cfaa4",
         "Content-Length": "1139",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "x-request-id": "fe17084b-4818-400b-ba3f-0bc04d42f5e8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "c93d868a-6fd9-4c41-99a2-9d68145cfaa4"
       },
       "ResponseBody": {
-        "dataFeedId": "00245112-e2b7-4fcd-b691-9a286189f14b",
+        "dataFeedId": "d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
         "dataFeedName": "dataFeedD7i9pDil",
         "metrics": [
           {
-            "metricId": "c190f49e-7031-4a5e-a13e-d1a501495a6e",
+            "metricId": "7b10692f-6d87-41a0-b108-45b2bf96f065",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -235,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:54Z",
+        "createdTime": "2021-02-05T17:57:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -247,33 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/00245112-e2b7-4fcd-b691-9a286189f14b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0b717ae-f1bc-4331-a0f9-2fcb0518736e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5170157e7e3ad2409f867c02656dd7ed-3ded6b76290d3e4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b475d53308467441a361807b40745817-fd6f2319ef68e745-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b7bf58431fb8da16ea3a54fe0201b975",
+        "x-ms-client-request-id": "2d2dd3fb85c973498d6eabdb9b4b54cf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1e176b9c-4e29-45c8-9946-3e045d9030d2",
+        "apim-request-id": "8c233a5e-e094-49ec-a1fd-de442a09bda0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "314",
-        "x-request-id": "1e176b9c-4e29-45c8-9946-3e045d9030d2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "275",
+        "X-Request-ID": "8c233a5e-e094-49ec-a1fd-de442a09bda0"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:56.0780602-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:29.5954424-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstance.json
index 9046e9f4f233..893ca7af4b29 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b2ab2497a837724a89df8fcc5d09b90a-d4f1e70077a0b148-00",
+        "traceparent": "00-d0fea6a06017f64d8a52bb56ca145bf9-e7be803972878541-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ae44fa58-34c8-4044-98a0-61d6cde599b0",
+        "apim-request-id": "8db6a32c-5012-4d24-afa3-bf6e9442aff2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:19 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/50f3eafc-5813-4721-8b5f-29bf92047418",
+        "Date": "Fri, 05 Feb 2021 17:54:33 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "5903",
-        "X-Request-ID": "ae44fa58-34c8-4044-98a0-61d6cde599b0"
+        "x-envoy-upstream-service-time": "395",
+        "X-Request-ID": "8db6a32c-5012-4d24-afa3-bf6e9442aff2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/50f3eafc-5813-4721-8b5f-29bf92047418",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d0fea6a06017f64d8a52bb56ca145bf9-bdbb176c0646114e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "63db7d2d6a081c6d1dd880eac78a86af",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "dd2804d7-54d4-4fd1-adfb-087c148956f4",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:34 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "dd2804d7-54d4-4fd1-adfb-087c148956f4"
+      },
+      "ResponseBody": {
+        "dataFeedId": "bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
+        "dataFeedName": "dataFeed1IlWlJRN",
+        "metrics": [
+          {
+            "metricId": "2009d783-8c43-453a-993e-85e786d71ede",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:33Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-badd10bf1a2835449361358481c78602-b0d618719466a64b-00",
+        "traceparent": "00-e57484ebdca3d7479f76626b1c1600b6-2d3a63940e25dc4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "63db7d2d6a081c6d1dd880eac78a86af",
+        "x-ms-client-request-id": "2613fe2daf552508aa5bb9506efbc1b5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "951f3cd4-327f-43d9-a82b-2364b694ae5b",
+        "apim-request-id": "074ce823-c200-4295-8a81-5ec39d736702",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "304",
-        "X-Request-ID": "951f3cd4-327f-43d9-a82b-2364b694ae5b"
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "074ce823-c200-4295-8a81-5ec39d736702"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/50f3eafc-5813-4721-8b5f-29bf92047418",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c6329b8e1164864eb1e9f98f00b7b7a5-0515ad28edf14b40-00",
+        "traceparent": "00-fdf08bc70211404e943782fbaa06f39c-14b1246d14d3a44f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2613fe2daf552508aa5bb9506efbc1b5",
+        "x-ms-client-request-id": "dc2a38cbd48f4f7dba0cfe415c64ab9c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b431d14c-449d-4833-a0ee-952f834af58d",
+        "apim-request-id": "c76671f9-7e46-4ccf-9f3b-a62935cf82d2",
         "Content-Length": "1122",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "280",
-        "X-Request-ID": "b431d14c-449d-4833-a0ee-952f834af58d"
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "c76671f9-7e46-4ccf-9f3b-a62935cf82d2"
       },
       "ResponseBody": {
-        "dataFeedId": "50f3eafc-5813-4721-8b5f-29bf92047418",
+        "dataFeedId": "bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
         "dataFeedName": "dataFeedmvyQGbvf",
         "metrics": [
           {
-            "metricId": "72a0a66c-e332-4024-afde-5f0f2e135768",
+            "metricId": "2009d783-8c43-453a-993e-85e786d71ede",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:19Z",
+        "createdTime": "2021-02-05T17:54:33Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/50f3eafc-5813-4721-8b5f-29bf92047418",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bc31a8e5-5b8a-4c7e-8cbc-d087763ab37c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c73ba5b23db5ef4bbd188d81239b11d4-82be286ee13e1243-00",
+        "traceparent": "00-9ca19a2e66f42741a49831f4e9505bcb-45fca7ff837fbc41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dc2a38cbd48f4f7dba0cfe415c64ab9c",
+        "x-ms-client-request-id": "365018d4cfac7ed975b6b8acb11dad22",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0ca4b96b-d2d5-4e3b-b3d2-1e7b5406f18b",
+        "apim-request-id": "b422b0f5-7538-4b16-8d9b-bf847facafa5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "385",
-        "X-Request-ID": "0ca4b96b-d2d5-4e3b-b3d2-1e7b5406f18b"
+        "x-envoy-upstream-service-time": "278",
+        "X-Request-ID": "b422b0f5-7538-4b16-8d9b-bf847facafa5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:20.4432490-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:34.9026661-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstanceAsync.json
index b42fb69bfb75..5272d6bc8953 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ba92fd4169cc7d419188cc939a0efaa5-a0c9a18fbf580243-00",
+        "traceparent": "00-3cb412b2a8180445aa63fbc9fbaf522c-289d0166b578f743-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "15b353d5-ef1c-49f4-a8a1-0509833b1f34",
+        "apim-request-id": "df21cdaf-c42b-4e31-a275-7b5d5adae2c3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/df4684e3-d924-47c5-b134-a0703027fae9",
+        "Date": "Fri, 05 Feb 2021 17:57:30 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a992c783-e593-43a8-addf-30b513459890",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "470",
-        "X-Request-ID": "15b353d5-ef1c-49f4-a8a1-0509833b1f34"
+        "x-envoy-upstream-service-time": "635",
+        "X-Request-ID": "df21cdaf-c42b-4e31-a275-7b5d5adae2c3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/df4684e3-d924-47c5-b134-a0703027fae9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a992c783-e593-43a8-addf-30b513459890",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-3cb412b2a8180445aa63fbc9fbaf522c-7729d3cabef1b64f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5c74fa795a62c84fc005b175be262b33",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "58f7c2bb-e3cd-4160-8d24-935a1c9a2592",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "58f7c2bb-e3cd-4160-8d24-935a1c9a2592"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a992c783-e593-43a8-addf-30b513459890",
+        "dataFeedName": "dataFeed5qDFtNKp",
+        "metrics": [
+          {
+            "metricId": "2bf6cd20-61ba-46f5-b898-24f5cbf939e9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:30Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a992c783-e593-43a8-addf-30b513459890",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-866f1e2b3c84f14085fb856c9d04396a-d499ae1881ddc340-00",
+        "traceparent": "00-efdf10fb0c0f8848bde7dde46732d734-b4875062bb726a41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5c74fa795a62c84fc005b175be262b33",
+        "x-ms-client-request-id": "5015229b8e97710b49b80595dca1388c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ee25e8b4-41a5-45c0-88b2-83282c103c1b",
+        "apim-request-id": "03a392c1-2d3c-4c88-bcad-ae88302da0c6",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "X-Request-ID": "ee25e8b4-41a5-45c0-88b2-83282c103c1b"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "03a392c1-2d3c-4c88-bcad-ae88302da0c6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/df4684e3-d924-47c5-b134-a0703027fae9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a992c783-e593-43a8-addf-30b513459890",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0eece3a360c5f14abe32b256444ba1a1-1e3e412d8ed43348-00",
+        "traceparent": "00-216f274a4140d5438fdf056a34bdc026-336f06dd107e4946-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5015229b8e97710b49b80595dca1388c",
+        "x-ms-client-request-id": "d4464c32fe15ad0c4cae58b192faa58a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ffd0fb40-0ae2-4f55-bcb6-feff01a28273",
+        "apim-request-id": "c2287f3d-11b0-4fbf-a516-f8ccc2143a36",
         "Content-Length": "1122",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "147",
-        "X-Request-ID": "ffd0fb40-0ae2-4f55-bcb6-feff01a28273"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "c2287f3d-11b0-4fbf-a516-f8ccc2143a36"
       },
       "ResponseBody": {
-        "dataFeedId": "df4684e3-d924-47c5-b134-a0703027fae9",
+        "dataFeedId": "a992c783-e593-43a8-addf-30b513459890",
         "dataFeedName": "dataFeedkJ1Wdoj9",
         "metrics": [
           {
-            "metricId": "2a4ac9c3-3843-4837-9bc8-4d9c8adcdbae",
+            "metricId": "2bf6cd20-61ba-46f5-b898-24f5cbf939e9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:51Z",
+        "createdTime": "2021-02-05T17:57:30Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/df4684e3-d924-47c5-b134-a0703027fae9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a992c783-e593-43a8-addf-30b513459890",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d9e5718f1979f141b72ea6bf3505d830-fb594d60787b0440-00",
+        "traceparent": "00-d8067200158d5c4b82c598b9d31d2b9a-40d817720a72ea46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d4464c32fe15ad0c4cae58b192faa58a",
+        "x-ms-client-request-id": "305b490a1e10ea31ef0213a955baeb1e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6447b22d-35b9-42e6-949c-379f2b968549",
+        "apim-request-id": "898fa93f-44f3-40ee-b8e2-47b157e1dd00",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "285",
-        "X-Request-ID": "6447b22d-35b9-42e6-949c-379f2b968549"
+        "x-envoy-upstream-service-time": "276",
+        "X-Request-ID": "898fa93f-44f3-40ee-b8e2-47b157e1dd00"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:52.4565491-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:31.1946128-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstance.json
index 3addf271a4c8..7fbe87803fde 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-111804a89caef84ab32f705700702c45-f2adda3cb0383146-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-81f883a0b7bd8343b5bd199bedf4ba56-cdbbe9ee4c58e44a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ecc371cbca883a1d8cd5d821d7b9426d",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f6bfd17d-ea42-4b8e-a1dd-a2ec20b293d7",
+        "apim-request-id": "12ed48cb-5d3b-4d60-a872-48ecb4d39e68",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/097437de-766f-4c55-be0b-980c1995abe7",
+        "Date": "Fri, 05 Feb 2021 17:54:35 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "632",
-        "x-request-id": "f6bfd17d-ea42-4b8e-a1dd-a2ec20b293d7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "480",
+        "X-Request-ID": "12ed48cb-5d3b-4d60-a872-48ecb4d39e68"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/097437de-766f-4c55-be0b-980c1995abe7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e85b7d3e311ba24384b02e5d1e5e35b7-8fa16fd438bf0d40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-81f883a0b7bd8343b5bd199bedf4ba56-f9a4fc3d20a63344-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f0c151054642c01bd8071ee87ddec1ee",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "dcddee9f-00a4-4c97-a1f7-2b760c752e95",
+        "apim-request-id": "b0642db7-f62d-4800-a6f2-66475370e11b",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:06:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "911",
-        "x-request-id": "dcddee9f-00a4-4c97-a1f7-2b760c752e95"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "b0642db7-f62d-4800-a6f2-66475370e11b"
       },
       "ResponseBody": {
-        "dataFeedId": "097437de-766f-4c55-be0b-980c1995abe7",
+        "dataFeedId": "85018638-649e-4b29-bb76-0568435eda68",
         "dataFeedName": "dataFeedhfpHkH83",
         "metrics": [
           {
-            "metricId": "032a584f-e2ef-4fa3-a115-6eb0e76cb568",
+            "metricId": "c1260005-defe-49d9-a49b-447c3e340e00",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:06:50Z",
+        "createdTime": "2021-02-05T17:54:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/097437de-766f-4c55-be0b-980c1995abe7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9d4fe70b1bf1644db0fbfeff7cc758c9-44cf06b76184074a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0f2758fb05ea8610980b9cd505d870de",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "536a93cc-615d-4735-befc-f000f7669d76",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:36 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "536a93cc-615d-4735-befc-f000f7669d76"
+      },
+      "ResponseBody": {
+        "dataFeedId": "85018638-649e-4b29-bb76-0568435eda68",
+        "dataFeedName": "dataFeedhfpHkH83",
+        "metrics": [
+          {
+            "metricId": "c1260005-defe-49d9-a49b-447c3e340e00",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:35Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "635",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1aa08c6e6e3ea741bbf8d16e571898f9-3a2c65d2534bce44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6364969e830e034a84c543392b658a4a-9b04a14278606543-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0f2758fb05ea8610980b9cd505d870de",
+        "x-ms-client-request-id": "64d7fdb21c2085a155031480ab34bcae",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1d89aa25-bcb8-4dfe-a93e-4fcb1017adc4",
+        "apim-request-id": "22316fbc-c719-43d1-a15f-aeee2db67f39",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "546",
-        "x-request-id": "1d89aa25-bcb8-4dfe-a93e-4fcb1017adc4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "515",
+        "X-Request-ID": "22316fbc-c719-43d1-a15f-aeee2db67f39"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/097437de-766f-4c55-be0b-980c1995abe7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5499ddf93e0b9b4fbc976b9b952633a7-c86a7811b9e39043-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6eda4ae647e5344c8b4c1c856bb81752-f56bb1664dd87147-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "64d7fdb21c2085a155031480ab34bcae",
+        "x-ms-client-request-id": "7e25ea1432920083413a5737a945baff",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ca2543d0-7e6f-497d-9b01-bccc6ca1f775",
+        "apim-request-id": "f9cb505b-dbca-44f2-97ba-49d5624930cd",
         "Content-Length": "1047",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:06:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "ca2543d0-7e6f-497d-9b01-bccc6ca1f775"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "f9cb505b-dbca-44f2-97ba-49d5624930cd"
       },
       "ResponseBody": {
-        "dataFeedId": "097437de-766f-4c55-be0b-980c1995abe7",
+        "dataFeedId": "85018638-649e-4b29-bb76-0568435eda68",
         "dataFeedName": "dataFeedhfpHkH83",
         "metrics": [
           {
-            "metricId": "032a584f-e2ef-4fa3-a115-6eb0e76cb568",
+            "metricId": "c1260005-defe-49d9-a49b-447c3e340e00",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:06:50Z",
+        "createdTime": "2021-02-05T17:54:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/097437de-766f-4c55-be0b-980c1995abe7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/85018638-649e-4b29-bb76-0568435eda68",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a77eaa6ea63de14eb8bddd57301460d4-4315fbc21a49b44d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bff5c84dda0d714fb1b368a066894b65-5674ffef095b0845-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7e25ea1432920083413a5737a945baff",
+        "x-ms-client-request-id": "7f363f975c06decdb6a1b9e7f18fda64",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f760ad8b-2ecb-49b1-a205-8a9522a63897",
+        "apim-request-id": "8e8a789c-a5d8-4a34-a7f1-86d29799300e",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "372",
-        "x-request-id": "f760ad8b-2ecb-49b1-a205-8a9522a63897"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "358",
+        "X-Request-ID": "8e8a789c-a5d8-4a34-a7f1-86d29799300e"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:06:52.6028955-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:37.2495465-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 1d67ebeaeebd..323c3b734320 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-24393c9b8360e641a59249bf79fbd961-54b460b5f2930e4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7786c4e161ea6a43ab7b816eecbcfad6-76aa4dd5861c4a4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e58e495411dda127fa614027fb8c6378",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7f64d035-df6c-48cb-9efa-b631d65c82fc",
+        "apim-request-id": "667070de-0a9a-466c-a28b-70196c312c81",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+        "Date": "Fri, 05 Feb 2021 17:57:31 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "560",
-        "x-request-id": "7f64d035-df6c-48cb-9efa-b631d65c82fc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "369",
+        "X-Request-ID": "667070de-0a9a-466c-a28b-70196c312c81"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6cde3b1b3b062c4482c2bac2741c1206-8fad747b3ac19349-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7786c4e161ea6a43ab7b816eecbcfad6-105dbbd4a4adc546-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9eaf3720e817e7556f750fd11432c17d",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0f46265f-65e3-440d-b790-0d74d12a0e1f",
+        "apim-request-id": "0abb65e5-9fce-4e3c-a9b6-9ae7f7f553b8",
         "Content-Length": "996",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:06:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "178",
-        "x-request-id": "0f46265f-65e3-440d-b790-0d74d12a0e1f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "0abb65e5-9fce-4e3c-a9b6-9ae7f7f553b8"
       },
       "ResponseBody": {
-        "dataFeedId": "ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+        "dataFeedId": "cb168142-de4c-4fbb-b6ed-54d475363df2",
         "dataFeedName": "dataFeedjFhURfBx",
         "metrics": [
           {
-            "metricId": "5df794e2-77e4-4234-a4eb-a684c178d46e",
+            "metricId": "166a16a5-0cad-4dc8-b4d2-6c8742547114",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:06:54Z",
+        "createdTime": "2021-02-05T17:57:31Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d475828ea6846b458d8b88f10c6447ac-db04a9abf79d6749-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b1ad1e6e911976510dec7e11f528ec40",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1ebe8b0a-4de6-45e8-b1dd-28f8606d9b4f",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:32 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "132",
+        "X-Request-ID": "1ebe8b0a-4de6-45e8-b1dd-28f8606d9b4f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cb168142-de4c-4fbb-b6ed-54d475363df2",
+        "dataFeedName": "dataFeedjFhURfBx",
+        "metrics": [
+          {
+            "metricId": "166a16a5-0cad-4dc8-b4d2-6c8742547114",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:31Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "635",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3e220800ac2764468d1dc556f311bc2a-0a0d14448ab76c40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d9fa13b8dff82143b0b376fab234e245-4a64d9aec5759d48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b1ad1e6e911976510dec7e11f528ec40",
+        "x-ms-client-request-id": "f2863a1c65476cc3f4a7756802558dc7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6456a28d-5b50-4cf0-ab1f-badd75fba1f9",
+        "apim-request-id": "ef2d883c-f720-4539-9ac1-b02adc493209",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "594",
-        "x-request-id": "6456a28d-5b50-4cf0-ab1f-badd75fba1f9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "580",
+        "X-Request-ID": "ef2d883c-f720-4539-9ac1-b02adc493209"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5ea1517755c1c44ba41c23e17460b41a-8f341e38ec9be34b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c1e73406f403334abd6f72143763f195-5225728949852242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f2863a1c65476cc3f4a7756802558dc7",
+        "x-ms-client-request-id": "ddb8c29fb1df8e5ee638902a6944f247",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6048649b-6f29-4ada-9f3d-93bef8ea4df9",
+        "apim-request-id": "d161d6dd-989f-421f-8e27-c34a17e90395",
         "Content-Length": "1047",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:06:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "221",
-        "x-request-id": "6048649b-6f29-4ada-9f3d-93bef8ea4df9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "d161d6dd-989f-421f-8e27-c34a17e90395"
       },
       "ResponseBody": {
-        "dataFeedId": "ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+        "dataFeedId": "cb168142-de4c-4fbb-b6ed-54d475363df2",
         "dataFeedName": "dataFeedjFhURfBx",
         "metrics": [
           {
-            "metricId": "5df794e2-77e4-4234-a4eb-a684c178d46e",
+            "metricId": "166a16a5-0cad-4dc8-b4d2-6c8742547114",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:06:54Z",
+        "createdTime": "2021-02-05T17:57:31Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ca9b7e9b-f88f-4f08-bf44-ce07cefe0392",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb168142-de4c-4fbb-b6ed-54d475363df2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-27a7ed2ac2700e42a24fa51bb5d2cd27-8bf64a9cb51d144e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a7a4fe31b12a44ea6d312d7e4e2f0e9-40d7e7986be9dc43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ddb8c29fb1df8e5ee638902a6944f247",
+        "x-ms-client-request-id": "d9b4ce89cfac08365a41bd721ce974b8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0e59b545-414b-421a-b102-34f6dd2d123f",
+        "apim-request-id": "1fb7bc86-150c-4853-a3a1-b68c62bbde99",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:06:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "399",
-        "x-request-id": "0e59b545-414b-421a-b102-34f6dd2d123f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "352",
+        "X-Request-ID": "1fb7bc86-150c-4853-a3a1-b68c62bbde99"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:06:55.7762693-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:33.1556481-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstance.json
index e8e715e3ac7e..f6c1243210e4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d494fec56f248645a34a32f31d54ecd3-50b4d83d76b1a04b-00",
+        "traceparent": "00-21181edcf57c164597bfa53ba7a748a0-11c8baa04a10324d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "adef1944-a8f3-4098-bdaa-be934c312a25",
+        "apim-request-id": "7c1c06af-d2cc-4ce7-b075-918f0ac426b3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:21 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19431fea-be0d-4fb4-a506-e1dbdf24d7e0",
+        "Date": "Fri, 05 Feb 2021 17:54:37 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b04f5c-3902-4bd6-8cf4-71031359b7f9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "473",
-        "X-Request-ID": "adef1944-a8f3-4098-bdaa-be934c312a25"
+        "x-envoy-upstream-service-time": "425",
+        "X-Request-ID": "7c1c06af-d2cc-4ce7-b075-918f0ac426b3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19431fea-be0d-4fb4-a506-e1dbdf24d7e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b04f5c-3902-4bd6-8cf4-71031359b7f9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-21181edcf57c164597bfa53ba7a748a0-4a9693c4c3e95e46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "de28f8eb928d00b3c78591ae88cc5b6f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a29d28c1-7a2a-40da-9aec-268885f339ac",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:38 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "140",
+        "X-Request-ID": "a29d28c1-7a2a-40da-9aec-268885f339ac"
+      },
+      "ResponseBody": {
+        "dataFeedId": "30b04f5c-3902-4bd6-8cf4-71031359b7f9",
+        "dataFeedName": "dataFeedzIoAIA4x",
+        "metrics": [
+          {
+            "metricId": "5382d461-a1e5-48e0-a052-9e11495d71bb",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:38Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b04f5c-3902-4bd6-8cf4-71031359b7f9",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5180d2abeb3bc247992a176c90dc83ac-a51d23d2abf9a94f-00",
+        "traceparent": "00-6174617356a81941a38db14c581cc6f2-a1ca123e74520042-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "de28f8eb928d00b3c78591ae88cc5b6f",
+        "x-ms-client-request-id": "ecc0dcc51b9d3e68ad61fe72969abc0e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fa71a2d6-a2ed-4602-b608-bf6c103b54e5",
+        "apim-request-id": "1b21b314-21e0-4c1d-b275-ec32aa8e7c7b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "X-Request-ID": "fa71a2d6-a2ed-4602-b608-bf6c103b54e5"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "1b21b314-21e0-4c1d-b275-ec32aa8e7c7b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19431fea-be0d-4fb4-a506-e1dbdf24d7e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b04f5c-3902-4bd6-8cf4-71031359b7f9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4c1b5c04e7726f4c9836c061515daf2e-af329bde7a119b44-00",
+        "traceparent": "00-932182d3926e6044878ae69606c08c75-30c15ec3d1030444-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ecc0dcc51b9d3e68ad61fe72969abc0e",
+        "x-ms-client-request-id": "501d09e4e36e569e70074d1f0dd99ff7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "091d061d-525f-484c-b814-0307ecfe28f8",
+        "apim-request-id": "d76e32f1-7107-412e-9e90-aa525ade672c",
         "Content-Length": "1047",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "X-Request-ID": "091d061d-525f-484c-b814-0307ecfe28f8"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "d76e32f1-7107-412e-9e90-aa525ade672c"
       },
       "ResponseBody": {
-        "dataFeedId": "19431fea-be0d-4fb4-a506-e1dbdf24d7e0",
+        "dataFeedId": "30b04f5c-3902-4bd6-8cf4-71031359b7f9",
         "dataFeedName": "dataFeedzIoAIA4x",
         "metrics": [
           {
-            "metricId": "335266c8-13ad-4bdd-ba6f-fbb3f4535da9",
+            "metricId": "5382d461-a1e5-48e0-a052-9e11495d71bb",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:21Z",
+        "createdTime": "2021-02-05T17:54:38Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19431fea-be0d-4fb4-a506-e1dbdf24d7e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30b04f5c-3902-4bd6-8cf4-71031359b7f9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ef1d309770e1c54cbda6c9741ee5c96e-8823d899bf7a5e4d-00",
+        "traceparent": "00-0ba4fb285917e0449b80a695d32fd85c-b1122b6bfff1e94d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "501d09e4e36e569e70074d1f0dd99ff7",
+        "x-ms-client-request-id": "18f663ad47e9cf4290ea302c93416a2c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fc47acfc-bdd1-4b21-8dc0-4e7a73237872",
+        "apim-request-id": "c94d5cc0-eebe-439f-b489-072952fb2e91",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "289",
-        "X-Request-ID": "fc47acfc-bdd1-4b21-8dc0-4e7a73237872"
+        "x-envoy-upstream-service-time": "301",
+        "X-Request-ID": "c94d5cc0-eebe-439f-b489-072952fb2e91"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:21.7936109-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:38.8880855-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 769acdd58906..640c7824133e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureApplicationInsightsDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "284",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-43713f830090d94e8286ed8aa4dab0b1-4e0cb34bb9feb14d-00",
+        "traceparent": "00-63b15a4c7e1533449c842841caa85e93-0e3fad0f2477964b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f3124ee4-32a1-425c-9049-e855fc7fb288",
+        "apim-request-id": "d3577bc0-0e22-4fc2-88bc-942e2c4e5124",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:53 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c666e157-3721-4da6-bfa1-1027981e242e",
+        "Date": "Fri, 05 Feb 2021 17:57:33 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/874f2637-7aa3-41b8-8920-edbbeb53f7e8",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "619",
-        "X-Request-ID": "f3124ee4-32a1-425c-9049-e855fc7fb288"
+        "x-envoy-upstream-service-time": "455",
+        "X-Request-ID": "d3577bc0-0e22-4fc2-88bc-942e2c4e5124"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c666e157-3721-4da6-bfa1-1027981e242e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/874f2637-7aa3-41b8-8920-edbbeb53f7e8",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-63b15a4c7e1533449c842841caa85e93-8f0cbd481fc6214f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6151095886eb00ac7a0c70e2fa7f5810",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d39c0c2e-7829-465b-b5c0-63a3bb5a1f11",
+        "Content-Length": "996",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:34 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "198",
+        "X-Request-ID": "d39c0c2e-7829-465b-b5c0-63a3bb5a1f11"
+      },
+      "ResponseBody": {
+        "dataFeedId": "874f2637-7aa3-41b8-8920-edbbeb53f7e8",
+        "dataFeedName": "dataFeedMd99mopz",
+        "metrics": [
+          {
+            "metricId": "51e1b7d4-77b7-492d-a73e-3b943c164e90",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureApplicationInsights",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:33Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "apiKey": "Sanitized",
+          "query": "query",
+          "azureCloud": "cloud",
+          "applicationId": "appId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/874f2637-7aa3-41b8-8920-edbbeb53f7e8",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fd2e64b9fb0ebd45b83b61427a218ce0-ef1190801c95bc4f-00",
+        "traceparent": "00-894793a555c219428bc5c2a831cd33a8-1e231b9405f01144-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6151095886eb00ac7a0c70e2fa7f5810",
+        "x-ms-client-request-id": "da1db1e7c1536911c48c0ad0f9e797a8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d127e0d6-4aae-4ae5-92f5-029b81075aae",
+        "apim-request-id": "bddaf21f-2a25-4c5a-b5f8-ba7595f6c9bc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "X-Request-ID": "d127e0d6-4aae-4ae5-92f5-029b81075aae"
+        "x-envoy-upstream-service-time": "211",
+        "X-Request-ID": "bddaf21f-2a25-4c5a-b5f8-ba7595f6c9bc"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c666e157-3721-4da6-bfa1-1027981e242e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/874f2637-7aa3-41b8-8920-edbbeb53f7e8",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a678a8176a95ce459b5342fdb230b500-8c4f13cff9f21d4e-00",
+        "traceparent": "00-5af5155e31500d438c9a1a8fdc7f468c-d6c49e4378c7c44e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "da1db1e7c1536911c48c0ad0f9e797a8",
+        "x-ms-client-request-id": "b9055052a3c8faefab81a687e16b9bef",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ce30081b-e65a-4e28-acdc-bdd7ea55c5e4",
+        "apim-request-id": "656ddb17-cbf2-4663-a59e-9ea851e5f8bf",
         "Content-Length": "1047",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "X-Request-ID": "ce30081b-e65a-4e28-acdc-bdd7ea55c5e4"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "656ddb17-cbf2-4663-a59e-9ea851e5f8bf"
       },
       "ResponseBody": {
-        "dataFeedId": "c666e157-3721-4da6-bfa1-1027981e242e",
+        "dataFeedId": "874f2637-7aa3-41b8-8920-edbbeb53f7e8",
         "dataFeedName": "dataFeedMd99mopz",
         "metrics": [
           {
-            "metricId": "87dfcf57-66c2-4298-a79c-5f6fbd45aaac",
+            "metricId": "51e1b7d4-77b7-492d-a73e-3b943c164e90",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:53Z",
+        "createdTime": "2021-02-05T17:57:33Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c666e157-3721-4da6-bfa1-1027981e242e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/874f2637-7aa3-41b8-8920-edbbeb53f7e8",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5ea73b4d24cb494e84ec172a5ec3cc87-a0fb3e1e2ddce942-00",
+        "traceparent": "00-8044e6004337af4ca300e958ff4538c1-6dd1c3476aae864d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b9055052a3c8faefab81a687e16b9bef",
+        "x-ms-client-request-id": "c5acc9323cf59709f8e79c5e7cdb0793",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "76f9f31f-5ab5-42eb-9014-00cd50929887",
+        "apim-request-id": "2d6d97cc-e5cf-4f06-8ae7-78b53e2add13",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "309",
-        "X-Request-ID": "76f9f31f-5ab5-42eb-9014-00cd50929887"
+        "x-envoy-upstream-service-time": "342",
+        "X-Request-ID": "2d6d97cc-e5cf-4f06-8ae7-78b53e2add13"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:53.8664643-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:34.7602095-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstance.json
index 940dd4d1e609..70d9a95bffac 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-94314a003f528e408655047ff15a6a14-b21b1f1cf69f7c4d-00",
+        "traceparent": "00-6a73c784911ae04580f52726fd8071a3-b5dd8b37a9930243-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,26 +35,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cd8a566d-8df6-49fb-98f2-22f84663e2c7",
+        "apim-request-id": "82785cb9-8bc3-444a-bad7-8ec448cc7e73",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:35 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+        "Date": "Fri, 05 Feb 2021 17:54:39 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "600",
-        "X-Request-ID": "cd8a566d-8df6-49fb-98f2-22f84663e2c7"
+        "x-envoy-upstream-service-time": "353",
+        "X-Request-ID": "82785cb9-8bc3-444a-bad7-8ec448cc7e73"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e9395d23b2d52d44a1e43f5a009367fb-8020a2c2c34bda48-00",
+        "traceparent": "00-6a73c784911ae04580f52726fd8071a3-e52aa10ee89db34c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -64,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6d96f5c7-bdf8-4876-9197-3561489363a0",
+        "apim-request-id": "8f7e0161-119b-45aa-9c27-d152bc266acb",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "196",
-        "X-Request-ID": "6d96f5c7-bdf8-4876-9197-3561489363a0"
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "8f7e0161-119b-45aa-9c27-d152bc266acb"
       },
       "ResponseBody": {
-        "dataFeedId": "ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+        "dataFeedId": "466eeff1-cff1-40fa-a3e2-356a644422fa",
         "dataFeedName": "dataFeedqF5usX2A",
         "metrics": [
           {
-            "metricId": "004f008d-0e5a-4694-928d-97201f67d084",
+            "metricId": "c8e46414-5b6c-47ce-b898-ec6f00bdb9e5",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -109,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:35Z",
+        "createdTime": "2021-02-05T17:54:39Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -120,20 +120,93 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-990e050fda72a04db24d1581958d7c79-d6aa0827b966e14a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1ea565a5a90e8ad51b1b6c75ccd07a83",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4c533f0b-f353-41c2-b7cf-a68efce2754d",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "4c533f0b-f353-41c2-b7cf-a68efce2754d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "466eeff1-cff1-40fa-a3e2-356a644422fa",
+        "dataFeedName": "dataFeedqF5usX2A",
+        "metrics": [
+          {
+            "metricId": "c8e46414-5b6c-47ce-b898-ec6f00bdb9e5",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:39Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "711",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-06ba1cd8a56ead40bdd198d1fac4526b-2bc1faa86100ff44-00",
+        "traceparent": "00-e3c22dd04ebc644f847ba936b8f07391-a988f4c630d18f4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1ea565a5a90e8ad51b1b6c75ccd07a83",
+        "x-ms-client-request-id": "f929830a6e5a8f1c32bb57664c85a8f5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -168,49 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "260347b9-6540-40a6-902f-5f3f1657b57a",
+        "apim-request-id": "f7e6665e-24c6-4d5f-8f26-b4e90abe8ba7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "673",
-        "X-Request-ID": "260347b9-6540-40a6-902f-5f3f1657b57a"
+        "x-envoy-upstream-service-time": "781",
+        "X-Request-ID": "f7e6665e-24c6-4d5f-8f26-b4e90abe8ba7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-138bdc632a76db4486b5970573e706ec-eb1319a1223dbf4c-00",
+        "traceparent": "00-b5e3c40386b8eb4b821f80faa69a5e54-6db3da2def485a49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f929830a6e5a8f1c32bb57664c85a8f5",
+        "x-ms-client-request-id": "b7f909424b069adc80e070a48aa1d2e2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f3f0a0cf-f586-4aba-89ba-8457b1b28f8d",
+        "apim-request-id": "0f98ff71-34ab-4a2c-abe4-b00377febcc4",
         "Content-Length": "1123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:36 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "194",
-        "X-Request-ID": "f3f0a0cf-f586-4aba-89ba-8457b1b28f8d"
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "0f98ff71-34ab-4a2c-abe4-b00377febcc4"
       },
       "ResponseBody": {
-        "dataFeedId": "ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+        "dataFeedId": "466eeff1-cff1-40fa-a3e2-356a644422fa",
         "dataFeedName": "dataFeed7de3uXf1",
         "metrics": [
           {
-            "metricId": "004f008d-0e5a-4694-928d-97201f67d084",
+            "metricId": "c8e46414-5b6c-47ce-b898-ec6f00bdb9e5",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -244,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:35Z",
+        "createdTime": "2021-02-05T17:54:39Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -255,36 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ddc8be57-9760-4ce2-9f7c-4c5243a0f705",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/466eeff1-cff1-40fa-a3e2-356a644422fa",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4d870f244424c34abd842811c846d116-df16a0bb6518ae43-00",
+        "traceparent": "00-e94908d47051894d8c0c5dcbb0bddb9f-c81946bfd4068d40-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b7f909424b069adc80e070a48aa1d2e2",
+        "x-ms-client-request-id": "1ebd9486796436804816eb53526e3e95",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3a15d548-f0b3-4ec4-927c-01d2baf7371f",
+        "apim-request-id": "f3063302-ac94-4c6a-b397-d1eb59c95713",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:36 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "331",
-        "X-Request-ID": "3a15d548-f0b3-4ec4-927c-01d2baf7371f"
+        "x-envoy-upstream-service-time": "281",
+        "X-Request-ID": "f3063302-ac94-4c6a-b397-d1eb59c95713"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:36.9855058-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:41.0356653-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstanceAsync.json
index 92d25b5237bf..4964e9f21579 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9c2d4fd1d406b044ae411e521734eb77-8a89440196d6b643-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-780d5726398a4d48a829bbaa88be3bbe-c247ec027e93ec4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7e1c6ce63737eeaf575fcef6e9d4d0b4",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "4c7ff473-bf30-451c-89bf-fe751abdeb7b",
+        "apim-request-id": "a738b8f0-97b9-4b05-9436-bbf064b10072",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+        "Date": "Fri, 05 Feb 2021 17:57:35 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "594",
-        "x-request-id": "4c7ff473-bf30-451c-89bf-fe751abdeb7b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "563",
+        "X-Request-ID": "a738b8f0-97b9-4b05-9436-bbf064b10072"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1bb7756c4aab694aa331112c8ec9f7d4-0000723d37c54641-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-780d5726398a4d48a829bbaa88be3bbe-21c273af3e72b24a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "29d55a24d0c54e0b7b2730d1e42e11c8",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "41b95aae-1b61-4525-b6d8-ba42631f3386",
+        "apim-request-id": "6e4ad447-3153-4ae8-8f5e-07e5f2fa1090",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:35 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "6e4ad447-3153-4ae8-8f5e-07e5f2fa1090"
+      },
+      "ResponseBody": {
+        "dataFeedId": "a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
+        "dataFeedName": "dataFeedUKzatqz4",
+        "metrics": [
+          {
+            "metricId": "920b6ae0-a279-4f00-b989-de430ce3adde",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:35Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c33a20b3cead734786ae1017bd0aec42-3fe6ba4b2cbf1d4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "592497f65097693efe6c75b37b8de1c9",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "99970d80-96d6-4826-bad2-f9f3857cbf5c",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "x-request-id": "41b95aae-1b61-4525-b6d8-ba42631f3386"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "99970d80-96d6-4826-bad2-f9f3857cbf5c"
       },
       "ResponseBody": {
-        "dataFeedId": "c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+        "dataFeedId": "a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
         "dataFeedName": "dataFeedUKzatqz4",
         "metrics": [
           {
-            "metricId": "5bd738c2-4423-4865-96a4-31b7c4eb6793",
+            "metricId": "920b6ae0-a279-4f00-b989-de430ce3adde",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:58Z",
+        "createdTime": "2021-02-05T17:57:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "711",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ed55e2e09d8a6f4fa3fd34388ce36423-142653aabec68c44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e5e16441ca4eed488a9c819ed9715d23-734aea72c529a349-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "592497f65097693efe6c75b37b8de1c9",
+        "x-ms-client-request-id": "a1d409f79e2d167b60cd020f07dd0928",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a5c9b3e3-e5de-45fb-8102-b16479eda0d7",
+        "apim-request-id": "0dfd98b7-7d20-4919-a98b-68d9cee8bf5b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "493",
-        "x-request-id": "a5c9b3e3-e5de-45fb-8102-b16479eda0d7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "567",
+        "X-Request-ID": "0dfd98b7-7d20-4919-a98b-68d9cee8bf5b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-36fa1290da660f4ca3a5e002679bc2f2-31c135818946a14e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02c43fb205cfef47bd028161294cbdcf-af0b673826a76d4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a1d409f79e2d167b60cd020f07dd0928",
+        "x-ms-client-request-id": "5200054d77b0d31d1b6c2a595b58d3ee",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4ffdfce8-f761-431b-8e97-47049c0b9667",
+        "apim-request-id": "649aa3ed-c378-41a4-b0c5-4aa807f6eb56",
         "Content-Length": "1123",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:40:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "x-request-id": "4ffdfce8-f761-431b-8e97-47049c0b9667"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "184",
+        "X-Request-ID": "649aa3ed-c378-41a4-b0c5-4aa807f6eb56"
       },
       "ResponseBody": {
-        "dataFeedId": "c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+        "dataFeedId": "a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
         "dataFeedName": "dataFeedbDwhM6EP",
         "metrics": [
           {
-            "metricId": "5bd738c2-4423-4865-96a4-31b7c4eb6793",
+            "metricId": "920b6ae0-a279-4f00-b989-de430ce3adde",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:40:58Z",
+        "createdTime": "2021-02-05T17:57:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -243,33 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3ac1650-91b4-4385-8f2d-3bbed8a81e34",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a82fe9f6-5d1d-43e5-a47a-5f189060a37a",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-700bae9e05bdc74ba09ff9520becd259-bff771208347124b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d70e85476df9de41bf0d04d3535beb0e-a35cea65c73e2644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5200054d77b0d31d1b6c2a595b58d3ee",
+        "x-ms-client-request-id": "dbda66456f59579a1b0ef8c94e2e6121",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9dccc005-57b6-48df-b6e4-9ebbcb97ee06",
+        "apim-request-id": "2d96378b-ad60-4b88-90bc-051f70bedb20",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:40:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "287",
-        "x-request-id": "9dccc005-57b6-48df-b6e4-9ebbcb97ee06"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "341",
+        "X-Request-ID": "2d96378b-ad60-4b88-90bc-051f70bedb20"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:40:59.2501381-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:36.9393641-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstance.json
index 3f30ffb65a80..a62f697e2436 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d13a3ccdd753904b84316d91c44569e1-79908f8b407b154b-00",
+        "traceparent": "00-1816be50db30ed4ca442b75143ca72ab-68ae9ffd7260b149-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0f3f3ce4-5668-4fa9-a2f7-57577d4051c4",
+        "apim-request-id": "84b524d7-0c41-4f0b-a548-f05c4c831bf2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:22 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa01b4fb-baf6-461d-9374-d332db42490d",
+        "Date": "Fri, 05 Feb 2021 17:54:41 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d7ea90de-ad93-477a-9456-7af4f69df067",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "530",
-        "X-Request-ID": "0f3f3ce4-5668-4fa9-a2f7-57577d4051c4"
+        "x-envoy-upstream-service-time": "453",
+        "X-Request-ID": "84b524d7-0c41-4f0b-a548-f05c4c831bf2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa01b4fb-baf6-461d-9374-d332db42490d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d7ea90de-ad93-477a-9456-7af4f69df067",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1816be50db30ed4ca442b75143ca72ab-e879cfe3748de644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e2f930950ba9bae3b5387a064bd34c40",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "801f7b09-365e-4c14-99d5-f07fb4041fa8",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:42 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "801f7b09-365e-4c14-99d5-f07fb4041fa8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d7ea90de-ad93-477a-9456-7af4f69df067",
+        "dataFeedName": "dataFeeddKgbTiwq",
+        "metrics": [
+          {
+            "metricId": "ea56e954-69b5-425c-9c8b-a4af49646787",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:41Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d7ea90de-ad93-477a-9456-7af4f69df067",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3cdad03672297848afc7a1c82f960c00-2e703c7ac3b6e245-00",
+        "traceparent": "00-42534e209305254a97ffd78bcd68b13a-3a537af9763c6040-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e2f930950ba9bae3b5387a064bd34c40",
+        "x-ms-client-request-id": "1abc746df90b68cc88f3c311b13b34f6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0cd29340-5c53-4376-bf84-30a57eaa7e2c",
+        "apim-request-id": "b1494c45-2dc5-4738-b90b-4a9f4ba8e37a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "174",
-        "X-Request-ID": "0cd29340-5c53-4376-bf84-30a57eaa7e2c"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "b1494c45-2dc5-4738-b90b-4a9f4ba8e37a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa01b4fb-baf6-461d-9374-d332db42490d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d7ea90de-ad93-477a-9456-7af4f69df067",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c3cae5eeaec9047a62e2f48dc0e86d9-9723fb94bad48942-00",
+        "traceparent": "00-36416f97583d0749b3cb5cc0dcb56072-eec9ae60f424384f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1abc746df90b68cc88f3c311b13b34f6",
+        "x-ms-client-request-id": "2395b904d92ef6d0a4430406ef2e2b59",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5adc6f5a-8463-48e9-b3a1-a22330db09ca",
+        "apim-request-id": "7017ef3f-b3f5-4e46-8a68-d1d95ae33728",
         "Content-Length": "1106",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "X-Request-ID": "5adc6f5a-8463-48e9-b3a1-a22330db09ca"
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "7017ef3f-b3f5-4e46-8a68-d1d95ae33728"
       },
       "ResponseBody": {
-        "dataFeedId": "aa01b4fb-baf6-461d-9374-d332db42490d",
+        "dataFeedId": "d7ea90de-ad93-477a-9456-7af4f69df067",
         "dataFeedName": "dataFeedUnSyfwLE",
         "metrics": [
           {
-            "metricId": "412648cf-144a-43a5-abd3-5c3cc04eabe9",
+            "metricId": "ea56e954-69b5-425c-9c8b-a4af49646787",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:22Z",
+        "createdTime": "2021-02-05T17:54:41Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa01b4fb-baf6-461d-9374-d332db42490d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d7ea90de-ad93-477a-9456-7af4f69df067",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fdd6ac2578ed00408f5931672d692cea-d987bc5eb351664a-00",
+        "traceparent": "00-102c7dca6d31bf419d8c5537189a3e98-5354bbbcf596ab44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2395b904d92ef6d0a4430406ef2e2b59",
+        "x-ms-client-request-id": "5f0bac190aa09c6f64915ab548d20879",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a4cebe6f-4890-4bb3-ba1b-6ae22add045d",
+        "apim-request-id": "51064c01-224b-4db3-9371-0933acc9e5dc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "312",
-        "X-Request-ID": "a4cebe6f-4890-4bb3-ba1b-6ae22add045d"
+        "x-envoy-upstream-service-time": "379",
+        "X-Request-ID": "51064c01-224b-4db3-9371-0933acc9e5dc"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:23.0388029-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:43.3031009-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstanceAsync.json
index 85bcc8feefbb..edcadcbcd9da 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cbe8253b5fd8674a834e4da657d215a2-759db756b1c27247-00",
+        "traceparent": "00-75dd84a267d4f9458615c88d244f3781-38629ed1a7e8394b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "96fde04c-d897-480b-a05e-8aede7716288",
+        "apim-request-id": "f7857044-f020-4e4b-b5bd-bdd88ed66ae0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0ac81ae-aaad-44c5-ba37-b06ed4b1d3a9",
+        "Date": "Fri, 05 Feb 2021 17:57:37 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8d68752-368a-4d0c-86bb-aba2e2a091e4",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "426",
-        "X-Request-ID": "96fde04c-d897-480b-a05e-8aede7716288"
+        "x-envoy-upstream-service-time": "382",
+        "X-Request-ID": "f7857044-f020-4e4b-b5bd-bdd88ed66ae0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0ac81ae-aaad-44c5-ba37-b06ed4b1d3a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8d68752-368a-4d0c-86bb-aba2e2a091e4",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-75dd84a267d4f9458615c88d244f3781-4273127f76c04f42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "edb041c9aa63ff6860449f8898531553",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "3e630542-5324-42cf-b80f-8e3a8b7caa46",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:37 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "3e630542-5324-42cf-b80f-8e3a8b7caa46"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f8d68752-368a-4d0c-86bb-aba2e2a091e4",
+        "dataFeedName": "dataFeedjowDOhD4",
+        "metrics": [
+          {
+            "metricId": "7660b76e-bde3-4b4d-81ae-433e6472ddfe",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:37Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8d68752-368a-4d0c-86bb-aba2e2a091e4",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-70f749c3d42a1f4ba4a94e53c3f04756-c30a2705ef2c6548-00",
+        "traceparent": "00-0ae62aeac0b117448c7c6ec8b9f178c4-d79cea8ea760bb4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "edb041c9aa63ff6860449f8898531553",
+        "x-ms-client-request-id": "e96f929c7c5dc7c6c3f8d915caa28d39",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6fcdffce-abbe-433e-a5d1-e7c6e0eef8b5",
+        "apim-request-id": "12c53345-ef47-4f5d-a368-91df5ebe4c81",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "X-Request-ID": "6fcdffce-abbe-433e-a5d1-e7c6e0eef8b5"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "12c53345-ef47-4f5d-a368-91df5ebe4c81"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0ac81ae-aaad-44c5-ba37-b06ed4b1d3a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8d68752-368a-4d0c-86bb-aba2e2a091e4",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eb8e1c5f2a27964d99f035f42a004a95-82bda6d781cf9845-00",
+        "traceparent": "00-db12b87be77f9245b8fe614a2c508502-8a65c95bebfa854f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e96f929c7c5dc7c6c3f8d915caa28d39",
+        "x-ms-client-request-id": "6223d9ada51e1fdc7e732548c8261722",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "95735334-0f56-4af3-92a5-f5e3fe09ae86",
+        "apim-request-id": "8176b6c2-c224-46f8-be08-54feaa1e5096",
         "Content-Length": "1106",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "X-Request-ID": "95735334-0f56-4af3-92a5-f5e3fe09ae86"
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "8176b6c2-c224-46f8-be08-54feaa1e5096"
       },
       "ResponseBody": {
-        "dataFeedId": "d0ac81ae-aaad-44c5-ba37-b06ed4b1d3a9",
+        "dataFeedId": "f8d68752-368a-4d0c-86bb-aba2e2a091e4",
         "dataFeedName": "dataFeedIt3EX1V7",
         "metrics": [
           {
-            "metricId": "622a115a-3239-4287-b2df-19a24b567227",
+            "metricId": "7660b76e-bde3-4b4d-81ae-433e6472ddfe",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:54Z",
+        "createdTime": "2021-02-05T17:57:37Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d0ac81ae-aaad-44c5-ba37-b06ed4b1d3a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8d68752-368a-4d0c-86bb-aba2e2a091e4",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ff1394d652a4014fa16556e545be26ca-9e29fa9fe4413042-00",
+        "traceparent": "00-7efd5c1b79c61a47b9a6cc8a4ca4f983-a45bb0d4c90b724a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6223d9ada51e1fdc7e732548c8261722",
+        "x-ms-client-request-id": "fd80bd9ae0cf4c887ae92a6bd05334bd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ed8f000a-4c95-4877-b6d8-90996d558e04",
+        "apim-request-id": "2b1c3d2a-fda8-4b27-b7b1-071632c12bef",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "360",
-        "X-Request-ID": "ed8f000a-4c95-4877-b6d8-90996d558e04"
+        "x-envoy-upstream-service-time": "330",
+        "X-Request-ID": "2b1c3d2a-fda8-4b27-b7b1-071632c12bef"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:55.0173758-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:38.3102296-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False).json
index d34b8a5d0fd9..6f9b2ef937d7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4acc973067514c40adc864bd8b9c4042-b9e020a232351e4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ffd0bca7b07f364d96cd27ccab65b318-e28bdb72e1e11f4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ea4ed28b9ebfb36c040e35deeb7e0fb8",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6ec254d9-e737-4966-af87-b32e1f04502c",
+        "apim-request-id": "9ec850c2-da64-4a01-9abd-6a109f1e279a",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:32 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b94724fd-ad45-461f-9a65-05e3743b259e",
+        "Date": "Fri, 05 Feb 2021 17:56:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "411",
-        "x-request-id": "6ec254d9-e737-4966-af87-b32e1f04502c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "549",
+        "X-Request-ID": "9ec850c2-da64-4a01-9abd-6a109f1e279a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b94724fd-ad45-461f-9a65-05e3743b259e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-04c420288efc234e9890fe9879cc1d14-6b94e9a4c962cc42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ffd0bca7b07f364d96cd27ccab65b318-64bfc851538fd441-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d1f36c28391f199fcf8db42b49de2a45",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2a1ab85e-81f4-458d-9e56-05be10e15901",
+        "apim-request-id": "f9d11890-a3e8-465e-b83f-bb9767a61a09",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:43 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "f9d11890-a3e8-465e-b83f-bb9767a61a09"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f34b72d5-3629-4ada-87be-fda458daf1de",
+        "dataFeedName": "dataFeed0ppyfHby",
+        "metrics": [
+          {
+            "metricId": "c9956ce7-bc33-497a-a916-6315971615d1",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:43Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-acbac117b6a3f540bf0a46e4b89b7c38-fe7ee7eb751d6643-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1eb14278c0cabc195111b3d621354203",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "999c2a96-9cdc-479e-ab9c-7460d6aa8787",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "2a1ab85e-81f4-458d-9e56-05be10e15901"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "999c2a96-9cdc-479e-ab9c-7460d6aa8787"
       },
       "ResponseBody": {
-        "dataFeedId": "b94724fd-ad45-461f-9a65-05e3743b259e",
+        "dataFeedId": "f34b72d5-3629-4ada-87be-fda458daf1de",
         "dataFeedName": "dataFeed0ppyfHby",
         "metrics": [
           {
-            "metricId": "c2ba288e-e44f-4cb2-828a-9a4fd30f4788",
+            "metricId": "c9956ce7-bc33-497a-a916-6315971615d1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:32Z",
+        "createdTime": "2021-02-05T17:56:43Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b94724fd-ad45-461f-9a65-05e3743b259e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "619",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-939f7dc515ec8b42b01582d15f75a966-40d38ed6a4097b49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9ed5ce6846b026498a787c5d3f4b62d3-1c99dd62db3a5443-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1eb14278c0cabc195111b3d621354203",
+        "x-ms-client-request-id": "4eff48b54e10516c33351a32ea416925",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "95476e8b-98d8-4ab7-9036-725a286d8d57",
+        "apim-request-id": "2181ede8-04f0-4b1d-baab-2f42c53a0e6d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "679",
-        "x-request-id": "95476e8b-98d8-4ab7-9036-725a286d8d57"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "494",
+        "X-Request-ID": "2181ede8-04f0-4b1d-baab-2f42c53a0e6d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b94724fd-ad45-461f-9a65-05e3743b259e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4ddaa435052f4746861d9157c3375c56-ff6fdf90502d894e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b8b9300f851019459dda88afa558c4b8-d8650e8a8679d042-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4eff48b54e10516c33351a32ea416925",
+        "x-ms-client-request-id": "a965f0e4f1cd67ee53367f0e86c9f89a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "85805454-c10e-4eb5-a70c-a731219f02bd",
+        "apim-request-id": "79953128-f197-41b9-8adb-c48e51364237",
         "Content-Length": "1031",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "85805454-c10e-4eb5-a70c-a731219f02bd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "79953128-f197-41b9-8adb-c48e51364237"
       },
       "ResponseBody": {
-        "dataFeedId": "b94724fd-ad45-461f-9a65-05e3743b259e",
+        "dataFeedId": "f34b72d5-3629-4ada-87be-fda458daf1de",
         "dataFeedName": "dataFeed0ppyfHby",
         "metrics": [
           {
-            "metricId": "c2ba288e-e44f-4cb2-828a-9a4fd30f4788",
+            "metricId": "c9956ce7-bc33-497a-a916-6315971615d1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:32Z",
+        "createdTime": "2021-02-05T17:56:43Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b94724fd-ad45-461f-9a65-05e3743b259e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f34b72d5-3629-4ada-87be-fda458daf1de",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f982ac034368304c9e2918ce266225d6-9f70d776309f6244-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9b8f9c95c49d7449bd2a04803b5daf74-c75f26fa29041047-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a965f0e4f1cd67ee53367f0e86c9f89a",
+        "x-ms-client-request-id": "0075b04bdbdf2a34d65feb94a5e7d20f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "16d246c1-4d79-4a5d-a139-3ae7b42ba046",
+        "apim-request-id": "53e3ceed-272b-4ab4-a138-da6e243f6ec5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "398",
-        "x-request-id": "16d246c1-4d79-4a5d-a139-3ae7b42ba046"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "312",
+        "X-Request-ID": "53e3ceed-272b-4ab4-a138-da6e243f6ec5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:33.6691916-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:44.9696017-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False)Async.json
index a3bd5c0a2286..c2a0a9568b10 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-243ffad2f9dd9c4a8142780f6e3c5ff5-ec110e047adce749-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-40e5d99b82e7fc42955e0620223db774-fff52ab4f9d1e742-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3ec8125165b7b09911fba127d5c0f6c2",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "bb2da358-fb9e-4903-a296-98bc514a89d0",
+        "apim-request-id": "b302910a-426f-419a-9b39-50ec204c1d3f",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+        "Date": "Fri, 05 Feb 2021 17:59:18 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "646",
-        "x-request-id": "bb2da358-fb9e-4903-a296-98bc514a89d0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "399",
+        "X-Request-ID": "b302910a-426f-419a-9b39-50ec204c1d3f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0c5e502c3f88f54ab96d769e28c87b85-42b3771370285946-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-40e5d99b82e7fc42955e0620223db774-757c285b4f870a4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "09a50511a9b7078bced7617cde7a6413",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f2dbb722-3ffc-4932-8f6c-10b2705cd6fa",
+        "apim-request-id": "02b046b8-4034-4719-b3a9-ad632b961672",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "02b046b8-4034-4719-b3a9-ad632b961672"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
+        "dataFeedName": "dataFeedJUUoOyzs",
+        "metrics": [
+          {
+            "metricId": "abd0d839-cad4-4c70-b6cb-99a543dac8b8",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:19Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-17f29abaf1cb96458ceeae2e32b26047-83ecbb8ea4a5cd43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c08bc879a8e6257e25eaa9541d2a870d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0ad15045-94f4-45d4-aed5-9bb4d2498c69",
         "Content-Length": "980",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "x-request-id": "f2dbb722-3ffc-4932-8f6c-10b2705cd6fa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "0ad15045-94f4-45d4-aed5-9bb4d2498c69"
       },
       "ResponseBody": {
-        "dataFeedId": "d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+        "dataFeedId": "f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
         "dataFeedName": "dataFeedJUUoOyzs",
         "metrics": [
           {
-            "metricId": "a5714b06-d53c-4d1a-b972-ffae1bd25841",
+            "metricId": "abd0d839-cad4-4c70-b6cb-99a543dac8b8",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:45Z",
+        "createdTime": "2021-02-05T17:59:19Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "619",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-375a9ab138a23f48a67879d068ddebb8-730c3ac9f39d3542-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fefb69968e190f47b7e0aab52bb36db9-05020842ccd1034a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c08bc879a8e6257e25eaa9541d2a870d",
+        "x-ms-client-request-id": "541e67037f47a7c186c070df041cd196",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "dffdb49b-7246-4eff-a503-922eafce58d0",
+        "apim-request-id": "80308786-b0d1-4cf7-bdd0-f5bcaf28323b",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "540",
-        "x-request-id": "dffdb49b-7246-4eff-a503-922eafce58d0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "480",
+        "X-Request-ID": "80308786-b0d1-4cf7-bdd0-f5bcaf28323b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c791391b7453df46af8594b3d19e9653-9408ee6f7d1f844a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3324b7a98e279645b5421d061aa0d42f-d66551c151243847-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "541e67037f47a7c186c070df041cd196",
+        "x-ms-client-request-id": "0dad8d96353569db8680e3cd0037eaa4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "60c18e65-c492-4a13-bc66-01f186550ae1",
+        "apim-request-id": "9ddb59b9-4e9f-4b3d-9a8f-6efd80eab731",
         "Content-Length": "1031",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "x-request-id": "60c18e65-c492-4a13-bc66-01f186550ae1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "131",
+        "X-Request-ID": "9ddb59b9-4e9f-4b3d-9a8f-6efd80eab731"
       },
       "ResponseBody": {
-        "dataFeedId": "d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+        "dataFeedId": "f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
         "dataFeedName": "dataFeedJUUoOyzs",
         "metrics": [
           {
-            "metricId": "a5714b06-d53c-4d1a-b972-ffae1bd25841",
+            "metricId": "abd0d839-cad4-4c70-b6cb-99a543dac8b8",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:45Z",
+        "createdTime": "2021-02-05T17:59:19Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d243aa66-73e1-4a11-8bd8-94c9b9a8fd7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f8108560-4b9e-4c31-abc9-fdb6cdc308cf",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c8adfb1c68a5d345918fac0112f87fc2-1704eaadbae2484a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-607bddbc2b1c4f498294a89ede40aca8-b629daec26ea9740-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0dad8d96353569db8680e3cd0037eaa4",
+        "x-ms-client-request-id": "7779544f105cfacc07e33a25389e2108",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "449e08ba-b141-4103-8dd3-650747bbaf0f",
+        "apim-request-id": "e4ef0804-061b-430b-994d-83305cb05dd7",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "376",
-        "x-request-id": "449e08ba-b141-4103-8dd3-650747bbaf0f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "302",
+        "X-Request-ID": "e4ef0804-061b-430b-994d-83305cb05dd7"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:46.4166352-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:20.1670711-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True).json
index 69cb94744c15..cc78a72118c0 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "268",
         "Content-Type": "application/json",
-        "traceparent": "00-1df54d0823740b41b476908cdb1c171a-85b38777e918f645-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f14792836107ab43a2a4c79a096411f8-089cc38be9441f4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "304ca13cb81bf305729e6779b2901acf",
         "x-ms-return-client-request-id": "true"
       },
@@ -31,46 +34,49 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "11d39c96-f8be-44ea-a9d2-730263c140a4",
+        "apim-request-id": "059729ad-9fd9-48f3-98f9-a1f606911be7",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0024b523-a476-49fa-917a-298a00179a80",
+        "Date": "Fri, 05 Feb 2021 17:56:41 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "358",
-        "x-request-id": "11d39c96-f8be-44ea-a9d2-730263c140a4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "320",
+        "X-Request-ID": "059729ad-9fd9-48f3-98f9-a1f606911be7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0024b523-a476-49fa-917a-298a00179a80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-a1243caa5b7fa5469bd405cbcd01d6b9-465e00b7438f9a43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f14792836107ab43a2a4c79a096411f8-1a8c4f7c85c9fd40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "5a80e04d07e916d69a4896caeb3b7b6e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6c073a51-d3fc-45b2-9fc9-47169d39a122",
+        "apim-request-id": "2e3421bc-dfff-40fc-84e2-f774d23f9a9d",
         "Content-Length": "1022",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "77",
-        "x-request-id": "6c073a51-d3fc-45b2-9fc9-47169d39a122"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "71",
+        "X-Request-ID": "2e3421bc-dfff-40fc-84e2-f774d23f9a9d"
       },
       "ResponseBody": {
-        "dataFeedId": "0024b523-a476-49fa-917a-298a00179a80",
+        "dataFeedId": "7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
         "dataFeedName": "dataFeed0RtRApf2",
         "metrics": [
           {
-            "metricId": "27e4dbc4-6c6d-4630-93a5-8793ef7bd9d5",
+            "metricId": "512c2c48-bac4-472d-804f-83f2d3ce5233",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -101,7 +107,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:30Z",
+        "createdTime": "2021-02-05T17:56:41Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,16 +118,91 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0024b523-a476-49fa-917a-298a00179a80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-ff1e1a735269984281c27c304aacb154-82c0f0ea264ce74f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "4e8fa3088d90b06ff0ab5f720a017dc1",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b8549be1-fe38-406a-b53f-719bbb6d44c5",
+        "Content-Length": "1022",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:41 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "70",
+        "X-Request-ID": "b8549be1-fe38-406a-b53f-719bbb6d44c5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
+        "dataFeedName": "dataFeed0RtRApf2",
+        "metrics": [
+          {
+            "metricId": "512c2c48-bac4-472d-804f-83f2d3ce5233",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:41Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "640",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-1c350bb5a81b5c4ea6658d8ff5c5fd52-7f5d54981da3e94a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "4e8fa3088d90b06ff0ab5f720a017dc1",
+        "traceparent": "00-1d9e9cf69735af47b9e69b2f85fdf91a-457da0c6c88b2f42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "cd1d79afab82356aca3595d3223a0737",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,45 +234,48 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "051a9c8e-56df-4053-9d04-1ff2399879b9",
+        "apim-request-id": "359eba6e-9319-4f8a-96cc-07dbaaf783c1",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "587",
-        "x-request-id": "051a9c8e-56df-4053-9d04-1ff2399879b9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "385",
+        "X-Request-ID": "359eba6e-9319-4f8a-96cc-07dbaaf783c1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0024b523-a476-49fa-917a-298a00179a80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-9862ce0b71ee824ea6713b5fdd32ddeb-ae869591ec0f0049-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "cd1d79afab82356aca3595d3223a0737",
+        "traceparent": "00-1bfa8f1a0e83794991527825d020723c-7fd0ca47716da642-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "0e70f923cc00bf3f71d06a3da8640c99",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e4316c10-b8fa-4551-b666-892e6bea3640",
+        "apim-request-id": "fbe18fd9-4262-4dbe-89bf-e2858f3d7db0",
         "Content-Length": "1073",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "71",
-        "x-request-id": "e4316c10-b8fa-4551-b666-892e6bea3640"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "fbe18fd9-4262-4dbe-89bf-e2858f3d7db0"
       },
       "ResponseBody": {
-        "dataFeedId": "0024b523-a476-49fa-917a-298a00179a80",
+        "dataFeedId": "7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
         "dataFeedName": "dataFeed0RtRApf2",
         "metrics": [
           {
-            "metricId": "27e4dbc4-6c6d-4630-93a5-8793ef7bd9d5",
+            "metricId": "512c2c48-bac4-472d-804f-83f2d3ce5233",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -222,7 +306,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:30Z",
+        "createdTime": "2021-02-05T17:56:41Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,32 +317,35 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0024b523-a476-49fa-917a-298a00179a80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7322d5e9-dcd1-4c8a-a77d-eeaefa1351ea",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-bc9af84f8827bc4c91cac3edba1944fc-79172fe823a1d848-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "0e70f923cc00bf3f71d06a3da8640c99",
+        "traceparent": "00-e85d5177e780ab43a4cf04b9c7ede33b-b96c11713726c74b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "721ad4caad1d5deb395a835af89b8db5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cf9d24cb-42cd-4181-b6f1-b4c4874860aa",
+        "apim-request-id": "58bc9a63-e671-4c8c-b77e-33a4fb939ab1",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "220",
-        "x-request-id": "cf9d24cb-42cd-4181-b6f1-b4c4874860aa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "195",
+        "X-Request-ID": "58bc9a63-e671-4c8c-b77e-33a4fb939ab1"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:31.7985190-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:43.1217943-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "RandomSeed": "675060581"
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True)Async.json
index b729c23d689a..73781d462dd4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndGetInstance(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "268",
         "Content-Type": "application/json",
-        "traceparent": "00-2c6854eab643f648a3ffc14a8891a79f-96964b187bcf704e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-88f0220253bb2946afe6ccde68e4cd1e-a2d314770e9cb940-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "e74690bd8dfdd07f3d060ec80e327b64",
         "x-ms-return-client-request-id": "true"
       },
@@ -31,46 +34,49 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "af938cc3-fa2c-4b0b-b9f6-4c986abc2c84",
+        "apim-request-id": "023167ea-b792-4448-865a-d0b82a451def",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+        "Date": "Fri, 05 Feb 2021 17:59:16 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "358",
-        "x-request-id": "af938cc3-fa2c-4b0b-b9f6-4c986abc2c84"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "533",
+        "X-Request-ID": "023167ea-b792-4448-865a-d0b82a451def"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-f9a2c644600a5e448519890bafb6daea-63bca1bd714c344c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-88f0220253bb2946afe6ccde68e4cd1e-137fab6766459647-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "3b359614de49edaae1d3656a5bbcde52",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6d4596fd-e3e5-4dcd-bc9b-a7e4c2842041",
+        "apim-request-id": "f8a21f18-c902-4bc5-86bf-338dc90bb43d",
         "Content-Length": "1022",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "112",
-        "x-request-id": "6d4596fd-e3e5-4dcd-bc9b-a7e4c2842041"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "72",
+        "X-Request-ID": "f8a21f18-c902-4bc5-86bf-338dc90bb43d"
       },
       "ResponseBody": {
-        "dataFeedId": "b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+        "dataFeedId": "0428e935-efa9-4746-9d15-b47bdd452998",
         "dataFeedName": "dataFeedhYXjOKuv",
         "metrics": [
           {
-            "metricId": "1dc5a77e-9795-41a3-a2ce-e5ea76a02f22",
+            "metricId": "5d10f0d4-5a49-47a8-890e-14379736c18a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -101,7 +107,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:43Z",
+        "createdTime": "2021-02-05T17:59:17Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,16 +118,91 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-0a51c7c5fa7b5f41b20861f5bfd1186a-5fed632372442444-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "8e436af77c6f71bb21b9f1da2ea2633d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "37c84c8b-efcb-4623-b6ea-6aeebe93d27c",
+        "Content-Length": "1022",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:17 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "85",
+        "X-Request-ID": "37c84c8b-efcb-4623-b6ea-6aeebe93d27c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0428e935-efa9-4746-9d15-b47bdd452998",
+        "dataFeedName": "dataFeedhYXjOKuv",
+        "metrics": [
+          {
+            "metricId": "5d10f0d4-5a49-47a8-890e-14379736c18a",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "viewers": [],
+        "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:17Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "640",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-0d9fa6c324555c4da7dde08f7518e547-9ed36a2a76ef4846-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "8e436af77c6f71bb21b9f1da2ea2633d",
+        "traceparent": "00-f2adb3888c0358468145d0ccb404c1de-91a3fbfb3478474f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "e2fbc91d23eade6ae658052a27157581",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,45 +234,48 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b276ff7d-57d1-45c8-91c0-f755181ff8dd",
+        "apim-request-id": "39885c4c-7b53-4e5b-9521-959b58e25fb8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "594",
-        "x-request-id": "b276ff7d-57d1-45c8-91c0-f755181ff8dd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "691",
+        "X-Request-ID": "39885c4c-7b53-4e5b-9521-959b58e25fb8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-10759093a2c1694a929ae1c7e059d33f-50afdcf36e3be646-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "e2fbc91d23eade6ae658052a27157581",
+        "traceparent": "00-18287dd482850b419803062c9e32ee3a-a4d540fd9ab0b74d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "a3d1bc27edee98f4dbc3198fedd0be3f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "05e714b6-a018-49a3-a018-07c419f4133d",
+        "apim-request-id": "b16c01b7-1da4-43fc-93bf-2b27b6d4bba3",
         "Content-Length": "1073",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "69",
-        "x-request-id": "05e714b6-a018-49a3-a018-07c419f4133d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "85",
+        "X-Request-ID": "b16c01b7-1da4-43fc-93bf-2b27b6d4bba3"
       },
       "ResponseBody": {
-        "dataFeedId": "b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+        "dataFeedId": "0428e935-efa9-4746-9d15-b47bdd452998",
         "dataFeedName": "dataFeedhYXjOKuv",
         "metrics": [
           {
-            "metricId": "1dc5a77e-9795-41a3-a2ce-e5ea76a02f22",
+            "metricId": "5d10f0d4-5a49-47a8-890e-14379736c18a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -222,7 +306,7 @@
         "viewers": [],
         "creator": "94dc466b-52e4-4678-892d-70a0c45c5f42",
         "status": "Active",
-        "createdTime": "2021-01-19T17:58:43Z",
+        "createdTime": "2021-02-05T17:59:17Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,32 +317,35 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b9e9092f-3525-4c2f-b2d1-bd4fd8badc30",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0428e935-efa9-4746-9d15-b47bdd452998",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-1829745117e5b94e8220f95cc1c7fd7c-e1fe2312a737374a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "a3d1bc27edee98f4dbc3198fedd0be3f",
+        "traceparent": "00-e6c79a05e85181469bc36d3f1cda969d-18133c016e6a4248-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "924c2770fbc0d3670064a8177690490c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b0d27cbb-0620-4a09-8179-f84e40514370",
+        "apim-request-id": "582fb2a0-f60a-4de1-bdab-a59f8ade4d23",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "264",
-        "x-request-id": "b0d27cbb-0620-4a09-8179-f84e40514370"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "200",
+        "X-Request-ID": "582fb2a0-f60a-4de1-bdab-a59f8ade4d23"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-19T09:58:44.3989560-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:18.4560039-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "RandomSeed": "853461122"
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstance.json
index f3b3e751d240..b0fb72ac5507 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dbcc0e9ec760144c90775b371e89d07e-28c8946d52b00843-00",
+        "traceparent": "00-f02377ae1f9a0a4386f9c526a9baf8e9-f6c0b624e7e7c44f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "945d350c-33bf-4c29-91f5-5bab50bcfcea",
+        "apim-request-id": "7bcfb180-5b6c-4c6e-986f-52fc2449ed4c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a3bbe529-d325-483a-97af-29423d3e2e8e",
+        "Date": "Fri, 05 Feb 2021 17:54:44 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b0cec4f3-2b9a-4932-852a-8753c6678a72",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "433",
-        "X-Request-ID": "945d350c-33bf-4c29-91f5-5bab50bcfcea"
+        "x-envoy-upstream-service-time": "600",
+        "X-Request-ID": "7bcfb180-5b6c-4c6e-986f-52fc2449ed4c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a3bbe529-d325-483a-97af-29423d3e2e8e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b0cec4f3-2b9a-4932-852a-8753c6678a72",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-f02377ae1f9a0a4386f9c526a9baf8e9-dc356d7d0f09f44c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "999e8c680b9e655411ef694a058352eb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6455d7fb-f86f-40cd-9f0d-097c76908671",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:44 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "190",
+        "X-Request-ID": "6455d7fb-f86f-40cd-9f0d-097c76908671"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b0cec4f3-2b9a-4932-852a-8753c6678a72",
+        "dataFeedName": "dataFeedBAJQJLAO",
+        "metrics": [
+          {
+            "metricId": "2e4b6701-2972-49c0-b95b-2e40f6540026",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:44Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b0cec4f3-2b9a-4932-852a-8753c6678a72",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8e3d058033c8574fa7f6a67a68e81a93-6c19f4d95473164b-00",
+        "traceparent": "00-51e63d3f653fa741a55069fbad7c781c-c10a77ecdc02d546-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "999e8c680b9e655411ef694a058352eb",
+        "x-ms-client-request-id": "94eeaaf17957f344ad67a453b89f4db7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "939292c0-fc41-4705-99b4-5dc78f40ec7f",
+        "apim-request-id": "bf161022-d61f-4500-9d00-9d0a8b5ddd3b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "208",
-        "X-Request-ID": "939292c0-fc41-4705-99b4-5dc78f40ec7f"
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "bf161022-d61f-4500-9d00-9d0a8b5ddd3b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a3bbe529-d325-483a-97af-29423d3e2e8e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b0cec4f3-2b9a-4932-852a-8753c6678a72",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0fad8a0bef473f44b30105088cebf401-ad67958aba5ef94e-00",
+        "traceparent": "00-bff6d331e46d304dbbac853210ffb022-944487929fe7e246-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "94eeaaf17957f344ad67a453b89f4db7",
+        "x-ms-client-request-id": "e750fe2d4b7d6589d4afd3d8d25011b5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "91e666f6-7bab-42cb-a9fc-9534686bb352",
+        "apim-request-id": "915558ff-b608-4a34-aa7e-dd1eb7bca4c4",
         "Content-Length": "1031",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "X-Request-ID": "91e666f6-7bab-42cb-a9fc-9534686bb352"
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "915558ff-b608-4a34-aa7e-dd1eb7bca4c4"
       },
       "ResponseBody": {
-        "dataFeedId": "a3bbe529-d325-483a-97af-29423d3e2e8e",
+        "dataFeedId": "b0cec4f3-2b9a-4932-852a-8753c6678a72",
         "dataFeedName": "dataFeedBAJQJLAO",
         "metrics": [
           {
-            "metricId": "e8a10814-289e-4e56-825b-cf04c94a10ae",
+            "metricId": "2e4b6701-2972-49c0-b95b-2e40f6540026",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:23Z",
+        "createdTime": "2021-02-05T17:54:44Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a3bbe529-d325-483a-97af-29423d3e2e8e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b0cec4f3-2b9a-4932-852a-8753c6678a72",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a32aeb48ae2a90469a2d261c279a1d02-9ed1c1fc7ef82543-00",
+        "traceparent": "00-651ffefcdd136f40b9f979f4ec112721-d70e1680735b6345-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e750fe2d4b7d6589d4afd3d8d25011b5",
+        "x-ms-client-request-id": "4facc20f97ffefe848abec376700ad71",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8dd57d09-1676-4b24-9fd3-00069d46c1bc",
+        "apim-request-id": "320a9d78-15ca-4909-ac4e-2ab9bb7f7a5e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "310",
-        "X-Request-ID": "8dd57d09-1676-4b24-9fd3-00069d46c1bc"
+        "x-envoy-upstream-service-time": "367",
+        "X-Request-ID": "320a9d78-15ca-4909-ac4e-2ab9bb7f7a5e"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:24.2323745-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:45.2151881-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 19ae75491def..69d82813ce9e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureBlobDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "268",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c4eb11cffba49c46b14927d5e70ed24a-f1dd851393a22e44-00",
+        "traceparent": "00-b74e089a06be934bb176b5b180a4feec-3691146fff7a6e49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f145a7c5-172f-4b67-a219-d8fc8290f197",
+        "apim-request-id": "88699e3b-e003-4e7d-bf6c-cdf37ec18113",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:55 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eb3f48d0-4f8b-47f5-89b5-a96dd21a2993",
+        "Date": "Fri, 05 Feb 2021 17:57:38 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17e0f16b-59c2-482f-8137-6e2496e4e77c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "448",
-        "X-Request-ID": "f145a7c5-172f-4b67-a219-d8fc8290f197"
+        "x-envoy-upstream-service-time": "580",
+        "X-Request-ID": "88699e3b-e003-4e7d-bf6c-cdf37ec18113"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eb3f48d0-4f8b-47f5-89b5-a96dd21a2993",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17e0f16b-59c2-482f-8137-6e2496e4e77c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b74e089a06be934bb176b5b180a4feec-ad721d46cc05194d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "83be54ca081c1b99d0ac0763fbb68630",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0fdb4ae3-fc1a-4d10-9f40-fac400b5a70f",
+        "Content-Length": "980",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "0fdb4ae3-fc1a-4d10-9f40-fac400b5a70f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "17e0f16b-59c2-482f-8137-6e2496e4e77c",
+        "dataFeedName": "dataFeedjhuxiH8g",
+        "metrics": [
+          {
+            "metricId": "876e06b8-4253-4954-a7d5-0f9dafdf3310",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureBlob",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:39Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "container": "container",
+          "connectionString": "Sanitized",
+          "blobTemplate": "template"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17e0f16b-59c2-482f-8137-6e2496e4e77c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-43be1d876009ca48a4b7dbe5e0a3f066-1eb97b4a837ac941-00",
+        "traceparent": "00-611f2a94244b5a4498ea6b456d0649cf-3c6824caeea7e043-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "83be54ca081c1b99d0ac0763fbb68630",
+        "x-ms-client-request-id": "d12149155385587c2bcba6227038ed43",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c61c2504-fea4-49bd-8652-b91296f26230",
+        "apim-request-id": "2cfa688a-c924-4bdd-a303-d2a3967e1cc3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "190",
-        "X-Request-ID": "c61c2504-fea4-49bd-8652-b91296f26230"
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "2cfa688a-c924-4bdd-a303-d2a3967e1cc3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eb3f48d0-4f8b-47f5-89b5-a96dd21a2993",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17e0f16b-59c2-482f-8137-6e2496e4e77c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e890c52ef0a8bd4bb55cf7cad8b9127d-65ca6100535a6341-00",
+        "traceparent": "00-ad43397b538a1f4e82cbae10279ebbd8-162326b0e618a147-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d12149155385587c2bcba6227038ed43",
+        "x-ms-client-request-id": "e429b6a5dce1c226717fdf92996ee1c3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b812142e-1abe-4acd-87c4-f1be7589ecd5",
+        "apim-request-id": "a5740a89-ff0a-4137-8eb2-9cb507f767bd",
         "Content-Length": "1031",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "178",
-        "X-Request-ID": "b812142e-1abe-4acd-87c4-f1be7589ecd5"
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "a5740a89-ff0a-4137-8eb2-9cb507f767bd"
       },
       "ResponseBody": {
-        "dataFeedId": "eb3f48d0-4f8b-47f5-89b5-a96dd21a2993",
+        "dataFeedId": "17e0f16b-59c2-482f-8137-6e2496e4e77c",
         "dataFeedName": "dataFeedjhuxiH8g",
         "metrics": [
           {
-            "metricId": "fd6b2390-3d32-431a-86cc-5f9467681e0a",
+            "metricId": "876e06b8-4253-4954-a7d5-0f9dafdf3310",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:55Z",
+        "createdTime": "2021-02-05T17:57:39Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eb3f48d0-4f8b-47f5-89b5-a96dd21a2993",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17e0f16b-59c2-482f-8137-6e2496e4e77c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-89ed9bee5b55cc43865d842d72e342b7-3292f48682f31142-00",
+        "traceparent": "00-9a95ce295586384ca59d69496f83da8a-62fe83b8f75fbd4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e429b6a5dce1c226717fdf92996ee1c3",
+        "x-ms-client-request-id": "3df6951909ee77ded76558506177ab98",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4129aa10-95cf-4870-923d-beee18390971",
+        "apim-request-id": "bb34101d-c889-42c4-a365-fdfdd4584492",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "365",
-        "X-Request-ID": "4129aa10-95cf-4870-923d-beee18390971"
+        "x-envoy-upstream-service-time": "305",
+        "X-Request-ID": "bb34101d-c889-42c4-a365-fdfdd4584492"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:56.3454622-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:39.8174305-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstance.json
index 18e5956fccd9..8d92cd4b7f91 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-730c9a70c116474493722ce1dace538a-741979f2d034fb4e-00",
+        "traceparent": "00-0e759029b99ce946a75249ea30f76445-3a58e94a9971fb4f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,26 +36,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dadb737f-4df0-4cea-a482-df64b98e5f57",
+        "apim-request-id": "ed7a0e78-c681-4753-9280-e5a0addb251f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:38 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/60787e73-f6a2-411f-a4c2-a1dacc157eda",
+        "Date": "Fri, 05 Feb 2021 17:54:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "687",
-        "X-Request-ID": "dadb737f-4df0-4cea-a482-df64b98e5f57"
+        "x-envoy-upstream-service-time": "559",
+        "X-Request-ID": "ed7a0e78-c681-4753-9280-e5a0addb251f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/60787e73-f6a2-411f-a4c2-a1dacc157eda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1a67e05d8ee8aa46b9194b8fec8b855b-69eaac69cfcf914c-00",
+        "traceparent": "00-0e759029b99ce946a75249ea30f76445-84c5a768053ae845-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -65,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4779d63e-d2d9-4e77-93d4-770c5a180821",
+        "apim-request-id": "dafcb933-0ffb-45da-94e8-1f690fb7be2e",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "139",
-        "X-Request-ID": "4779d63e-d2d9-4e77-93d4-770c5a180821"
+        "x-envoy-upstream-service-time": "200",
+        "X-Request-ID": "dafcb933-0ffb-45da-94e8-1f690fb7be2e"
       },
       "ResponseBody": {
-        "dataFeedId": "60787e73-f6a2-411f-a4c2-a1dacc157eda",
+        "dataFeedId": "fd0e5340-2e56-4249-99d8-949848d624cb",
         "dataFeedName": "dataFeeduxkt4O0L",
         "metrics": [
           {
-            "metricId": "8f85097a-c3cf-421c-8ef1-0d1f15646ee6",
+            "metricId": "858173df-e779-4848-88dc-f13611029b5f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -110,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:39Z",
+        "createdTime": "2021-02-05T17:54:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -122,20 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/60787e73-f6a2-411f-a4c2-a1dacc157eda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-00116db347d07f4f936a9580e4769f6a-bd923a67a6c69a44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f91204fd916bacaf108bfa28d58ab66d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "41b8bd16-265c-4502-9a72-66fe1af24393",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "41b8bd16-265c-4502-9a72-66fe1af24393"
+      },
+      "ResponseBody": {
+        "dataFeedId": "fd0e5340-2e56-4249-99d8-949848d624cb",
+        "dataFeedName": "dataFeeduxkt4O0L",
+        "metrics": [
+          {
+            "metricId": "858173df-e779-4848-88dc-f13611029b5f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:46Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "733",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3463b06235aea64b997a39d5f09c8a26-e752857e91779b4e-00",
+        "traceparent": "00-10a2758ff9eae14f96e39212b0168303-b48902db03c47448-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f91204fd916bacaf108bfa28d58ab66d",
+        "x-ms-client-request-id": "00a20ad9abc8855b09cb26d8689a2d17",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -171,49 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "426f5d13-05bc-45c3-ab2c-628bf5bf8616",
+        "apim-request-id": "5892ff7c-a1fb-46b9-b3bb-f094c1bc9752",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:39 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "807",
-        "X-Request-ID": "426f5d13-05bc-45c3-ab2c-628bf5bf8616"
+        "x-envoy-upstream-service-time": "672",
+        "X-Request-ID": "5892ff7c-a1fb-46b9-b3bb-f094c1bc9752"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/60787e73-f6a2-411f-a4c2-a1dacc157eda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1191cc7507e68644b4ae86a82269e486-6c4b9f957b7eab4b-00",
+        "traceparent": "00-215069b479194741b2d44fb5bceb3f34-26e1cc1ac6b8b242-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "00a20ad9abc8855b09cb26d8689a2d17",
+        "x-ms-client-request-id": "4ae69cdb53704be9dfe295b05bbe64d3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e7dda6ae-bf41-4ab1-8180-76377227f6d9",
+        "apim-request-id": "e0d9c6f0-46a7-4a95-a12a-8cdf457c9573",
         "Content-Length": "1145",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:39 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "144",
-        "X-Request-ID": "e7dda6ae-bf41-4ab1-8180-76377227f6d9"
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "e0d9c6f0-46a7-4a95-a12a-8cdf457c9573"
       },
       "ResponseBody": {
-        "dataFeedId": "60787e73-f6a2-411f-a4c2-a1dacc157eda",
+        "dataFeedId": "fd0e5340-2e56-4249-99d8-949848d624cb",
         "dataFeedName": "dataFeedvmT7DNpI",
         "metrics": [
           {
-            "metricId": "8f85097a-c3cf-421c-8ef1-0d1f15646ee6",
+            "metricId": "858173df-e779-4848-88dc-f13611029b5f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -247,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:39Z",
+        "createdTime": "2021-02-05T17:54:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -259,36 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/60787e73-f6a2-411f-a4c2-a1dacc157eda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fd0e5340-2e56-4249-99d8-949848d624cb",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-375db57ad627584893a528ba62073f58-9b198d80faa7d845-00",
+        "traceparent": "00-9e262c737e857f41abd09bdb01c79b1f-a2e69abca3a3a446-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4ae69cdb53704be9dfe295b05bbe64d3",
+        "x-ms-client-request-id": "4493e11e56845112a98cefa06ad74375",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "677dfe63-cd46-4175-8cbf-777780d40074",
+        "apim-request-id": "4f65771b-cb4a-417f-82b2-d9df8e9c51b1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "304",
-        "X-Request-ID": "677dfe63-cd46-4175-8cbf-777780d40074"
+        "x-envoy-upstream-service-time": "300",
+        "X-Request-ID": "4f65771b-cb4a-417f-82b2-d9df8e9c51b1"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:40.8426828-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:47.9244765-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstanceAsync.json
index 3e02643260c6..ceb898cd19ec 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7aa06a068bac4d429e6ef37a0988881b-7c9f8bd095d12849-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-77c229417f54804db2bcdc8f10de7d26-bf63f5ee9ceff043-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "053953a3bc1324c35d91f45da1bd8f39",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "862a990b-777e-43a6-a7a4-40dd5b38f8be",
+        "apim-request-id": "d12fe81c-aa0f-4b58-94b4-f1cd85257137",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+        "Date": "Fri, 05 Feb 2021 17:57:40 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "460",
-        "x-request-id": "862a990b-777e-43a6-a7a4-40dd5b38f8be"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "372",
+        "X-Request-ID": "d12fe81c-aa0f-4b58-94b4-f1cd85257137"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6d7a1ad498ad0e449e8effeb91a31192-74e2761d94013444-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-77c229417f54804db2bcdc8f10de7d26-de6ddb0fbd259847-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c1c79b88777908719e799834b6b86cd0",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f6f2aff6-ee54-4784-a22b-d4776f14d253",
+        "apim-request-id": "ef0eff6d-73ae-459d-bb1f-269a9c9988e7",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "f6f2aff6-ee54-4784-a22b-d4776f14d253"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "ef0eff6d-73ae-459d-bb1f-269a9c9988e7"
       },
       "ResponseBody": {
-        "dataFeedId": "d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+        "dataFeedId": "ec11c826-9f85-4544-b826-a2a8759ea035",
         "dataFeedName": "dataFeedov6CZcD6",
         "metrics": [
           {
-            "metricId": "4ce8a664-b037-428a-86a0-6b7beace3e71",
+            "metricId": "f0557d44-2a07-4156-a547-42a134c0b2f6",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:01Z",
+        "createdTime": "2021-02-05T17:57:40Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5d8c2371a5749b43be970a4b4e827228-4e3dfa19e8660f48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8788e4b463821a68f8b80c4a715406e9",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "652029b2-4820-4872-b21d-f9f8ec4ec3b8",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:40 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "652029b2-4820-4872-b21d-f9f8ec4ec3b8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ec11c826-9f85-4544-b826-a2a8759ea035",
+        "dataFeedName": "dataFeedov6CZcD6",
+        "metrics": [
+          {
+            "metricId": "f0557d44-2a07-4156-a547-42a134c0b2f6",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:40Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "733",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f236c1824ac95c4f83e945b86491ac14-038d2815d6466d4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-61440de4fb9ced4c9f4ecb8e790edaa6-86ba1bd523919340-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8788e4b463821a68f8b80c4a715406e9",
+        "x-ms-client-request-id": "ac36a3912e182b93e131679a248e6da4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c5a58423-633e-4308-96d5-1e4fb2aa89d3",
+        "apim-request-id": "4c92111f-d6ef-4f88-9b9a-4256bdaaf4bf",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "724",
-        "x-request-id": "c5a58423-633e-4308-96d5-1e4fb2aa89d3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "709",
+        "X-Request-ID": "4c92111f-d6ef-4f88-9b9a-4256bdaaf4bf"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-88b041ba74e01d43b6f8123f5db4ee11-806c5efb521da740-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3091402c4dc03646bcd95342cf7ecf1a-0613d03cb9399e47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ac36a3912e182b93e131679a248e6da4",
+        "x-ms-client-request-id": "bda82325083524b733acc9c06b26964a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "11de7f34-667f-439b-ac7a-a2d1198bb476",
+        "apim-request-id": "e8b8a71b-1157-4dc6-bfa5-db885affb5a1",
         "Content-Length": "1145",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "x-request-id": "11de7f34-667f-439b-ac7a-a2d1198bb476"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "190",
+        "X-Request-ID": "e8b8a71b-1157-4dc6-bfa5-db885affb5a1"
       },
       "ResponseBody": {
-        "dataFeedId": "d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+        "dataFeedId": "ec11c826-9f85-4544-b826-a2a8759ea035",
         "dataFeedName": "dataFeedXMi101m0",
         "metrics": [
           {
-            "metricId": "4ce8a664-b037-428a-86a0-6b7beace3e71",
+            "metricId": "f0557d44-2a07-4156-a547-42a134c0b2f6",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -235,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:01Z",
+        "createdTime": "2021-02-05T17:57:40Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -247,33 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d8c23dc9-311e-4fc4-ac33-868b5ed5c15b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec11c826-9f85-4544-b826-a2a8759ea035",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a11b2cdbef93974aa5cb7cdae3a9c46a-7076633aea1a004a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e35e2d53bdd6c04a81bb8c69e57d87d2-379e7d5b2b43cb4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "bda82325083524b733acc9c06b26964a",
+        "x-ms-client-request-id": "13a3af73bf8285b8505ca651fccef66a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4cc09497-ea2d-478b-a2d1-4f32ac38f800",
+        "apim-request-id": "8529bfb3-ed3e-4a1d-a0f5-b405ec044743",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "318",
-        "x-request-id": "4cc09497-ea2d-478b-a2d1-4f32ac38f800"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "321",
+        "X-Request-ID": "8529bfb3-ed3e-4a1d-a0f5-b405ec044743"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:02.6655988-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:42.2640794-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstance.json
index 2e4ec81b19bb..3d7ef688c82e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c8cf8f32a06d7042b6f81f50c0384de2-69e4ed12b6851a47-00",
+        "traceparent": "00-59a5cd668448f94389c63643a70f71ce-e52aa4abe896e540-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "28cfdea5-0ece-4393-9f7b-e45cd3385782",
+        "apim-request-id": "9344e496-9e8b-4fdb-ba9c-89ef5df55226",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:25 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/69e78e63-c05a-4e8d-8efa-7d6a5a0e57cd",
+        "Date": "Fri, 05 Feb 2021 17:54:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6a4f7e16-7659-4306-8a22-c1e1819f51de",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "614",
-        "X-Request-ID": "28cfdea5-0ece-4393-9f7b-e45cd3385782"
+        "x-envoy-upstream-service-time": "457",
+        "X-Request-ID": "9344e496-9e8b-4fdb-ba9c-89ef5df55226"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/69e78e63-c05a-4e8d-8efa-7d6a5a0e57cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6a4f7e16-7659-4306-8a22-c1e1819f51de",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-59a5cd668448f94389c63643a70f71ce-b81d156af9330846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1fb279e7ce539956b9ed7e2e2dba87ec",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1cbd3f9e-19fd-4430-88a6-42604e341c9a",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:48 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "1cbd3f9e-19fd-4430-88a6-42604e341c9a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "6a4f7e16-7659-4306-8a22-c1e1819f51de",
+        "dataFeedName": "dataFeedBRes2Pal",
+        "metrics": [
+          {
+            "metricId": "749a476e-79f2-4c39-8031-a49cb1e2b7bc",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:48Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6a4f7e16-7659-4306-8a22-c1e1819f51de",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2025486c43359a4cbf6c326e4070eef2-fd66b479c159434e-00",
+        "traceparent": "00-99190bb78b96184d9c497bc35e68ca0e-d824ca5bf5d7f047-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1fb279e7ce539956b9ed7e2e2dba87ec",
+        "x-ms-client-request-id": "3d849c23eff020859b76fa8934b88539",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "47ae8f14-4d2a-4849-917b-b60f05f2e72e",
+        "apim-request-id": "532b5fb0-05f0-4359-a74d-1d1df7d39929",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "205",
-        "X-Request-ID": "47ae8f14-4d2a-4849-917b-b60f05f2e72e"
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "532b5fb0-05f0-4359-a74d-1d1df7d39929"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/69e78e63-c05a-4e8d-8efa-7d6a5a0e57cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6a4f7e16-7659-4306-8a22-c1e1819f51de",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2a8ef9ffcbe6c14aa2ee92c3f730a391-02ca3c2138aabf41-00",
+        "traceparent": "00-eabc5361d5fd7d4286160f92a4dcec53-8da85258b8e18a49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3d849c23eff020859b76fa8934b88539",
+        "x-ms-client-request-id": "63ce0bdead3cd2a0341715399bf49cde",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "beb7fcc0-8e61-4c5e-ab03-5549a5b4ea30",
+        "apim-request-id": "9436ad4d-ba3d-48f7-a2ab-88afabfe74b8",
         "Content-Length": "1128",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "182",
-        "X-Request-ID": "beb7fcc0-8e61-4c5e-ab03-5549a5b4ea30"
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "9436ad4d-ba3d-48f7-a2ab-88afabfe74b8"
       },
       "ResponseBody": {
-        "dataFeedId": "69e78e63-c05a-4e8d-8efa-7d6a5a0e57cd",
+        "dataFeedId": "6a4f7e16-7659-4306-8a22-c1e1819f51de",
         "dataFeedName": "dataFeedxyXJvUQO",
         "metrics": [
           {
-            "metricId": "9bc530a0-307c-4e0b-b6b4-75b56d6e823e",
+            "metricId": "749a476e-79f2-4c39-8031-a49cb1e2b7bc",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:25Z",
+        "createdTime": "2021-02-05T17:54:48Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/69e78e63-c05a-4e8d-8efa-7d6a5a0e57cd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6a4f7e16-7659-4306-8a22-c1e1819f51de",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-893a5e882793274e9e2c740afb901fb9-fb5cad8b67fd6f4d-00",
+        "traceparent": "00-d88784cc5a33054d920d2a7814b303b9-5adf90cc19ee444b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "63ce0bdead3cd2a0341715399bf49cde",
+        "x-ms-client-request-id": "ff855c5e4b97f8c3f39184dcd3cc6501",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "057fb711-84a9-4f64-9f86-4fc750077682",
+        "apim-request-id": "a99c898d-2f96-4af8-9eaf-750363c40ae8",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "470",
-        "X-Request-ID": "057fb711-84a9-4f64-9f86-4fc750077682"
+        "x-envoy-upstream-service-time": "278",
+        "X-Request-ID": "a99c898d-2f96-4af8-9eaf-750363c40ae8"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:25.6728385-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:49.8211089-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstanceAsync.json
index 0fbda01cefcf..b3264ec5df1d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-35870d0c65c67942944330fecf01a939-a392bf9861931a43-00",
+        "traceparent": "00-afb238c1ebd59c41a70bca0faa0f2647-3e880418704d9e4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b64bbfdc-4939-4623-84af-ae8628dbeb5a",
+        "apim-request-id": "6ad7a5d8-9bab-4f58-b24a-06ebfce41ab1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:56 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fa3e1ee9-4ae3-4cf9-b4a9-f8e1becfaaf2",
+        "Date": "Fri, 05 Feb 2021 17:57:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36b9b2ad-d94b-4d81-91ef-c4673d42974f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "408",
-        "X-Request-ID": "b64bbfdc-4939-4623-84af-ae8628dbeb5a"
+        "x-envoy-upstream-service-time": "647",
+        "X-Request-ID": "6ad7a5d8-9bab-4f58-b24a-06ebfce41ab1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fa3e1ee9-4ae3-4cf9-b4a9-f8e1becfaaf2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36b9b2ad-d94b-4d81-91ef-c4673d42974f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-afb238c1ebd59c41a70bca0faa0f2647-f07f57ef10791f4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d69ac2d6c3913c3f2452dae28ea2f051",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1a4a15e7-72ab-4a5a-8205-edb9a0020f94",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:43 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "1a4a15e7-72ab-4a5a-8205-edb9a0020f94"
+      },
+      "ResponseBody": {
+        "dataFeedId": "36b9b2ad-d94b-4d81-91ef-c4673d42974f",
+        "dataFeedName": "dataFeedCG23sntr",
+        "metrics": [
+          {
+            "metricId": "7845e146-a5e8-4ecc-ae4a-128a4ac125d4",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:43Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36b9b2ad-d94b-4d81-91ef-c4673d42974f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9993ee1cdd05004db1ba704f9d4cacfd-961337b810dc7f43-00",
+        "traceparent": "00-341299666fbb0844a2e7b3bba8dbcc29-04b16bf569319543-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d69ac2d6c3913c3f2452dae28ea2f051",
+        "x-ms-client-request-id": "59f326a2d6e7d3bb3a46fca49754c50d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d43b4a7e-a6e3-417b-86b0-358fe437eaeb",
+        "apim-request-id": "e5a641b7-e6cc-4f92-8503-5ad2fc1338c0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "191",
-        "X-Request-ID": "d43b4a7e-a6e3-417b-86b0-358fe437eaeb"
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "e5a641b7-e6cc-4f92-8503-5ad2fc1338c0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fa3e1ee9-4ae3-4cf9-b4a9-f8e1becfaaf2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36b9b2ad-d94b-4d81-91ef-c4673d42974f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-53e9b2f5341e3e4c9bc98113d810e199-ac1f2e6d4f17c44e-00",
+        "traceparent": "00-98b5ea415ab46140a65c54c5f0bfe221-09e75779f6e24448-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "59f326a2d6e7d3bb3a46fca49754c50d",
+        "x-ms-client-request-id": "1c1c7adfe4b70eda35c63db487df0f4f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e5ff911f-8ea3-447f-914b-a912d31a000d",
+        "apim-request-id": "512fae43-2c16-4b40-a266-175533e40f61",
         "Content-Length": "1128",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "172",
-        "X-Request-ID": "e5ff911f-8ea3-447f-914b-a912d31a000d"
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "512fae43-2c16-4b40-a266-175533e40f61"
       },
       "ResponseBody": {
-        "dataFeedId": "fa3e1ee9-4ae3-4cf9-b4a9-f8e1becfaaf2",
+        "dataFeedId": "36b9b2ad-d94b-4d81-91ef-c4673d42974f",
         "dataFeedName": "dataFeedU36paY9y",
         "metrics": [
           {
-            "metricId": "022ddbe0-2a4c-4d20-9ed8-3794f09ed24b",
+            "metricId": "7845e146-a5e8-4ecc-ae4a-128a4ac125d4",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:57Z",
+        "createdTime": "2021-02-05T17:57:43Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fa3e1ee9-4ae3-4cf9-b4a9-f8e1becfaaf2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/36b9b2ad-d94b-4d81-91ef-c4673d42974f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6cb24ca19320314689534908163932e1-d93b312c29ac9349-00",
+        "traceparent": "00-7a0873276420aa4ba67dddd62354b19f-5918f714f2c32c40-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1c1c7adfe4b70eda35c63db487df0f4f",
+        "x-ms-client-request-id": "ef579c954ba6005807c69c4ac69ba5d0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "59010bb1-b789-44e4-92a8-ae3b1f88b4d8",
+        "apim-request-id": "4744063f-3a4f-4c62-a7d2-474da2f9691f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:43 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "363",
-        "X-Request-ID": "59010bb1-b789-44e4-92a8-ae3b1f88b4d8"
+        "x-envoy-upstream-service-time": "318",
+        "X-Request-ID": "4744063f-3a4f-4c62-a7d2-474da2f9691f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:57.5685783-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:44.1014147-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstance.json
index 56d53f2eba99..91b0cb0da8b9 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-347e93549e4e9c4d93ecf7e0da6b955b-5004f4394b03f04c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1c532524654ae74e904dc1b4eb831adb-e89c16396ab3844b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "4ca2a6fb5ebfc853d8dec69841e71be4",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "3de51c08-5f07-410b-850e-edd278020368",
+        "apim-request-id": "f7909850-bbd9-4e31-bd1f-6acb08847c21",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:48 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7e5e042-84e4-46e5-805b-13725252592b",
+        "Date": "Fri, 05 Feb 2021 17:54:50 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "377",
-        "x-request-id": "3de51c08-5f07-410b-850e-edd278020368"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "664",
+        "X-Request-ID": "f7909850-bbd9-4e31-bd1f-6acb08847c21"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7e5e042-84e4-46e5-805b-13725252592b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f31bbdbb7f17ea41bb10de9ea0616b5b-ad2c3a5b0bbb5d47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1c532524654ae74e904dc1b4eb831adb-a9c743a8f1722242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2f48fa024f6586972ecfb761bf680ca5",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a7a1b56c-d1c8-46d6-a969-d753165dfcae",
+        "apim-request-id": "80eb9adb-619a-4d55-ba39-9209acd32ace",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:08:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "161",
-        "x-request-id": "a7a1b56c-d1c8-46d6-a969-d753165dfcae"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "80eb9adb-619a-4d55-ba39-9209acd32ace"
       },
       "ResponseBody": {
-        "dataFeedId": "f7e5e042-84e4-46e5-805b-13725252592b",
+        "dataFeedId": "44f32ac8-10a0-4963-bc4c-40be41eaebf1",
         "dataFeedName": "dataFeedRedtiyL6",
         "metrics": [
           {
-            "metricId": "7af2324e-e175-47aa-bac8-64a367a03df0",
+            "metricId": "4498bf98-8911-4591-bb30-13c72a059ae9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:08:49Z",
+        "createdTime": "2021-02-05T17:54:50Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7e5e042-84e4-46e5-805b-13725252592b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b6ff869bf67f8d47a5bc17983d40a558-5067d17e411e8044-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6d7a5076cf7b1f394802f9fea0c5a2a3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "09ea1ab3-ef7d-4c29-93e6-472cd72eb6bd",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:50 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "09ea1ab3-ef7d-4c29-93e6-472cd72eb6bd"
+      },
+      "ResponseBody": {
+        "dataFeedId": "44f32ac8-10a0-4963-bc4c-40be41eaebf1",
+        "dataFeedName": "dataFeedRedtiyL6",
+        "metrics": [
+          {
+            "metricId": "4498bf98-8911-4591-bb30-13c72a059ae9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:50Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "641",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4c9215d1846b4547be4e2e2bf13e0839-e4ac3ccc5c460d4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8e9ce7f6b872de4c80049bdb22fa9662-ce496959634e6847-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6d7a5076cf7b1f394802f9fea0c5a2a3",
+        "x-ms-client-request-id": "39839966e8f4abdc0f1c1df0a6f10970",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0a230de2-854d-4f75-aadd-935395515cc6",
+        "apim-request-id": "7866fe5b-e7f4-4ae1-ac30-d6b2eed947a5",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "504",
-        "x-request-id": "0a230de2-854d-4f75-aadd-935395515cc6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "518",
+        "X-Request-ID": "7866fe5b-e7f4-4ae1-ac30-d6b2eed947a5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7e5e042-84e4-46e5-805b-13725252592b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-feef6aa9c8c3e0489ef8f08a27fc00c9-eb91dd25527d1c43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0fa3d9717b82d842b20d8dd03513883f-428b6b6fb5036a48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "39839966e8f4abdc0f1c1df0a6f10970",
+        "x-ms-client-request-id": "f12121d1ae6c3269c128e6635698e569",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e6151fd1-a01b-4021-bbb3-5ec9a5b42b98",
+        "apim-request-id": "babf2899-9bd9-4e7e-9dd3-f3ca2da4e6cc",
         "Content-Length": "1053",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:08:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "x-request-id": "e6151fd1-a01b-4021-bbb3-5ec9a5b42b98"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "134",
+        "X-Request-ID": "babf2899-9bd9-4e7e-9dd3-f3ca2da4e6cc"
       },
       "ResponseBody": {
-        "dataFeedId": "f7e5e042-84e4-46e5-805b-13725252592b",
+        "dataFeedId": "44f32ac8-10a0-4963-bc4c-40be41eaebf1",
         "dataFeedName": "dataFeedRedtiyL6",
         "metrics": [
           {
-            "metricId": "7af2324e-e175-47aa-bac8-64a367a03df0",
+            "metricId": "4498bf98-8911-4591-bb30-13c72a059ae9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:08:49Z",
+        "createdTime": "2021-02-05T17:54:50Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7e5e042-84e4-46e5-805b-13725252592b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/44f32ac8-10a0-4963-bc4c-40be41eaebf1",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7e742bb1de5a91468c942976e9d0651b-17f18055a371b340-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-898b4b71c8a3954783bf5f220741aa0b-e0ae0d12b7e8b34d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f12121d1ae6c3269c128e6635698e569",
+        "x-ms-client-request-id": "25fa132dd3e48db073cf5e5fb1487856",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "42f1a485-96a2-467c-9d2a-a98726057398",
+        "apim-request-id": "2806bd13-5c70-4d8f-a658-7d48b8c2fa2d",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "355",
-        "x-request-id": "42f1a485-96a2-467c-9d2a-a98726057398"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "292",
+        "X-Request-ID": "2806bd13-5c70-4d8f-a658-7d48b8c2fa2d"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:08:50.1029333-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:52.2843351-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 0274a0e25144..cd4006e8ef7c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-94bae8172fbdb646adc7b5e0daf84e00-9025719ec2cf4f48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f759104e998d994daaef99d00b545512-8d2b69a903cc3540-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b3b8676246b362ad9c102cc177f5e93e",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ea25cf1d-8ad6-491e-a2c9-d3eee6fb36a0",
+        "apim-request-id": "02de216c-52dd-4099-a581-37e8b27b44b2",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:13 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+        "Date": "Fri, 05 Feb 2021 17:57:44 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "600",
-        "x-request-id": "ea25cf1d-8ad6-491e-a2c9-d3eee6fb36a0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "626",
+        "X-Request-ID": "02de216c-52dd-4099-a581-37e8b27b44b2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a25f063df7c7d64c92a06f133bbf9ed4-7118626b727c6a47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f759104e998d994daaef99d00b545512-5107ce9a7ede2f4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "28ef885fbfc68c54822f1ab36f2f10c1",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "67c5b066-3a01-4de1-a881-b1ea1adacbf4",
+        "apim-request-id": "61c91eb6-0799-4021-9b02-24252880dec0",
         "Content-Length": "1002",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:09:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "213",
-        "x-request-id": "67c5b066-3a01-4de1-a881-b1ea1adacbf4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "61c91eb6-0799-4021-9b02-24252880dec0"
       },
       "ResponseBody": {
-        "dataFeedId": "aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+        "dataFeedId": "2f074ba6-5b51-442e-bccf-fec103f5d3c2",
         "dataFeedName": "dataFeedt8yLM4f9",
         "metrics": [
           {
-            "metricId": "10ebddee-8364-473a-9c9e-713c7a683006",
+            "metricId": "e270b388-e3c3-4c2a-b1b4-81befa4fcd17",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:09:13Z",
+        "createdTime": "2021-02-05T17:57:44Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-3b1321382919994a9b52b8631667cb46-182939f063900e42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c55c9febdb90038fa86cceb8fa7c615c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1fc0669b-dc09-419c-ab99-36c5760e6b3b",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:45 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "183",
+        "X-Request-ID": "1fc0669b-dc09-419c-ab99-36c5760e6b3b"
+      },
+      "ResponseBody": {
+        "dataFeedId": "2f074ba6-5b51-442e-bccf-fec103f5d3c2",
+        "dataFeedName": "dataFeedt8yLM4f9",
+        "metrics": [
+          {
+            "metricId": "e270b388-e3c3-4c2a-b1b4-81befa4fcd17",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:44Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "641",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-309f9048d4166143982692b734408e30-8b97d4d04d7deb40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-895ec8f25075c8449540fdf7976d1a3b-bdbe8214601b0f4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c55c9febdb90038fa86cceb8fa7c615c",
+        "x-ms-client-request-id": "4d37d684618fa273132b30842cf9f36c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e51e8ce9-c385-4bb3-affa-ae9878e84534",
+        "apim-request-id": "72929a3e-e99e-4c2c-b9c9-d51ab10de48a",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "929",
-        "x-request-id": "e51e8ce9-c385-4bb3-affa-ae9878e84534"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "517",
+        "X-Request-ID": "72929a3e-e99e-4c2c-b9c9-d51ab10de48a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3e1831b93e0e234d8e5ded6a40e4537c-8162372d9de59748-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9c8b526b442fb24f93508cf8f6dcddcb-7c451f13d69ee04b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4d37d684618fa273132b30842cf9f36c",
+        "x-ms-client-request-id": "d8d56a00249883adf9ec8059f19b9206",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9ade539f-bf36-4193-8289-abe476479cdf",
+        "apim-request-id": "e02e8d87-b292-48c4-a1b7-f3bed004ba92",
         "Content-Length": "1053",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:09:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "234",
-        "x-request-id": "9ade539f-bf36-4193-8289-abe476479cdf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "e02e8d87-b292-48c4-a1b7-f3bed004ba92"
       },
       "ResponseBody": {
-        "dataFeedId": "aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+        "dataFeedId": "2f074ba6-5b51-442e-bccf-fec103f5d3c2",
         "dataFeedName": "dataFeedt8yLM4f9",
         "metrics": [
           {
-            "metricId": "10ebddee-8364-473a-9c9e-713c7a683006",
+            "metricId": "e270b388-e3c3-4c2a-b1b4-81befa4fcd17",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:09:13Z",
+        "createdTime": "2021-02-05T17:57:44Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa5de0a6-f512-4970-bda4-ae4b60d395c3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2f074ba6-5b51-442e-bccf-fec103f5d3c2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b278ddc0ed13464bbc0b098d2338e1b8-20843f61938c1042-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2751cbfe80a59c4fa3aab5709b926bb4-a0ba34c8b037b140-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d8d56a00249883adf9ec8059f19b9206",
+        "x-ms-client-request-id": "992fbdcdc3f88a312cbab164aa0ad7ae",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9ad5b682-a2d4-4ac7-aeae-587d381181c1",
+        "apim-request-id": "0603c1ad-be36-4fc1-8f77-6365fe01d8b4",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "409",
-        "x-request-id": "9ad5b682-a2d4-4ac7-aeae-587d381181c1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "320",
+        "X-Request-ID": "0603c1ad-be36-4fc1-8f77-6365fe01d8b4"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:09:15.6010541-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:46.2556609-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstance.json
index 95d22294bd6a..1ff4a47b0817 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0479a8bae36d5d4781add5f7f9cef2e0-2a504dce3488284c-00",
+        "traceparent": "00-c8823b81a24f8f4bb54fe11767e33514-e9d7fe50e6b63a43-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d96d0b59-6aaf-4958-9a2d-644936ec8beb",
+        "apim-request-id": "2947ac23-733a-4bb9-9f89-d6b7b3f80d93",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:26 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1a8cc048-71f8-43b0-9635-62bb1cd9f97f",
+        "Date": "Fri, 05 Feb 2021 17:54:52 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "427",
-        "X-Request-ID": "d96d0b59-6aaf-4958-9a2d-644936ec8beb"
+        "x-envoy-upstream-service-time": "678",
+        "X-Request-ID": "2947ac23-733a-4bb9-9f89-d6b7b3f80d93"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1a8cc048-71f8-43b0-9635-62bb1cd9f97f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c8823b81a24f8f4bb54fe11767e33514-ff7c6f48e3aaf540-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "54854b21bb0bb791d3c292255c426a58",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "83f5ed4c-dfce-40ba-be9d-5d3e91c29461",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "83f5ed4c-dfce-40ba-be9d-5d3e91c29461"
+      },
+      "ResponseBody": {
+        "dataFeedId": "146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
+        "dataFeedName": "dataFeedg8aWDqZ6",
+        "metrics": [
+          {
+            "metricId": "d1d6ea28-94d3-4554-bf84-f1eb0783101c",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:53Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c652e64f3999064a9ed84dade69f9903-28027d3c64363045-00",
+        "traceparent": "00-782455e52de5a94db1f9088dc67784a4-19cd51dad5f47b41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "54854b21bb0bb791d3c292255c426a58",
+        "x-ms-client-request-id": "2ee96d6ff42eb249eefd4e8e67052a01",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d29c34c0-1678-4d5e-af8e-ea204af852c3",
+        "apim-request-id": "0a2c7331-181a-421c-8017-68acd580890f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "181",
-        "X-Request-ID": "d29c34c0-1678-4d5e-af8e-ea204af852c3"
+        "x-envoy-upstream-service-time": "183",
+        "X-Request-ID": "0a2c7331-181a-421c-8017-68acd580890f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1a8cc048-71f8-43b0-9635-62bb1cd9f97f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cf8fdf1b08be9b40a910d8b7567e4ac4-7d1cf6963c92da42-00",
+        "traceparent": "00-3bdc01ef012e544b9b921b0520de2bac-3052e507bc8d5549-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2ee96d6ff42eb249eefd4e8e67052a01",
+        "x-ms-client-request-id": "9be8262bfe481988bbec6c9897f86a6d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9abb67f2-70dd-4c94-817d-69fbe8b562cb",
+        "apim-request-id": "cb74fae1-9261-41bb-9007-b43269dd10d1",
         "Content-Length": "1053",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "X-Request-ID": "9abb67f2-70dd-4c94-817d-69fbe8b562cb"
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "cb74fae1-9261-41bb-9007-b43269dd10d1"
       },
       "ResponseBody": {
-        "dataFeedId": "1a8cc048-71f8-43b0-9635-62bb1cd9f97f",
+        "dataFeedId": "146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
         "dataFeedName": "dataFeedg8aWDqZ6",
         "metrics": [
           {
-            "metricId": "c9e3829a-f17d-4794-a440-87df8126cd99",
+            "metricId": "d1d6ea28-94d3-4554-bf84-f1eb0783101c",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:26Z",
+        "createdTime": "2021-02-05T17:54:53Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1a8cc048-71f8-43b0-9635-62bb1cd9f97f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/146273a7-b1bb-4bd2-8ccb-aee02d04fafe",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6aed26c8e354e144af54a4c934c32ea6-8c32f100d2e2dd40-00",
+        "traceparent": "00-6567967b09fa8841ae5acce686e6284c-894775e6c138e64a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9be8262bfe481988bbec6c9897f86a6d",
+        "x-ms-client-request-id": "291cc5eeed2c2c7402d2660e6d0250ce",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e7d70979-b2ee-4d8b-9913-6585a2e8cd47",
+        "apim-request-id": "8df35363-4641-4dbc-aec4-9be3f239dc5a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "326",
-        "X-Request-ID": "e7d70979-b2ee-4d8b-9913-6585a2e8cd47"
+        "x-envoy-upstream-service-time": "334",
+        "X-Request-ID": "8df35363-4641-4dbc-aec4-9be3f239dc5a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:27.0009296-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:54.3637600-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 092cbbc45c13..b7da403e45cc 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureCosmosDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "290",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f39f106786bd534f98abeb29df9bcd36-48f60d41cce66843-00",
+        "traceparent": "00-42ac6807c48e2d4c9128a78842f3492c-947cee12c4457844-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "3d89810a-5d78-46d5-a683-2c858f005b25",
+        "apim-request-id": "a51ad24e-87ea-4a95-b781-d5aa490e027f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:57 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3c21d9de-81c6-4610-8e14-066b9fedf40b",
+        "Date": "Fri, 05 Feb 2021 17:57:46 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "498",
-        "X-Request-ID": "3d89810a-5d78-46d5-a683-2c858f005b25"
+        "x-envoy-upstream-service-time": "492",
+        "X-Request-ID": "a51ad24e-87ea-4a95-b781-d5aa490e027f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3c21d9de-81c6-4610-8e14-066b9fedf40b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-42ac6807c48e2d4c9128a78842f3492c-9324cdbd6f668b44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9a6a0e55db68df488bc6bc513ce48cdd",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "979e5260-8c2a-4fe9-aae5-8e6d26f2c0a5",
+        "Content-Length": "1002",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "979e5260-8c2a-4fe9-aae5-8e6d26f2c0a5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
+        "dataFeedName": "dataFeedcJuuEvid",
+        "metrics": [
+          {
+            "metricId": "c3d78a71-d262-4e5f-b363-2078929ac848",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureCosmosDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:47Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "sqlQuery": "query",
+          "collectionId": "collectId"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-774b0a424912e249bb9ca9caa671725f-1ab43b74d6db7c4d-00",
+        "traceparent": "00-3e8fb15024103a40828b31739750b54f-e9d99b6af7361344-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9a6a0e55db68df488bc6bc513ce48cdd",
+        "x-ms-client-request-id": "5adc7a088a74771331216309a8620fbe",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5ef4da75-1c62-4314-b8ba-0dc349c10f53",
+        "apim-request-id": "135e058e-1547-4175-a4f7-1bc897650058",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "X-Request-ID": "5ef4da75-1c62-4314-b8ba-0dc349c10f53"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "135e058e-1547-4175-a4f7-1bc897650058"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3c21d9de-81c6-4610-8e14-066b9fedf40b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b035043335bbac44b4e9aa8a29fbb24f-4022f657a993884f-00",
+        "traceparent": "00-66acdae90b95ca44b8137f6b58ab77e3-abdfad76436e4b48-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5adc7a088a74771331216309a8620fbe",
+        "x-ms-client-request-id": "b80c8912593c352c054355d97c7445f4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fe9c210f-4e5b-4bcb-8eba-791ad43fbcf6",
+        "apim-request-id": "c6e80ce9-472e-4cde-9039-6246f5e298ac",
         "Content-Length": "1053",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "X-Request-ID": "fe9c210f-4e5b-4bcb-8eba-791ad43fbcf6"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "c6e80ce9-472e-4cde-9039-6246f5e298ac"
       },
       "ResponseBody": {
-        "dataFeedId": "3c21d9de-81c6-4610-8e14-066b9fedf40b",
+        "dataFeedId": "d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
         "dataFeedName": "dataFeedcJuuEvid",
         "metrics": [
           {
-            "metricId": "5f09f84c-0ece-4e3c-9abd-6d881de693aa",
+            "metricId": "c3d78a71-d262-4e5f-b363-2078929ac848",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:58Z",
+        "createdTime": "2021-02-05T17:57:47Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3c21d9de-81c6-4610-8e14-066b9fedf40b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d6104e2d-ddde-48ac-be40-6a8eca6b70bf",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2ba81988b7ca244eb9564a17bfb76239-603c556b4bbc7b45-00",
+        "traceparent": "00-3a05e1841dd21942a8c6da8e4ff1ac15-6dbd3b517a932549-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b80c8912593c352c054355d97c7445f4",
+        "x-ms-client-request-id": "d77683935e4cca97faf26947773e3729",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "919b6d88-9757-49d6-85a3-cc74f34e15ba",
+        "apim-request-id": "cc89e805-d895-4e50-9519-d25ab671e46b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "309",
-        "X-Request-ID": "919b6d88-9757-49d6-85a3-cc74f34e15ba"
+        "x-envoy-upstream-service-time": "336",
+        "X-Request-ID": "cc89e805-d895-4e50-9519-d25ab671e46b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:58.9062701-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:47.8001696-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstance.json
index 8e98f4fccea2..d915ff74b75e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7bf0fed180be4b4988bb2155372a72e1-d9d53ff100a42747-00",
+        "traceparent": "00-4657bc3a5ff3e841af63319fcd64c0a9-d4b1ee4be5a4d24a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,26 +34,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2266f927-d65a-4a8a-8226-ba87cd429ad1",
+        "apim-request-id": "57f5ecd2-e87b-42fb-aed5-625dc2ec3f85",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/14374405-3b91-4714-bb0b-b4bbbf07ce05",
+        "Date": "Fri, 05 Feb 2021 17:54:54 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "554",
-        "X-Request-ID": "2266f927-d65a-4a8a-8226-ba87cd429ad1"
+        "x-envoy-upstream-service-time": "638",
+        "X-Request-ID": "57f5ecd2-e87b-42fb-aed5-625dc2ec3f85"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/14374405-3b91-4714-bb0b-b4bbbf07ce05",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-37cd737eb6f6814ca3f0e6cfa15d0463-3fb399bdbba3744e-00",
+        "traceparent": "00-4657bc3a5ff3e841af63319fcd64c0a9-ed95d18c09a85c47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -63,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a0f1ae67-d3b0-4847-9f89-a3b72c1d87e0",
+        "apim-request-id": "b4a018e6-193d-41b6-b4a3-7d01c65f4c7b",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "X-Request-ID": "a0f1ae67-d3b0-4847-9f89-a3b72c1d87e0"
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "b4a018e6-193d-41b6-b4a3-7d01c65f4c7b"
       },
       "ResponseBody": {
-        "dataFeedId": "14374405-3b91-4714-bb0b-b4bbbf07ce05",
+        "dataFeedId": "e0bab00e-10af-4836-927d-fd7e15bb4378",
         "dataFeedName": "dataFeedlyX8Vr5E",
         "metrics": [
           {
-            "metricId": "922a5430-d377-4f84-af2e-709713dc1ef1",
+            "metricId": "cc930144-26c3-4e6e-9381-40132c1e84fa",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -108,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:43Z",
+        "createdTime": "2021-02-05T17:54:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,20 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/14374405-3b91-4714-bb0b-b4bbbf07ce05",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0f9fac1a5f731f4a805e5856699dd42d-e3667b7190db2547-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5b541f8011c8015fb179311ce068f4b2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ca7fb67c-7235-4438-8db9-846f16564483",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "ca7fb67c-7235-4438-8db9-846f16564483"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e0bab00e-10af-4836-927d-fd7e15bb4378",
+        "dataFeedName": "dataFeedlyX8Vr5E",
+        "metrics": [
+          {
+            "metricId": "cc930144-26c3-4e6e-9381-40132c1e84fa",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:55Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "685",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3e4cf6275094a244947a1a5b4eb9bcba-6ad85aef1317de46-00",
+        "traceparent": "00-b528d1149d0a7f4f820d99b565e7a0fa-e774ca468615c348-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5b541f8011c8015fb179311ce068f4b2",
+        "x-ms-client-request-id": "e1e175c0bce3a8684c0346cdd5490162",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,49 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "579eaf0e-1fd3-486f-af51-3ec6927c0c51",
+        "apim-request-id": "f1f99214-fe8b-4a27-b0ef-1a51516e5944",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "798",
-        "X-Request-ID": "579eaf0e-1fd3-486f-af51-3ec6927c0c51"
+        "x-envoy-upstream-service-time": "671",
+        "X-Request-ID": "f1f99214-fe8b-4a27-b0ef-1a51516e5944"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/14374405-3b91-4714-bb0b-b4bbbf07ce05",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0b7efed644d7174a9101d05a5634f5d0-562ad11b940de34c-00",
+        "traceparent": "00-ee0c0fdce592594f99988fdbfb489d2d-1801d1c322dde54d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e1e175c0bce3a8684c0346cdd5490162",
+        "x-ms-client-request-id": "da2819dc313b873fc9c5067b253d5e0c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3e6bc8b3-2bf9-4727-b8df-ef32668e16f3",
+        "apim-request-id": "e5c89633-39d7-4f51-90ca-f284c69d940c",
         "Content-Length": "1097",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "143",
-        "X-Request-ID": "3e6bc8b3-2bf9-4727-b8df-ef32668e16f3"
+        "x-envoy-upstream-service-time": "206",
+        "X-Request-ID": "e5c89633-39d7-4f51-90ca-f284c69d940c"
       },
       "ResponseBody": {
-        "dataFeedId": "14374405-3b91-4714-bb0b-b4bbbf07ce05",
+        "dataFeedId": "e0bab00e-10af-4836-927d-fd7e15bb4378",
         "dataFeedName": "dataFeedOwA4fUul",
         "metrics": [
           {
-            "metricId": "922a5430-d377-4f84-af2e-709713dc1ef1",
+            "metricId": "cc930144-26c3-4e6e-9381-40132c1e84fa",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -241,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:43Z",
+        "createdTime": "2021-02-05T17:54:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,36 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/14374405-3b91-4714-bb0b-b4bbbf07ce05",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0bab00e-10af-4836-927d-fd7e15bb4378",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-34b9adc04836f646b8d60ddee613adbd-4b36bca2ae397341-00",
+        "traceparent": "00-360a4e550060064c8dd26d8d97dfc5c5-6f7532ed54569343-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "da2819dc313b873fc9c5067b253d5e0c",
+        "x-ms-client-request-id": "5942da00f803c405b7ab0fc4ca912c67",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b49d4e52-0fd6-48d0-8ffd-4289deee042e",
+        "apim-request-id": "053bdc97-6617-441c-8f54-16ccd103c0a0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "309",
-        "X-Request-ID": "b49d4e52-0fd6-48d0-8ffd-4289deee042e"
+        "x-envoy-upstream-service-time": "308",
+        "X-Request-ID": "053bdc97-6617-441c-8f54-16ccd103c0a0"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:44.9529225-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:57.3334814-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstanceAsync.json
index 648eaa4fdc53..4e80fefe1058 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5afb4a262e592047b6483d1cb5d1b256-ae80dedf1d723c42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-182976eac2c9c74697f230d79fade61d-77aa168d42e46c44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d0fa0538560779237dfa6eee3f178f42",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "27b54a31-54ce-4c33-9d3e-415119674eab",
+        "apim-request-id": "b298960d-a5d4-4911-acbc-7ad06be80324",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+        "Date": "Fri, 05 Feb 2021 17:57:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "609",
-        "x-request-id": "27b54a31-54ce-4c33-9d3e-415119674eab"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "534",
+        "X-Request-ID": "b298960d-a5d4-4911-acbc-7ad06be80324"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-be60da7950da6e42b56fa3ceb421a4f4-0285288ce1055e46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-182976eac2c9c74697f230d79fade61d-1f7fd8c4ab89f442-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "82b85caba0fd6bd9f89afdf736cd17d4",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fa933d3b-1173-4090-876f-a4a4199e56cf",
+        "apim-request-id": "b9f416d8-081b-437d-a25f-df82ec22f46c",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "fa933d3b-1173-4090-876f-a4a4199e56cf"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "b9f416d8-081b-437d-a25f-df82ec22f46c"
       },
       "ResponseBody": {
-        "dataFeedId": "ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+        "dataFeedId": "ac1f13f5-9b26-4147-b20c-beb026cca98e",
         "dataFeedName": "dataFeedqtqXRYM8",
         "metrics": [
           {
-            "metricId": "ac22bea9-1cd4-42f8-ace4-27b5109a555a",
+            "metricId": "ef203ce6-1157-40cc-a186-70bb7f72822d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:04Z",
+        "createdTime": "2021-02-05T17:57:48Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-76a4e3bf4c7b7e47b41a068c9a2fefc9-e25bf2998787b242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1396621345368f35cf02576a6654f41d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "25d498d8-bf7a-49d5-a68a-01e1946803a6",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:48 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "25d498d8-bf7a-49d5-a68a-01e1946803a6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ac1f13f5-9b26-4147-b20c-beb026cca98e",
+        "dataFeedName": "dataFeedqtqXRYM8",
+        "metrics": [
+          {
+            "metricId": "ef203ce6-1157-40cc-a186-70bb7f72822d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:48Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "685",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8c803e99ba6af144a4ce3ce35af475f1-198e681b14f2b046-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-45d1fdd0ae72104cb11d7f2beeb1ab91-7c4abc19de835f42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1396621345368f35cf02576a6654f41d",
+        "x-ms-client-request-id": "2da42c57792f97982b8fd86d592b43b0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "21f8b368-0cbe-4f05-af35-d18c1e4cd627",
+        "apim-request-id": "deec66de-144f-44f5-ad83-3b4a5765914b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "625",
-        "x-request-id": "21f8b368-0cbe-4f05-af35-d18c1e4cd627"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "481",
+        "X-Request-ID": "deec66de-144f-44f5-ad83-3b4a5765914b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a023d55c9542b343a623c82d31422e79-6c5a9034ac095d43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7ec73d40fe40994e8a8b52aca722d585-e9759c2b50e92045-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2da42c57792f97982b8fd86d592b43b0",
+        "x-ms-client-request-id": "dcda9ae27c80650b2728b3fa486f04a4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "36aae744-b87d-4b87-b9ac-94cc7ca62c06",
+        "apim-request-id": "f88daf37-a35c-4e62-9284-18f644414881",
         "Content-Length": "1097",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "197",
-        "x-request-id": "36aae744-b87d-4b87-b9ac-94cc7ca62c06"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "f88daf37-a35c-4e62-9284-18f644414881"
       },
       "ResponseBody": {
-        "dataFeedId": "ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+        "dataFeedId": "ac1f13f5-9b26-4147-b20c-beb026cca98e",
         "dataFeedName": "dataFeedCBL3dSPT",
         "metrics": [
           {
-            "metricId": "ac22bea9-1cd4-42f8-ace4-27b5109a555a",
+            "metricId": "ef203ce6-1157-40cc-a186-70bb7f72822d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:04Z",
+        "createdTime": "2021-02-05T17:57:48Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -239,33 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ad8901a0-1d37-4f8f-8a3c-2578b93b2af5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ac1f13f5-9b26-4147-b20c-beb026cca98e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-29ffa2ca1d2f324d974d51cfda9e2029-01a14a6de954d543-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1b97ea285e091242bf424abc38894dd9-759698416167744d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dcda9ae27c80650b2728b3fa486f04a4",
+        "x-ms-client-request-id": "09a0dfa5ea2899a4c9fee8a76dc836a4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "812f503f-1d49-47fd-a0cc-1b0eba38d69d",
+        "apim-request-id": "e2b024cc-0fd6-4977-9e02-a071ca4e42d7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:06 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "335",
-        "x-request-id": "812f503f-1d49-47fd-a0cc-1b0eba38d69d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "296",
+        "X-Request-ID": "e2b024cc-0fd6-4977-9e02-a071ca4e42d7"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:06.1426760-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:49.7802218-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstance.json
index 909794e4ee91..451ac7ac3312 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-692bdd5adf246449974b47052cdb7daf-5b400898bbb0bf4b-00",
+        "traceparent": "00-e8fa8b45fdfea24ab75f8daea99e7768-f03fa8ec35658342-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "da8f57a2-bc33-4089-a6d4-32c87cbe90aa",
+        "apim-request-id": "d86ca3a1-f14e-4aae-b7da-61461a95e784",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:27 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31542cba-2bad-4338-83fc-b0d44dae9e92",
+        "Date": "Fri, 05 Feb 2021 17:54:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1757829-9c34-47a6-afda-1c7eaf488314",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "435",
-        "X-Request-ID": "da8f57a2-bc33-4089-a6d4-32c87cbe90aa"
+        "x-envoy-upstream-service-time": "672",
+        "X-Request-ID": "d86ca3a1-f14e-4aae-b7da-61461a95e784"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31542cba-2bad-4338-83fc-b0d44dae9e92",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1757829-9c34-47a6-afda-1c7eaf488314",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e8fa8b45fdfea24ab75f8daea99e7768-a6b7991334d64844-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "29c5295bcb04a95ba10cb55bfb6c311a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "42e4b738-c37c-4f58-a8b1-010f4a263d3f",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:54:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "42e4b738-c37c-4f58-a8b1-010f4a263d3f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b1757829-9c34-47a6-afda-1c7eaf488314",
+        "dataFeedName": "dataFeedYtc7NEWp",
+        "metrics": [
+          {
+            "metricId": "90db91b5-0fbc-4ecd-85c3-4e8aca429695",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:54:58Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1757829-9c34-47a6-afda-1c7eaf488314",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-28b7b49ab2f25e40ad9a608345d063ad-14a9a1beddb7294c-00",
+        "traceparent": "00-aa55e49cdeae944d98e6c1f476226740-c445198d81ccee47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "29c5295bcb04a95ba10cb55bfb6c311a",
+        "x-ms-client-request-id": "9de4edc5896f7be76ea41622df8895a9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8cb51a7e-7eb9-44c1-8577-251a40a14217",
+        "apim-request-id": "43f5ba2d-a7b6-43c5-9837-07c7da75f42f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "177",
-        "X-Request-ID": "8cb51a7e-7eb9-44c1-8577-251a40a14217"
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "43f5ba2d-a7b6-43c5-9837-07c7da75f42f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31542cba-2bad-4338-83fc-b0d44dae9e92",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1757829-9c34-47a6-afda-1c7eaf488314",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9d791efbc5f3fe4398b24ff39b153cad-d0e3007b8c6f904e-00",
+        "traceparent": "00-06e7dc7ccd30424c9a940aa72e78f4ef-1ce423890c3b3446-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9de4edc5896f7be76ea41622df8895a9",
+        "x-ms-client-request-id": "5e2d151e3ea409000488a4d62fe79c9f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5c43a331-00ca-403e-b1a8-c60822d25679",
+        "apim-request-id": "662731e7-1a44-4c17-84c3-f95481b8b550",
         "Content-Length": "1080",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "5c43a331-00ca-403e-b1a8-c60822d25679"
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "662731e7-1a44-4c17-84c3-f95481b8b550"
       },
       "ResponseBody": {
-        "dataFeedId": "31542cba-2bad-4338-83fc-b0d44dae9e92",
+        "dataFeedId": "b1757829-9c34-47a6-afda-1c7eaf488314",
         "dataFeedName": "dataFeedOrzgLdZs",
         "metrics": [
           {
-            "metricId": "ecfa6a4f-62cb-4da1-9953-43c980a0fe3c",
+            "metricId": "90db91b5-0fbc-4ecd-85c3-4e8aca429695",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:27Z",
+        "createdTime": "2021-02-05T17:54:58Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31542cba-2bad-4338-83fc-b0d44dae9e92",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b1757829-9c34-47a6-afda-1c7eaf488314",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-02e1e01ce0e1a84cb5bd7e7bad918b4d-10f07c3095b06149-00",
+        "traceparent": "00-a2bad0fd24053a44a6746505f67c5772-a1f1d2a4713fe746-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5e2d151e3ea409000488a4d62fe79c9f",
+        "x-ms-client-request-id": "c042e74d515dd19d4249ba5fb539ca18",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "82789566-d84a-46f4-b340-ed16c18a0180",
+        "apim-request-id": "c515a3b8-7822-4c7c-b863-e549dba957cf",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:54:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "311",
-        "X-Request-ID": "82789566-d84a-46f4-b340-ed16c18a0180"
+        "x-envoy-upstream-service-time": "295",
+        "X-Request-ID": "c515a3b8-7822-4c7c-b863-e549dba957cf"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:28.2165907-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:54:59.2339142-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstanceAsync.json
index 302ac2f9dc9e..696a4c1d47ef 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-48160ab4a66a3b419884c56ac4324e60-0814f4d7b3a18148-00",
+        "traceparent": "00-a123ab1dccb1034a87447e631e6f8329-ecf3af6b95036443-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b80dd442-4a0c-49b6-9cab-100b90452cff",
+        "apim-request-id": "927905ac-6adc-4d0a-b087-c3b6e6c4b079",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/81624928-bb8b-4c95-a75d-6de4c31b6bda",
+        "Date": "Fri, 05 Feb 2021 17:57:50 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "390",
-        "X-Request-ID": "b80dd442-4a0c-49b6-9cab-100b90452cff"
+        "x-envoy-upstream-service-time": "536",
+        "X-Request-ID": "927905ac-6adc-4d0a-b087-c3b6e6c4b079"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/81624928-bb8b-4c95-a75d-6de4c31b6bda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a123ab1dccb1034a87447e631e6f8329-dd727a81480ae24f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4261b61e496a8967fa06cdbc142631c2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6c2cadcd-52da-4e5b-bd39-32dedc98e922",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:50 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "6c2cadcd-52da-4e5b-bd39-32dedc98e922"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
+        "dataFeedName": "dataFeed44nhOsM3",
+        "metrics": [
+          {
+            "metricId": "5ddfd9c6-1df6-4cee-8c9e-358689960078",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:50Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-14e466042c05da4db0f8d150237c8b78-3145c958ac7e964a-00",
+        "traceparent": "00-00d32a660505b348b995c47e05b1930a-65543cd8c982b947-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4261b61e496a8967fa06cdbc142631c2",
+        "x-ms-client-request-id": "2833097a97b8fd7e039e7e92bc07fba3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "30121d5b-7b3a-42d6-8a7c-4ccfc418c38a",
+        "apim-request-id": "0b57313a-08ea-4af6-8b6b-89d533240622",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "174",
-        "X-Request-ID": "30121d5b-7b3a-42d6-8a7c-4ccfc418c38a"
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "0b57313a-08ea-4af6-8b6b-89d533240622"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/81624928-bb8b-4c95-a75d-6de4c31b6bda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5718c221fe07644d8878e6de0f752026-383c97778933064e-00",
+        "traceparent": "00-1630863dde225047b01179fccde2e861-4d10a3925615f245-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2833097a97b8fd7e039e7e92bc07fba3",
+        "x-ms-client-request-id": "ea270a96abc18531ff03793685631d82",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0d637c19-bbf8-4975-b5e1-52480ee4ce3d",
+        "apim-request-id": "c9dd69b2-e9e1-4a1f-883d-5745a7284095",
         "Content-Length": "1080",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "X-Request-ID": "0d637c19-bbf8-4975-b5e1-52480ee4ce3d"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "c9dd69b2-e9e1-4a1f-883d-5745a7284095"
       },
       "ResponseBody": {
-        "dataFeedId": "81624928-bb8b-4c95-a75d-6de4c31b6bda",
+        "dataFeedId": "cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
         "dataFeedName": "dataFeedslpZOlRZ",
         "metrics": [
           {
-            "metricId": "b73d04d1-5f96-41d7-b528-8fb2820b4643",
+            "metricId": "5ddfd9c6-1df6-4cee-8c9e-358689960078",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:59Z",
+        "createdTime": "2021-02-05T17:57:50Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/81624928-bb8b-4c95-a75d-6de4c31b6bda",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbde6b48-4b17-40e1-ad03-0bbdd74508d0",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-abc23770dbdee645bfb6936868a58507-66cd6b52d298a547-00",
+        "traceparent": "00-96b59e31d0975e49925385b32f4284c4-d6efbc78e3396f46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ea270a96abc18531ff03793685631d82",
+        "x-ms-client-request-id": "330be6129b1e872438643ecbcbd5ccf2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6643797d-4800-4784-8395-ab4d2b7ed527",
+        "apim-request-id": "bb200ddb-b1dd-49d0-ba64-484c8dad97e5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "307",
-        "X-Request-ID": "6643797d-4800-4784-8395-ab4d2b7ed527"
+        "x-envoy-upstream-service-time": "275",
+        "X-Request-ID": "bb200ddb-b1dd-49d0-ba64-484c8dad97e5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:59.9996443-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:51.4351946-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstance.json
index 907eba2a5797..be9f392c6ead 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5ed70d6abb9f6641b5f3de86d70ac948-cb8060ec93766643-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-be3f83dc3fbb9849b940124e0a1dc8f2-32ccec8fddfd764b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a0dd92e75fba1fc38e2c3546eee3b13e",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dd72d6db-2a5c-461f-a221-114fab39db98",
+        "apim-request-id": "689869d5-b02d-4db4-adb7-8201d6c0905a",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:56 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c0318603-0764-47b9-84e9-db35089116e1",
+        "Date": "Fri, 05 Feb 2021 17:55:00 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "451",
-        "x-request-id": "dd72d6db-2a5c-461f-a221-114fab39db98"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "546",
+        "X-Request-ID": "689869d5-b02d-4db4-adb7-8201d6c0905a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c0318603-0764-47b9-84e9-db35089116e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9a04bb4b971f134f89fbe57426efcd75-e7808237410a9949-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-be3f83dc3fbb9849b940124e0a1dc8f2-896c6ab49a3e2a41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "8f983f325c579a28501c43527918f4cb",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b58505a7-5edc-4fe2-ad04-416f00da1f65",
+        "apim-request-id": "1833104d-a5ce-4c5f-ae71-3a869d673a7c",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:08:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "184",
-        "x-request-id": "b58505a7-5edc-4fe2-ad04-416f00da1f65"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "1833104d-a5ce-4c5f-ae71-3a869d673a7c"
       },
       "ResponseBody": {
-        "dataFeedId": "c0318603-0764-47b9-84e9-db35089116e1",
+        "dataFeedId": "30bcb64d-4c1f-455f-a185-138920fcd553",
         "dataFeedName": "dataFeed2YQEJy4o",
         "metrics": [
           {
-            "metricId": "06feecc4-f2ac-4bdf-b340-724f623f9bcc",
+            "metricId": "2ea34acd-f64c-4a7b-b314-7b01a7dd48bb",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:08:56Z",
+        "createdTime": "2021-02-05T17:55:00Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c0318603-0764-47b9-84e9-db35089116e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-42ca0deb99ad414d9be3bff4ffa9b618-86ee56bc21566940-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "530c1391f175805c426c2ebff6d4c4f5",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "99751e44-7159-4887-98b5-939d6925fe57",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:00 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "99751e44-7159-4887-98b5-939d6925fe57"
+      },
+      "ResponseBody": {
+        "dataFeedId": "30bcb64d-4c1f-455f-a185-138920fcd553",
+        "dataFeedName": "dataFeed2YQEJy4o",
+        "metrics": [
+          {
+            "metricId": "2ea34acd-f64c-4a7b-b314-7b01a7dd48bb",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:00Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "593",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fdd0fa47399a2244b4ffd705de9bddd4-46b7f7afe6c81b42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9b732c65d4a48b469591357be2e8db5f-725f04788abe7446-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "530c1391f175805c426c2ebff6d4c4f5",
+        "x-ms-client-request-id": "c3d99495c9808a096a434f9e1b70a675",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "093e5e9d-c58a-4304-84eb-6a98e326ae26",
+        "apim-request-id": "25fcc360-7d35-433f-ad30-a6bfd5044b1a",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "696",
-        "x-request-id": "093e5e9d-c58a-4304-84eb-6a98e326ae26"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "741",
+        "X-Request-ID": "25fcc360-7d35-433f-ad30-a6bfd5044b1a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c0318603-0764-47b9-84e9-db35089116e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cc07a502a94bb94c9a110c7e8e2c1205-4a44339f5e8f5a4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-aa0633524ca6fb4cbacbe460dc8575ca-dc9f989f924fe54c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c3d99495c9808a096a434f9e1b70a675",
+        "x-ms-client-request-id": "dbb46a385ed741c8e3184cea2e68a37c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "bc9f2954-c101-4b66-b765-da15ad329f1c",
+        "apim-request-id": "6a45f1e1-56b9-411b-a4af-866e14704fe0",
         "Content-Length": "1005",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:08:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "192",
-        "x-request-id": "bc9f2954-c101-4b66-b765-da15ad329f1c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "6a45f1e1-56b9-411b-a4af-866e14704fe0"
       },
       "ResponseBody": {
-        "dataFeedId": "c0318603-0764-47b9-84e9-db35089116e1",
+        "dataFeedId": "30bcb64d-4c1f-455f-a185-138920fcd553",
         "dataFeedName": "dataFeed2YQEJy4o",
         "metrics": [
           {
-            "metricId": "06feecc4-f2ac-4bdf-b340-724f623f9bcc",
+            "metricId": "2ea34acd-f64c-4a7b-b314-7b01a7dd48bb",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:08:56Z",
+        "createdTime": "2021-02-05T17:55:00Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c0318603-0764-47b9-84e9-db35089116e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30bcb64d-4c1f-455f-a185-138920fcd553",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-61af797df739fd40b72bb2552c3f54a8-3d5b61cd5011fa47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fb53bdb6fbdd264180caa81f71028ef2-7cf010b55574634d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dbb46a385ed741c8e3184cea2e68a37c",
+        "x-ms-client-request-id": "e5bd4e57303fc74b0981e932a1bd64d1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "068504db-f327-447e-906d-d415861984c3",
+        "apim-request-id": "15fecacf-e175-4574-b843-2338da707e5a",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:08:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "372",
-        "x-request-id": "068504db-f327-447e-906d-d415861984c3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "297",
+        "X-Request-ID": "15fecacf-e175-4574-b843-2338da707e5a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:08:58.2363615-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:01.9756830-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 00ae670f2fc5..68777554dac5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f7a8dc0980769a4cb71294d78c7920dc-2991ec55e11e4443-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9b3f25e9c8e231469c589e77514333b3-7d5fc015e715454e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a4dc4ddc7bf6bbb9816eb4531c54ca33",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "dea1fd1d-12fa-469d-9594-b40db8e52cb2",
+        "apim-request-id": "0658c670-b814-4a67-8bb1-01f954d7e49c",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:22 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+        "Date": "Fri, 05 Feb 2021 17:57:51 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "601",
-        "x-request-id": "dea1fd1d-12fa-469d-9594-b40db8e52cb2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "530",
+        "X-Request-ID": "0658c670-b814-4a67-8bb1-01f954d7e49c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2c7ac7a183accc49b6345d232a828c1c-9f410db66968b64e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9b3f25e9c8e231469c589e77514333b3-05eca0454c57a041-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7d851f44e07caac650558fcc339f4064",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a0effeff-9d26-45c5-9dc0-8c50c2cffda0",
+        "apim-request-id": "d79d02ad-bd38-4f07-a8bd-b46092dfacf5",
         "Content-Length": "954",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:09:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "206",
-        "x-request-id": "a0effeff-9d26-45c5-9dc0-8c50c2cffda0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "d79d02ad-bd38-4f07-a8bd-b46092dfacf5"
       },
       "ResponseBody": {
-        "dataFeedId": "18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+        "dataFeedId": "59df58d7-b7d5-44a6-9674-a6c30c7a210d",
         "dataFeedName": "dataFeedMAk4pq4J",
         "metrics": [
           {
-            "metricId": "0a697a7e-8b68-401e-8d51-9bfdea2fade9",
+            "metricId": "41953ce5-b322-4c2b-b737-d03fbdc43049",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:09:23Z",
+        "createdTime": "2021-02-05T17:57:52Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5486363249820042b22ada60ad4f924f-65f9a1fe48d6064b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "13d861048d7e9601e2c6d5245fc94a24",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "18e74e39-cbc3-4d04-9952-38e1d4815ee6",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "18e74e39-cbc3-4d04-9952-38e1d4815ee6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "59df58d7-b7d5-44a6-9674-a6c30c7a210d",
+        "dataFeedName": "dataFeedMAk4pq4J",
+        "metrics": [
+          {
+            "metricId": "41953ce5-b322-4c2b-b737-d03fbdc43049",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:52Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "593",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-356a2144ff7f284486e6a919bdb54777-40a0c724856c704f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-053f8239a9578b4ebf4168c036a89711-8409bdf0fcd5564e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "13d861048d7e9601e2c6d5245fc94a24",
+        "x-ms-client-request-id": "f1bc269c6ba1fb58863253a0ecec88e1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "74ce7a91-ecf5-4bbb-9601-2a960eade097",
+        "apim-request-id": "0e083019-6be7-448f-8207-47c4965cf259",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "753",
-        "x-request-id": "74ce7a91-ecf5-4bbb-9601-2a960eade097"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "430",
+        "X-Request-ID": "0e083019-6be7-448f-8207-47c4965cf259"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-60a5ca45f6cd7b4ca5a5e9d3c71582b4-148d703a20bc8b4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-21f130bc8eddf24fab4ed316e9c0e614-19a9e4afa7307643-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f1bc269c6ba1fb58863253a0ecec88e1",
+        "x-ms-client-request-id": "ba4f4f2eb67cb6b51eef9ab50ba24b86",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e1b919dc-b1c9-47a5-87e9-e68d8f20298f",
+        "apim-request-id": "7f0bb280-bf53-4fd0-bce6-eb15b25822fd",
         "Content-Length": "1005",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 20 Jan 2021 19:09:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "200",
-        "x-request-id": "e1b919dc-b1c9-47a5-87e9-e68d8f20298f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "7f0bb280-bf53-4fd0-bce6-eb15b25822fd"
       },
       "ResponseBody": {
-        "dataFeedId": "18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+        "dataFeedId": "59df58d7-b7d5-44a6-9674-a6c30c7a210d",
         "dataFeedName": "dataFeedMAk4pq4J",
         "metrics": [
           {
-            "metricId": "0a697a7e-8b68-401e-8d51-9bfdea2fade9",
+            "metricId": "41953ce5-b322-4c2b-b737-d03fbdc43049",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-20T19:09:23Z",
+        "createdTime": "2021-02-05T17:57:52Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/18fdca60-3144-4d0b-ae34-a4ced5a99fef",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/59df58d7-b7d5-44a6-9674-a6c30c7a210d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dd9f2a8ecbba544db2519d23b5d75b24-dc03d7200ac95448-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210120.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-da659b933dec69419a99229da732964e-0f61ca478e44a140-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ba4f4f2eb67cb6b51eef9ab50ba24b86",
+        "x-ms-client-request-id": "0d2f6a0b4fe298c209dc8c4c3a61a9f6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "79bba25a-57b5-41cc-b801-865a36d798dd",
+        "apim-request-id": "101333f2-bfb3-4e26-a2c8-9a6e2013252c",
         "Content-Length": "0",
-        "Date": "Wed, 20 Jan 2021 19:09:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "407",
-        "x-request-id": "79bba25a-57b5-41cc-b801-865a36d798dd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "343",
+        "X-Request-ID": "101333f2-bfb3-4e26-a2c8-9a6e2013252c"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-20T11:09:24.4415120-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:53.3200032-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstance.json
index b00d5617baf6..8a17c72594d3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eca25b69327d7a4994aebe853c0e5778-97bbf4ed521fd44e-00",
+        "traceparent": "00-735bfe9af3aaaa46bc3b27128b4eaef8-c211c5158ee2e749-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b5b1e77f-542d-430b-b6a3-7cc1e272d807",
+        "apim-request-id": "c7435113-e0db-4f4c-8eaf-b1042540e488",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:28 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0da2ef8-1c5f-44ef-b7b0-ba7d6c4ee05d",
+        "Date": "Fri, 05 Feb 2021 17:55:02 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "419",
-        "X-Request-ID": "b5b1e77f-542d-430b-b6a3-7cc1e272d807"
+        "x-envoy-upstream-service-time": "584",
+        "X-Request-ID": "c7435113-e0db-4f4c-8eaf-b1042540e488"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0da2ef8-1c5f-44ef-b7b0-ba7d6c4ee05d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-735bfe9af3aaaa46bc3b27128b4eaef8-2b7bf8b33a76c544-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "efae618c01e4b5af49a899bfd0ac8a3f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "492158b9-aaa1-4e98-a833-3301fddf6fed",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:03 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "492158b9-aaa1-4e98-a833-3301fddf6fed"
+      },
+      "ResponseBody": {
+        "dataFeedId": "6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
+        "dataFeedName": "dataFeedqyNTDz1h",
+        "metrics": [
+          {
+            "metricId": "d0983a74-d905-464a-81da-3714280a0e4d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:02Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-36368daa21aff04281818ae9bdfc6d93-2046be1d4545ba48-00",
+        "traceparent": "00-ee85cbe339dd7d4e8723b2b63e4ad487-1b046850395a424b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "efae618c01e4b5af49a899bfd0ac8a3f",
+        "x-ms-client-request-id": "8b648dd678ba90a60c8b92700cb23300",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "57417cdd-b020-4b68-8a18-652d4c5e3e20",
+        "apim-request-id": "45269186-ba20-43e3-ac4f-d290d5a7d1c0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "168",
-        "X-Request-ID": "57417cdd-b020-4b68-8a18-652d4c5e3e20"
+        "x-envoy-upstream-service-time": "186",
+        "X-Request-ID": "45269186-ba20-43e3-ac4f-d290d5a7d1c0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0da2ef8-1c5f-44ef-b7b0-ba7d6c4ee05d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5154f41165e8fc4aa4db23b660c207d3-114ecc24a2403d40-00",
+        "traceparent": "00-1a6d2941dd8a1f4eac7f33486fb8cf6e-30bae469c6287f4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8b648dd678ba90a60c8b92700cb23300",
+        "x-ms-client-request-id": "a1042818d4c2d3bf6697eaa963ce7d61",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e51f4d66-b18b-4c93-83cc-0d5c07ba0bd6",
+        "apim-request-id": "6050fdfc-443d-4d47-8a5c-4be0d3b979dd",
         "Content-Length": "1005",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "143",
-        "X-Request-ID": "e51f4d66-b18b-4c93-83cc-0d5c07ba0bd6"
+        "x-envoy-upstream-service-time": "196",
+        "X-Request-ID": "6050fdfc-443d-4d47-8a5c-4be0d3b979dd"
       },
       "ResponseBody": {
-        "dataFeedId": "e0da2ef8-1c5f-44ef-b7b0-ba7d6c4ee05d",
+        "dataFeedId": "6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
         "dataFeedName": "dataFeedqyNTDz1h",
         "metrics": [
           {
-            "metricId": "44f7f039-80bb-4a3c-8b0a-68c3aa3a0993",
+            "metricId": "d0983a74-d905-464a-81da-3714280a0e4d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:28Z",
+        "createdTime": "2021-02-05T17:55:02Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0da2ef8-1c5f-44ef-b7b0-ba7d6c4ee05d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6ab4d3c5-ad9e-4753-80aa-9b8cb7c865fd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-63cb415f786b8f4586c79de2c3ef2440-82fa02fe67017d4c-00",
+        "traceparent": "00-f54954cfc4ae4e44a07589d9f3e4b19a-fa55c86e482e7447-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a1042818d4c2d3bf6697eaa963ce7d61",
+        "x-ms-client-request-id": "04938670a5e9139cba1de3586e3fa997",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6d796dea-fec3-4edc-b963-b891c68811b7",
+        "apim-request-id": "450f2da9-8b0a-4498-a236-cf32f0f05c69",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "311",
-        "X-Request-ID": "6d796dea-fec3-4edc-b963-b891c68811b7"
+        "x-envoy-upstream-service-time": "355",
+        "X-Request-ID": "450f2da9-8b0a-4498-a236-cf32f0f05c69"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:29.3622461-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:03.7927048-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 715c6b5b289a..a6fbb5c6e04b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataExplorerDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "242",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9c6c646c25c1914b9a2a681913ea4558-3ade0b1703fa8a4a-00",
+        "traceparent": "00-7c23a1b8ac94e649ad7327691440dc70-8460baf92215bb45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "22258953-27dd-400a-ae1e-0ce54b6a0069",
+        "apim-request-id": "faaa60fe-e38c-4d22-869c-cef86cd4a026",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:59 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d33221d9-e4de-4bd4-8123-2aaacad9d6c5",
+        "Date": "Fri, 05 Feb 2021 17:57:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1f194b65-d069-4e76-bd36-b1b7f57f271d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "475",
-        "X-Request-ID": "22258953-27dd-400a-ae1e-0ce54b6a0069"
+        "x-envoy-upstream-service-time": "437",
+        "X-Request-ID": "faaa60fe-e38c-4d22-869c-cef86cd4a026"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d33221d9-e4de-4bd4-8123-2aaacad9d6c5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1f194b65-d069-4e76-bd36-b1b7f57f271d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-7c23a1b8ac94e649ad7327691440dc70-a10ff15ad3ba1543-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b5017883541ace38b396625471509120",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0a260266-78fb-47ce-a731-ba548b0254ed",
+        "Content-Length": "954",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:53 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "0a260266-78fb-47ce-a731-ba548b0254ed"
+      },
+      "ResponseBody": {
+        "dataFeedId": "1f194b65-d069-4e76-bd36-b1b7f57f271d",
+        "dataFeedName": "dataFeedONgk1nBH",
+        "metrics": [
+          {
+            "metricId": "528eebe1-4bfd-4951-a311-05deff8e898f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataExplorer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:54Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1f194b65-d069-4e76-bd36-b1b7f57f271d",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6c7cb376960e814cb6665ae511481782-bb48dfa33a867a4a-00",
+        "traceparent": "00-1c470190da53a1459e0b8a5f26dfa655-91a7e1baf2809b40-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b5017883541ace38b396625471509120",
+        "x-ms-client-request-id": "f63d8825e6737dadf6426efb3702ff44",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1f8aed97-c77d-41e4-944f-d744a5e7afb7",
+        "apim-request-id": "79d11d6b-7217-4c17-abab-1a4469bf19f1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "168",
-        "X-Request-ID": "1f8aed97-c77d-41e4-944f-d744a5e7afb7"
+        "x-envoy-upstream-service-time": "192",
+        "X-Request-ID": "79d11d6b-7217-4c17-abab-1a4469bf19f1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d33221d9-e4de-4bd4-8123-2aaacad9d6c5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1f194b65-d069-4e76-bd36-b1b7f57f271d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-16d9e340a338c843ab38e90472f64fed-f42e5f579a47d044-00",
+        "traceparent": "00-a76f2523f2386845a2598c39937dd8b7-906b181297d7c248-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f63d8825e6737dadf6426efb3702ff44",
+        "x-ms-client-request-id": "fd898b011136c278aad62ffa7a07f0fd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9e0e3247-cebc-4038-849f-f21d34f0f5be",
+        "apim-request-id": "800ac576-79cf-4c41-97b6-2e31790a2d88",
         "Content-Length": "1005",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "X-Request-ID": "9e0e3247-cebc-4038-849f-f21d34f0f5be"
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "800ac576-79cf-4c41-97b6-2e31790a2d88"
       },
       "ResponseBody": {
-        "dataFeedId": "d33221d9-e4de-4bd4-8123-2aaacad9d6c5",
+        "dataFeedId": "1f194b65-d069-4e76-bd36-b1b7f57f271d",
         "dataFeedName": "dataFeedONgk1nBH",
         "metrics": [
           {
-            "metricId": "9bd42848-a398-47bd-af92-7cb01831608b",
+            "metricId": "528eebe1-4bfd-4951-a311-05deff8e898f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:00Z",
+        "createdTime": "2021-02-05T17:57:54Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d33221d9-e4de-4bd4-8123-2aaacad9d6c5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1f194b65-d069-4e76-bd36-b1b7f57f271d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cdd1a4888320b34bb9517baaba6b35b7-178853e1de009e49-00",
+        "traceparent": "00-ec51930e7b619045bd6f40365a3c613e-2101a904fedc3046-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fd898b011136c278aad62ffa7a07f0fd",
+        "x-ms-client-request-id": "7fb12cf8fefc9ce3cb83bed8e63c96b0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cf298e26-72a6-4130-ac3e-e2c800c1b62d",
+        "apim-request-id": "17d307ed-480b-4e78-871e-c059bf301f42",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:01 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "298",
-        "X-Request-ID": "cf298e26-72a6-4130-ac3e-e2c800c1b62d"
+        "x-envoy-upstream-service-time": "308",
+        "X-Request-ID": "17d307ed-480b-4e78-871e-c059bf301f42"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:01.3019767-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:54.7718001-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstance.json
index fd035849425b..73410ccc0de0 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-042a1e18f4bbcd44bd286b17a20a7dcf-46fb6b9de6ae884a-00",
+        "traceparent": "00-ed413e0cc5cec0498808c058f068ff6b-c2c26ae3c8217a4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,26 +37,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "03bb1c0a-4d0f-4eea-96a1-6b8ca1d34588",
+        "apim-request-id": "0e4872c7-c318-4cd7-af19-af15e80f87f5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:47 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+        "Date": "Fri, 05 Feb 2021 17:55:04 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "605",
-        "X-Request-ID": "03bb1c0a-4d0f-4eea-96a1-6b8ca1d34588"
+        "x-envoy-upstream-service-time": "777",
+        "X-Request-ID": "0e4872c7-c318-4cd7-af19-af15e80f87f5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8ae4ceb6665dc34d86aa415eb3ad8042-a183e6a7d6894540-00",
+        "traceparent": "00-ed413e0cc5cec0498808c058f068ff6b-35eb1c4759aaab47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -66,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "db48a2fc-a2aa-48f9-b434-b0a6a17d391a",
+        "apim-request-id": "cfbc3ddc-a4b8-4ee6-b14e-f6353ce7a615",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "X-Request-ID": "db48a2fc-a2aa-48f9-b434-b0a6a17d391a"
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "cfbc3ddc-a4b8-4ee6-b14e-f6353ce7a615"
       },
       "ResponseBody": {
-        "dataFeedId": "6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+        "dataFeedId": "ec864069-7ed4-438b-b815-1ec45f6fc95f",
         "dataFeedName": "dataFeedoowhDb3K",
         "metrics": [
           {
-            "metricId": "c6360c9b-bf17-4d53-a6c1-9cad7d72c1da",
+            "metricId": "d04a2c01-0dab-4fd4-89e4-cf38c5698174",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -111,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:47Z",
+        "createdTime": "2021-02-05T17:55:04Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -124,20 +124,95 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a2776386125a694bab28fbaff94cf13b-672968e141e3d64a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6f6f07206169a8f7db957b041b0e8e3c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a5f9dc33-6fd7-4b9b-8efc-a385e5e37862",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "a5f9dc33-6fd7-4b9b-8efc-a385e5e37862"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ec864069-7ed4-438b-b815-1ec45f6fc95f",
+        "dataFeedName": "dataFeedoowhDb3K",
+        "metrics": [
+          {
+            "metricId": "d04a2c01-0dab-4fd4-89e4-cf38c5698174",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:04Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "772",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4aa12cb8aaca9a488f84a19dd0fbca18-4b531cb3b8619c4d-00",
+        "traceparent": "00-797269db3939974b886ca09f07bd0fbf-efe4be0d993fca42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6f6f07206169a8f7db957b041b0e8e3c",
+        "x-ms-client-request-id": "a12436d114d2efa566a0c61c9077551f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -174,49 +249,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a594ce56-7a34-42a9-b1c5-b100cc758388",
+        "apim-request-id": "7a2e64b7-04cc-4030-b81c-a60b99250419",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "696",
-        "X-Request-ID": "a594ce56-7a34-42a9-b1c5-b100cc758388"
+        "x-envoy-upstream-service-time": "756",
+        "X-Request-ID": "7a2e64b7-04cc-4030-b81c-a60b99250419"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ff21b02348b2de4e8c24d97929c4f870-f406baaec823584c-00",
+        "traceparent": "00-1661627b4647e64988c18cf681ef77a8-288e9b606cdee144-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a12436d114d2efa566a0c61c9077551f",
+        "x-ms-client-request-id": "c0540b2495776ab348fe1d0d5ab57312",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a61c203c-3004-418a-85d8-974e8ebd3fef",
+        "apim-request-id": "0bbad715-6205-4eef-9aa4-b8917d08823f",
         "Content-Length": "1184",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "138",
-        "X-Request-ID": "a61c203c-3004-418a-85d8-974e8ebd3fef"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "0bbad715-6205-4eef-9aa4-b8917d08823f"
       },
       "ResponseBody": {
-        "dataFeedId": "6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+        "dataFeedId": "ec864069-7ed4-438b-b815-1ec45f6fc95f",
         "dataFeedName": "dataFeedXGc3Uzmk",
         "metrics": [
           {
-            "metricId": "c6360c9b-bf17-4d53-a6c1-9cad7d72c1da",
+            "metricId": "d04a2c01-0dab-4fd4-89e4-cf38c5698174",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -250,7 +325,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:47Z",
+        "createdTime": "2021-02-05T17:55:04Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -263,36 +338,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6c8216dd-d405-4c0b-bb0a-6b6732871f16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ec864069-7ed4-438b-b815-1ec45f6fc95f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c8aed1e67a5dbf45a25e09e4a6da65d2-fe537000b4715949-00",
+        "traceparent": "00-692de5c8c07c814da5276bd2a71a4775-ec43940cc3d95142-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c0540b2495776ab348fe1d0d5ab57312",
+        "x-ms-client-request-id": "0bb2d42421760b2f617f09c89bdb1863",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2860b85e-b432-4894-b00c-083a252b13b4",
+        "apim-request-id": "9dbfcafa-9c0b-47fa-b212-7a65771eb7a9",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "281",
-        "X-Request-ID": "2860b85e-b432-4894-b00c-083a252b13b4"
+        "x-envoy-upstream-service-time": "271",
+        "X-Request-ID": "9dbfcafa-9c0b-47fa-b212-7a65771eb7a9"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:48.7211155-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:07.0610718-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstanceAsync.json
index 081d80890490..8164de0397f2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f0d6f24ca84a704ab5646e477a72e7ad-8c67d9d777f0c84d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8718e472c0006249979b903795cc613a-43a45eb7d809c641-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fb5f737e09fa12de336ebc6b076ee5ca",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9685cd9c-f77e-49ba-acae-541089f6f360",
+        "apim-request-id": "d6c1e3c3-645e-4bb6-b228-0a525cf0ac69",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:08 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b07766c8-218f-4973-9e93-bee85243ae90",
+        "Date": "Fri, 05 Feb 2021 17:57:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "639",
-        "x-request-id": "9685cd9c-f77e-49ba-acae-541089f6f360"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "663",
+        "X-Request-ID": "d6c1e3c3-645e-4bb6-b228-0a525cf0ac69"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b07766c8-218f-4973-9e93-bee85243ae90",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f7390921fcf4194b8b188c78c906491c-aa196376bbac2a43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8718e472c0006249979b903795cc613a-e4d533c8067b2c4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "29bbcfb31b45cd18e05ed06d3fb33207",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c910acd6-ad55-47f6-b8fe-38d236838e1c",
+        "apim-request-id": "a2c4a82e-6a8c-46f0-9ad9-892d8943bbbc",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "a2c4a82e-6a8c-46f0-9ad9-892d8943bbbc"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
+        "dataFeedName": "dataFeeddTt9Ks3M",
+        "metrics": [
+          {
+            "metricId": "fb1cb99b-49a6-41a9-80c8-48cc0f195b55",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:55Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-de09d0a05ad5324f8fcbdef1ad44d9ac-a3e343a05366ac4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "faad1aa766db7bf63c6e5964a7c04035",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "873039a2-7c9f-4d44-8b89-ae1c10db525f",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "x-request-id": "c910acd6-ad55-47f6-b8fe-38d236838e1c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "873039a2-7c9f-4d44-8b89-ae1c10db525f"
       },
       "ResponseBody": {
-        "dataFeedId": "b07766c8-218f-4973-9e93-bee85243ae90",
+        "dataFeedId": "7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
         "dataFeedName": "dataFeeddTt9Ks3M",
         "metrics": [
           {
-            "metricId": "868c3249-f150-45d0-8aad-0ac44d5f42a2",
+            "metricId": "fb1cb99b-49a6-41a9-80c8-48cc0f195b55",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:08Z",
+        "createdTime": "2021-02-05T17:57:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b07766c8-218f-4973-9e93-bee85243ae90",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "772",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-268a667b43d6a7419a286727abde2849-0e784683d074c843-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ee1bd483d050dc468c0a47c00600aaf8-884dec6fb2d3f64d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "faad1aa766db7bf63c6e5964a7c04035",
+        "x-ms-client-request-id": "0a3469a9e65d62385b921a9b3970d27f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,46 +249,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c7bace5a-e7af-4c19-81cc-4edea3fa75e7",
+        "apim-request-id": "4f8d0ba6-73ad-48a0-90de-c4cc7e5281a7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "717",
-        "x-request-id": "c7bace5a-e7af-4c19-81cc-4edea3fa75e7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "768",
+        "X-Request-ID": "4f8d0ba6-73ad-48a0-90de-c4cc7e5281a7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b07766c8-218f-4973-9e93-bee85243ae90",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-352418eee4b78d469723ddc8e1f525b6-9a0d6c61c6f6524e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b514c9ffa973f7469f9cc0169270fa68-0ca930f798a5b745-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0a3469a9e65d62385b921a9b3970d27f",
+        "x-ms-client-request-id": "edc4b53beac14ceed83fedd7c2b32620",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9d9153b2-69c2-46a9-81de-ef313cba3af3",
+        "apim-request-id": "985676b4-2d22-4362-add7-eeb4455307b1",
         "Content-Length": "1184",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "9d9153b2-69c2-46a9-81de-ef313cba3af3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "985676b4-2d22-4362-add7-eeb4455307b1"
       },
       "ResponseBody": {
-        "dataFeedId": "b07766c8-218f-4973-9e93-bee85243ae90",
+        "dataFeedId": "7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
         "dataFeedName": "dataFeedh9eW4KWH",
         "metrics": [
           {
-            "metricId": "868c3249-f150-45d0-8aad-0ac44d5f42a2",
+            "metricId": "fb1cb99b-49a6-41a9-80c8-48cc0f195b55",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -238,7 +325,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:08Z",
+        "createdTime": "2021-02-05T17:57:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,33 +338,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b07766c8-218f-4973-9e93-bee85243ae90",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e7e30e3-1f7b-440c-8865-ee5da92ea6b5",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-96ac291f5f98e8428284a1574291ef22-74ae33bf54266043-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e256d04cf861b2479b0f6a9988408656-b980aaba6f3b8e44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "edc4b53beac14ceed83fedd7c2b32620",
+        "x-ms-client-request-id": "d6c39a1e277fc0a9e14a9e494c5a42cb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c8679b35-dfe5-4072-9bb2-5c3508c20f81",
+        "apim-request-id": "2dde9fc7-69a1-4b5b-8766-656a61810dc9",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "284",
-        "x-request-id": "c8679b35-dfe5-4072-9bb2-5c3508c20f81"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "316",
+        "X-Request-ID": "2dde9fc7-69a1-4b5b-8766-656a61810dc9"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:09.8493568-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:57.2850266-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstance.json
index 3dc4bf9b57aa..7fc5aa19cfa7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-274acb4d0b8da048a900a87b4067b32b-3fc420836b31a84a-00",
+        "traceparent": "00-c7bfa48335c3984b8a2fc8cdf82dca81-43c150c974dbfb4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "15f8fe5a-5657-4af3-b946-faf6b0350ae6",
+        "apim-request-id": "c48510fb-3fc6-415f-ba51-bc4f5aa82cb9",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:29 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/070c67c8-9589-45c3-8591-caa2a93dc659",
+        "Date": "Fri, 05 Feb 2021 17:55:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "431",
-        "X-Request-ID": "15f8fe5a-5657-4af3-b946-faf6b0350ae6"
+        "x-envoy-upstream-service-time": "605",
+        "X-Request-ID": "c48510fb-3fc6-415f-ba51-bc4f5aa82cb9"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/070c67c8-9589-45c3-8591-caa2a93dc659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c7bfa48335c3984b8a2fc8cdf82dca81-f663dc7bcdaf134f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6954880e1c4ef917813db3f03d101c72",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "54ccb333-c1ba-4762-800e-e5ff3c2306f5",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:08 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "54ccb333-c1ba-4762-800e-e5ff3c2306f5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
+        "dataFeedName": "dataFeedrPZAERmZ",
+        "metrics": [
+          {
+            "metricId": "d7ae6bd0-f837-42e8-8e0c-ec398d3f2063",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:08Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-febd43aef67889488481050070d35135-bfb7e00e59e58b43-00",
+        "traceparent": "00-5210ffd483b4a245beb8877ce4943fe4-1f86e2f253ec9f44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6954880e1c4ef917813db3f03d101c72",
+        "x-ms-client-request-id": "1745286542cb1dcaddfd1b820fa94f49",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -84,49 +159,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f387c1ed-e7f8-41aa-a717-36849d1cdec6",
+        "apim-request-id": "9f6f72d0-2855-48a3-89c6-16d8159f889c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "196",
-        "X-Request-ID": "f387c1ed-e7f8-41aa-a717-36849d1cdec6"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "9f6f72d0-2855-48a3-89c6-16d8159f889c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/070c67c8-9589-45c3-8591-caa2a93dc659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-944204ccf2e06b489b5018b0ded6adf7-7205fb36f247a64b-00",
+        "traceparent": "00-458ab4a522439b43811354c657915c4e-31b1c893ba086548-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1745286542cb1dcaddfd1b820fa94f49",
+        "x-ms-client-request-id": "74e2d6b4c173cfaf7923ffb9f9c4d5fe",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "281e1302-bec5-4c77-af8b-1a0f2bc745e4",
+        "apim-request-id": "5c68edd4-aae7-4610-aa3d-8756332a8ef4",
         "Content-Length": "1167",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "X-Request-ID": "281e1302-bec5-4c77-af8b-1a0f2bc745e4"
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "5c68edd4-aae7-4610-aa3d-8756332a8ef4"
       },
       "ResponseBody": {
-        "dataFeedId": "070c67c8-9589-45c3-8591-caa2a93dc659",
+        "dataFeedId": "88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
         "dataFeedName": "dataFeedkHjxYJne",
         "metrics": [
           {
-            "metricId": "42098c31-d4dc-4e67-af9f-aacc1dba2281",
+            "metricId": "d7ae6bd0-f837-42e8-8e0c-ec398d3f2063",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -159,7 +234,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:30Z",
+        "createdTime": "2021-02-05T17:55:08Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -172,36 +247,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/070c67c8-9589-45c3-8591-caa2a93dc659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/88cbcb5d-d940-486e-89e1-8b3dbbfb8531",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d0cfb9429242f946ba029b6eb35449b2-041db959bea60048-00",
+        "traceparent": "00-cf28351ecfc5fb47b73612ae880be51b-d910e00f1bf52a4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "74e2d6b4c173cfaf7923ffb9f9c4d5fe",
+        "x-ms-client-request-id": "54a092676fcbcc67bd378b510094ead8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9eca6b57-f77d-4e9b-ad6e-d2fc336b26a9",
+        "apim-request-id": "a5244ba3-ebd7-4a14-b005-8affaad84eb3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "302",
-        "X-Request-ID": "9eca6b57-f77d-4e9b-ad6e-d2fc336b26a9"
+        "x-envoy-upstream-service-time": "306",
+        "X-Request-ID": "a5244ba3-ebd7-4a14-b005-8affaad84eb3"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:30.5813050-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:08.8484856-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstanceAsync.json
index 37e578863a08..647ba99b091c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-44f0a4b723bbc248af02e0c989486a07-f49552a5c859f24d-00",
+        "traceparent": "00-1e024d309344e340909067f1e6fc4c8e-48328efd85958143-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "29a74f5a-9c1e-4c66-9708-bb7930c26760",
+        "apim-request-id": "4eb47f30-e2f2-46e4-9749-dfe492cc8699",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/32a952f1-e28d-4b0b-b6eb-3f1c5b1012e5",
+        "Date": "Fri, 05 Feb 2021 17:57:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "355",
-        "X-Request-ID": "29a74f5a-9c1e-4c66-9708-bb7930c26760"
+        "x-envoy-upstream-service-time": "633",
+        "X-Request-ID": "4eb47f30-e2f2-46e4-9749-dfe492cc8699"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/32a952f1-e28d-4b0b-b6eb-3f1c5b1012e5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1e024d309344e340909067f1e6fc4c8e-461021105c75bb4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f06cd8b98383f1bdb5f6389b5397f347",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7b982dea-3b12-4ce4-b9db-d6967d893e13",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "7b982dea-3b12-4ce4-b9db-d6967d893e13"
+      },
+      "ResponseBody": {
+        "dataFeedId": "336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
+        "dataFeedName": "dataFeedeNqX8GsA",
+        "metrics": [
+          {
+            "metricId": "15249af4-1623-4385-a152-e167e97406de",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:58Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eeee618aae5a3c48bb814bdcdc5741d1-55eedf253c32564e-00",
+        "traceparent": "00-afd765314096a14b8b53277dacc207b3-6950e71b66136149-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f06cd8b98383f1bdb5f6389b5397f347",
+        "x-ms-client-request-id": "e19b26376918c3a95dd28aaea7795400",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -84,49 +159,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5a03001d-a2a4-4b46-aae8-0c673839bc21",
+        "apim-request-id": "eea58d75-5ff5-44c1-b659-3c58932e6d98",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "X-Request-ID": "5a03001d-a2a4-4b46-aae8-0c673839bc21"
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "eea58d75-5ff5-44c1-b659-3c58932e6d98"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/32a952f1-e28d-4b0b-b6eb-3f1c5b1012e5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-127fe9d958245d4499d44608d50e8aba-4fbc3b58e9f3fc42-00",
+        "traceparent": "00-9aa33facfcec0848a6a01c931f8ce9ba-aa2da2fef2155c4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e19b26376918c3a95dd28aaea7795400",
+        "x-ms-client-request-id": "8900a8129b1049785dfc608516c6a553",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4f501cfc-a1e6-4e2a-a51f-7a2a2709ea31",
+        "apim-request-id": "e27deb29-afca-49aa-996b-53db83996911",
         "Content-Length": "1167",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "X-Request-ID": "4f501cfc-a1e6-4e2a-a51f-7a2a2709ea31"
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "e27deb29-afca-49aa-996b-53db83996911"
       },
       "ResponseBody": {
-        "dataFeedId": "32a952f1-e28d-4b0b-b6eb-3f1c5b1012e5",
+        "dataFeedId": "336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
         "dataFeedName": "dataFeedH5QzBNwc",
         "metrics": [
           {
-            "metricId": "38eba9fd-baaf-4ea9-b5bd-e433d46d7118",
+            "metricId": "15249af4-1623-4385-a152-e167e97406de",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -159,7 +234,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:01Z",
+        "createdTime": "2021-02-05T17:57:58Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -172,36 +247,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/32a952f1-e28d-4b0b-b6eb-3f1c5b1012e5",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/336a1b38-4d46-4bbd-8159-0bbb2a27f62b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-514ecc588e50aa4caed618ad69337628-2e692f9a76ffcc4c-00",
+        "traceparent": "00-e4acf2ae149f0140ae768a6606bed1f0-15d8309f5706bb4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8900a8129b1049785dfc608516c6a553",
+        "x-ms-client-request-id": "8c285a51304f50cf2fa993b1f80f4a3b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "016642c5-7047-47c0-8497-aeda0666cde3",
+        "apim-request-id": "65d17b4a-109f-48c8-9376-672dd1262659",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:02 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "329",
-        "X-Request-ID": "016642c5-7047-47c0-8497-aeda0666cde3"
+        "x-envoy-upstream-service-time": "261",
+        "X-Request-ID": "65d17b4a-109f-48c8-9376-672dd1262659"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:02.3478829-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:57:58.8225576-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstance.json
index 058de574ecd6..c881c33c4912 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eae27e400d1abc4099c4c3f9885f74b4-c1b6e4fb3e2d7746-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4eb59472f5b1804bbb432f2c87e50ba0-d13b684451aa2d4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ef6a38f46e3d405c07e5d21c5bef1e20",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "a3603179-993a-4831-80e2-9ed4b7b0e5a3",
+        "apim-request-id": "eb5858ea-39ec-4fcf-9a3d-314f9af125ef",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:13 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7a1799f-fd02-436b-8900-443f423e8955",
+        "Date": "Fri, 05 Feb 2021 17:55:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "432",
-        "x-request-id": "a3603179-993a-4831-80e2-9ed4b7b0e5a3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "682",
+        "X-Request-ID": "eb5858ea-39ec-4fcf-9a3d-314f9af125ef"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7a1799f-fd02-436b-8900-443f423e8955",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1615ac0d5bd9d34a86b0f5d8d369238a-b5150d8d26d31347-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4eb59472f5b1804bbb432f2c87e50ba0-686a6cbf107b844b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d29262a6135476791ae87432158d46fb",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0e4f8579-65c0-4bef-a37a-5fa1540f2643",
+        "apim-request-id": "3a8628ad-a129-49a8-9eba-0e8ad3e7892d",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "3a8628ad-a129-49a8-9eba-0e8ad3e7892d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "2c21b61b-7175-4f8e-9128-f377c153c05e",
+        "dataFeedName": "dataFeed4bG4Zh90",
+        "metrics": [
+          {
+            "metricId": "2ade0201-caac-40c2-9212-f06ecab12ae3",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:09Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0cc06a1e00dcd749b4ec3a5058ffd599-a167d1178e21be44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9dd43809802bb06671c505ee62e31306",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "6bc1b3e4-ed30-40cc-a8a3-d02dfc354f99",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "195",
-        "x-request-id": "0e4f8579-65c0-4bef-a37a-5fa1540f2643"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "6bc1b3e4-ed30-40cc-a8a3-d02dfc354f99"
       },
       "ResponseBody": {
-        "dataFeedId": "a7a1799f-fd02-436b-8900-443f423e8955",
+        "dataFeedId": "2c21b61b-7175-4f8e-9128-f377c153c05e",
         "dataFeedName": "dataFeed4bG4Zh90",
         "metrics": [
           {
-            "metricId": "453eadd1-c5e5-4631-9fbf-7e8532828752",
+            "metricId": "2ade0201-caac-40c2-9212-f06ecab12ae3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:13Z",
+        "createdTime": "2021-02-05T17:55:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7a1799f-fd02-436b-8900-443f423e8955",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "680",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7d0b7ec4c7fb98409b63ab5526a04bed-b98c8208e43c8d4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5bb7ee08b98e0f408b393218ad3a82a7-640b29fb8314ca4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9dd43809802bb06671c505ee62e31306",
+        "x-ms-client-request-id": "c41b455b6183e04dbef3d455f92a2a79",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +246,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4590595c-528c-4344-b030-1e42137f42bb",
+        "apim-request-id": "1cd06c33-6c79-43c1-9df5-25a56109b967",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "516",
-        "x-request-id": "4590595c-528c-4344-b030-1e42137f42bb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "638",
+        "X-Request-ID": "1cd06c33-6c79-43c1-9df5-25a56109b967"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7a1799f-fd02-436b-8900-443f423e8955",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-41cf8bced97ac640ba84f0508faa544f-681b7d17fb37a54c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7165ca11d0d56343a9f28d496af5c60c-77b0a3dde740e841-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c41b455b6183e04dbef3d455f92a2a79",
+        "x-ms-client-request-id": "2212d69f811a25f5fce1618f0e8a1337",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f2b649b5-80c9-4ff8-b5b1-a35e5f0e6f05",
+        "apim-request-id": "fcbbf170-0339-40bc-ad88-edb453d7a2c5",
         "Content-Length": "1092",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "180",
-        "x-request-id": "f2b649b5-80c9-4ff8-b5b1-a35e5f0e6f05"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "fcbbf170-0339-40bc-ad88-edb453d7a2c5"
       },
       "ResponseBody": {
-        "dataFeedId": "a7a1799f-fd02-436b-8900-443f423e8955",
+        "dataFeedId": "2c21b61b-7175-4f8e-9128-f377c153c05e",
         "dataFeedName": "dataFeed4bG4Zh90",
         "metrics": [
           {
-            "metricId": "453eadd1-c5e5-4631-9fbf-7e8532828752",
+            "metricId": "2ade0201-caac-40c2-9212-f06ecab12ae3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +319,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:13Z",
+        "createdTime": "2021-02-05T17:55:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -245,33 +332,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a7a1799f-fd02-436b-8900-443f423e8955",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2c21b61b-7175-4f8e-9128-f377c153c05e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b055039da055a040aa78ce65d2c832aa-c6ab0fec204b8544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0b8b50d09267a84aa364dc01559777ae-14a269a1381c6d49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2212d69f811a25f5fce1618f0e8a1337",
+        "x-ms-client-request-id": "cfd76ed48171a877ebf4de37ab10b746",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "016e5add-272c-402a-89b1-87bee030f3fc",
+        "apim-request-id": "6c5c8cfa-0b15-4fc0-a517-9eb27c568ac3",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "375",
-        "x-request-id": "016e5add-272c-402a-89b1-87bee030f3fc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "295",
+        "X-Request-ID": "6c5c8cfa-0b15-4fc0-a517-9eb27c568ac3"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:14.4405605-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:11.3258316-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstanceAsync.json
index d51e43745374..a83bac364e53 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8cca02c6077a4f44bfbfab996aff2230-00aaa28b5e791540-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8449ec5996b5d443be512eb6b983df20-abc2173ac21b854f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "05a5a7780861b4c465ad1d806ed158b9",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "60d1dcb7-7e1a-4bb6-85d8-13441a7611ff",
+        "apim-request-id": "5adc4a54-3b16-405b-8839-98b988a62496",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:20 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6bc49c40-c57a-4818-8352-44c86fa97d20",
+        "Date": "Fri, 05 Feb 2021 17:57:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "575",
-        "x-request-id": "60d1dcb7-7e1a-4bb6-85d8-13441a7611ff"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "540",
+        "X-Request-ID": "5adc4a54-3b16-405b-8839-98b988a62496"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6bc49c40-c57a-4818-8352-44c86fa97d20",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e077166ab92ff347aedff296524e01cb-ea5aa8498947114d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8449ec5996b5d443be512eb6b983df20-7f77b9264d4bc440-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "df0dcbbb0833cc40ef60347ba3a6db8b",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c2758df4-dbe1-4c09-bbb9-80039ab87ede",
+        "apim-request-id": "a00b03cc-6e41-4567-a4fa-6b136803b459",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:57:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "a00b03cc-6e41-4567-a4fa-6b136803b459"
+      },
+      "ResponseBody": {
+        "dataFeedId": "eda3b477-286e-404c-8fed-fc0c1ebc7832",
+        "dataFeedName": "dataFeedMwrVGTPj",
+        "metrics": [
+          {
+            "metricId": "9217341f-3e28-4d42-8c30-1343c8bcadde",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:57:59Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-310daf345f662a47ada4b59095edb588-400049240b38344b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "180857cb4ad2d9526d4f3a16a3eb5403",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1d756cc3-2960-455b-a9eb-2e7dbf9e802e",
         "Content-Length": "1041",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:57:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "135",
-        "x-request-id": "c2758df4-dbe1-4c09-bbb9-80039ab87ede"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "1d756cc3-2960-455b-a9eb-2e7dbf9e802e"
       },
       "ResponseBody": {
-        "dataFeedId": "6bc49c40-c57a-4818-8352-44c86fa97d20",
+        "dataFeedId": "eda3b477-286e-404c-8fed-fc0c1ebc7832",
         "dataFeedName": "dataFeedMwrVGTPj",
         "metrics": [
           {
-            "metricId": "14781eb6-2819-46a4-9bb3-2f21861be19a",
+            "metricId": "9217341f-3e28-4d42-8c30-1343c8bcadde",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:20Z",
+        "createdTime": "2021-02-05T17:57:59Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6bc49c40-c57a-4818-8352-44c86fa97d20",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "680",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1fd723b30900b44782863d659602e508-16f603b65a02ab46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c56149b0a7d7b942b3244981c95bf0ee-771819e3015b5a4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "180857cb4ad2d9526d4f3a16a3eb5403",
+        "x-ms-client-request-id": "8f8a611b9a5c6f2366d91500d44910be",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +246,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "74e3268e-4e19-47ad-b0bc-1e615958fc9a",
+        "apim-request-id": "e2d9e873-b902-4c3c-a772-0b416c2d5dea",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "632",
-        "x-request-id": "74e3268e-4e19-47ad-b0bc-1e615958fc9a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "647",
+        "X-Request-ID": "e2d9e873-b902-4c3c-a772-0b416c2d5dea"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6bc49c40-c57a-4818-8352-44c86fa97d20",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e6581f3867cc384c8527619b435e5326-41d2337c1538cd44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c99bd857f24ef64a83fdd178e8d084aa-77fdc4da5b2c404f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8f8a611b9a5c6f2366d91500d44910be",
+        "x-ms-client-request-id": "16b492d240c970e7783471e3cd292803",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cfd1ac6e-93c9-4f36-bb1e-cb309599ae6a",
+        "apim-request-id": "67a5bfc4-9235-4903-819f-6aeefa312dd1",
         "Content-Length": "1092",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "131",
-        "x-request-id": "cfd1ac6e-93c9-4f36-bb1e-cb309599ae6a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "67a5bfc4-9235-4903-819f-6aeefa312dd1"
       },
       "ResponseBody": {
-        "dataFeedId": "6bc49c40-c57a-4818-8352-44c86fa97d20",
+        "dataFeedId": "eda3b477-286e-404c-8fed-fc0c1ebc7832",
         "dataFeedName": "dataFeedMwrVGTPj",
         "metrics": [
           {
-            "metricId": "14781eb6-2819-46a4-9bb3-2f21861be19a",
+            "metricId": "9217341f-3e28-4d42-8c30-1343c8bcadde",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +319,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:20Z",
+        "createdTime": "2021-02-05T17:57:59Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -245,33 +332,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6bc49c40-c57a-4818-8352-44c86fa97d20",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eda3b477-286e-404c-8fed-fc0c1ebc7832",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0dcb7993fd60784d9e01020bc45b22c6-4f51bbefde75da42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4da2872426d6744890d6fb38ee0e983e-2f23ebd2a2e8674e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "16b492d240c970e7783471e3cd292803",
+        "x-ms-client-request-id": "415f300b4c1b302e3498b1f834520524",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9f3efb3e-f356-401b-b07c-48d0cb2e7b4d",
+        "apim-request-id": "3373ba16-d703-472c-a433-9b81c56d2333",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "272",
-        "x-request-id": "9f3efb3e-f356-401b-b07c-48d0cb2e7b4d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "290",
+        "X-Request-ID": "3373ba16-d703-472c-a433-9b81c56d2333"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:22.1242438-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:01.0930358-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstance.json
index 58f8eee1feea..8d44e7bef4f8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2b1a6f1c0a634946970392800d5a40a1-583f25306da6c64e-00",
+        "traceparent": "00-0bb966fa1814ae4797a3ddc6fc7ed33d-02c181165ff08244-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "fabf2def-434d-4eff-8ca7-3b3e97ca486a",
+        "apim-request-id": "ed1c687d-7558-4edd-8d62-f02bda2c6eba",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5001546f-0852-4166-8a9b-5f6a5832bf76",
+        "Date": "Fri, 05 Feb 2021 17:55:11 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/318a99e5-1bbb-404b-a434-9757db238e48",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "449",
-        "X-Request-ID": "fabf2def-434d-4eff-8ca7-3b3e97ca486a"
+        "x-envoy-upstream-service-time": "604",
+        "X-Request-ID": "ed1c687d-7558-4edd-8d62-f02bda2c6eba"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5001546f-0852-4166-8a9b-5f6a5832bf76",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/318a99e5-1bbb-404b-a434-9757db238e48",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0bb966fa1814ae4797a3ddc6fc7ed33d-ea1959213524e44d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4696669ac90fb621c95c4f30c69a6471",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f19e363e-bedb-48c8-93b1-09dca2217fdf",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:12 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "f19e363e-bedb-48c8-93b1-09dca2217fdf"
+      },
+      "ResponseBody": {
+        "dataFeedId": "318a99e5-1bbb-404b-a434-9757db238e48",
+        "dataFeedName": "dataFeedd1DcWx57",
+        "metrics": [
+          {
+            "metricId": "3fbf100b-6203-4160-b2d4-2b2228665f84",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:12Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/318a99e5-1bbb-404b-a434-9757db238e48",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-aef452bb1dea3747a8cc0b6b2dbedeb7-6b77e6715059f54c-00",
+        "traceparent": "00-37dad4d2ee15e84ea38961158ea8d61c-0ba0e39ae94e0b43-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4696669ac90fb621c95c4f30c69a6471",
+        "x-ms-client-request-id": "6ed57c3bddedef7ea95d6701e3f1cc97",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,49 +146,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "dabcb8c4-74ea-4567-a864-86307e8abcd1",
+        "apim-request-id": "438ae05a-5c52-43a1-9c44-736c2909e2c4",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "202",
-        "X-Request-ID": "dabcb8c4-74ea-4567-a864-86307e8abcd1"
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "438ae05a-5c52-43a1-9c44-736c2909e2c4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5001546f-0852-4166-8a9b-5f6a5832bf76",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/318a99e5-1bbb-404b-a434-9757db238e48",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2264f03cafd36a49ab4404229ef29019-f39f882a5134564f-00",
+        "traceparent": "00-f99489197b0ea6479dd35ffca44f8483-fa94844020fbf24e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6ed57c3bddedef7ea95d6701e3f1cc97",
+        "x-ms-client-request-id": "ffeebdb1c98a21a95faa1e8ae1631c9f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e37cfb0f-4eab-4809-bb23-12e48acdf2b5",
+        "apim-request-id": "a36fd1fe-ce3a-4ffa-b293-d1780ea36183",
         "Content-Length": "1092",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "X-Request-ID": "e37cfb0f-4eab-4809-bb23-12e48acdf2b5"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "a36fd1fe-ce3a-4ffa-b293-d1780ea36183"
       },
       "ResponseBody": {
-        "dataFeedId": "5001546f-0852-4166-8a9b-5f6a5832bf76",
+        "dataFeedId": "318a99e5-1bbb-404b-a434-9757db238e48",
         "dataFeedName": "dataFeedd1DcWx57",
         "metrics": [
           {
-            "metricId": "2ac38b77-4d7e-451f-b97e-d346a6fa0f09",
+            "metricId": "3fbf100b-6203-4160-b2d4-2b2228665f84",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -144,7 +219,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:31Z",
+        "createdTime": "2021-02-05T17:55:12Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -157,36 +232,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5001546f-0852-4166-8a9b-5f6a5832bf76",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/318a99e5-1bbb-404b-a434-9757db238e48",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-958d4ed88a9f4846a789173faed9f406-2d2df8a36de18a4d-00",
+        "traceparent": "00-71df0f38177dbb46b0eb7f9f4a689893-fa7db057ce99b141-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ffeebdb1c98a21a95faa1e8ae1631c9f",
+        "x-ms-client-request-id": "307c1ff84569bdc9e8a79cb2621fd3d7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "39ad59be-3dfe-4091-9816-e6d6a0fdc151",
+        "apim-request-id": "f4bd99aa-be7e-4e83-aa01-c1e6b02eeadc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "317",
-        "X-Request-ID": "39ad59be-3dfe-4091-9816-e6d6a0fdc151"
+        "x-envoy-upstream-service-time": "337",
+        "X-Request-ID": "f4bd99aa-be7e-4e83-aa01-c1e6b02eeadc"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:31.8048426-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:13.3902136-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstanceAsync.json
index e52e4bf8f9fc..76ed22a32a5d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureDataLakeStorageGen2DataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "329",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f996a2acc45587498c0ebaf8ae28830d-fd367e29bcb6e94b-00",
+        "traceparent": "00-383abfc5693d2f4a829aa31912491b04-3c95c7701f737f4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ddc333ca-8f59-4565-b204-bff19ce91e7e",
+        "apim-request-id": "68f789c4-ec0e-4a9a-925e-22d7eb08ba1a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:03 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c4796f94-6cc4-4225-908a-942c2d6e69e1",
+        "Date": "Fri, 05 Feb 2021 17:58:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b5b9911a-7d7a-47b6-a228-4b07fa76054f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "436",
-        "X-Request-ID": "ddc333ca-8f59-4565-b204-bff19ce91e7e"
+        "x-envoy-upstream-service-time": "593",
+        "X-Request-ID": "68f789c4-ec0e-4a9a-925e-22d7eb08ba1a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c4796f94-6cc4-4225-908a-942c2d6e69e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b5b9911a-7d7a-47b6-a228-4b07fa76054f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-383abfc5693d2f4a829aa31912491b04-bce54789a06a8e43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "60902c671b6f927f8026dde63fe7aeeb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "24e7c43a-2893-4595-9b0f-99c7deec9815",
+        "Content-Length": "1041",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:01 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "24e7c43a-2893-4595-9b0f-99c7deec9815"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b5b9911a-7d7a-47b6-a228-4b07fa76054f",
+        "dataFeedName": "dataFeedYunOXyZy",
+        "metrics": [
+          {
+            "metricId": "043f46b0-7959-457b-a8d9-f89c80d14324",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureDataLakeStorageGen2",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:01Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "fileTemplate": "file",
+          "accountName": "account",
+          "directoryTemplate": "dir",
+          "fileSystemName": "fileSystem",
+          "accountKey": "Sanitized"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b5b9911a-7d7a-47b6-a228-4b07fa76054f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8117ce9a3237334aa6c0b419ce56d7dc-0d951de315f81d4d-00",
+        "traceparent": "00-8aee462d91d1d6469ac4a244e82be618-6a94b4ca1489d54c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "60902c671b6f927f8026dde63fe7aeeb",
+        "x-ms-client-request-id": "008d38644bddd1708dcdfab55295350b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,49 +146,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c647c8bb-b379-4636-a04e-fec32ea4abe9",
+        "apim-request-id": "d7719cac-d77e-4711-9173-ff046a6ade4d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "167",
-        "X-Request-ID": "c647c8bb-b379-4636-a04e-fec32ea4abe9"
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "d7719cac-d77e-4711-9173-ff046a6ade4d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c4796f94-6cc4-4225-908a-942c2d6e69e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b5b9911a-7d7a-47b6-a228-4b07fa76054f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dae1101e95fa244d9f08ce26f35e9c6a-1e8c8cf3acae3443-00",
+        "traceparent": "00-786bcc5f51c70942b081d5de0788a5db-b198d91b5d3e024e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "008d38644bddd1708dcdfab55295350b",
+        "x-ms-client-request-id": "44fccf0446dc743a936b88904d14672e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "841dac64-95ce-4d8a-82ed-61c0766e1818",
+        "apim-request-id": "8e9084dc-82ca-44be-84a6-f59786854a4a",
         "Content-Length": "1092",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "X-Request-ID": "841dac64-95ce-4d8a-82ed-61c0766e1818"
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "8e9084dc-82ca-44be-84a6-f59786854a4a"
       },
       "ResponseBody": {
-        "dataFeedId": "c4796f94-6cc4-4225-908a-942c2d6e69e1",
+        "dataFeedId": "b5b9911a-7d7a-47b6-a228-4b07fa76054f",
         "dataFeedName": "dataFeedYunOXyZy",
         "metrics": [
           {
-            "metricId": "6b706651-0ae8-4846-bed8-1b1a55d820f2",
+            "metricId": "043f46b0-7959-457b-a8d9-f89c80d14324",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -144,7 +219,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:03Z",
+        "createdTime": "2021-02-05T17:58:01Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -157,36 +232,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c4796f94-6cc4-4225-908a-942c2d6e69e1",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b5b9911a-7d7a-47b6-a228-4b07fa76054f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5300638ebf94014aa505e4919100c23c-ed7dc4738b2bcf4d-00",
+        "traceparent": "00-cb1a0e07cbd6ba4f9d1b8eafbac490c2-c94b38a7a81e2f44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "44fccf0446dc743a936b88904d14672e",
+        "x-ms-client-request-id": "60c7fb5818a01b13bbbfd2a120c940ea",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "11b296d2-5c82-4777-8434-4df5e16750f2",
+        "apim-request-id": "ffa7e86d-cdec-48ed-964d-aa0b308023a3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "297",
-        "X-Request-ID": "11b296d2-5c82-4777-8434-4df5e16750f2"
+        "x-envoy-upstream-service-time": "314",
+        "X-Request-ID": "ffa7e86d-cdec-48ed-964d-aa0b308023a3"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:03.5463843-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:02.6160492-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstance.json
index 5530d3c5be58..8af1c298be42 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-245b2a623a801b48a03c019cf8d02394-8909f8ed78f6344c-00",
+        "traceparent": "00-fc22696b624c9c4f8fade344d0ba8bdc-6872c5b624ff2e4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,26 +35,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c36973d7-8081-44d2-b338-e7ce2d38c5f3",
+        "apim-request-id": "03fe19f0-ea28-48c8-96ae-81a7e8b3833a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+        "Date": "Fri, 05 Feb 2021 17:55:14 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "711",
-        "X-Request-ID": "c36973d7-8081-44d2-b338-e7ce2d38c5f3"
+        "x-envoy-upstream-service-time": "609",
+        "X-Request-ID": "03fe19f0-ea28-48c8-96ae-81a7e8b3833a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d339257478588143a9da638b331a8809-3c77347563a2f04f-00",
+        "traceparent": "00-fc22696b624c9c4f8fade344d0ba8bdc-c3af91f8178a1849-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -64,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1139b6c5-e096-497e-aaa2-5860585ac1e0",
+        "apim-request-id": "91bf972e-a1d5-451e-b9c6-e019627ff169",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "X-Request-ID": "1139b6c5-e096-497e-aaa2-5860585ac1e0"
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "91bf972e-a1d5-451e-b9c6-e019627ff169"
       },
       "ResponseBody": {
-        "dataFeedId": "1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+        "dataFeedId": "9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
         "dataFeedName": "dataFeedbvrHP8sF",
         "metrics": [
           {
-            "metricId": "3d7c2e40-fe6a-48b0-bf20-95c23fe1cc16",
+            "metricId": "c973dba4-4aec-49df-bcc4-37eea8d90540",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -109,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:51Z",
+        "createdTime": "2021-02-05T17:55:14Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -120,20 +120,93 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4dadabb816a97a4b914a2102c2e933bb-56fcf6f0ae31534a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1b0fedef9991aceb8149c530f64103b1",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9eed412c-a94e-4f9f-8d08-54617c392e0d",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:14 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "9eed412c-a94e-4f9f-8d08-54617c392e0d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
+        "dataFeedName": "dataFeedbvrHP8sF",
+        "metrics": [
+          {
+            "metricId": "c973dba4-4aec-49df-bcc4-37eea8d90540",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:14Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "694",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-58bb513e972b4e4dbd63569144bd1ff1-b4f80a2fd7ef1645-00",
+        "traceparent": "00-488f8869a1fb1645aff454c8cb5cf937-2825b4bfe97d0d4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1b0fedef9991aceb8149c530f64103b1",
+        "x-ms-client-request-id": "b0360baf2f37f314d4d10e421ca321b3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -168,49 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f3299fac-145d-494b-b8a0-ee9afe3d6914",
+        "apim-request-id": "bfdd40dc-7536-4292-9663-e413741bcdd1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "648",
-        "X-Request-ID": "f3299fac-145d-494b-b8a0-ee9afe3d6914"
+        "x-envoy-upstream-service-time": "749",
+        "X-Request-ID": "bfdd40dc-7536-4292-9663-e413741bcdd1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-995883824b274a48ac1b2e0edd3c84cf-26a5b41abf0da945-00",
+        "traceparent": "00-432930e49ed44a45baeb92de8f673b71-3452aa016cab6143-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b0360baf2f37f314d4d10e421ca321b3",
+        "x-ms-client-request-id": "080e43702a11257fe8119b538a2c7881",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "627ca8b3-a147-4053-abe1-d4120ec7e77b",
+        "apim-request-id": "7f59a8d6-5954-4a4c-a562-fc9c952c4169",
         "Content-Length": "1106",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "167",
-        "X-Request-ID": "627ca8b3-a147-4053-abe1-d4120ec7e77b"
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "7f59a8d6-5954-4a4c-a562-fc9c952c4169"
       },
       "ResponseBody": {
-        "dataFeedId": "1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+        "dataFeedId": "9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
         "dataFeedName": "dataFeedvx6FuHYo",
         "metrics": [
           {
-            "metricId": "3d7c2e40-fe6a-48b0-bf20-95c23fe1cc16",
+            "metricId": "c973dba4-4aec-49df-bcc4-37eea8d90540",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -244,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:51Z",
+        "createdTime": "2021-02-05T17:55:14Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -255,36 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1cc1f365-1028-476c-a81e-3ac3ff3385f7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9ad3c269-fffa-4e9c-a58b-01ba957fabbd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5c26d138a373a34881e9aed3a0bd43f3-8468cf0fae3f8343-00",
+        "traceparent": "00-b31d288355454b4599935002fa2f10d8-cd092dad1aa9ce42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "080e43702a11257fe8119b538a2c7881",
+        "x-ms-client-request-id": "b2c976575bcbbf37d91c47c08ba890dd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d02428c6-145c-4faa-8c81-251fefe39412",
+        "apim-request-id": "d4dc0f55-7f51-425f-bcd5-8f582c5b5ddc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "287",
-        "X-Request-ID": "d02428c6-145c-4faa-8c81-251fefe39412"
+        "x-envoy-upstream-service-time": "352",
+        "X-Request-ID": "d4dc0f55-7f51-425f-bcd5-8f582c5b5ddc"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:52.6110124-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:16.8902281-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstanceAsync.json
index 4d0d5f16b5f0..0cdbb0635ab2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2c4699df4567b648a6b0f8be98e1e09c-64b37932c265694e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a6b041e7cc16d2459f17cab714349fd5-c30c4e2a9b303c4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d9ac92169ecd94f8de47b1d36d9cba27",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "556eef8c-9a3d-4504-a2dd-c685aa37a430",
+        "apim-request-id": "20217c80-eed4-498a-aa41-1c4b384c1b4e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:11 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fed5781f-8e5d-41bb-afe5-d95c66122c72",
+        "Date": "Fri, 05 Feb 2021 17:58:03 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "711",
-        "x-request-id": "556eef8c-9a3d-4504-a2dd-c685aa37a430"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "614",
+        "X-Request-ID": "20217c80-eed4-498a-aa41-1c4b384c1b4e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fed5781f-8e5d-41bb-afe5-d95c66122c72",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-248e3a5956e7c7449f7896e5f53036cd-2590de241436c747-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a6b041e7cc16d2459f17cab714349fd5-e3dd5247f9dc5147-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ee463468903463dcbf39395816f3f376",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "672464c2-82d2-46d2-a888-dc2b2bff8716",
+        "apim-request-id": "8bb2c361-1d04-4be8-9159-257134adb1d9",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:03 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "178",
+        "X-Request-ID": "8bb2c361-1d04-4be8-9159-257134adb1d9"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c7eba9f8-07bf-4305-b3de-c2d3e9246034",
+        "dataFeedName": "dataFeedDnn54WoG",
+        "metrics": [
+          {
+            "metricId": "db95a605-6720-47e8-9dc8-3a396f8eed72",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:03Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e8ed87ee77eba944a81c99b4eb20dd2a-fbb5f8593cc06f4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f5e9be7050985462b3455de9a6e2b145",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ed5a658c-59e2-44a2-8b84-45f25b6c4b58",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "672464c2-82d2-46d2-a888-dc2b2bff8716"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "ed5a658c-59e2-44a2-8b84-45f25b6c4b58"
       },
       "ResponseBody": {
-        "dataFeedId": "fed5781f-8e5d-41bb-afe5-d95c66122c72",
+        "dataFeedId": "c7eba9f8-07bf-4305-b3de-c2d3e9246034",
         "dataFeedName": "dataFeedDnn54WoG",
         "metrics": [
           {
-            "metricId": "2ef4d987-8b67-4585-956d-8fee70da464b",
+            "metricId": "db95a605-6720-47e8-9dc8-3a396f8eed72",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:12Z",
+        "createdTime": "2021-02-05T17:58:03Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fed5781f-8e5d-41bb-afe5-d95c66122c72",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "694",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d16ac47c17e74648818b1226d628cce8-f7e7cb29baebd34b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c416e3932e14254daaf3ac4de75d5108-1b21f99af1099b47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f5e9be7050985462b3455de9a6e2b145",
+        "x-ms-client-request-id": "ee495fc6d5f9866ab6491993659f7deb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b13e13bc-6203-4182-bc6c-e3b8184c5be5",
+        "apim-request-id": "e33df049-6d58-4702-aa64-534660de5d5d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "739",
-        "x-request-id": "b13e13bc-6203-4182-bc6c-e3b8184c5be5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "638",
+        "X-Request-ID": "e33df049-6d58-4702-aa64-534660de5d5d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fed5781f-8e5d-41bb-afe5-d95c66122c72",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-66a6d0241e2ad8429c2a49591ddc7b39-30ae3f14fde2ec46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-565236e2eb42e0408b7411bef9fbae00-69ae8b900a34df46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ee495fc6d5f9866ab6491993659f7deb",
+        "x-ms-client-request-id": "af623b54c5b2188ed2f23bef32f2bcdd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e39777a2-c458-4942-94a4-7dfeba765b5c",
+        "apim-request-id": "5d0f49b0-051f-4e1c-adaa-3dff424e36cd",
         "Content-Length": "1106",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "e39777a2-c458-4942-94a4-7dfeba765b5c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "5d0f49b0-051f-4e1c-adaa-3dff424e36cd"
       },
       "ResponseBody": {
-        "dataFeedId": "fed5781f-8e5d-41bb-afe5-d95c66122c72",
+        "dataFeedId": "c7eba9f8-07bf-4305-b3de-c2d3e9246034",
         "dataFeedName": "dataFeedpUyOpBSF",
         "metrics": [
           {
-            "metricId": "2ef4d987-8b67-4585-956d-8fee70da464b",
+            "metricId": "db95a605-6720-47e8-9dc8-3a396f8eed72",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:12Z",
+        "createdTime": "2021-02-05T17:58:03Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -243,33 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fed5781f-8e5d-41bb-afe5-d95c66122c72",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c7eba9f8-07bf-4305-b3de-c2d3e9246034",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8332336c4bce6742a2ff91437effd9ba-13cc119a9fe0a947-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9c1ad6cf0f5359439dbfd7a011fd1666-7853566525a09148-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "af623b54c5b2188ed2f23bef32f2bcdd",
+        "x-ms-client-request-id": "b791f38804aa9b7c54633e4f36cfee14",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e4e99e00-5c47-4d09-8193-367eed27cfa7",
+        "apim-request-id": "9807b94a-9613-4a88-b5df-e7db63c41752",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "341",
-        "x-request-id": "e4e99e00-5c47-4d09-8193-367eed27cfa7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "353",
+        "X-Request-ID": "9807b94a-9613-4a88-b5df-e7db63c41752"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:13.3162115-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:05.1915277-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstance.json
index 51d75d5bd13a..8fe188e28f2c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-219c9a09eb336546b435e9b24b9d5893-232fca3598573d4f-00",
+        "traceparent": "00-37c586384377024db868c178d72cf428-deba292917f9cb4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c393cefc-9c66-44e0-9907-b1c496349ebf",
+        "apim-request-id": "2bd4b8ba-0d2d-4c96-9e2c-bb05be01a311",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:31 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9f3135b1-19ca-4dea-863e-f30c0625ef80",
+        "Date": "Fri, 05 Feb 2021 17:55:22 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19c692be-0550-4ae0-933b-21596c9e3817",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "430",
-        "X-Request-ID": "c393cefc-9c66-44e0-9907-b1c496349ebf"
+        "x-envoy-upstream-service-time": "5627",
+        "X-Request-ID": "2bd4b8ba-0d2d-4c96-9e2c-bb05be01a311"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9f3135b1-19ca-4dea-863e-f30c0625ef80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19c692be-0550-4ae0-933b-21596c9e3817",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-37c586384377024db868c178d72cf428-0da5b5ea6f5a6e4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "aeab749383a54315a313e94ed320d77b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "384a2106-79d9-4172-ab26-31b0c860ea81",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:22 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "384a2106-79d9-4172-ab26-31b0c860ea81"
+      },
+      "ResponseBody": {
+        "dataFeedId": "19c692be-0550-4ae0-933b-21596c9e3817",
+        "dataFeedName": "dataFeedgCPXJzpZ",
+        "metrics": [
+          {
+            "metricId": "aee47a96-07bf-4bed-b00c-80082efccbc9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:22Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19c692be-0550-4ae0-933b-21596c9e3817",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5cebc454ea7c114f9624dcda82563ad1-f08ae436a58e5344-00",
+        "traceparent": "00-0bcc8eb82ea4c444b5badb518427b625-b2edad5992ed8b46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "aeab749383a54315a313e94ed320d77b",
+        "x-ms-client-request-id": "18c7e318a9a53b84cd7ce2f2006bd2dd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b2952950-e3a1-4752-9eab-c53aea878528",
+        "apim-request-id": "ae046cd0-02ba-4387-86f9-9f13b4aba997",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "198",
-        "X-Request-ID": "b2952950-e3a1-4752-9eab-c53aea878528"
+        "x-envoy-upstream-service-time": "186",
+        "X-Request-ID": "ae046cd0-02ba-4387-86f9-9f13b4aba997"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9f3135b1-19ca-4dea-863e-f30c0625ef80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19c692be-0550-4ae0-933b-21596c9e3817",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-14e8a22122532946bc7799e27e433cfa-c8596c997473e348-00",
+        "traceparent": "00-1e366217cf116643b4b28f31f9196323-4e9ac4af1fced644-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "18c7e318a9a53b84cd7ce2f2006bd2dd",
+        "x-ms-client-request-id": "078a0fd4487c1aa970c4d056f425b24d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5e65c2db-c53b-45ee-b7c5-bc7ad6e111ca",
+        "apim-request-id": "a566175a-01da-44cd-b64d-143d4a1dac55",
         "Content-Length": "1089",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "143",
-        "X-Request-ID": "5e65c2db-c53b-45ee-b7c5-bc7ad6e111ca"
+        "x-envoy-upstream-service-time": "198",
+        "X-Request-ID": "a566175a-01da-44cd-b64d-143d4a1dac55"
       },
       "ResponseBody": {
-        "dataFeedId": "9f3135b1-19ca-4dea-863e-f30c0625ef80",
+        "dataFeedId": "19c692be-0550-4ae0-933b-21596c9e3817",
         "dataFeedName": "dataFeeddQ1QSlCB",
         "metrics": [
           {
-            "metricId": "c48d2f71-b51a-430a-8c84-516c7f72f83f",
+            "metricId": "aee47a96-07bf-4bed-b00c-80082efccbc9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:32Z",
+        "createdTime": "2021-02-05T17:55:22Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9f3135b1-19ca-4dea-863e-f30c0625ef80",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/19c692be-0550-4ae0-933b-21596c9e3817",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f572db806ada934e9a371c9c259d7e2b-9305a55c7c9c0d43-00",
+        "traceparent": "00-80e3ed9d17fd654798db051d3be80bca-d2edb9d84318ac49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "078a0fd4487c1aa970c4d056f425b24d",
+        "x-ms-client-request-id": "f02f4a51bba7e98bef6fe129a1224238",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "44661bfc-03e6-47cc-9557-b15b20fc87e8",
+        "apim-request-id": "b7e87600-b0d7-4327-8cce-2f3afccc044a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "297",
-        "X-Request-ID": "44661bfc-03e6-47cc-9557-b15b20fc87e8"
+        "x-envoy-upstream-service-time": "320",
+        "X-Request-ID": "b7e87600-b0d7-4327-8cce-2f3afccc044a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:33.0364897-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:23.9570548-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstanceAsync.json
index 77cba0383133..d5e3247e6657 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0ad3f701f57f874c8025f92b2ac8b361-f7e1e655ae556742-00",
+        "traceparent": "00-b2634650f394db4d97b59500ac958280-3badd0cd1f15d84b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "abbb4186-6a6f-445f-831c-25c34231d3cd",
+        "apim-request-id": "385392da-afc2-454b-a56c-26bed9bb3649",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9bfc4c23-a7e2-41e7-b0d6-6924a2c842e6",
+        "Date": "Fri, 05 Feb 2021 17:58:05 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3907c7e6-d160-4697-98c5-c85c8c09064b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "404",
-        "X-Request-ID": "abbb4186-6a6f-445f-831c-25c34231d3cd"
+        "x-envoy-upstream-service-time": "651",
+        "X-Request-ID": "385392da-afc2-454b-a56c-26bed9bb3649"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9bfc4c23-a7e2-41e7-b0d6-6924a2c842e6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3907c7e6-d160-4697-98c5-c85c8c09064b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b2634650f394db4d97b59500ac958280-1a6961a949210a4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ce9dc37689ad5bf48002b5b579ea50e8",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c891d358-e71b-49fb-84e9-f11ad1e718e3",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "197",
+        "X-Request-ID": "c891d358-e71b-49fb-84e9-f11ad1e718e3"
+      },
+      "ResponseBody": {
+        "dataFeedId": "3907c7e6-d160-4697-98c5-c85c8c09064b",
+        "dataFeedName": "dataFeedf4k9rJBM",
+        "metrics": [
+          {
+            "metricId": "e57e656a-ba50-4393-9d24-319346f7b2ef",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:06Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3907c7e6-d160-4697-98c5-c85c8c09064b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bb0199e08df76e4cbfc188fce7906bdd-9fb77c688b14cf40-00",
+        "traceparent": "00-48befece73098e4fa7d14b77d6e47ae8-f9a446d5ddad2544-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ce9dc37689ad5bf48002b5b579ea50e8",
+        "x-ms-client-request-id": "ac6f1660d621c63559b8657a5b93c735",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "aa04f412-1d0f-44f2-ba47-da183724ec21",
+        "apim-request-id": "943b26e3-7e50-4c8e-bce5-95a66793c4ea",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "189",
-        "X-Request-ID": "aa04f412-1d0f-44f2-ba47-da183724ec21"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "943b26e3-7e50-4c8e-bce5-95a66793c4ea"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9bfc4c23-a7e2-41e7-b0d6-6924a2c842e6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3907c7e6-d160-4697-98c5-c85c8c09064b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-60801793c36c6d4e9071b6e0e46f52a3-b2c2e271f45d924a-00",
+        "traceparent": "00-7f3ef3a7ad86e1448c71f87cd9e8ccf8-cae179eb5720094b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ac6f1660d621c63559b8657a5b93c735",
+        "x-ms-client-request-id": "12d980aa9930ba6865b1c06793eedcf8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5c22db11-5380-4bd9-919b-66da77de417e",
+        "apim-request-id": "80e24d87-dda1-4ea6-9655-c8613aa5720f",
         "Content-Length": "1089",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "X-Request-ID": "5c22db11-5380-4bd9-919b-66da77de417e"
+        "x-envoy-upstream-service-time": "204",
+        "X-Request-ID": "80e24d87-dda1-4ea6-9655-c8613aa5720f"
       },
       "ResponseBody": {
-        "dataFeedId": "9bfc4c23-a7e2-41e7-b0d6-6924a2c842e6",
+        "dataFeedId": "3907c7e6-d160-4697-98c5-c85c8c09064b",
         "dataFeedName": "dataFeedqd5JdCmu",
         "metrics": [
           {
-            "metricId": "9feeaa17-cbcb-4746-bbb2-8f881c153346",
+            "metricId": "e57e656a-ba50-4393-9d24-319346f7b2ef",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:04Z",
+        "createdTime": "2021-02-05T17:58:06Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9bfc4c23-a7e2-41e7-b0d6-6924a2c842e6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3907c7e6-d160-4697-98c5-c85c8c09064b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fe1bc23464500e4fb2d9338212def02f-6cdc8cfe43c04b45-00",
+        "traceparent": "00-b7f7072e9f169e408664f756a983f804-c1b69989e91e1840-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "12d980aa9930ba6865b1c06793eedcf8",
+        "x-ms-client-request-id": "0d6f607ff1649f3e8ed774f4237affed",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "59c1daf9-6634-459c-b028-ef34a696f2a6",
+        "apim-request-id": "fbeef386-dff7-4028-a4f8-c31ead66fad0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "289",
-        "X-Request-ID": "59c1daf9-6634-459c-b028-ef34a696f2a6"
+        "x-envoy-upstream-service-time": "306",
+        "X-Request-ID": "fbeef386-dff7-4028-a4f8-c31ead66fad0"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:04.6868778-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:06.9990549-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstance.json
index 13705ab2914c..535c245bf77e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a9ef96a58eec9e4ca376a103301136bd-9fe4c44bc3758b46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-80aa9f679f451f4fa485209ef35a4f76-5cb0f1c769bbe145-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "dddf01fa831d7ca4a7ed15a31ec04d4a",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6381f64f-ca1a-4036-9c8c-32693db999df",
+        "apim-request-id": "0aedc50b-f7f5-470d-b60a-5fb924355250",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:16 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+        "Date": "Fri, 05 Feb 2021 17:55:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "374",
-        "x-request-id": "6381f64f-ca1a-4036-9c8c-32693db999df"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "585",
+        "X-Request-ID": "0aedc50b-f7f5-470d-b60a-5fb924355250"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-64c4d04864e55c43ae6a44058110da4e-af4016dcf3c32d42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-80aa9f679f451f4fa485209ef35a4f76-ae2a9dc18992d644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "488c7282ad728c8ea95d5a329bd8527a",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a87a342f-92de-4e6b-8e15-df7d0a7a8fd4",
+        "apim-request-id": "44427ff8-e06d-481d-8040-fe67c3936c93",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "44427ff8-e06d-481d-8040-fe67c3936c93"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
+        "dataFeedName": "dataFeedDkBd0jDI",
+        "metrics": [
+          {
+            "metricId": "5c02f4c2-c907-40e5-9b75-e23d792ce6a7",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:24Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-509d872b83efad49bda871307b3b384c-36c1baae7b864849-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "36746f640585e3852148868fa7efc919",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "633b2e86-4695-4245-8742-4edb55763f2d",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "x-request-id": "a87a342f-92de-4e6b-8e15-df7d0a7a8fd4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "633b2e86-4695-4245-8742-4edb55763f2d"
       },
       "ResponseBody": {
-        "dataFeedId": "e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+        "dataFeedId": "c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
         "dataFeedName": "dataFeedDkBd0jDI",
         "metrics": [
           {
-            "metricId": "4c4842dc-aa93-49f2-8aee-ca7e5eedb50c",
+            "metricId": "5c02f4c2-c907-40e5-9b75-e23d792ce6a7",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:16Z",
+        "createdTime": "2021-02-05T17:55:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "602",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3f4c86087a1feb46beb8610c47ea26d0-fcf94f5213d0ef4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6965d31ae9f7ad4a820eb2fef3e64dd5-5d4bf0440dd71848-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "36746f640585e3852148868fa7efc919",
+        "x-ms-client-request-id": "75ff3b9893a34cab735334c02871e1ce",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5c403031-b692-41ee-8749-6bc307f1e9da",
+        "apim-request-id": "59e9ff6c-0936-4444-a825-0801891b5cf0",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "465",
-        "x-request-id": "5c403031-b692-41ee-8749-6bc307f1e9da"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "723",
+        "X-Request-ID": "59e9ff6c-0936-4444-a825-0801891b5cf0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0d8f8f4f7d7ece4cbe0ae6553e36d4b3-33318db735935c49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-084a528f2f354c4bbb0189b0e4e3f4d5-7a6b8a93a5a6a14f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "75ff3b9893a34cab735334c02871e1ce",
+        "x-ms-client-request-id": "ae3f9b9a164c7dc4eda9262a27fee4ba",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "107589b0-eb1c-4c2f-a421-86c47f5b354d",
+        "apim-request-id": "ad2ad57f-375b-4613-95a9-693410ce2b13",
         "Content-Length": "1014",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "107589b0-eb1c-4c2f-a421-86c47f5b354d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "ad2ad57f-375b-4613-95a9-693410ce2b13"
       },
       "ResponseBody": {
-        "dataFeedId": "e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+        "dataFeedId": "c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
         "dataFeedName": "dataFeedDkBd0jDI",
         "metrics": [
           {
-            "metricId": "4c4842dc-aa93-49f2-8aee-ca7e5eedb50c",
+            "metricId": "5c02f4c2-c907-40e5-9b75-e23d792ce6a7",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:16Z",
+        "createdTime": "2021-02-05T17:55:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e69f7241-a5b9-4d5f-b25f-5a1dcc3b0940",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c2a73ffd-376b-4c9a-8c17-3fcd34b0e4eb",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6c2c807fdff03a4ca01a33183d47ab28-c0bafdef55969447-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bb9690338a305f40b40f3b351810ae96-1318b7437b3d494b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ae3f9b9a164c7dc4eda9262a27fee4ba",
+        "x-ms-client-request-id": "5f9a4194ddd8d0d6c428c332d0c4bab0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "043438ae-5ca9-4abe-b23a-adb4d0590d0e",
+        "apim-request-id": "47685521-1541-441b-ac52-886fbadd58ae",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "287",
-        "x-request-id": "043438ae-5ca9-4abe-b23a-adb4d0590d0e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "378",
+        "X-Request-ID": "47685521-1541-441b-ac52-886fbadd58ae"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:17.6966790-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:27.0319265-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 79d32aac0148..eb60929c02a3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a0ec5159e510c4f961077d559e154a4-bd2bc81adeb0774a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9d817a787a1bca47843238a882fc8163-ffc0b7d921e9d948-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "06ea04a2e677ed9e9e7a0d6ee69d4554",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "05a708ef-b1de-4ec2-b626-3bdf61a3c5bb",
+        "apim-request-id": "c2222b70-8c9b-414c-8ace-db37737fcf7d",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:24 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+        "Date": "Fri, 05 Feb 2021 17:58:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "580",
-        "x-request-id": "05a708ef-b1de-4ec2-b626-3bdf61a3c5bb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "594",
+        "X-Request-ID": "c2222b70-8c9b-414c-8ace-db37737fcf7d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a81f1561e4415840963f4f4431d7cc1c-2aa8965629fe0747-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9d817a787a1bca47843238a882fc8163-692664ad1dbc4441-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2149e231183ee1d4390fb81ef7278e21",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "045da98e-825e-4055-afa3-c03fd13ba7d9",
+        "apim-request-id": "ef8b4ea1-1efd-4152-ac94-dd59dcb17f83",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "ef8b4ea1-1efd-4152-ac94-dd59dcb17f83"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d67f95f7-cbf7-41a4-bd2f-85073069e34c",
+        "dataFeedName": "dataFeedRFkqvdDB",
+        "metrics": [
+          {
+            "metricId": "3166429e-c9a4-42af-bbf6-4d99f448be91",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:07Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-e46ef09d8c614545b1bb1ccf27603d42-933652b2beabb84d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "dc20a2cfe0aecb8959026f4c8b7324d0",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "5e420210-90d5-465a-8409-2c8ac1683359",
         "Content-Length": "963",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "045da98e-825e-4055-afa3-c03fd13ba7d9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "5e420210-90d5-465a-8409-2c8ac1683359"
       },
       "ResponseBody": {
-        "dataFeedId": "ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+        "dataFeedId": "d67f95f7-cbf7-41a4-bd2f-85073069e34c",
         "dataFeedName": "dataFeedRFkqvdDB",
         "metrics": [
           {
-            "metricId": "f910f98c-e2ab-44c0-8edc-b9aa601df2bf",
+            "metricId": "3166429e-c9a4-42af-bbf6-4d99f448be91",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:24Z",
+        "createdTime": "2021-02-05T17:58:07Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "602",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dde0498585efd04e90e0ef12ccbe2bec-1bd55a083fd59440-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7ab27abdf397184ea6f5b5f2456619cf-b2b9de81f9292043-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dc20a2cfe0aecb8959026f4c8b7324d0",
+        "x-ms-client-request-id": "593e46ec02aa8a472f09cc672e80f577",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "440c235a-8773-4d0c-9cdb-b7082385f7f3",
+        "apim-request-id": "24ba2634-d5bb-4462-9e3c-637d8c28b744",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "700",
-        "x-request-id": "440c235a-8773-4d0c-9cdb-b7082385f7f3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "611",
+        "X-Request-ID": "24ba2634-d5bb-4462-9e3c-637d8c28b744"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2fa1a6d0b881ce46a31007bda2fb30d6-fd08a9862dfcf74c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2439b5a96f57754aa6ae5c0cd80c1ffa-e5eddf4716881845-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "593e46ec02aa8a472f09cc672e80f577",
+        "x-ms-client-request-id": "449eecec687d51a5597ec83ca88855c5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b9762bb0-73bc-451e-b479-09465c767b72",
+        "apim-request-id": "ac3f0260-cd74-4dd3-8bca-bf98b011fcad",
         "Content-Length": "1014",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "b9762bb0-73bc-451e-b479-09465c767b72"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "ac3f0260-cd74-4dd3-8bca-bf98b011fcad"
       },
       "ResponseBody": {
-        "dataFeedId": "ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+        "dataFeedId": "d67f95f7-cbf7-41a4-bd2f-85073069e34c",
         "dataFeedName": "dataFeedRFkqvdDB",
         "metrics": [
           {
-            "metricId": "f910f98c-e2ab-44c0-8edc-b9aa601df2bf",
+            "metricId": "3166429e-c9a4-42af-bbf6-4d99f448be91",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:24Z",
+        "createdTime": "2021-02-05T17:58:07Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ce389d0b-e54f-4ce8-b3b6-e07bae592d26",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d67f95f7-cbf7-41a4-bd2f-85073069e34c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-866dede2d754af4fabf04fe0b21574ba-2d792671e37e1245-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fe8e1c0f5e2d0f4da92719dd23dc7d16-86de38b64b928c43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "449eecec687d51a5597ec83ca88855c5",
+        "x-ms-client-request-id": "b131e8eb34e9cd765b95ada513219dd8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e8536729-2c55-4c64-8035-f71e30c55b0c",
+        "apim-request-id": "eec082a3-ee95-4d90-b5c4-aaf5eee09801",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "306",
-        "x-request-id": "e8536729-2c55-4c64-8035-f71e30c55b0c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "274",
+        "X-Request-ID": "eec082a3-ee95-4d90-b5c4-aaf5eee09801"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:26.1171055-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:09.1670129-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstance.json
index 5d963e8b7e1e..7502c47403ca 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-70ee7da286a7e94eb2c0bb9507dbfeaa-41d1acf305668e46-00",
+        "traceparent": "00-8394a085e954ef449d61d89f7f1b87fa-793dceacb0ba0b45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7242edb5-b912-480e-b786-1ccc51435dae",
+        "apim-request-id": "813c186e-dab2-4c98-9d84-1bb49261720d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:33 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a108f938-04b6-46f2-b417-d5ebb67961c8",
+        "Date": "Fri, 05 Feb 2021 17:55:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/56907dce-50cb-47b2-a7e2-64311ae6962e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "432",
-        "X-Request-ID": "7242edb5-b912-480e-b786-1ccc51435dae"
+        "x-envoy-upstream-service-time": "650",
+        "X-Request-ID": "813c186e-dab2-4c98-9d84-1bb49261720d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a108f938-04b6-46f2-b417-d5ebb67961c8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/56907dce-50cb-47b2-a7e2-64311ae6962e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8394a085e954ef449d61d89f7f1b87fa-ec21d799bd0f0749-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cf41fb96013dab61bce36654bf14074f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ce97e069-00eb-487e-a540-cf9bbee5ba4e",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:27 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "ce97e069-00eb-487e-a540-cf9bbee5ba4e"
+      },
+      "ResponseBody": {
+        "dataFeedId": "56907dce-50cb-47b2-a7e2-64311ae6962e",
+        "dataFeedName": "dataFeedQ88BhUu1",
+        "metrics": [
+          {
+            "metricId": "88bcea27-c160-47c1-a935-55771b43f865",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:28Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/56907dce-50cb-47b2-a7e2-64311ae6962e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b34332d3b1094e49a7b825ea6912adcd-9e4ae255cea3484e-00",
+        "traceparent": "00-64a027c29cd5fd4684670c949385d944-9b0efd1b68d6034b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cf41fb96013dab61bce36654bf14074f",
+        "x-ms-client-request-id": "5aed25c9446853bb7943fdad0b15c09b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f85a26cc-deeb-416d-9532-1c15d3d7563c",
+        "apim-request-id": "b65891cf-4315-4e70-a7ed-5641c6badb2a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "171",
-        "X-Request-ID": "f85a26cc-deeb-416d-9532-1c15d3d7563c"
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "b65891cf-4315-4e70-a7ed-5641c6badb2a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a108f938-04b6-46f2-b417-d5ebb67961c8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/56907dce-50cb-47b2-a7e2-64311ae6962e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f2ce287d24e87c41a55af8139b2949fe-4c2063cd6f51c147-00",
+        "traceparent": "00-78f37f19f3bd5b459955bbe8f91703b0-063c1af71c4d6946-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5aed25c9446853bb7943fdad0b15c09b",
+        "x-ms-client-request-id": "2b386e57fc61991f477e30b2477e8baf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "26b3d1dd-14c6-4d9c-8ae7-5309849926de",
+        "apim-request-id": "9fb90b23-0a16-4cf4-ad4c-4dfb36c21442",
         "Content-Length": "1014",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "X-Request-ID": "26b3d1dd-14c6-4d9c-8ae7-5309849926de"
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "9fb90b23-0a16-4cf4-ad4c-4dfb36c21442"
       },
       "ResponseBody": {
-        "dataFeedId": "a108f938-04b6-46f2-b417-d5ebb67961c8",
+        "dataFeedId": "56907dce-50cb-47b2-a7e2-64311ae6962e",
         "dataFeedName": "dataFeedQ88BhUu1",
         "metrics": [
           {
-            "metricId": "3fe60f3d-33a7-4f6f-a7cb-054ea4b85b29",
+            "metricId": "88bcea27-c160-47c1-a935-55771b43f865",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:33Z",
+        "createdTime": "2021-02-05T17:55:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a108f938-04b6-46f2-b417-d5ebb67961c8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/56907dce-50cb-47b2-a7e2-64311ae6962e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a02b41b3f0cb8b4da440ccc85696e92f-61f35d78c24d104c-00",
+        "traceparent": "00-c108aac458e69042ac1d178d7bb5a113-14c3f1352ea75343-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2b386e57fc61991f477e30b2477e8baf",
+        "x-ms-client-request-id": "57eb52667bf5529740ed56f903b39fa6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e3ea20e4-f6a9-4af8-94bd-dda86bd326cd",
+        "apim-request-id": "9ffa657e-30b0-4d58-beee-964c115e2324",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "321",
-        "X-Request-ID": "e3ea20e4-f6a9-4af8-94bd-dda86bd326cd"
+        "x-envoy-upstream-service-time": "318",
+        "X-Request-ID": "9ffa657e-30b0-4d58-beee-964c115e2324"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:34.1919649-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:28.9740066-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstanceAsync.json
index d238f5e98bd4..cf0b559d9dc1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateAzureTableDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "251",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e61eb4c270181d48993c029119878c0d-5591377339c57640-00",
+        "traceparent": "00-1ed34fdff60c0341bd6e347b1182fceb-4d163b79d189ab42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "11085e73-7515-422b-99d6-239a7090c6d5",
+        "apim-request-id": "33c57b7c-d470-420f-877f-2cd9bdf5a91c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:05 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0d9ae310-68c6-4fc8-9a67-5ea9c86f1124",
+        "Date": "Fri, 05 Feb 2021 17:58:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "467",
-        "X-Request-ID": "11085e73-7515-422b-99d6-239a7090c6d5"
+        "x-envoy-upstream-service-time": "631",
+        "X-Request-ID": "33c57b7c-d470-420f-877f-2cd9bdf5a91c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0d9ae310-68c6-4fc8-9a67-5ea9c86f1124",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1ed34fdff60c0341bd6e347b1182fceb-afd2086b68796e48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "396afd1e1b2d598e040b38a7f82ba2ef",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ab551df4-2ce7-4f3f-8a68-d7c55475ff15",
+        "Content-Length": "963",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:10 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "ab551df4-2ce7-4f3f-8a68-d7c55475ff15"
+      },
+      "ResponseBody": {
+        "dataFeedId": "5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
+        "dataFeedName": "dataFeed6ugrj57o",
+        "metrics": [
+          {
+            "metricId": "fc60295c-49ae-4af7-bbe1-6efbbd50951b",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "AzureTable",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:10Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query",
+          "table": "table"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8ce830aa93ed4a43b1dce05b3c6621c5-a6120438df097b40-00",
+        "traceparent": "00-8f3cc0650449774692813b259ba850b6-abd8d71eccf60044-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "396afd1e1b2d598e040b38a7f82ba2ef",
+        "x-ms-client-request-id": "0557637ec0deb654171e9b35cbc265f3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fdff9b8d-30af-4e09-b939-1566c420a1ee",
+        "apim-request-id": "ef33f09c-dec0-42a8-a4d9-3cbbee07dc3a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "X-Request-ID": "fdff9b8d-30af-4e09-b939-1566c420a1ee"
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "ef33f09c-dec0-42a8-a4d9-3cbbee07dc3a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0d9ae310-68c6-4fc8-9a67-5ea9c86f1124",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e354175df98a5240a66793babb390785-4c44d3ccdbc9b049-00",
+        "traceparent": "00-cf233a9fd2edbf469fa9988495d8ae07-14f05db3d2815747-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0557637ec0deb654171e9b35cbc265f3",
+        "x-ms-client-request-id": "8fc3c4eb07f198052e6fd0568a2ed822",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "deed685a-101b-4914-a77b-11f54b465c6b",
+        "apim-request-id": "63233e6b-4ff4-4557-b5d6-f0ce2387365a",
         "Content-Length": "1014",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "159",
-        "X-Request-ID": "deed685a-101b-4914-a77b-11f54b465c6b"
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "63233e6b-4ff4-4557-b5d6-f0ce2387365a"
       },
       "ResponseBody": {
-        "dataFeedId": "0d9ae310-68c6-4fc8-9a67-5ea9c86f1124",
+        "dataFeedId": "5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
         "dataFeedName": "dataFeed6ugrj57o",
         "metrics": [
           {
-            "metricId": "44336103-2eda-4cca-8f3d-1617cf20296c",
+            "metricId": "fc60295c-49ae-4af7-bbe1-6efbbd50951b",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:05Z",
+        "createdTime": "2021-02-05T17:58:10Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0d9ae310-68c6-4fc8-9a67-5ea9c86f1124",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fa9a77a-6235-427f-8ee7-ef0faf1b42b7",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6a01ab6a40458e46a57ec14c413f684b-709fe845bc32c047-00",
+        "traceparent": "00-5c0455f35c27fd47b4485dc47d325df8-5ee71365194c4f46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8fc3c4eb07f198052e6fd0568a2ed822",
+        "x-ms-client-request-id": "e9087f692a385e83a8b3220f80588e41",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e788e5f8-27e8-4c46-b737-dbe61e192d6e",
+        "apim-request-id": "d2f7c5b3-87b1-4c93-a317-7322be4e3601",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:06 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "390",
-        "X-Request-ID": "e788e5f8-27e8-4c46-b737-dbe61e192d6e"
+        "x-envoy-upstream-service-time": "279",
+        "X-Request-ID": "d2f7c5b3-87b1-4c93-a317-7322be4e3601"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:05.9042686-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:11.4242548-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstance.json
index 72fc6e7bbe6a..cf9e16e9df41 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ca34d8b460a448438e6b062a829ae4ad-f17aa9717eb81243-00",
+        "traceparent": "00-79370ff49666334cba83a4c1316b9583-883d912575378849-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,26 +36,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5b39ad40-4b86-4ea8-9ac1-d4d3f732320d",
+        "apim-request-id": "9143b539-3a65-4bb4-bd56-6e898c1cfa92",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:55 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+        "Date": "Fri, 05 Feb 2021 17:55:29 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "660",
-        "X-Request-ID": "5b39ad40-4b86-4ea8-9ac1-d4d3f732320d"
+        "x-envoy-upstream-service-time": "534",
+        "X-Request-ID": "9143b539-3a65-4bb4-bd56-6e898c1cfa92"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-13a456d720fb604db0324109cb239e9b-186601cfab25674b-00",
+        "traceparent": "00-79370ff49666334cba83a4c1316b9583-23f8b654a5fc5249-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -65,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5d092498-cc96-4b32-9dda-3bfaccaa917e",
+        "apim-request-id": "ebdf9af1-eef1-4d80-942f-455d81be4011",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "189",
-        "X-Request-ID": "5d092498-cc96-4b32-9dda-3bfaccaa917e"
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "ebdf9af1-eef1-4d80-942f-455d81be4011"
       },
       "ResponseBody": {
-        "dataFeedId": "2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+        "dataFeedId": "bdb57967-f616-49f2-aafa-f0deb800f63e",
         "dataFeedName": "dataFeedzAmjgdIi",
         "metrics": [
           {
-            "metricId": "9df52b20-6ba2-4fc6-8cd4-ec02976959d7",
+            "metricId": "f7efa426-8343-434f-88b0-e0292c09e850",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -110,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:55Z",
+        "createdTime": "2021-02-05T17:55:29Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -122,20 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b223481598c8de4ca89f6e75c18f64e0-5eccf8fbb64ad248-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5e792129daddc4293016894a75717287",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1a3e65a1-ad32-428a-ac03-ca2b34dc322c",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:29 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "1a3e65a1-ad32-428a-ac03-ca2b34dc322c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "bdb57967-f616-49f2-aafa-f0deb800f63e",
+        "dataFeedName": "dataFeedzAmjgdIi",
+        "metrics": [
+          {
+            "metricId": "f7efa426-8343-434f-88b0-e0292c09e850",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:29Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "720",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3baa5bdb453c9d49937dbfbdb5b69308-7ee8a48a574c3647-00",
+        "traceparent": "00-33b5a20bffaa4849b6b3134927718aa9-62bc49c3b8e76748-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5e792129daddc4293016894a75717287",
+        "x-ms-client-request-id": "82a4ae08080c8d30ab893fd94f4f7447",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -171,49 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bb84978a-0e43-4534-a1b7-e5a038570110",
+        "apim-request-id": "946712fd-d485-4f14-8a7c-233224318d35",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "824",
-        "X-Request-ID": "bb84978a-0e43-4534-a1b7-e5a038570110"
+        "x-envoy-upstream-service-time": "2249",
+        "X-Request-ID": "946712fd-d485-4f14-8a7c-233224318d35"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-65470a340e3f65458c58362e7bc75db3-7b9c60678eeefe4d-00",
+        "traceparent": "00-3ac59e29a67ba747a08f0442916f98f1-7480dad80fd96e41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "82a4ae08080c8d30ab893fd94f4f7447",
+        "x-ms-client-request-id": "abaee35cab3e0ee8528d0c1661a9526b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ee951b4d-59e6-46fc-ab94-df4be1b3475f",
+        "apim-request-id": "6eefaa30-9d77-4ac5-b3bd-d5c3ff0bc861",
         "Content-Length": "1132",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "170",
-        "X-Request-ID": "ee951b4d-59e6-46fc-ab94-df4be1b3475f"
+        "x-envoy-upstream-service-time": "821",
+        "X-Request-ID": "6eefaa30-9d77-4ac5-b3bd-d5c3ff0bc861"
       },
       "ResponseBody": {
-        "dataFeedId": "2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+        "dataFeedId": "bdb57967-f616-49f2-aafa-f0deb800f63e",
         "dataFeedName": "dataFeedMTQTfC8G",
         "metrics": [
           {
-            "metricId": "9df52b20-6ba2-4fc6-8cd4-ec02976959d7",
+            "metricId": "f7efa426-8343-434f-88b0-e0292c09e850",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -247,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:55Z",
+        "createdTime": "2021-02-05T17:55:29Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -259,36 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2670bd66-a2cb-48d9-aee7-0e42ecc2ed9d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bdb57967-f616-49f2-aafa-f0deb800f63e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dd4732f2d269764a83f31273990b2e5e-ce07ea83eb27ab40-00",
+        "traceparent": "00-342960babd36154cbc3000bdbf0fdcf3-8228897fc74afb4f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "abaee35cab3e0ee8528d0c1661a9526b",
+        "x-ms-client-request-id": "efa2eb7bec802019f1ebb3539b5074e0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0f52f412-11f1-48e3-ab21-90789c4ec706",
+        "apim-request-id": "ce98ca21-ea7c-45f8-a43a-1aeccf65c9bf",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "357",
-        "X-Request-ID": "0f52f412-11f1-48e3-ab21-90789c4ec706"
+        "x-envoy-upstream-service-time": "351",
+        "X-Request-ID": "ce98ca21-ea7c-45f8-a43a-1aeccf65c9bf"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:24:56.8667676-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:33.8112429-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstanceAsync.json
index be78e2f4b233..aeb435864dd7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3c8d1d247ab00a46a9b5d3ec2f22d8ab-81e8e98f02543c42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a75371f64dd96d47a242cc94c799b802-08a1107a86ef194b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bf62410ae62d7b2531fa6ebf5aa9ea12",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e28267fd-10ef-4b67-a4f1-0aba007c380a",
+        "apim-request-id": "42786dac-7488-45d5-9fd8-e95631e7b4da",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:15 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7137678-2789-4353-bf44-2188d72354bf",
+        "Date": "Fri, 05 Feb 2021 17:58:11 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "428",
-        "x-request-id": "e28267fd-10ef-4b67-a4f1-0aba007c380a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "556",
+        "X-Request-ID": "42786dac-7488-45d5-9fd8-e95631e7b4da"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7137678-2789-4353-bf44-2188d72354bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d990ce4b5da3bf4cb4f076cc0f05b907-2a5f40393993344f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a75371f64dd96d47a242cc94c799b802-4dd16589a136b445-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3f25e9a14d3a645ab22dace7943d9092",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5bf667f6-d232-41a5-ba54-8e137a54001b",
+        "apim-request-id": "a9160b4c-8fa2-416c-bb46-4dfdeb33ed1f",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "179",
-        "x-request-id": "5bf667f6-d232-41a5-ba54-8e137a54001b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "a9160b4c-8fa2-416c-bb46-4dfdeb33ed1f"
       },
       "ResponseBody": {
-        "dataFeedId": "f7137678-2789-4353-bf44-2188d72354bf",
+        "dataFeedId": "cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
         "dataFeedName": "dataFeedVnhrJrLK",
         "metrics": [
           {
-            "metricId": "6cb4dcfa-2640-48a7-a2bd-7ed93b324803",
+            "metricId": "f26c2742-1385-48f4-861b-347a369e9026",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:15Z",
+        "createdTime": "2021-02-05T17:58:12Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7137678-2789-4353-bf44-2188d72354bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1f4b58fb89d19041b8ef455c74182991-86c12d6ae1843846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d7838869997cc2e06d32cd9290002365",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1bf721ee-0a48-4720-b5b1-949961d2ac9c",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "1bf721ee-0a48-4720-b5b1-949961d2ac9c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
+        "dataFeedName": "dataFeedVnhrJrLK",
+        "metrics": [
+          {
+            "metricId": "f26c2742-1385-48f4-861b-347a369e9026",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:12Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "720",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-96620bb73363d249b29dd78e3f87ae3a-9e22e2dfde8cb443-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-65f9405ac038be48935089a27765734e-15bf2d28f5fee249-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d7838869997cc2e06d32cd9290002365",
+        "x-ms-client-request-id": "0b41c615cbd6bc01e7fd0c003a3ee6f3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "637cde50-2cbf-4ceb-8feb-12e7a47fb41b",
+        "apim-request-id": "18760c0c-eb7d-430d-88c5-1f62071f2f8e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "567",
-        "x-request-id": "637cde50-2cbf-4ceb-8feb-12e7a47fb41b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "683",
+        "X-Request-ID": "18760c0c-eb7d-430d-88c5-1f62071f2f8e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7137678-2789-4353-bf44-2188d72354bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1021266f337c104c99e66f05392d0564-a816bbf4b951af43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2d8e2ddb7351034582c958f29f4476ac-a39cd22a79125e40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0b41c615cbd6bc01e7fd0c003a3ee6f3",
+        "x-ms-client-request-id": "d155dc6a122607960863d20880c7d4b2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fa62fb58-07b9-4240-8a3d-8e72c7d0a7ad",
+        "apim-request-id": "a82e2bd9-5a3a-460c-b346-de3c632ba016",
         "Content-Length": "1132",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "164",
-        "x-request-id": "fa62fb58-07b9-4240-8a3d-8e72c7d0a7ad"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "184",
+        "X-Request-ID": "a82e2bd9-5a3a-460c-b346-de3c632ba016"
       },
       "ResponseBody": {
-        "dataFeedId": "f7137678-2789-4353-bf44-2188d72354bf",
+        "dataFeedId": "cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
         "dataFeedName": "dataFeedARxUv2qN",
         "metrics": [
           {
-            "metricId": "6cb4dcfa-2640-48a7-a2bd-7ed93b324803",
+            "metricId": "f26c2742-1385-48f4-861b-347a369e9026",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -235,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:15Z",
+        "createdTime": "2021-02-05T17:58:12Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -247,33 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7137678-2789-4353-bf44-2188d72354bf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cf444bac-f4c6-412e-b1ff-4f8fd93f3621",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-afbd68e8655be740b1ca105693065df2-9947bb73747b7b47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bd35464c089e46438adbb6ef8f597ffd-980556edbfa67f40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d155dc6a122607960863d20880c7d4b2",
+        "x-ms-client-request-id": "ced1460a84fc9dbb87c6ef7e8ce0872f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ed321bb0-b2f4-4dd3-a90d-1459d23502fa",
+        "apim-request-id": "0cd89ba7-50c2-4be1-9e05-2d2325c58913",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "314",
-        "x-request-id": "ed321bb0-b2f4-4dd3-a90d-1459d23502fa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "353",
+        "X-Request-ID": "0cd89ba7-50c2-4be1-9e05-2d2325c58913"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:16.5610063-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:13.5979984-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstance.json
index b1fe7d26397f..ac549b1b907d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3c20ca0580b6f946af49ac317f21ee87-362a7062e4d1f745-00",
+        "traceparent": "00-6658bb1425650f4292379d8b7fe4bdf9-97d1060bd8bf1942-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ade2c94f-a329-4735-87f6-1c35a2ae358f",
+        "apim-request-id": "ac1dfe9e-d8d9-43eb-afae-61b8192e6eeb",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:34 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/baa3028e-5477-4c89-8910-04991afe3395",
+        "Date": "Fri, 05 Feb 2021 17:55:34 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "463",
-        "X-Request-ID": "ade2c94f-a329-4735-87f6-1c35a2ae358f"
+        "x-envoy-upstream-service-time": "630",
+        "X-Request-ID": "ac1dfe9e-d8d9-43eb-afae-61b8192e6eeb"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/baa3028e-5477-4c89-8910-04991afe3395",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6658bb1425650f4292379d8b7fe4bdf9-829bb3dea2d1f14d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d210707664533b511afd06f82b6c4ae7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a31cb37c-7a75-4689-8457-6c45228061d0",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:35 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "169",
+        "X-Request-ID": "a31cb37c-7a75-4689-8457-6c45228061d0"
+      },
+      "ResponseBody": {
+        "dataFeedId": "1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
+        "dataFeedName": "dataFeed8UNnGk7Z",
+        "metrics": [
+          {
+            "metricId": "0e5d5b39-8c21-4770-bb7b-442550ae4a31",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:34Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3cd27ddfbece2143b9b088cfe5be37cb-33af77d8f64b684b-00",
+        "traceparent": "00-4ded3f27dc2f334bba2451efbb7f7d90-57f388c5cf8e0e4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d210707664533b511afd06f82b6c4ae7",
+        "x-ms-client-request-id": "595b1fc4f2d8c592c0d48cfa179282b6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "72fae6a2-a267-4b01-8d70-deacbeb90ab2",
+        "apim-request-id": "2574e968-2a8a-4a49-a3c3-1155345806a7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "188",
-        "X-Request-ID": "72fae6a2-a267-4b01-8d70-deacbeb90ab2"
+        "x-envoy-upstream-service-time": "209",
+        "X-Request-ID": "2574e968-2a8a-4a49-a3c3-1155345806a7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/baa3028e-5477-4c89-8910-04991afe3395",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cc7f9a901306da4a91b5aded1aae6d08-2ae901654cb21345-00",
+        "traceparent": "00-9fdad19fa6e8e04f95af270a3c1cf8d9-4978ddc8c7a1a745-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "595b1fc4f2d8c592c0d48cfa179282b6",
+        "x-ms-client-request-id": "24d6bd617a372341a1e6a0be1482ea71",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "baf5698c-3874-455a-b0a4-9b66d8b3be06",
+        "apim-request-id": "c6f2df66-e652-4b9a-800d-d0b57f5b21b3",
         "Content-Length": "1115",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "183",
-        "X-Request-ID": "baf5698c-3874-455a-b0a4-9b66d8b3be06"
+        "x-envoy-upstream-service-time": "198",
+        "X-Request-ID": "c6f2df66-e652-4b9a-800d-d0b57f5b21b3"
       },
       "ResponseBody": {
-        "dataFeedId": "baa3028e-5477-4c89-8910-04991afe3395",
+        "dataFeedId": "1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
         "dataFeedName": "dataFeedaSHHI6J0",
         "metrics": [
           {
-            "metricId": "a8c54971-afa7-4c32-a676-5c14bbe3307b",
+            "metricId": "0e5d5b39-8c21-4770-bb7b-442550ae4a31",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:34Z",
+        "createdTime": "2021-02-05T17:55:34Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/baa3028e-5477-4c89-8910-04991afe3395",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/1bca1eaa-a9fe-4eeb-9262-6698a8164e2b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-88a0dd31a76d2e418b1e30bbaa61a217-16682b1f17b25c40-00",
+        "traceparent": "00-efb750282f27734db3d5f76466dbfb94-c7ffd656ba0fd442-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "24d6bd617a372341a1e6a0be1482ea71",
+        "x-ms-client-request-id": "20cae8ecdf858422de4b127ed7562388",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a1d7505d-4d54-4359-873f-f8fb15122d36",
+        "apim-request-id": "3b10fdf9-feb8-4937-aee3-42c9b537a1af",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "352",
-        "X-Request-ID": "a1d7505d-4d54-4359-873f-f8fb15122d36"
+        "x-envoy-upstream-service-time": "371",
+        "X-Request-ID": "3b10fdf9-feb8-4937-aee3-42c9b537a1af"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:35.5088016-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:35.9832900-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstanceAsync.json
index 5c3a700e40b8..d0b25c3cea7e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d14425f222aab34998af8a1915c54169-2b5c959f320c1148-00",
+        "traceparent": "00-b3a4542dd298fa4fbe7ef5bbe3582faa-e014602b81feb84f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "568d3b35-a056-439e-a38d-311c146f771b",
+        "apim-request-id": "b2ee0392-0fd5-487f-8686-b0702db0afab",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:06 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62c87746-882e-419f-831b-e637b2b2889e",
+        "Date": "Fri, 05 Feb 2021 17:58:13 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221f240d-b73a-44a3-ac37-93f8419e77a1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "444",
-        "X-Request-ID": "568d3b35-a056-439e-a38d-311c146f771b"
+        "x-envoy-upstream-service-time": "621",
+        "X-Request-ID": "b2ee0392-0fd5-487f-8686-b0702db0afab"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62c87746-882e-419f-831b-e637b2b2889e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221f240d-b73a-44a3-ac37-93f8419e77a1",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b3a4542dd298fa4fbe7ef5bbe3582faa-712e30946fcc7041-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cdd6719d826bc63e439e820299e9461b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ea5513ce-45ba-4562-9090-415fd6352714",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "ea5513ce-45ba-4562-9090-415fd6352714"
+      },
+      "ResponseBody": {
+        "dataFeedId": "221f240d-b73a-44a3-ac37-93f8419e77a1",
+        "dataFeedName": "dataFeedCleLfrR1",
+        "metrics": [
+          {
+            "metricId": "ab31ec41-ed58-4d93-813c-4c56965487db",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:14Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221f240d-b73a-44a3-ac37-93f8419e77a1",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f39d9c4b856597479d274f7ce31bd29d-efc78707f5a1954c-00",
+        "traceparent": "00-c3418de4124f884a9d22cc9f7ce8b608-9e71c2713f46a144-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cdd6719d826bc63e439e820299e9461b",
+        "x-ms-client-request-id": "3b5cf867c2ffd560fd9f9003d167875c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "440ff300-55e8-453b-84de-dd0a8f8c3c30",
+        "apim-request-id": "49dcb240-e305-43f0-846c-7c790352c1c6",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:06 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "190",
-        "X-Request-ID": "440ff300-55e8-453b-84de-dd0a8f8c3c30"
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "49dcb240-e305-43f0-846c-7c790352c1c6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62c87746-882e-419f-831b-e637b2b2889e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221f240d-b73a-44a3-ac37-93f8419e77a1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-847b5832dc306840af200caa017ed156-4252e72f92733545-00",
+        "traceparent": "00-54885ab62c20484ca71def0b1983c82c-0e0d9a0dad325c49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3b5cf867c2ffd560fd9f9003d167875c",
+        "x-ms-client-request-id": "fe111e8b4e9182abaec2f8148911f728",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9efb4f62-74cb-45c6-b567-e5370afa05ef",
+        "apim-request-id": "319ac36a-869b-4168-9acb-53fe1cfdb277",
         "Content-Length": "1115",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:06 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "X-Request-ID": "9efb4f62-74cb-45c6-b567-e5370afa05ef"
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "319ac36a-869b-4168-9acb-53fe1cfdb277"
       },
       "ResponseBody": {
-        "dataFeedId": "62c87746-882e-419f-831b-e637b2b2889e",
+        "dataFeedId": "221f240d-b73a-44a3-ac37-93f8419e77a1",
         "dataFeedName": "dataFeedtdJ6aC0n",
         "metrics": [
           {
-            "metricId": "30b22401-87ae-477d-a0ed-3e05eeb947a5",
+            "metricId": "ab31ec41-ed58-4d93-813c-4c56965487db",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:06Z",
+        "createdTime": "2021-02-05T17:58:14Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62c87746-882e-419f-831b-e637b2b2889e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/221f240d-b73a-44a3-ac37-93f8419e77a1",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d1bb29f5acb6e74e8155d3d9a5fdeff7-1a9dab8d5d995544-00",
+        "traceparent": "00-6c9c512104beff4ba243f4778421c798-758b0741a6804741-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fe111e8b4e9182abaec2f8148911f728",
+        "x-ms-client-request-id": "f8fe7dd72d7fda221100d0cbf13bf5dc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e19d1ace-7d87-4c6e-b62c-a6bac2ee146d",
+        "apim-request-id": "c648483a-6f11-4a27-b4ce-e6b98465e5ba",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "354",
-        "X-Request-ID": "e19d1ace-7d87-4c6e-b62c-a6bac2ee146d"
+        "x-envoy-upstream-service-time": "342",
+        "X-Request-ID": "c648483a-6f11-4a27-b4ce-e6b98465e5ba"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:07.2313101-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:15.1785604-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstance.json
index ef2d4bac8132..3a26511d93f8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5f6340cefd6426449ad230835a35a260-b5ed8207d3467243-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8adbac9e836cff4cae8cee1b72d3a4d0-6ca6be44baf48a4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a839f886c17c3077113b55c02cdb02aa",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "237ed90a-84e9-4586-95d0-e56bc5124caa",
+        "apim-request-id": "4279f068-3251-4559-a6d2-43210984b0bf",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/41c1f14f-0315-49c7-8b77-c1574d8b5317",
+        "Date": "Fri, 05 Feb 2021 17:55:36 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "574",
-        "x-request-id": "237ed90a-84e9-4586-95d0-e56bc5124caa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "651",
+        "X-Request-ID": "4279f068-3251-4559-a6d2-43210984b0bf"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/41c1f14f-0315-49c7-8b77-c1574d8b5317",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4691d59ff18b11449d857f31ae81a886-adbd54325590cf4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8adbac9e836cff4cae8cee1b72d3a4d0-a8acd4f00dcf6f4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "19440eea863f249ccb75473af7e276fe",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8bb98ab0-7b1a-4b94-b82f-c75ceb7370e6",
+        "apim-request-id": "d406a1d3-e8ff-4dd7-ae51-556af5f134da",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "150",
-        "x-request-id": "8bb98ab0-7b1a-4b94-b82f-c75ceb7370e6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "d406a1d3-e8ff-4dd7-ae51-556af5f134da"
       },
       "ResponseBody": {
-        "dataFeedId": "41c1f14f-0315-49c7-8b77-c1574d8b5317",
+        "dataFeedId": "e602926a-32c5-4697-b9dc-0c9affe23dc2",
         "dataFeedName": "dataFeed9c6QIp5T",
         "metrics": [
           {
-            "metricId": "f5d11fc8-c4bc-495f-825f-6e543f08e228",
+            "metricId": "b1cb1879-e2cc-4e4b-83aa-5b039eeb73ea",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:42Z",
+        "createdTime": "2021-02-05T17:55:36Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/41c1f14f-0315-49c7-8b77-c1574d8b5317",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cb15f30166e4c24d9b1145e778f90647-684c1bbc570b364d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "2dadd2741316533dfc314502a68ee505",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "61677347-2440-4389-a46a-f0282e8cedba",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:37 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "61677347-2440-4389-a46a-f0282e8cedba"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e602926a-32c5-4697-b9dc-0c9affe23dc2",
+        "dataFeedName": "dataFeed9c6QIp5T",
+        "metrics": [
+          {
+            "metricId": "b1cb1879-e2cc-4e4b-83aa-5b039eeb73ea",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:36Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "628",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7bbb2326a6795e48886ee0fdc05dd204-b035c021c4b1204a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f64807e61bb69446af954b03a8cec042-ada0d81e2633af4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2dadd2741316533dfc314502a68ee505",
+        "x-ms-client-request-id": "49eeeac2cd5eff185c15dd07793c392e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bd7f8eb6-cf51-4d0a-a1ab-2a83bfcff5ca",
+        "apim-request-id": "486a40a1-f6e2-4abe-81ed-f90c39131195",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "877",
-        "x-request-id": "bd7f8eb6-cf51-4d0a-a1ab-2a83bfcff5ca"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "685",
+        "X-Request-ID": "486a40a1-f6e2-4abe-81ed-f90c39131195"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/41c1f14f-0315-49c7-8b77-c1574d8b5317",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1d2fac6141761e41a59a3a63de413e3d-95d47515e57aa64f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ee44e74cdf412c4b87d2298d687245a4-8a0c3d5a91baed4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "49eeeac2cd5eff185c15dd07793c392e",
+        "x-ms-client-request-id": "5a4b57c4d42ed694d1f01d0d41997d3c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d68f87f3-b6bd-4611-b6be-0b32b73fb34d",
+        "apim-request-id": "cc17e9e0-c57f-470a-b266-fe65749072f0",
         "Content-Length": "1040",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "d68f87f3-b6bd-4611-b6be-0b32b73fb34d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "cc17e9e0-c57f-470a-b266-fe65749072f0"
       },
       "ResponseBody": {
-        "dataFeedId": "41c1f14f-0315-49c7-8b77-c1574d8b5317",
+        "dataFeedId": "e602926a-32c5-4697-b9dc-0c9affe23dc2",
         "dataFeedName": "dataFeed9c6QIp5T",
         "metrics": [
           {
-            "metricId": "f5d11fc8-c4bc-495f-825f-6e543f08e228",
+            "metricId": "b1cb1879-e2cc-4e4b-83aa-5b039eeb73ea",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:42Z",
+        "createdTime": "2021-02-05T17:55:36Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/41c1f14f-0315-49c7-8b77-c1574d8b5317",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e602926a-32c5-4697-b9dc-0c9affe23dc2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0f081ee18f543344ab45185b28476a96-0bfa69589cc36544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-78cfb31eb698a34698458c131e97eb00-5fa7fe834c567545-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5a4b57c4d42ed694d1f01d0d41997d3c",
+        "x-ms-client-request-id": "0c78428f2df4a7a0baadd1013636dac0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "23dfc559-139f-44a1-bcc3-a50cd6be6fad",
+        "apim-request-id": "c2a7effe-f73e-4bf1-82be-61b28794492f",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "324",
-        "x-request-id": "23dfc559-139f-44a1-bcc3-a50cd6be6fad"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "273",
+        "X-Request-ID": "c2a7effe-f73e-4bf1-82be-61b28794492f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-05T17:16:44.4558546-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:38.5948945-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 104001eca374..82e0a2661629 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-35a9733020f9f54284c92bdd84aa7a31-75e602195864f943-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-667642813752e04992215975796b8afc-bee70cca4836094b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "00bbe17a44e2e7c7de3468b347f6023d",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "31e026b6-63da-4733-babf-443ebbcc0564",
+        "apim-request-id": "dac13535-3547-461e-8b1d-0cb451344588",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964b686f-3516-45d8-9c67-98e11dac967f",
+        "Date": "Fri, 05 Feb 2021 17:58:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "514",
-        "x-request-id": "31e026b6-63da-4733-babf-443ebbcc0564"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "633",
+        "X-Request-ID": "dac13535-3547-461e-8b1d-0cb451344588"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964b686f-3516-45d8-9c67-98e11dac967f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-83e0bc92a624584fb5895bb2801c336a-a71005d6a4481344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-667642813752e04992215975796b8afc-8ca13a1c2c66bb4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3af98b08657842473e300b49fb11ee9e",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "044cf665-f202-4394-ba30-e2e7b2297964",
+        "apim-request-id": "b6eb177a-efb0-4554-a8f7-ca4f4b9ab950",
         "Content-Length": "989",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "x-request-id": "044cf665-f202-4394-ba30-e2e7b2297964"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "b6eb177a-efb0-4554-a8f7-ca4f4b9ab950"
       },
       "ResponseBody": {
-        "dataFeedId": "964b686f-3516-45d8-9c67-98e11dac967f",
+        "dataFeedId": "06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
         "dataFeedName": "dataFeedqOdtATNM",
         "metrics": [
           {
-            "metricId": "809d7b19-08df-4ac0-8c29-fb2fcd4ebded",
+            "metricId": "aa13616d-f579-4d73-b618-1ef01272dc5e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:58Z",
+        "createdTime": "2021-02-05T17:58:16Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964b686f-3516-45d8-9c67-98e11dac967f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d523f2928122a749b595bfaa38bb6ca3-f19f2d7629ce1a48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8a75ef743a97bdc1df27d500bd795045",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "71f770ac-7fd8-4ed9-949f-73123cd3c9d6",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:15 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "71f770ac-7fd8-4ed9-949f-73123cd3c9d6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
+        "dataFeedName": "dataFeedqOdtATNM",
+        "metrics": [
+          {
+            "metricId": "aa13616d-f579-4d73-b618-1ef01272dc5e",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:16Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "628",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-75aec238a2f7c249b38764cab22755b0-559516d7c3abe240-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f76292ca3eb465419ff4d72440441e47-67b3cf1415b3df4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8a75ef743a97bdc1df27d500bd795045",
+        "x-ms-client-request-id": "35d75b0a628c14649978c1b2397eeccd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "13d7e588-bdd9-406b-859a-b0b0a3eab818",
+        "apim-request-id": "ca76ef52-d042-4e93-8612-ed1735ead8e1",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:16:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "690",
-        "x-request-id": "13d7e588-bdd9-406b-859a-b0b0a3eab818"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "762",
+        "X-Request-ID": "ca76ef52-d042-4e93-8612-ed1735ead8e1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964b686f-3516-45d8-9c67-98e11dac967f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b5e346371d6cfe45829fc7517c071ed0-3f43a3c9039a7f44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6496eb4eb1a1064c980cc51cbcd59e71-f79ba6d60bd28d44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "35d75b0a628c14649978c1b2397eeccd",
+        "x-ms-client-request-id": "583fc9457780cda6c93c5a51904685c4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3e1c615a-17f1-4c32-90f7-c03f9d765581",
+        "apim-request-id": "440b21f9-ad98-4179-9731-d2a37047898c",
         "Content-Length": "1040",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 06 Jan 2021 01:16:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "172",
-        "x-request-id": "3e1c615a-17f1-4c32-90f7-c03f9d765581"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "440b21f9-ad98-4179-9731-d2a37047898c"
       },
       "ResponseBody": {
-        "dataFeedId": "964b686f-3516-45d8-9c67-98e11dac967f",
+        "dataFeedId": "06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
         "dataFeedName": "dataFeedqOdtATNM",
         "metrics": [
           {
-            "metricId": "809d7b19-08df-4ac0-8c29-fb2fcd4ebded",
+            "metricId": "aa13616d-f579-4d73-b618-1ef01272dc5e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-01-06T01:16:58Z",
+        "createdTime": "2021-02-05T17:58:16Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964b686f-3516-45d8-9c67-98e11dac967f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06cb1463-5fa4-4d51-88ec-d55e1fdb806b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ef60e77dfb6bd049b905fd6387195a05-2d29419c3e1cc843-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210105.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7a5a5fd9848c2940a87bba134cc36513-bc3c16f46a91c249-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "583fc9457780cda6c93c5a51904685c4",
+        "x-ms-client-request-id": "9f3fc5dfb93a12128a60f01e780f8361",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "deeb54e0-3c0b-47ba-82f5-9b6eb394b2cb",
+        "apim-request-id": "4d095f44-9457-4c13-850a-6326f02d6a94",
         "Content-Length": "0",
-        "Date": "Wed, 06 Jan 2021 01:17:00 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "401",
-        "x-request-id": "deeb54e0-3c0b-47ba-82f5-9b6eb394b2cb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "293",
+        "X-Request-ID": "4d095f44-9457-4c13-850a-6326f02d6a94"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-01-05T17:17:00.1036612-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:17.7075549-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstance.json
index 22ec2cc0f1f1..676171ba24ac 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-818a6d4b5a5e364aa62e6990d4d84938-bb3f98fd6bd15345-00",
+        "traceparent": "00-1d9315ed9f17f94ba03fa3548b20c935-6c544b7b3080434b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "145701c9-74a6-409e-b06b-3eee5d323d66",
+        "apim-request-id": "ba703956-42ba-44e9-a77e-eed21e4ecb31",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:35 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be24d1f5-afb8-47cd-b2c4-910f525ec193",
+        "Date": "Fri, 05 Feb 2021 17:55:39 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fb5d1e9e-5099-455f-899a-4c138b97a188",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "434",
-        "X-Request-ID": "145701c9-74a6-409e-b06b-3eee5d323d66"
+        "x-envoy-upstream-service-time": "573",
+        "X-Request-ID": "ba703956-42ba-44e9-a77e-eed21e4ecb31"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be24d1f5-afb8-47cd-b2c4-910f525ec193",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fb5d1e9e-5099-455f-899a-4c138b97a188",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1d9315ed9f17f94ba03fa3548b20c935-f2630287bff0bf41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d2391366ca03573b7ce47c596f91e362",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0caa12e1-6999-48ee-9580-da9c9b8d0a40",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:39 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "0caa12e1-6999-48ee-9580-da9c9b8d0a40"
+      },
+      "ResponseBody": {
+        "dataFeedId": "fb5d1e9e-5099-455f-899a-4c138b97a188",
+        "dataFeedName": "dataFeedaa3Dg3AO",
+        "metrics": [
+          {
+            "metricId": "e128351a-9f25-45f1-83f5-a2b9dedb5ff2",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:39Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fb5d1e9e-5099-455f-899a-4c138b97a188",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-44b0e6ae793148458db5cf080f466e53-9f76d73c3ccaec47-00",
+        "traceparent": "00-f294da592b8fb148bbdc396aae1330a4-cdcf2e5894b1704d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d2391366ca03573b7ce47c596f91e362",
+        "x-ms-client-request-id": "e82c0c1194992fc7691a34c99406b69e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4b98b24b-3856-4332-8751-06b5176872ce",
+        "apim-request-id": "766555d9-288c-4543-bb93-a6d0a64a13df",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "192",
-        "X-Request-ID": "4b98b24b-3856-4332-8751-06b5176872ce"
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "766555d9-288c-4543-bb93-a6d0a64a13df"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be24d1f5-afb8-47cd-b2c4-910f525ec193",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fb5d1e9e-5099-455f-899a-4c138b97a188",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-26d2a7c28336ce41bf9f178f0b0d177f-623fbca950085a46-00",
+        "traceparent": "00-06b9c61cc09f8b41af546f19b32ee470-9e2435a4222c374a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e82c0c1194992fc7691a34c99406b69e",
+        "x-ms-client-request-id": "175a60259187ef2370d15d1fd59a1016",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b32b8009-4e8a-4b67-acf1-10865719099f",
+        "apim-request-id": "c01c4c02-2e6a-439c-b018-5b2eea768395",
         "Content-Length": "1040",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "193",
-        "X-Request-ID": "b32b8009-4e8a-4b67-acf1-10865719099f"
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "c01c4c02-2e6a-439c-b018-5b2eea768395"
       },
       "ResponseBody": {
-        "dataFeedId": "be24d1f5-afb8-47cd-b2c4-910f525ec193",
+        "dataFeedId": "fb5d1e9e-5099-455f-899a-4c138b97a188",
         "dataFeedName": "dataFeedaa3Dg3AO",
         "metrics": [
           {
-            "metricId": "4026eb85-dd05-45b4-805e-437e0289883b",
+            "metricId": "e128351a-9f25-45f1-83f5-a2b9dedb5ff2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:36Z",
+        "createdTime": "2021-02-05T17:55:39Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be24d1f5-afb8-47cd-b2c4-910f525ec193",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fb5d1e9e-5099-455f-899a-4c138b97a188",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-97a9861b685dcf4088f59232f6a36252-cb7e66dca74c1641-00",
+        "traceparent": "00-e533b06eb5be0244a4b40cbe5086a0bc-2bd9ce80fa36214d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "175a60259187ef2370d15d1fd59a1016",
+        "x-ms-client-request-id": "528548ab1ebad1934c0969e99672c276",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4ca01459-954a-4fb6-9db0-3abbd21e1daf",
+        "apim-request-id": "2462c817-d2c5-4a0e-9979-4db6dff38b4a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:36 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "395",
-        "X-Request-ID": "4ca01459-954a-4fb6-9db0-3abbd21e1daf"
+        "x-envoy-upstream-service-time": "335",
+        "X-Request-ID": "2462c817-d2c5-4a0e-9979-4db6dff38b4a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:36.7865652-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:40.1485703-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 3f3a4c103af9..764cd6444c23 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateElasticsearchDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "277",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-12d1e65be969c84dad20caf12f58e228-b66f3278a0b55c41-00",
+        "traceparent": "00-17fa281b69d96c44b428aa53b443bd7b-7db18e4c9fa9564c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "53be9e79-f384-4b80-a9d5-374f35f31e84",
+        "apim-request-id": "00100192-e835-4a0e-ae73-6d422b4bd72d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:07 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb0e4634-6d2d-44f2-ba1d-bb935e37a84d",
+        "Date": "Fri, 05 Feb 2021 17:58:17 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "405",
-        "X-Request-ID": "53be9e79-f384-4b80-a9d5-374f35f31e84"
+        "x-envoy-upstream-service-time": "607",
+        "X-Request-ID": "00100192-e835-4a0e-ae73-6d422b4bd72d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb0e4634-6d2d-44f2-ba1d-bb935e37a84d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-17fa281b69d96c44b428aa53b443bd7b-7583bdd6a0cecc40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9b09ae620c055ece37c961b652a48414",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4d506417-c70b-4634-84b8-abf40c220c18",
+        "Content-Length": "989",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "4d506417-c70b-4634-84b8-abf40c220c18"
+      },
+      "ResponseBody": {
+        "dataFeedId": "066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
+        "dataFeedName": "dataFeedeoZ83UKE",
+        "metrics": [
+          {
+            "metricId": "e3c2246c-60a8-481c-9520-decde2216c14",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "Elasticsearch",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:18Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "authHeader": "Sanitized",
+          "port": "port",
+          "query": "query",
+          "host": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4df7f45b4e68a64ca1f4fdeb0342dcc3-65896e8266b21943-00",
+        "traceparent": "00-449246f672eb0d439f6abe78ddfdf05a-10508f183e131849-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9b09ae620c055ece37c961b652a48414",
+        "x-ms-client-request-id": "ccce69ccc2ddd518a94543b1d36bbe51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "065ab7a3-d370-484c-8320-c34039b37b3c",
+        "apim-request-id": "66b04bfd-b082-4841-9531-58d13bd79380",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "182",
-        "X-Request-ID": "065ab7a3-d370-484c-8320-c34039b37b3c"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "66b04bfd-b082-4841-9531-58d13bd79380"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb0e4634-6d2d-44f2-ba1d-bb935e37a84d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-15dfa33a12dbe541adc4aa140c618933-fe75108e018d1242-00",
+        "traceparent": "00-5a4d549fb1ec2d4c8234473d1f9a78cc-a4e3b7ac1c525d4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ccce69ccc2ddd518a94543b1d36bbe51",
+        "x-ms-client-request-id": "1201f18d6dd25b1a8ccc5ca581dbc3ac",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f917b904-7ed1-44fa-ab12-3b913176cefc",
+        "apim-request-id": "64f92eea-04a8-4ef6-92b9-ba172aba3a6c",
         "Content-Length": "1040",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "f917b904-7ed1-44fa-ab12-3b913176cefc"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "64f92eea-04a8-4ef6-92b9-ba172aba3a6c"
       },
       "ResponseBody": {
-        "dataFeedId": "cb0e4634-6d2d-44f2-ba1d-bb935e37a84d",
+        "dataFeedId": "066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
         "dataFeedName": "dataFeedeoZ83UKE",
         "metrics": [
           {
-            "metricId": "593d0f64-5d14-4b7f-be3e-f042fbdf82d7",
+            "metricId": "e3c2246c-60a8-481c-9520-decde2216c14",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:07Z",
+        "createdTime": "2021-02-05T17:58:18Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cb0e4634-6d2d-44f2-ba1d-bb935e37a84d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/066b871c-cfb8-49b4-9a0b-6b5ffe33bb62",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-88430fd4c3bba342a684c5eb854337b0-c9ebbceb210a8643-00",
+        "traceparent": "00-e4a1a767b387e24598de5f112105065c-6ea2372223794349-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1201f18d6dd25b1a8ccc5ca581dbc3ac",
+        "x-ms-client-request-id": "81f5e47eb4929f779534f1bfc91d8bcc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7a4ffe49-8fa4-4463-b65c-94965dcc0be8",
+        "apim-request-id": "48ed694c-64c0-40a9-a045-157902a4a883",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "293",
-        "X-Request-ID": "7a4ffe49-8fa4-4463-b65c-94965dcc0be8"
+        "x-envoy-upstream-service-time": "306",
+        "X-Request-ID": "48ed694c-64c0-40a9-a045-157902a4a883"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:08.4331675-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:19.3258846-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstance.json
index b422f90059d7..71a65e4bf6b5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-500f9b47a2064648b5f464d81ed4903d-f7498d50e29c424a-00",
+        "traceparent": "00-69c86585eecaf34a93563440603656f9-119ea29d42a65546-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,26 +36,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d3aab469-2993-407f-855f-64e5f40ecc93",
+        "apim-request-id": "ffee6d48-a7ba-4395-96af-fbbcc1f3cd18",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/05e73a4e-481a-4438-b841-231d614223a9",
+        "Date": "Fri, 05 Feb 2021 17:55:40 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "592",
-        "X-Request-ID": "d3aab469-2993-407f-855f-64e5f40ecc93"
+        "x-envoy-upstream-service-time": "555",
+        "X-Request-ID": "ffee6d48-a7ba-4395-96af-fbbcc1f3cd18"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/05e73a4e-481a-4438-b841-231d614223a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-449049b53dc01547b9a62013fff0c93d-a58bea425da2de41-00",
+        "traceparent": "00-69c86585eecaf34a93563440603656f9-988d2030c6a7d245-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -65,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "46ae4c65-0fe5-46cb-a0ae-e151db1927d6",
+        "apim-request-id": "a5ff32a6-e518-4636-996a-dffb206c686c",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "X-Request-ID": "46ae4c65-0fe5-46cb-a0ae-e151db1927d6"
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "a5ff32a6-e518-4636-996a-dffb206c686c"
       },
       "ResponseBody": {
-        "dataFeedId": "05e73a4e-481a-4438-b841-231d614223a9",
+        "dataFeedId": "e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
         "dataFeedName": "dataFeedFXglzsLV",
         "metrics": [
           {
-            "metricId": "573a8ef1-2ba4-46a1-beaa-38c4b68d40ab",
+            "metricId": "17a4c9c1-9c07-4645-aeaa-5cb4b8bf5c99",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -110,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:59Z",
+        "createdTime": "2021-02-05T17:55:41Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -122,20 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/05e73a4e-481a-4438-b841-231d614223a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-331092dde402614588ccdafb15724570-209decfe51f94a49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d6b0285fffe06966160f20f6cd4033c4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "bda6365b-c2fd-4292-8a75-48911df3bce8",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:41 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "bda6365b-c2fd-4292-8a75-48911df3bce8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
+        "dataFeedName": "dataFeedFXglzsLV",
+        "metrics": [
+          {
+            "metricId": "17a4c9c1-9c07-4645-aeaa-5cb4b8bf5c99",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:41Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "729",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3c2ad9b2d530ac4a93049f6bf7c76741-e7624430124ecb4d-00",
+        "traceparent": "00-9e247d33f93b414eaecec2ebde9c01c6-53294b9d0bce6c45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d6b0285fffe06966160f20f6cd4033c4",
+        "x-ms-client-request-id": "d7bebd2ec4b080d7ca9bbcfbeef75114",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -171,49 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "53e626bf-c3fd-4d78-9a71-ab6a2aaef4f9",
+        "apim-request-id": "d95fecea-9066-4b8c-bf22-53d429213ea7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:24:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "728",
-        "X-Request-ID": "53e626bf-c3fd-4d78-9a71-ab6a2aaef4f9"
+        "x-envoy-upstream-service-time": "655",
+        "X-Request-ID": "d95fecea-9066-4b8c-bf22-53d429213ea7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/05e73a4e-481a-4438-b841-231d614223a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-58b8703aa1a12a46ab4ca3be8820fa4f-1fc651ee52fba946-00",
+        "traceparent": "00-b80e938cb71b7c41943e04242dd1c1fc-aa1b6579b78cbe43-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d7bebd2ec4b080d7ca9bbcfbeef75114",
+        "x-ms-client-request-id": "f69136c85aeb9433fa73b2f30c00ce4b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "954676bc-67dd-4c34-839d-6deae04d3c51",
+        "apim-request-id": "9d40ffe6-36eb-4bb0-a7da-aba88b05d281",
         "Content-Length": "1141",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:24:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "X-Request-ID": "954676bc-67dd-4c34-839d-6deae04d3c51"
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "9d40ffe6-36eb-4bb0-a7da-aba88b05d281"
       },
       "ResponseBody": {
-        "dataFeedId": "05e73a4e-481a-4438-b841-231d614223a9",
+        "dataFeedId": "e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
         "dataFeedName": "dataFeedd5KUxBpJ",
         "metrics": [
           {
-            "metricId": "573a8ef1-2ba4-46a1-beaa-38c4b68d40ab",
+            "metricId": "17a4c9c1-9c07-4645-aeaa-5cb4b8bf5c99",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -247,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:24:59Z",
+        "createdTime": "2021-02-05T17:55:41Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -259,36 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/05e73a4e-481a-4438-b841-231d614223a9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e03c6a39-3bb8-4db0-a691-e0998cc94a2c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d7cfb0e87141854f93a0db3e0e3b5bf1-3bc70ddff5bb4746-00",
+        "traceparent": "00-f6864487f2c3ed4c93258b25b5d90e3e-fee11d84addc1347-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f69136c85aeb9433fa73b2f30c00ce4b",
+        "x-ms-client-request-id": "a758866f526e9b45512f0b45426b7a1f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "72f39f6e-faa8-4d5e-8f83-e13d7247689e",
+        "apim-request-id": "b640fbe6-4459-4eae-b7c0-43af85f70459",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:00 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "297",
-        "X-Request-ID": "72f39f6e-faa8-4d5e-8f83-e13d7247689e"
+        "x-envoy-upstream-service-time": "319",
+        "X-Request-ID": "b640fbe6-4459-4eae-b7c0-43af85f70459"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:00.5984548-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:42.9884228-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstanceAsync.json
index 4c1afe821a7d..9756979ac0a7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5791521b3c94e644940c5047105cc075-ea993488b9aa0041-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e39f113fccc5274c8844372b0c0454e7-04dcdd6cff66bb40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cc82816ddf1ccf672a85042fcb93758b",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "49991062-697f-427e-afc2-d33d2a164031",
+        "apim-request-id": "642887b3-7933-44ce-b93c-e24aae1d7f24",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7cfabb00-4408-4471-82bd-e2413f199dbd",
+        "Date": "Fri, 05 Feb 2021 17:58:19 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "432",
-        "x-request-id": "49991062-697f-427e-afc2-d33d2a164031"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "566",
+        "X-Request-ID": "642887b3-7933-44ce-b93c-e24aae1d7f24"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7cfabb00-4408-4471-82bd-e2413f199dbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a83add196a562a4384ee83c01d9df882-2ad52628bab7554f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e39f113fccc5274c8844372b0c0454e7-eda6071d12c9cc4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1d56e05d535ed0919b39280dba91fb47",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "375e1dd7-0346-42fb-81db-a8421b39ed81",
+        "apim-request-id": "13bac500-57fc-44e2-a549-d23fcaa77493",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "138",
-        "x-request-id": "375e1dd7-0346-42fb-81db-a8421b39ed81"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "13bac500-57fc-44e2-a549-d23fcaa77493"
       },
       "ResponseBody": {
-        "dataFeedId": "7cfabb00-4408-4471-82bd-e2413f199dbd",
+        "dataFeedId": "ea30fda0-ff4c-4643-8632-ea269cbe818c",
         "dataFeedName": "dataFeedXUbS2vdX",
         "metrics": [
           {
-            "metricId": "82ab7578-57b4-45ce-aa42-f266cb701a2a",
+            "metricId": "cd4a6483-f5b7-491b-9e71-78a36592aaa3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:18Z",
+        "createdTime": "2021-02-05T17:58:20Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7cfabb00-4408-4471-82bd-e2413f199dbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b1d245650f657f45beefe24e802f9e8d-1a22c3f462dcaa4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a26878922485c56e6a26a75f54199598",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "11e5ebe9-0fa6-4079-994d-1f2696f2eecb",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:19 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "167",
+        "X-Request-ID": "11e5ebe9-0fa6-4079-994d-1f2696f2eecb"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ea30fda0-ff4c-4643-8632-ea269cbe818c",
+        "dataFeedName": "dataFeedXUbS2vdX",
+        "metrics": [
+          {
+            "metricId": "cd4a6483-f5b7-491b-9e71-78a36592aaa3",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:20Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "729",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4395a1540ca2f84e9e3c77bea7ac8f90-97d0c75b3d1db449-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f5c5e8849cc72746bda9eeda0bc2bb56-5e19133867209d44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a26878922485c56e6a26a75f54199598",
+        "x-ms-client-request-id": "7a1a9da2c9f619f7efb130e3b75a1598",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +245,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "418d5400-0790-422d-aeea-4a5154b09ac9",
+        "apim-request-id": "652aa7fd-719c-4d07-90ef-21dcc7027ebc",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "503",
-        "x-request-id": "418d5400-0790-422d-aeea-4a5154b09ac9"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "701",
+        "X-Request-ID": "652aa7fd-719c-4d07-90ef-21dcc7027ebc"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7cfabb00-4408-4471-82bd-e2413f199dbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c270292d1b829b409d8998454c46a219-71a50361505e7c4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cc9444a9dab840499e6aaab86978b773-b25da43984e71a41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7a1a9da2c9f619f7efb130e3b75a1598",
+        "x-ms-client-request-id": "529cbc89d32b39067190b237ab327c81",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d442cea8-6e8f-492c-976b-68d1283f413c",
+        "apim-request-id": "2b193222-826b-4966-8913-e14820939739",
         "Content-Length": "1141",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "d442cea8-6e8f-492c-976b-68d1283f413c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "2b193222-826b-4966-8913-e14820939739"
       },
       "ResponseBody": {
-        "dataFeedId": "7cfabb00-4408-4471-82bd-e2413f199dbd",
+        "dataFeedId": "ea30fda0-ff4c-4643-8632-ea269cbe818c",
         "dataFeedName": "dataFeedk0coNrgg",
         "metrics": [
           {
-            "metricId": "82ab7578-57b4-45ce-aa42-f266cb701a2a",
+            "metricId": "cd4a6483-f5b7-491b-9e71-78a36592aaa3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -235,7 +321,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:18Z",
+        "createdTime": "2021-02-05T17:58:20Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -247,33 +333,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7cfabb00-4408-4471-82bd-e2413f199dbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ea30fda0-ff4c-4643-8632-ea269cbe818c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7e5b956721781c48a2bdfb9deb9e35df-6348ad5c2b50e54a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b809e8c312f0ad4b9d3596e1f526a179-0eab394e078e4343-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "529cbc89d32b39067190b237ab327c81",
+        "x-ms-client-request-id": "1c6b8fa38076c951814eb2d3f38b0e0f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6e22120f-2b55-46cf-8223-ca0f2dc601e7",
+        "apim-request-id": "2330c75d-b7ef-4822-be1b-21c101d4d912",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "283",
-        "x-request-id": "6e22120f-2b55-46cf-8223-ca0f2dc601e7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "278",
+        "X-Request-ID": "2330c75d-b7ef-4822-be1b-21c101d4d912"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:19.6117056-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:21.5998793-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstance.json
index c2ec00113b67..79959a377f6d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-79101b71c38d934092af9fff18f6c557-c17e92833f987a49-00",
+        "traceparent": "00-9d96dcfc3f3d5d4daf656a1f622cde66-c1d7903a61d88c4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ad44dbe8-227f-4a49-b8cf-016c5bd20265",
+        "apim-request-id": "5e712891-f2a2-4e0e-8958-fac29467bc95",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:36 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7ab60b4-1be5-4f5d-8376-a29242662e59",
+        "Date": "Fri, 05 Feb 2021 17:55:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "476",
-        "X-Request-ID": "ad44dbe8-227f-4a49-b8cf-016c5bd20265"
+        "x-envoy-upstream-service-time": "652",
+        "X-Request-ID": "5e712891-f2a2-4e0e-8958-fac29467bc95"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7ab60b4-1be5-4f5d-8376-a29242662e59",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9d96dcfc3f3d5d4daf656a1f622cde66-b5539f486f544d41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "48c93ad2590adc8561d99c331c8b8e4a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "49474d3e-a6f0-4442-944b-535230e56997",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:44 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "49474d3e-a6f0-4442-944b-535230e56997"
+      },
+      "ResponseBody": {
+        "dataFeedId": "cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
+        "dataFeedName": "dataFeed0WLyGoTb",
+        "metrics": [
+          {
+            "metricId": "f953665a-2a49-48d1-854b-4af2e0f9319f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:44Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e2328a2f77df6e4287e6cea3bebcd457-d8bc59216ab80546-00",
+        "traceparent": "00-05e403876f4f4444a5fa2607ad3d2b0b-82a710d60c22df4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "48c93ad2590adc8561d99c331c8b8e4a",
+        "x-ms-client-request-id": "ff39e50cc176b17e644d324d596184cc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "34136b0a-33e2-4423-b462-abf9c9e1ff21",
+        "apim-request-id": "45393508-a076-40c2-a86e-8ed1c1c6d1b2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "180",
-        "X-Request-ID": "34136b0a-33e2-4423-b462-abf9c9e1ff21"
+        "x-envoy-upstream-service-time": "187",
+        "X-Request-ID": "45393508-a076-40c2-a86e-8ed1c1c6d1b2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7ab60b4-1be5-4f5d-8376-a29242662e59",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2f1b49fa667fdc448fa06c454e7f0acc-49ed83d108d7bd49-00",
+        "traceparent": "00-bd31c6baabee47469714ddbc87ac11b1-5f1ececb3ee06d46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ff39e50cc176b17e644d324d596184cc",
+        "x-ms-client-request-id": "ef0af52d813c20a76c600bc64fcc1e93",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "941cffc8-ee80-4e7b-893c-f15e38997015",
+        "apim-request-id": "0943e8fb-ad79-41f4-8a81-24200f8dfa06",
         "Content-Length": "1124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "167",
-        "X-Request-ID": "941cffc8-ee80-4e7b-893c-f15e38997015"
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "0943e8fb-ad79-41f4-8a81-24200f8dfa06"
       },
       "ResponseBody": {
-        "dataFeedId": "b7ab60b4-1be5-4f5d-8376-a29242662e59",
+        "dataFeedId": "cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
         "dataFeedName": "dataFeedvNmU1Yd5",
         "metrics": [
           {
-            "metricId": "54b88e72-2667-4214-ab3f-1797cefab062",
+            "metricId": "f953665a-2a49-48d1-854b-4af2e0f9319f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:37Z",
+        "createdTime": "2021-02-05T17:55:44Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b7ab60b4-1be5-4f5d-8376-a29242662e59",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cbc47cf8-b23d-4a84-b290-4f6e5f40e75c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-309d81bc64a04f4eac2d5fb55848b92c-bd4bb05aef22884d-00",
+        "traceparent": "00-d35ec2567495504a86a222592ed6dca4-e43dd1259d1e8245-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ef0af52d813c20a76c600bc64fcc1e93",
+        "x-ms-client-request-id": "38ff9cda4bb111ccbb18e4bd27388200",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0b311643-f971-40e1-af6e-4b8985742137",
+        "apim-request-id": "6dde25ba-d722-4a92-8d62-45c5379668bd",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "310",
-        "X-Request-ID": "0b311643-f971-40e1-af6e-4b8985742137"
+        "x-envoy-upstream-service-time": "336",
+        "X-Request-ID": "6dde25ba-d722-4a92-8d62-45c5379668bd"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:38.1549465-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:45.2671615-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstanceAsync.json
index a7f86b62b7cc..b19713a221e1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f2746b03491ed5439dfff3770564e6c7-93be71349eb1ec4c-00",
+        "traceparent": "00-1b87fd171c2e20489a06a082e5a4ffc5-f72ad8f99361da4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "49c84d15-a997-46f8-b250-9070e03a9c45",
+        "apim-request-id": "ad61b7d3-8ce9-4aa5-87e6-7cc4a00b1fe2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:08 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d046a1c8-604c-426c-b2a1-43a7dde76b1a",
+        "Date": "Fri, 05 Feb 2021 17:58:21 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3d46852a-943f-4aee-aea4-def9ed224551",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "352",
-        "X-Request-ID": "49c84d15-a997-46f8-b250-9070e03a9c45"
+        "x-envoy-upstream-service-time": "562",
+        "X-Request-ID": "ad61b7d3-8ce9-4aa5-87e6-7cc4a00b1fe2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d046a1c8-604c-426c-b2a1-43a7dde76b1a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3d46852a-943f-4aee-aea4-def9ed224551",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1b87fd171c2e20489a06a082e5a4ffc5-9624cd2455da904a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "53831aae414ef6ae9608e8b1519f0251",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "23b30a10-38ea-4bfe-ab15-c143e97c7c90",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:21 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "23b30a10-38ea-4bfe-ab15-c143e97c7c90"
+      },
+      "ResponseBody": {
+        "dataFeedId": "3d46852a-943f-4aee-aea4-def9ed224551",
+        "dataFeedName": "dataFeednOXZo4U6",
+        "metrics": [
+          {
+            "metricId": "f0c671f6-1445-490f-817a-4c3ecc56e3d1",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:22Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3d46852a-943f-4aee-aea4-def9ed224551",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fe408606ebc774469e46a43cf480bf35-df4eaca556cecc43-00",
+        "traceparent": "00-6208e2c2ba32c446a140d60f3c0b8bfa-d9858c79f8edce46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "53831aae414ef6ae9608e8b1519f0251",
+        "x-ms-client-request-id": "275d0cb30a5886d3b892314b80750366",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -83,49 +157,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "94e29535-f47b-4094-8897-7a508f708fad",
+        "apim-request-id": "e7413d93-6e49-4c4d-9b85-451cc7daa5af",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "X-Request-ID": "94e29535-f47b-4094-8897-7a508f708fad"
+        "x-envoy-upstream-service-time": "182",
+        "X-Request-ID": "e7413d93-6e49-4c4d-9b85-451cc7daa5af"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d046a1c8-604c-426c-b2a1-43a7dde76b1a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3d46852a-943f-4aee-aea4-def9ed224551",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f43931b3c6165144babea770d60cd02c-66294fc375e7eb4e-00",
+        "traceparent": "00-a8453df9460e1b4fb01abfd853249200-24f8e2dfe11c2b44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "275d0cb30a5886d3b892314b80750366",
+        "x-ms-client-request-id": "a2377956a208be11d1eac4e75823efa6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d1c20d62-6bf1-4385-b9aa-060b689d527d",
+        "apim-request-id": "1666332d-8eae-4f94-87fc-a2c5e15e8d21",
         "Content-Length": "1124",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "135",
-        "X-Request-ID": "d1c20d62-6bf1-4385-b9aa-060b689d527d"
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "1666332d-8eae-4f94-87fc-a2c5e15e8d21"
       },
       "ResponseBody": {
-        "dataFeedId": "d046a1c8-604c-426c-b2a1-43a7dde76b1a",
+        "dataFeedId": "3d46852a-943f-4aee-aea4-def9ed224551",
         "dataFeedName": "dataFeed5C72jKOD",
         "metrics": [
           {
-            "metricId": "7dbaf6ef-4362-49f3-84bc-ee751c91afb4",
+            "metricId": "f0c671f6-1445-490f-817a-4c3ecc56e3d1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -158,7 +232,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:09Z",
+        "createdTime": "2021-02-05T17:58:22Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -170,36 +244,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d046a1c8-604c-426c-b2a1-43a7dde76b1a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3d46852a-943f-4aee-aea4-def9ed224551",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-af205abd99d7e340966cdd2e5cfb96e4-c2f2bd0fa02bb341-00",
+        "traceparent": "00-3841da4332493b4b8c6b83d2daaffc60-16c84ef1e1757840-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a2377956a208be11d1eac4e75823efa6",
+        "x-ms-client-request-id": "3d5cb5775ba5a42c47fc9bbb10627621",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "aaa40109-0e4e-4afb-b6e1-571a279e294b",
+        "apim-request-id": "eaa7bfd6-f38b-4a90-9bdc-da685bd64032",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:09 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "298",
-        "X-Request-ID": "aaa40109-0e4e-4afb-b6e1-571a279e294b"
+        "x-envoy-upstream-service-time": "324",
+        "X-Request-ID": "eaa7bfd6-f38b-4a90-9bdc-da685bd64032"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:09.5693976-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:23.1085707-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstance.json
index 289dcdd9aa2f..78dd3d08d6e6 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-56089344f837214bb0415e0f40eee5ac-71eb4a60067d0743-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-488b3dafbcbe1e43b7ba13817f352fce-38b09b9f0dcfe14a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a90d7e19451cf54a404ffe17ff5f8d1c",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "338c7d5d-e083-4443-9a9e-76c312f88663",
+        "apim-request-id": "05969802-34c8-4430-b445-ab222886f7b8",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:22 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+        "Date": "Fri, 05 Feb 2021 17:55:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "330",
-        "x-request-id": "338c7d5d-e083-4443-9a9e-76c312f88663"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "588",
+        "X-Request-ID": "05969802-34c8-4430-b445-ab222886f7b8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-af31d298c15d1747a36e2cc43abcf1a5-c545d7b06b47a648-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-488b3dafbcbe1e43b7ba13817f352fce-e7e40b5733d8e64f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5428f11075580b2eb47b5e25dc2a581a",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cf1c1af9-65ff-4844-a0bd-1f14daadabd1",
+        "apim-request-id": "a1caef5f-98f4-4b28-b1eb-eaae70a433d4",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "x-request-id": "cf1c1af9-65ff-4844-a0bd-1f14daadabd1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "197",
+        "X-Request-ID": "a1caef5f-98f4-4b28-b1eb-eaae70a433d4"
       },
       "ResponseBody": {
-        "dataFeedId": "cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+        "dataFeedId": "2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
         "dataFeedName": "dataFeeddn152yCG",
         "metrics": [
           {
-            "metricId": "4b6b79b0-f320-413c-8422-f6d94e52cb0b",
+            "metricId": "090e915a-20d9-4517-a5b1-d8182d80a23f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:22Z",
+        "createdTime": "2021-02-05T17:55:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9871bca2787aab4093f4746efdd499c9-01ba5b0edeb6af4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "083254c943830d72387acf2b15e3a8d5",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e91b5806-222b-4a0d-95c2-3dfb8d3b7e74",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "e91b5806-222b-4a0d-95c2-3dfb8d3b7e74"
+      },
+      "ResponseBody": {
+        "dataFeedId": "2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
+        "dataFeedName": "dataFeeddn152yCG",
+        "metrics": [
+          {
+            "metricId": "090e915a-20d9-4517-a5b1-d8182d80a23f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:46Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "637",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9fc39b7460014c469f6630b49c4b66b6-37b4c9232a12e448-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a607791f1c093488559e1efd0e530fe-552698b30944b844-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "083254c943830d72387acf2b15e3a8d5",
+        "x-ms-client-request-id": "9bcab2d6ad81a3dd5002f4a1e7241816",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f1c30143-a87e-489d-a4a5-6dab984ce25b",
+        "apim-request-id": "498db1b4-a0ff-4b12-9dc8-2dbb2ef53076",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "445",
-        "x-request-id": "f1c30143-a87e-489d-a4a5-6dab984ce25b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "5805",
+        "X-Request-ID": "498db1b4-a0ff-4b12-9dc8-2dbb2ef53076"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-294c6637177a494ba7966318e283427e-ae7ca6a8761f114f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c448b99c7ccf4944ae1c29d401ae1cc7-35ed34872950f048-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9bcab2d6ad81a3dd5002f4a1e7241816",
+        "x-ms-client-request-id": "ab4de4f6852ccd997e1a1bdda502f5d0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "72f5a51c-adf1-4170-9728-b86b19e0987f",
+        "apim-request-id": "52eba20a-51f9-4c3c-b995-9906a826b9a3",
         "Content-Length": "1049",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "x-request-id": "72f5a51c-adf1-4170-9728-b86b19e0987f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "52eba20a-51f9-4c3c-b995-9906a826b9a3"
       },
       "ResponseBody": {
-        "dataFeedId": "cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+        "dataFeedId": "2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
         "dataFeedName": "dataFeeddn152yCG",
         "metrics": [
           {
-            "metricId": "4b6b79b0-f320-413c-8422-f6d94e52cb0b",
+            "metricId": "090e915a-20d9-4517-a5b1-d8182d80a23f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:22Z",
+        "createdTime": "2021-02-05T17:55:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/cba8ef8a-a73e-4a63-b9a5-99f9d3e25750",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2b3c46fb-c8d7-45e0-ace9-5c9b5d534255",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6775ed7e54b67b4298d96ec1fed27fe0-307e9b60dc928246-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cd33310faff4fe4bb65787c3e9394886-9e43bb93bd25f041-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ab4de4f6852ccd997e1a1bdda502f5d0",
+        "x-ms-client-request-id": "2a4e88d2bd601c98778fb8804ed02614",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7d5f9b82-8154-435e-856e-4668394e52e4",
+        "apim-request-id": "7da50fb0-b70b-4bdf-844f-17b46a85fedf",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "267",
-        "x-request-id": "7d5f9b82-8154-435e-856e-4668394e52e4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "364",
+        "X-Request-ID": "7da50fb0-b70b-4bdf-844f-17b46a85fedf"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:23.9209049-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:53.5454966-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 1c8e7d069740..30e753029efe 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3466bfdee64b6b4cbcb902ca0aa4c5cd-05f28f739ff4be44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-332b9d82c8d89743b62d6827de261431-c08450d8c4830a45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fc0b87882ad27c35a504f0d2c3a157fd",
         "x-ms-return-client-request-id": "true"
@@ -33,25 +36,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2e9c32db-77a5-41e2-bc01-1b68cb262e69",
+        "apim-request-id": "0e3d484c-d0b6-4155-bac1-08a130a1bcd5",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:33 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+        "Date": "Fri, 05 Feb 2021 17:58:23 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "565",
-        "x-request-id": "2e9c32db-77a5-41e2-bc01-1b68cb262e69"
+        "X-Request-ID": "0e3d484c-d0b6-4155-bac1-08a130a1bcd5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5800aaac25969f4bb14261f1c6af5ed9-5c1f59bc950dc440-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-332b9d82c8d89743b62d6827de261431-c03ba42a2f7d4d4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2e62f0a8306f492d7e768eb33b5fdf76",
         "x-ms-return-client-request-id": "true"
@@ -59,21 +65,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1cbe2ea0-567a-4755-ae0d-88c7f33d8684",
+        "apim-request-id": "986f1bdd-f5fe-4fe2-8e67-fbd10f4ebf4b",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "177",
-        "x-request-id": "1cbe2ea0-567a-4755-ae0d-88c7f33d8684"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "986f1bdd-f5fe-4fe2-8e67-fbd10f4ebf4b"
       },
       "ResponseBody": {
-        "dataFeedId": "5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+        "dataFeedId": "93504d18-c5d7-411a-aaab-786111f2e287",
         "dataFeedName": "dataFeedamWKNFSi",
         "metrics": [
           {
-            "metricId": "58a4b7fa-5716-4ebb-9fc3-fecfd054d738",
+            "metricId": "00e646ad-9a45-44fa-9335-9e245338740b",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -104,7 +110,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:33Z",
+        "createdTime": "2021-02-05T17:58:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -116,17 +122,94 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-61c8698ff0e30843a432f7746d9fa10f-c424176db7fbb847-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "51fc126798651307383c10b3ec5aeede",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "900a3e6b-d180-440d-b9df-751aff57182f",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:23 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "900a3e6b-d180-440d-b9df-751aff57182f"
+      },
+      "ResponseBody": {
+        "dataFeedId": "93504d18-c5d7-411a-aaab-786111f2e287",
+        "dataFeedName": "dataFeedamWKNFSi",
+        "metrics": [
+          {
+            "metricId": "00e646ad-9a45-44fa-9335-9e245338740b",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:24Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "637",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-778e8bca2144874d97819541bee850ff-cc4189476d0a464f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8f5789165b4384458e403e149505b82c-d1e2c2e03515704c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "51fc126798651307383c10b3ec5aeede",
+        "x-ms-client-request-id": "251c5a49762f58d859c17e5c9b824045",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +242,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f5a4f41a-5585-4576-be9c-35287e2ba7a2",
+        "apim-request-id": "b6ebd653-12d0-43f9-a92e-29ea93361be6",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "654",
-        "x-request-id": "f5a4f41a-5585-4576-be9c-35287e2ba7a2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "690",
+        "X-Request-ID": "b6ebd653-12d0-43f9-a92e-29ea93361be6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-72ca77fabe4f3947a74b87201d2c77eb-26a14ed79cda8540-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-32d2c82a6f488a41a0755ade14e4477e-b486baa2ef68be4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "251c5a49762f58d859c17e5c9b824045",
+        "x-ms-client-request-id": "b06b7a2406a51098e84ff6321f7a5d24",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2f6f26bc-9334-4a9d-987e-9b1f4cb7e6a6",
+        "apim-request-id": "b1544291-8791-4d21-9616-3bf416fe9450",
         "Content-Length": "1049",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "2f6f26bc-9334-4a9d-987e-9b1f4cb7e6a6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "b1544291-8791-4d21-9616-3bf416fe9450"
       },
       "ResponseBody": {
-        "dataFeedId": "5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+        "dataFeedId": "93504d18-c5d7-411a-aaab-786111f2e287",
         "dataFeedName": "dataFeedamWKNFSi",
         "metrics": [
           {
-            "metricId": "58a4b7fa-5716-4ebb-9fc3-fecfd054d738",
+            "metricId": "00e646ad-9a45-44fa-9335-9e245338740b",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +315,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:33Z",
+        "createdTime": "2021-02-05T17:58:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -241,33 +327,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5fdd446e-c1bb-453f-a401-907a2a1cd9a8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/93504d18-c5d7-411a-aaab-786111f2e287",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4bc9c3c188573d40bcdf0fc2f1d8ba42-f1808bb69343774e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ee62f16c106e9744959efcea8d23b7b9-f8ff2ec1fc70e04f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b06b7a2406a51098e84ff6321f7a5d24",
+        "x-ms-client-request-id": "e169b087ba43f0463aa3f7a31aab78b5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3dede087-8f34-4b84-873b-20f85dcd0201",
+        "apim-request-id": "813e2e6b-f35a-406b-9e46-95652fa6af37",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "325",
-        "x-request-id": "3dede087-8f34-4b84-873b-20f85dcd0201"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "354",
+        "X-Request-ID": "813e2e6b-f35a-406b-9e46-95652fa6af37"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:34.4954311-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:25.4191222-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstance.json
index ebfc17d230b1..62cbebb39e41 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7638d5aea008b24d9e2cc91865343800-e3ce69333872f44c-00",
+        "traceparent": "00-0e81f2b2d9ade34581e6a02d99b7947a-a5e32e4a77b32249-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cbbc95e2-91f4-45b7-9428-fce46bdccd2c",
+        "apim-request-id": "8f647d5f-c72f-4cbe-8d63-1f2fbbde220e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2d5d9b39-ccdc-495c-9fef-39764190f20e",
+        "Date": "Fri, 05 Feb 2021 17:55:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e453317c-72d5-477d-b3b6-cdff190dbcde",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "396",
-        "X-Request-ID": "cbbc95e2-91f4-45b7-9428-fce46bdccd2c"
+        "x-envoy-upstream-service-time": "381",
+        "X-Request-ID": "8f647d5f-c72f-4cbe-8d63-1f2fbbde220e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2d5d9b39-ccdc-495c-9fef-39764190f20e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e453317c-72d5-477d-b3b6-cdff190dbcde",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-0e81f2b2d9ade34581e6a02d99b7947a-5b6af4f0ccbcc34f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0d3bf58cb71d3ece65de934460d9c57c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c3fe120f-4518-43b5-930b-070f9c748e7a",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:53 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "c3fe120f-4518-43b5-930b-070f9c748e7a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e453317c-72d5-477d-b3b6-cdff190dbcde",
+        "dataFeedName": "dataFeed4lysRCIB",
+        "metrics": [
+          {
+            "metricId": "b463ec4d-1c3b-4789-b114-c35ad01ddd2e",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:54Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e453317c-72d5-477d-b3b6-cdff190dbcde",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9f6deb0e7c491f45a4ca2de8b29f5335-02377a75b3d85a44-00",
+        "traceparent": "00-53b0b2371f17f545bea8104b3abf08ba-f18bed0ee2117e40-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0d3bf58cb71d3ece65de934460d9c57c",
+        "x-ms-client-request-id": "b4b18e3ec305c8eba563a4f20333746f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "983d3b1f-7899-4968-a1d1-2a1ba899512d",
+        "apim-request-id": "8b26ee11-89a1-4139-9b3e-2815d361bcb5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "183",
-        "X-Request-ID": "983d3b1f-7899-4968-a1d1-2a1ba899512d"
+        "x-envoy-upstream-service-time": "187",
+        "X-Request-ID": "8b26ee11-89a1-4139-9b3e-2815d361bcb5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2d5d9b39-ccdc-495c-9fef-39764190f20e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e453317c-72d5-477d-b3b6-cdff190dbcde",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e931af312b03294180e4263632191501-87704baa9e6efb46-00",
+        "traceparent": "00-4dc5fe50bb2cbb4eb0d96f4e98f6a3d6-752f575b5d7b3e4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b4b18e3ec305c8eba563a4f20333746f",
+        "x-ms-client-request-id": "69360d39728e95e872be74d54382e219",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2595b356-3b0a-4f07-b103-d94b9cff19ac",
+        "apim-request-id": "59a63779-a6bd-480e-ab00-da3b30f01365",
         "Content-Length": "1049",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "161",
-        "X-Request-ID": "2595b356-3b0a-4f07-b103-d94b9cff19ac"
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "59a63779-a6bd-480e-ab00-da3b30f01365"
       },
       "ResponseBody": {
-        "dataFeedId": "2d5d9b39-ccdc-495c-9fef-39764190f20e",
+        "dataFeedId": "e453317c-72d5-477d-b3b6-cdff190dbcde",
         "dataFeedName": "dataFeed4lysRCIB",
         "metrics": [
           {
-            "metricId": "5e8a22ca-9cd1-488f-8efa-6432243e4130",
+            "metricId": "b463ec4d-1c3b-4789-b114-c35ad01ddd2e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:38Z",
+        "createdTime": "2021-02-05T17:55:54Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2d5d9b39-ccdc-495c-9fef-39764190f20e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e453317c-72d5-477d-b3b6-cdff190dbcde",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3d370e7af907cf43a2b8526ae49672f6-baa85c7020e12c44-00",
+        "traceparent": "00-e9c083c91565c74c94eb2365cec6d06d-9b903b8fada2df42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "69360d39728e95e872be74d54382e219",
+        "x-ms-client-request-id": "a3d7d7ddddb8c8a7097267b912db3a32",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cd42af31-ea30-4df0-883d-6f6935800219",
+        "apim-request-id": "95cea486-434e-4287-a8f9-3e8f0b03724f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "287",
-        "X-Request-ID": "cd42af31-ea30-4df0-883d-6f6935800219"
+        "x-envoy-upstream-service-time": "340",
+        "X-Request-ID": "95cea486-434e-4287-a8f9-3e8f0b03724f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:39.2867207-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:55.1981573-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstanceAsync.json
index c6769bdeb1ba..ba8eddf0f0b3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateHttpRequestDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "286",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d2caf33fa0cce04fa0c1599ff4c07b7e-f58710aff54de94b-00",
+        "traceparent": "00-002e331074545c49b5c2564a92401a69-0f48f88ea1561c4c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -36,32 +36,106 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "18be1265-dda4-49f0-9c93-c0f2f5d1b80c",
+        "apim-request-id": "a0242fee-248b-40c9-a488-f22436c0f399",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:10 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/405fe672-6f3c-4a90-9a39-1cedbafd218a",
+        "Date": "Fri, 05 Feb 2021 17:58:25 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "604",
-        "X-Request-ID": "18be1265-dda4-49f0-9c93-c0f2f5d1b80c"
+        "x-envoy-upstream-service-time": "583",
+        "X-Request-ID": "a0242fee-248b-40c9-a488-f22436c0f399"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/405fe672-6f3c-4a90-9a39-1cedbafd218a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-002e331074545c49b5c2564a92401a69-a9981df9df19fc4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "dd45c5d71c1173638278e559a72536aa",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "66cf947b-68ca-4922-84ac-f947e2e9f5ae",
+        "Content-Length": "998",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:25 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "66cf947b-68ca-4922-84ac-f947e2e9f5ae"
+      },
+      "ResponseBody": {
+        "dataFeedId": "25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
+        "dataFeedName": "dataFeedj7SUje7h",
+        "metrics": [
+          {
+            "metricId": "772486d2-77d3-48a5-9e03-c14fc3425477",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "HttpRequest",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:26Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "httpHeader": "Sanitized",
+          "payload": "payload",
+          "httpMethod": "method",
+          "url": "https://fakehost.com/"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dbbf3fe7a0dd3c4f80b1c1628309d449-70f4837bd5901845-00",
+        "traceparent": "00-e8410c6a8b303144a2bf9188c29f84a0-5e9a97d991897c4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dd45c5d71c1173638278e559a72536aa",
+        "x-ms-client-request-id": "90e6b4d057b9c74e95f877e7bbf38e1d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -70,49 +144,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fc302d72-93e7-43f1-ae55-5b037a361f79",
+        "apim-request-id": "79e3d4ec-1e7b-4870-bb98-1b992614f0d2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "147",
-        "X-Request-ID": "fc302d72-93e7-43f1-ae55-5b037a361f79"
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "79e3d4ec-1e7b-4870-bb98-1b992614f0d2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/405fe672-6f3c-4a90-9a39-1cedbafd218a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ecabed061ee3cb4cba8e60acc8395f13-7116394399119449-00",
+        "traceparent": "00-85d0eabac00ea2449870557765cb1ec8-23539e2f798d8442-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "90e6b4d057b9c74e95f877e7bbf38e1d",
+        "x-ms-client-request-id": "dcb5d55ed421763e54fc130cda13a865",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "333aa5f8-fb83-42f0-bff2-2aa119f95311",
+        "apim-request-id": "60bd87b0-84c8-40bb-9706-e3c7bb2eb2ea",
         "Content-Length": "1049",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "139",
-        "X-Request-ID": "333aa5f8-fb83-42f0-bff2-2aa119f95311"
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "60bd87b0-84c8-40bb-9706-e3c7bb2eb2ea"
       },
       "ResponseBody": {
-        "dataFeedId": "405fe672-6f3c-4a90-9a39-1cedbafd218a",
+        "dataFeedId": "25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
         "dataFeedName": "dataFeedj7SUje7h",
         "metrics": [
           {
-            "metricId": "0bcd0d28-764e-4f14-a0b4-f4bade22a2b6",
+            "metricId": "772486d2-77d3-48a5-9e03-c14fc3425477",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -143,7 +217,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:10Z",
+        "createdTime": "2021-02-05T17:58:26Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -155,36 +229,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/405fe672-6f3c-4a90-9a39-1cedbafd218a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/25caa1a5-bddb-4bfb-a33d-a8aa629c7175",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ad8a32466f232c42b660d88ac6d84d70-a09f8e58b6f93f4d-00",
+        "traceparent": "00-2614f431cf3049488850776770029772-e705b1f9d27b814c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dcb5d55ed421763e54fc130cda13a865",
+        "x-ms-client-request-id": "afe03e98dc458035767e4819a47cb78e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1443bb35-fee7-4cc7-95f7-c570940a403b",
+        "apim-request-id": "4d35bd8a-18db-4d4b-bd46-487ff792b20a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "307",
-        "X-Request-ID": "1443bb35-fee7-4cc7-95f7-c570940a403b"
+        "x-envoy-upstream-service-time": "345",
+        "X-Request-ID": "4d35bd8a-18db-4d4b-bd46-487ff792b20a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:10.8442934-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:27.0033589-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstance.json
index 23f8e6ed6df1..3c4d8b22f1c1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-11d9e210027f9e46bd12c0aac66fbe53-fb8b541ae69d1647-00",
+        "traceparent": "00-b54621a1e35f664d9f75fcc33ea55623-f9c69b83e65f7042-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,26 +37,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "23e518a5-3317-4f97-9b78-755ddf3a5692",
+        "apim-request-id": "5c7acb1b-2247-478b-abb4-a6044c451116",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:03 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+        "Date": "Fri, 05 Feb 2021 17:55:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "715",
-        "X-Request-ID": "23e518a5-3317-4f97-9b78-755ddf3a5692"
+        "x-envoy-upstream-service-time": "669",
+        "X-Request-ID": "5c7acb1b-2247-478b-abb4-a6044c451116"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-97ee36bb75973d4d8d3e88c5b842260b-3dc3f28798c30c4b-00",
+        "traceparent": "00-b54621a1e35f664d9f75fcc33ea55623-19b29b5d29907941-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -66,21 +66,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f52a13ef-07d0-4561-b6f1-a2ad499368da",
+        "apim-request-id": "a2c2663a-11b7-4e5c-8d94-d6609a91d6ae",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:03 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "183",
-        "X-Request-ID": "f52a13ef-07d0-4561-b6f1-a2ad499368da"
+        "x-envoy-upstream-service-time": "192",
+        "X-Request-ID": "a2c2663a-11b7-4e5c-8d94-d6609a91d6ae"
       },
       "ResponseBody": {
-        "dataFeedId": "3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+        "dataFeedId": "377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
         "dataFeedName": "dataFeedplZVrok1",
         "metrics": [
           {
-            "metricId": "4a52eca0-b438-4a6b-bb71-5d8a06d2e0b0",
+            "metricId": "bbaf2c4a-4f8f-42a1-a4fb-9b9d998e6190",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -111,7 +111,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:03Z",
+        "createdTime": "2021-02-05T17:55:56Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -124,20 +124,95 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cc63ba3ccf4792438341409945aa7f10-404c92341272a249-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cc11a330a02db6fd49239bb4a408ed6d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "01670905-0b78-4355-bf2a-32464c99edc3",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:56 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "01670905-0b78-4355-bf2a-32464c99edc3"
+      },
+      "ResponseBody": {
+        "dataFeedId": "377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
+        "dataFeedName": "dataFeedplZVrok1",
+        "metrics": [
+          {
+            "metricId": "bbaf2c4a-4f8f-42a1-a4fb-9b9d998e6190",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:56Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "738",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a31528a5b9428418fc1d038b67bc7e6-bae9d03fc9981e4d-00",
+        "traceparent": "00-bd3e634b92838949b2a3a4c44169a45c-74de8b7c0d4c3c4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cc11a330a02db6fd49239bb4a408ed6d",
+        "x-ms-client-request-id": "fc160df146051584292eef03dc7f7a7e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -174,49 +249,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e28f9e27-1fa4-4b81-ba3d-5d9c049cc04d",
+        "apim-request-id": "12e18cd4-9b04-41dc-80b1-b7111288e8d2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "656",
-        "X-Request-ID": "e28f9e27-1fa4-4b81-ba3d-5d9c049cc04d"
+        "x-envoy-upstream-service-time": "774",
+        "X-Request-ID": "12e18cd4-9b04-41dc-80b1-b7111288e8d2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a1549ad30eff684cbe1c4645de4a931c-818ea4f6320f0042-00",
+        "traceparent": "00-3301359729f0954a8851b15f033fd6ec-44b9888deb078e44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fc160df146051584292eef03dc7f7a7e",
+        "x-ms-client-request-id": "fbb020bc69ad5882c580946f3cf2b4d3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cd350498-9a57-4569-b92f-2639fc63a9bb",
+        "apim-request-id": "291fa461-d4f3-45b6-8217-859d4b6b091a",
         "Content-Length": "1150",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "194",
-        "X-Request-ID": "cd350498-9a57-4569-b92f-2639fc63a9bb"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "291fa461-d4f3-45b6-8217-859d4b6b091a"
       },
       "ResponseBody": {
-        "dataFeedId": "3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+        "dataFeedId": "377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
         "dataFeedName": "dataFeedB7kjvllu",
         "metrics": [
           {
-            "metricId": "4a52eca0-b438-4a6b-bb71-5d8a06d2e0b0",
+            "metricId": "bbaf2c4a-4f8f-42a1-a4fb-9b9d998e6190",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -250,7 +325,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:03Z",
+        "createdTime": "2021-02-05T17:55:56Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -263,36 +338,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/3ac8b68d-d2b4-41da-ac50-898caaa478fc",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/377a0bd2-2a0e-48a1-98bc-38f5d2a8b415",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-01d390f9f4caba48964ee9e1a7247ca9-54854ef5cb003e45-00",
+        "traceparent": "00-24ed86d7199c414d8ca81c8f769bd13d-0e7cd0ff2a4fa34d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fbb020bc69ad5882c580946f3cf2b4d3",
+        "x-ms-client-request-id": "2c61f26cf2e3eaaf1ffca3feb0fadac9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "19cf4503-0b73-4c8a-ad8b-29ee524d569e",
+        "apim-request-id": "8ea16b46-8912-4456-9e3b-10d1276ebaa2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "332",
-        "X-Request-ID": "19cf4503-0b73-4c8a-ad8b-29ee524d569e"
+        "x-envoy-upstream-service-time": "301",
+        "X-Request-ID": "8ea16b46-8912-4456-9e3b-10d1276ebaa2"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:04.6559268-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:58.0591520-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstanceAsync.json
index d72502e94260..d54cd9ad92a6 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c92b3e06b9fcc3458d544781053edfaa-fc9798486103dc46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7924c347d9fc4e409be9872b0618f1ae-81a7f3948382b348-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "cea1c0c8d90a1ea923108d9f3d7e0004",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "aff11f31-dc60-4def-834c-c7db72c6866c",
+        "apim-request-id": "ccd4b54d-50ed-44b3-8b3b-1ad522778c4a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:21 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+        "Date": "Fri, 05 Feb 2021 17:58:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "329",
-        "x-request-id": "aff11f31-dc60-4def-834c-c7db72c6866c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "677",
+        "X-Request-ID": "ccd4b54d-50ed-44b3-8b3b-1ad522778c4a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6de392849e55a349a1d945ba42d6f387-ed35e1ba1672cf48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7924c347d9fc4e409be9872b0618f1ae-a425d282fce21645-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "fa87d71a597b3cc88e44a535e0e56908",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "245e3ad3-1fc8-4134-81f4-0f654755a991",
+        "apim-request-id": "ed27a7a1-dd3b-40d0-a02a-0b26cfb54c53",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:27 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "ed27a7a1-dd3b-40d0-a02a-0b26cfb54c53"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
+        "dataFeedName": "dataFeedYBU4mzwj",
+        "metrics": [
+          {
+            "metricId": "424a1029-d127-4965-a9af-5a63a9f16ea1",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:28Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-268f8415fc1bb14c9a46323be295d39f-1f178ae5146fec43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "6c5668bbb98ec9fe6727822b243208cb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a14d92d4-e07a-4155-b1f6-94ec2fc79100",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "x-request-id": "245e3ad3-1fc8-4134-81f4-0f654755a991"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "a14d92d4-e07a-4155-b1f6-94ec2fc79100"
       },
       "ResponseBody": {
-        "dataFeedId": "b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+        "dataFeedId": "f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
         "dataFeedName": "dataFeedYBU4mzwj",
         "metrics": [
           {
-            "metricId": "98a16010-0f7f-4e58-b1ac-8101cc8f1b50",
+            "metricId": "424a1029-d127-4965-a9af-5a63a9f16ea1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:21Z",
+        "createdTime": "2021-02-05T17:58:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "738",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8cfa380fa03187409e7c300d15b08c2b-6f4b5f272604ef4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e07208bf1cb37b4cb6d0ac81fae53973-5539be0c761ba346-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6c5668bbb98ec9fe6727822b243208cb",
+        "x-ms-client-request-id": "e7f4752cc6166ff3f86440c534743d3e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,46 +249,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "94bf2b86-1e57-41c4-98b3-a9cca77840d4",
+        "apim-request-id": "a4643ecb-7e84-4bcc-98d6-d0cb02256e5f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "628",
-        "x-request-id": "94bf2b86-1e57-41c4-98b3-a9cca77840d4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "613",
+        "X-Request-ID": "a4643ecb-7e84-4bcc-98d6-d0cb02256e5f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3c76074958fceb43b9a65d9583622351-8c76754fc84eb844-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2e9ba5096e35314ba80b5b0a3127e2d5-8125008d3ac60940-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e7f4752cc6166ff3f86440c534743d3e",
+        "x-ms-client-request-id": "d4e485a794276075d8be9354d69d175b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "16fe6d56-e5cc-494e-a30b-17482bf056d2",
+        "apim-request-id": "7823fcbe-4734-4fe9-8b4f-bf409e30a72c",
         "Content-Length": "1150",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "167",
-        "x-request-id": "16fe6d56-e5cc-494e-a30b-17482bf056d2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "289",
+        "X-Request-ID": "7823fcbe-4734-4fe9-8b4f-bf409e30a72c"
       },
       "ResponseBody": {
-        "dataFeedId": "b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+        "dataFeedId": "f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
         "dataFeedName": "dataFeedKYH7ogWy",
         "metrics": [
           {
-            "metricId": "98a16010-0f7f-4e58-b1ac-8101cc8f1b50",
+            "metricId": "424a1029-d127-4965-a9af-5a63a9f16ea1",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -238,7 +325,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:21Z",
+        "createdTime": "2021-02-05T17:58:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,33 +338,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b506be88-0866-4e2d-bc9f-24ccc2f8b64f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f2f9f6d7-5f16-4a4d-8195-a2eba45c0b6a",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ea9d666244968c48947cc778cebb431f-25ff89aba183c743-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-52f66e0ab2173b4fb5c7112736dae787-054cca6ffa8b2645-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d4e485a794276075d8be9354d69d175b",
+        "x-ms-client-request-id": "6a08d93c81f0f4f275e77429793994f2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "26b309d1-b083-4af4-95ee-530d07f451ac",
+        "apim-request-id": "00026bcd-fdbe-4a5c-8b26-c634ed2ff565",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "366",
-        "x-request-id": "26b309d1-b083-4af4-95ee-530d07f451ac"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "352",
+        "X-Request-ID": "00026bcd-fdbe-4a5c-8b26-c634ed2ff565"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:22.8582428-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:29.4563421-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstance.json
index 9634872c9429..fb245cb46a35 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-aac649a9945a1047a8f55651eb431c62-525f136c0c828843-00",
+        "traceparent": "00-6ad618258227ec4284cae7074c0acd3f-88021316d30a6848-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "71712dd8-6447-48ff-ae32-759432926f67",
+        "apim-request-id": "5dc27be0-4508-4aed-96d6-f27fca86ce94",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40042025-2302-4238-a973-bd9317658031",
+        "Date": "Fri, 05 Feb 2021 17:55:58 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "392",
-        "X-Request-ID": "71712dd8-6447-48ff-ae32-759432926f67"
+        "x-envoy-upstream-service-time": "343",
+        "X-Request-ID": "5dc27be0-4508-4aed-96d6-f27fca86ce94"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40042025-2302-4238-a973-bd9317658031",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6ad618258227ec4284cae7074c0acd3f-a83d21222df38f4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c1580e90dd6eec025c302bcd6d67733a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "da941b6a-38bf-473f-92f6-a3ea9de68972",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:58 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "da941b6a-38bf-473f-92f6-a3ea9de68972"
+      },
+      "ResponseBody": {
+        "dataFeedId": "e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
+        "dataFeedName": "dataFeeddyIvZPRR",
+        "metrics": [
+          {
+            "metricId": "940815ed-0916-48da-8c08-edfd79bfc9a9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:55:58Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3dc3ec5a40eaba459701d6f2b2afe9b4-0c43fba8a48db042-00",
+        "traceparent": "00-16927f5671b8dc4fa518ecdee20ee50d-47a073c357e62c45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c1580e90dd6eec025c302bcd6d67733a",
+        "x-ms-client-request-id": "fc95bd3f2b8b86916582a6872cd4ee42",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -84,49 +159,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0ae3ea41-fa23-44ff-a376-5802090e18c7",
+        "apim-request-id": "a6d3a647-44e8-438d-8af1-0d559858228b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "X-Request-ID": "0ae3ea41-fa23-44ff-a376-5802090e18c7"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "a6d3a647-44e8-438d-8af1-0d559858228b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40042025-2302-4238-a973-bd9317658031",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bfaa6845eebd224a917e5f0b24e322ac-5302d762093a7949-00",
+        "traceparent": "00-a60a5182e6c48a438a30e50456a9af75-2b93e76d4d63e34d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fc95bd3f2b8b86916582a6872cd4ee42",
+        "x-ms-client-request-id": "acba9dc3370321e11da30f7ea63b2790",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2130f175-de33-4d20-9db8-36979cb5cfa1",
+        "apim-request-id": "83e5773a-4bf5-403a-8ab8-5b12b10c0587",
         "Content-Length": "1133",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "X-Request-ID": "2130f175-de33-4d20-9db8-36979cb5cfa1"
+        "x-envoy-upstream-service-time": "133",
+        "X-Request-ID": "83e5773a-4bf5-403a-8ab8-5b12b10c0587"
       },
       "ResponseBody": {
-        "dataFeedId": "40042025-2302-4238-a973-bd9317658031",
+        "dataFeedId": "e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
         "dataFeedName": "dataFeed8Xxdg75m",
         "metrics": [
           {
-            "metricId": "bc28943c-be55-4a4b-b28f-8410bcd72fe2",
+            "metricId": "940815ed-0916-48da-8c08-edfd79bfc9a9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -159,7 +234,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:39Z",
+        "createdTime": "2021-02-05T17:55:58Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -172,36 +247,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/40042025-2302-4238-a973-bd9317658031",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e51a0ba8-29f3-4cf9-9e87-33169c8fddfa",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3fa474a9c305544890b0e5db495d162c-67c4eeafa5f9d74f-00",
+        "traceparent": "00-08f9100002f5be44be3a696f26216e36-97bef0c4525d6748-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "acba9dc3370321e11da30f7ea63b2790",
+        "x-ms-client-request-id": "451888ad936c65eb7dd25cec367abf87",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "284d1efc-7374-45f2-b938-f713b66fefb0",
+        "apim-request-id": "17d058ee-c8d2-4166-afaa-6d6664271882",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "302",
-        "X-Request-ID": "284d1efc-7374-45f2-b938-f713b66fefb0"
+        "x-envoy-upstream-service-time": "276",
+        "X-Request-ID": "17d058ee-c8d2-4166-afaa-6d6664271882"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:40.4541793-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:55:59.5408229-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstanceAsync.json
index ba64fc6ac15d..b200e7b92e2e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7f76abf138886141b24bc26d94997006-e5178af22763874d-00",
+        "traceparent": "00-20f03ae7eed18f4997e053f182eca568-493ebc3d2957674c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "69ee365e-4066-47b5-9490-63249f110404",
+        "apim-request-id": "6fc5420e-5e6d-4f81-87c1-16a4e2497be6",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:11 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f610b5b-315c-4330-8424-5dcd8a064021",
+        "Date": "Fri, 05 Feb 2021 17:58:30 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/faec5e09-e604-49a1-aa28-82d020d51eb2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "405",
-        "X-Request-ID": "69ee365e-4066-47b5-9490-63249f110404"
+        "x-envoy-upstream-service-time": "659",
+        "X-Request-ID": "6fc5420e-5e6d-4f81-87c1-16a4e2497be6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f610b5b-315c-4330-8424-5dcd8a064021",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/faec5e09-e604-49a1-aa28-82d020d51eb2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-20f03ae7eed18f4997e053f182eca568-33b1843d28db8f40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "67dd6413ecd9af5ec8bffd6b266cb10c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a90b245c-8f6e-4bc2-98d4-cd74188f6005",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "a90b245c-8f6e-4bc2-98d4-cd74188f6005"
+      },
+      "ResponseBody": {
+        "dataFeedId": "faec5e09-e604-49a1-aa28-82d020d51eb2",
+        "dataFeedName": "dataFeedNbRJf0tc",
+        "metrics": [
+          {
+            "metricId": "44e5deae-0ee9-4a42-af67-c8cddefae14d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:30Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/faec5e09-e604-49a1-aa28-82d020d51eb2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-90f58eace79fd741b129c94d8a2dae8d-df5ce4aade539646-00",
+        "traceparent": "00-88cb7f7afb864b4f8fde2b1a81a8c5b9-f278cfc854c1b149-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "67dd6413ecd9af5ec8bffd6b266cb10c",
+        "x-ms-client-request-id": "1db287858da4d46beaafac095b3dbe14",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -84,49 +159,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "64a68c50-97ca-4c6b-bc71-1a722d3439a2",
+        "apim-request-id": "98a25e5d-0c32-43ff-a8bc-132b2499c37c",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "X-Request-ID": "64a68c50-97ca-4c6b-bc71-1a722d3439a2"
+        "x-envoy-upstream-service-time": "221",
+        "X-Request-ID": "98a25e5d-0c32-43ff-a8bc-132b2499c37c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f610b5b-315c-4330-8424-5dcd8a064021",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/faec5e09-e604-49a1-aa28-82d020d51eb2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4b8cfa59b25c8149a3d4b80e63bf0c0b-c988f506eb44ef4c-00",
+        "traceparent": "00-1288e2afa99f4c489465aa77103844e2-9742b64129ef0e45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1db287858da4d46beaafac095b3dbe14",
+        "x-ms-client-request-id": "f58fc92a245d62c4308133ef46bd1610",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1858c560-e0dc-4438-8be0-00558ec95740",
+        "apim-request-id": "f2ea29d3-5f27-466f-88bf-579eee919b9e",
         "Content-Length": "1133",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "X-Request-ID": "1858c560-e0dc-4438-8be0-00558ec95740"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "f2ea29d3-5f27-466f-88bf-579eee919b9e"
       },
       "ResponseBody": {
-        "dataFeedId": "8f610b5b-315c-4330-8424-5dcd8a064021",
+        "dataFeedId": "faec5e09-e604-49a1-aa28-82d020d51eb2",
         "dataFeedName": "dataFeeddFXIhuLo",
         "metrics": [
           {
-            "metricId": "2ee09729-5d98-4d3a-9848-dd5ea764c039",
+            "metricId": "44e5deae-0ee9-4a42-af67-c8cddefae14d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -159,7 +234,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:11Z",
+        "createdTime": "2021-02-05T17:58:30Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -172,36 +247,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f610b5b-315c-4330-8424-5dcd8a064021",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/faec5e09-e604-49a1-aa28-82d020d51eb2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c305082942d0f741871e8444654a587c-5c6772ea8a3dcc45-00",
+        "traceparent": "00-2f179c297a5a4f46af51ddc6a9307a64-f22f9fcc2b6f7b47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f58fc92a245d62c4308133ef46bd1610",
+        "x-ms-client-request-id": "437ba2816a70857bf8097d2a3f55548b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7dec3935-ec68-4c16-b8b1-3cb11fd6c487",
+        "apim-request-id": "70104760-fcaf-4110-b7c7-3ed34055a39a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "298",
-        "X-Request-ID": "7dec3935-ec68-4c16-b8b1-3cb11fd6c487"
+        "x-envoy-upstream-service-time": "283",
+        "X-Request-ID": "70104760-fcaf-4110-b7c7-3ed34055a39a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:12.0282935-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:31.2954287-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstance.json
index 32dab9091928..04bf33f64b22 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2e71bdbcb4d21843900d9e29d48692ce-c090bafd7173264b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ed7a0b534503b44bab262e76219e5367-a3dacd79c4740a4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9ff7c772daa77144da69d747daa3ebf8",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ca04987b-e169-425e-9bcd-ec9d1f322b43",
+        "apim-request-id": "ec6cba15-4146-4054-b6ad-311623381ed4",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:26 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+        "Date": "Fri, 05 Feb 2021 17:55:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "396",
-        "x-request-id": "ca04987b-e169-425e-9bcd-ec9d1f322b43"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "376",
+        "X-Request-ID": "ec6cba15-4146-4054-b6ad-311623381ed4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7b0713861a8d4c4e979e32830f69c905-e39272b6aefb544f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ed7a0b534503b44bab262e76219e5367-90ce28e3761cf446-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f3ad6e8bd148d464887e759db30cb7b1",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f4c9a9a0-e912-4749-9e87-439a8d3a2165",
+        "apim-request-id": "d041c100-31e4-4306-80b1-57992d40c195",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:55:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "d041c100-31e4-4306-80b1-57992d40c195"
+      },
+      "ResponseBody": {
+        "dataFeedId": "5613b40d-42cc-4c07-85a3-d81c4a5935fb",
+        "dataFeedName": "dataFeedR6vvuKtr",
+        "metrics": [
+          {
+            "metricId": "3305fb4a-24cb-4676-b5cd-86dbf5a5f236",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:00Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-faf8972989f441429bef0444739ba0a9-04f14009d79ab547-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "b895898403d13f8e4e8a1f4d1171003f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "06c3b329-ce50-4664-830d-ba48dd8ae2bf",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:55:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "172",
-        "x-request-id": "f4c9a9a0-e912-4749-9e87-439a8d3a2165"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "140",
+        "X-Request-ID": "06c3b329-ce50-4664-830d-ba48dd8ae2bf"
       },
       "ResponseBody": {
-        "dataFeedId": "63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+        "dataFeedId": "5613b40d-42cc-4c07-85a3-d81c4a5935fb",
         "dataFeedName": "dataFeedR6vvuKtr",
         "metrics": [
           {
-            "metricId": "8c319f2f-4da1-434b-b132-61bd4ce58c21",
+            "metricId": "3305fb4a-24cb-4676-b5cd-86dbf5a5f236",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:26Z",
+        "createdTime": "2021-02-05T17:56:00Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "646",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6a984f9a5e3faf4db3110bdd3920c5dd-9f3885435cbc3444-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7b6887d148aeca45bbcbd39b04380624-43b6606eb0a50040-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b895898403d13f8e4e8a1f4d1171003f",
+        "x-ms-client-request-id": "3ac977c7e80ea0426222162865a6becd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +246,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "45bf331d-90ea-411d-ac0d-573e63351fd0",
+        "apim-request-id": "48b1bf5d-9427-484f-81c6-586c9e86a9df",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:26 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "485",
-        "x-request-id": "45bf331d-90ea-411d-ac0d-573e63351fd0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "527",
+        "X-Request-ID": "48b1bf5d-9427-484f-81c6-586c9e86a9df"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-adc5d28f8eedfb4496fbc7946206beeb-60d19e1bb1bf6040-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-34e28aecafc8c24aa53c48a55bce42d5-f1e45790e306f64e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3ac977c7e80ea0426222162865a6becd",
+        "x-ms-client-request-id": "51c325b2330e8826df6ea4bdb116c216",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4bec927a-1c03-42ad-9e54-87a0f054465e",
+        "apim-request-id": "835d16a7-2c35-46b1-b842-456a19be2e15",
         "Content-Length": "1058",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "4bec927a-1c03-42ad-9e54-87a0f054465e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "835d16a7-2c35-46b1-b842-456a19be2e15"
       },
       "ResponseBody": {
-        "dataFeedId": "63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+        "dataFeedId": "5613b40d-42cc-4c07-85a3-d81c4a5935fb",
         "dataFeedName": "dataFeedR6vvuKtr",
         "metrics": [
           {
-            "metricId": "8c319f2f-4da1-434b-b132-61bd4ce58c21",
+            "metricId": "3305fb4a-24cb-4676-b5cd-86dbf5a5f236",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +319,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:26Z",
+        "createdTime": "2021-02-05T17:56:00Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -245,33 +332,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/63f8b7fb-ff93-4377-9ca9-7a5462fb230a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5613b40d-42cc-4c07-85a3-d81c4a5935fb",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e53481ba73be234fb36ed150b3d9043a-275e76455bffd44d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-42e0693224fcf14781d03c9f887642f3-41cf157b6cc50e48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "51c325b2330e8826df6ea4bdb116c216",
+        "x-ms-client-request-id": "3cd5357e7c439ca346f455aeec65daa8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "aec45b26-0cc8-43b2-85c7-0dacaa86e611",
+        "apim-request-id": "ef7933ac-0ae4-4078-8fc5-77ce3aab4037",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "288",
-        "x-request-id": "aec45b26-0cc8-43b2-85c7-0dacaa86e611"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "282",
+        "X-Request-ID": "ef7933ac-0ae4-4078-8fc5-77ce3aab4037"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:27.0788502-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:01.7475016-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
index b5b49d3c3732..d14550d464d2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1f3797293bfc50479d9f0ffc9b5b5128-bbf454e2ce0a444a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-910e778f08a7f34f992b3807a117187d-50daa8891c13084e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "8d5f033a6c235f85ef18b4167af567a3",
         "x-ms-return-client-request-id": "true"
@@ -34,25 +37,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "5552624f-3fea-424f-ae69-e3f0a993d6af",
+        "apim-request-id": "324f4ce8-9c41-47bf-9aaa-de9c55b1ec7a",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+        "Date": "Fri, 05 Feb 2021 17:58:32 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "621",
-        "x-request-id": "5552624f-3fea-424f-ae69-e3f0a993d6af"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "639",
+        "X-Request-ID": "324f4ce8-9c41-47bf-9aaa-de9c55b1ec7a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fccb26dd19e4a4418468e56eca384ed3-495345a62a322c42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-910e778f08a7f34f992b3807a117187d-77cb326aff7c1d49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e681050f236678d2c32e5e14e49df52f",
         "x-ms-return-client-request-id": "true"
@@ -60,21 +66,96 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1ff4427a-2c8c-4dff-be46-f1394e820533",
+        "apim-request-id": "ee9f358e-15d0-420b-af2d-c22140fac4ac",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:32 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "ee9f358e-15d0-420b-af2d-c22140fac4ac"
+      },
+      "ResponseBody": {
+        "dataFeedId": "bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
+        "dataFeedName": "dataFeedvzOA8SvX",
+        "metrics": [
+          {
+            "metricId": "870c4aaf-2b51-480f-8610-ad9155c62e8a",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:32Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ee58fd3b5a9a344ebb4ef752c8fb87ea-3790c95bd7b9af4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4e1770c7e6c10765bc4b5381f942989b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e4a21888-788f-4aa5-a2f5-43401cd8042b",
         "Content-Length": "1007",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "165",
-        "x-request-id": "1ff4427a-2c8c-4dff-be46-f1394e820533"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "181",
+        "X-Request-ID": "e4a21888-788f-4aa5-a2f5-43401cd8042b"
       },
       "ResponseBody": {
-        "dataFeedId": "6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+        "dataFeedId": "bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
         "dataFeedName": "dataFeedvzOA8SvX",
         "metrics": [
           {
-            "metricId": "e17eee33-fe53-42e3-a247-e83cfeaacb45",
+            "metricId": "870c4aaf-2b51-480f-8610-ad9155c62e8a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -105,7 +186,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:37Z",
+        "createdTime": "2021-02-05T17:58:32Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,17 +199,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "646",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-86ccc44e542b6e408e58abd0424dc411-96d5af0fc22b5748-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8462482c9f4a3147b6413b7ed7bc1b13-59f031abf7f9cb43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4e1770c7e6c10765bc4b5381f942989b",
+        "x-ms-client-request-id": "c99e7e022675169e31e7c9f50e717a51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -162,46 +246,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3b826c5c-ca0c-49eb-8ae2-bf505ec712ad",
+        "apim-request-id": "07e9e189-4354-4a89-b11d-8b6c6878fad6",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "612",
-        "x-request-id": "3b826c5c-ca0c-49eb-8ae2-bf505ec712ad"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "565",
+        "X-Request-ID": "07e9e189-4354-4a89-b11d-8b6c6878fad6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4133461027e78247b4b5f789d81fbce5-7d8d2cdb01f01247-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ca7d3f515d22a242907de7a328eb1899-b57b30c5d91eb243-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c99e7e022675169e31e7c9f50e717a51",
+        "x-ms-client-request-id": "094f842219dd29e1a0792a1acf507e81",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f51a401e-366d-4652-ad38-2d88afb5724e",
+        "apim-request-id": "10727d73-f188-4962-bf0f-c6eda68024d7",
         "Content-Length": "1058",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "f51a401e-366d-4652-ad38-2d88afb5724e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "10727d73-f188-4962-bf0f-c6eda68024d7"
       },
       "ResponseBody": {
-        "dataFeedId": "6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+        "dataFeedId": "bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
         "dataFeedName": "dataFeedvzOA8SvX",
         "metrics": [
           {
-            "metricId": "e17eee33-fe53-42e3-a247-e83cfeaacb45",
+            "metricId": "870c4aaf-2b51-480f-8610-ad9155c62e8a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +319,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:37Z",
+        "createdTime": "2021-02-05T17:58:32Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -245,33 +332,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6051ffcd-c47b-4128-a5c3-e4c45aaaff3f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/bfd30bf4-aad0-4ac6-9a02-46da85d10ab8",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-11ac682ca490e14d914d30c3b6c282b3-c607dd838506ae4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1fc3cc1648c1de4b9586c9aaae69ce7d-15fbe4fb9ed66541-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "094f842219dd29e1a0792a1acf507e81",
+        "x-ms-client-request-id": "6512c3952bffa1bad1001dda1c70f94b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "711f0045-8831-4e33-a865-39755809a456",
+        "apim-request-id": "0fcce119-f6dd-4d79-9934-1de00f1ea8cc",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "269",
-        "x-request-id": "711f0045-8831-4e33-a865-39755809a456"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "356",
+        "X-Request-ID": "0fcce119-f6dd-4d79-9934-1de00f1ea8cc"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:39.0339582-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:34.0867000-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstance.json
index c4fa2b7ef0d9..a6f9064f746c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b50c3ea20eefa3448837724c35c00877-3fe537bee8e3f143-00",
+        "traceparent": "00-4aef3785fb369545bc7388797d30a1a0-2ccf67a2a15fe847-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "652f0b3e-2685-4fae-9dbd-227816179be7",
+        "apim-request-id": "335d61b7-1b74-41ea-8d50-10f9cb012a29",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:41 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/261efc29-cab4-481a-8e23-f35ddd7094d4",
+        "Date": "Fri, 05 Feb 2021 17:56:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17d7ae55-4f4b-4994-a519-761c248ac055",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "453",
-        "X-Request-ID": "652f0b3e-2685-4fae-9dbd-227816179be7"
+        "x-envoy-upstream-service-time": "445",
+        "X-Request-ID": "335d61b7-1b74-41ea-8d50-10f9cb012a29"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/261efc29-cab4-481a-8e23-f35ddd7094d4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17d7ae55-4f4b-4994-a519-761c248ac055",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4aef3785fb369545bc7388797d30a1a0-106421115c831f45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "63a76b9b716f64370b51d3d8cd2ba36d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "803ca063-ddf5-4e12-bdfb-51d52e5c190c",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "217",
+        "X-Request-ID": "803ca063-ddf5-4e12-bdfb-51d52e5c190c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "17d7ae55-4f4b-4994-a519-761c248ac055",
+        "dataFeedName": "dataFeedjJtUDzwV",
+        "metrics": [
+          {
+            "metricId": "f098057a-7809-4526-8cb9-c1c7fcfec529",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:02Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17d7ae55-4f4b-4994-a519-761c248ac055",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-65678d6fd400354a821623027311760b-9c2b79966832a644-00",
+        "traceparent": "00-2c4df21f11649b429039779b1b90ba60-fd02b2a572a7144d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "63a76b9b716f64370b51d3d8cd2ba36d",
+        "x-ms-client-request-id": "5af30981dc3dfa8eaf71d34d2850a5f0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,49 +146,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7d882817-3e49-4348-a25d-5e4080d906f9",
+        "apim-request-id": "208b3f4d-466a-44a8-929f-688b10495be5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "X-Request-ID": "7d882817-3e49-4348-a25d-5e4080d906f9"
+        "x-envoy-upstream-service-time": "209",
+        "X-Request-ID": "208b3f4d-466a-44a8-929f-688b10495be5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/261efc29-cab4-481a-8e23-f35ddd7094d4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17d7ae55-4f4b-4994-a519-761c248ac055",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-58747fa3879c094787806b1132f7c355-2ef58857d7f6464c-00",
+        "traceparent": "00-465b6d938c49d649af542f9c6daff3eb-dbb636799449954f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5af30981dc3dfa8eaf71d34d2850a5f0",
+        "x-ms-client-request-id": "6090e0a6a643565681f0ff3ad654a578",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3466f91b-11b7-45f3-95ff-4aaaaa68cdfc",
+        "apim-request-id": "a039d545-b994-4d03-841c-87f3ae225acf",
         "Content-Length": "1058",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "X-Request-ID": "3466f91b-11b7-45f3-95ff-4aaaaa68cdfc"
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "a039d545-b994-4d03-841c-87f3ae225acf"
       },
       "ResponseBody": {
-        "dataFeedId": "261efc29-cab4-481a-8e23-f35ddd7094d4",
+        "dataFeedId": "17d7ae55-4f4b-4994-a519-761c248ac055",
         "dataFeedName": "dataFeedjJtUDzwV",
         "metrics": [
           {
-            "metricId": "b72ce390-4d54-4553-8226-b0a1ac006143",
+            "metricId": "f098057a-7809-4526-8cb9-c1c7fcfec529",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -144,7 +219,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:41Z",
+        "createdTime": "2021-02-05T17:56:02Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -157,36 +232,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/261efc29-cab4-481a-8e23-f35ddd7094d4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/17d7ae55-4f4b-4994-a519-761c248ac055",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8e691d479004884a8ad1ae4389aee469-ff86b1111c3b9045-00",
+        "traceparent": "00-fc342ab325cfdc4cb4b880799fa5cbd3-37f949d94c650e4d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6090e0a6a643565681f0ff3ad654a578",
+        "x-ms-client-request-id": "c49c8edd0044be2cdcadb3fd9ee93bba",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bbc7b968-6ec7-4310-a397-629569a2d513",
+        "apim-request-id": "addb1e5a-62bf-4cf8-908f-a7bf77a0bd63",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "307",
-        "X-Request-ID": "bbc7b968-6ec7-4310-a397-629569a2d513"
+        "x-envoy-upstream-service-time": "322",
+        "X-Request-ID": "addb1e5a-62bf-4cf8-908f-a7bf77a0bd63"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:41.6101130-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:04.2014679-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 2122b3ea3dd6..b5e011fe5c3d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateInfluxDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "295",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-faf6c29be715c14993c4adabe42c02f3-bb43e202af1d1a4a-00",
+        "traceparent": "00-86afe4d1b5d6274dbf48eb764e46ef3e-afd224055b92b844-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -37,32 +37,107 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e5174bd1-fb2d-4b33-9167-7d69ac00536e",
+        "apim-request-id": "a319e96a-37d1-4c24-b688-26c43fc93ef0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:12 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6b36d25a-95b9-41ef-8804-cfe52e225b39",
+        "Date": "Fri, 05 Feb 2021 17:58:35 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "392",
-        "X-Request-ID": "e5174bd1-fb2d-4b33-9167-7d69ac00536e"
+        "x-envoy-upstream-service-time": "618",
+        "X-Request-ID": "a319e96a-37d1-4c24-b688-26c43fc93ef0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6b36d25a-95b9-41ef-8804-cfe52e225b39",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-86afe4d1b5d6274dbf48eb764e46ef3e-708ea35974b3944f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7ace475647d063310adb8b11c8585091",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b5fb685f-3c76-48dd-9d96-42b23fb5a7c6",
+        "Content-Length": "1007",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:35 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "b5fb685f-3c76-48dd-9d96-42b23fb5a7c6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
+        "dataFeedName": "dataFeedrxLMSD30",
+        "metrics": [
+          {
+            "metricId": "866a1673-4459-4e6d-ad71-871ccd7b794c",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "InfluxDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:35Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "password": "pass",
+          "database": "database",
+          "query": "query",
+          "userName": "username"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-38fae90f49bfdd43b37b6f6daeda66ea-d9c3e5ac7acc6d46-00",
+        "traceparent": "00-29680a4de3d4ff49aa4d6b31cb7d823d-6f670653d3ca114c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7ace475647d063310adb8b11c8585091",
+        "x-ms-client-request-id": "d545196bbc4952564b422983133bca28",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,49 +146,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "119df5c8-2f70-4771-8cdb-725f71e69881",
+        "apim-request-id": "0432ff1e-6511-4d91-990e-886136a4b5d6",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "X-Request-ID": "119df5c8-2f70-4771-8cdb-725f71e69881"
+        "x-envoy-upstream-service-time": "192",
+        "X-Request-ID": "0432ff1e-6511-4d91-990e-886136a4b5d6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6b36d25a-95b9-41ef-8804-cfe52e225b39",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ce4e4321c8be7040833d43c332c40313-2333bd26d2f18144-00",
+        "traceparent": "00-8bc8c3755d7bcf45b79725b3bf60d8b7-a3244a336db2a248-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d545196bbc4952564b422983133bca28",
+        "x-ms-client-request-id": "dbb8f3be2fdd135cfcdceaa92818fde2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ea78280b-3254-49ae-8545-d90a362a807f",
+        "apim-request-id": "f24a4a82-1c7e-4ae0-928d-e139c1242bf8",
         "Content-Length": "1058",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "X-Request-ID": "ea78280b-3254-49ae-8545-d90a362a807f"
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "f24a4a82-1c7e-4ae0-928d-e139c1242bf8"
       },
       "ResponseBody": {
-        "dataFeedId": "6b36d25a-95b9-41ef-8804-cfe52e225b39",
+        "dataFeedId": "31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
         "dataFeedName": "dataFeedrxLMSD30",
         "metrics": [
           {
-            "metricId": "85637e0b-9468-4b1a-a0a1-ce9a8b24f8f6",
+            "metricId": "866a1673-4459-4e6d-ad71-871ccd7b794c",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -144,7 +219,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:12Z",
+        "createdTime": "2021-02-05T17:58:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -157,36 +232,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6b36d25a-95b9-41ef-8804-cfe52e225b39",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/31665bc0-8a0e-4ef2-8347-a4d0d3e24c38",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eb41449c7b0e5040ba2c7efdf32e6180-83fcf9b0792ec64c-00",
+        "traceparent": "00-464b61c1a4b3914698cd3cc681daac59-1fd4eae6d3f09f4b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dbb8f3be2fdd135cfcdceaa92818fde2",
+        "x-ms-client-request-id": "38b11ac868f19afbf17c2f8d1dad4fcf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fb8d0d22-ee3a-4291-90bd-0a17e6568376",
+        "apim-request-id": "06f577aa-cbc4-4251-8a62-3bbe94cba72b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:12 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "308",
-        "X-Request-ID": "fb8d0d22-ee3a-4291-90bd-0a17e6568376"
+        "x-envoy-upstream-service-time": "362",
+        "X-Request-ID": "06f577aa-cbc4-4251-8a62-3bbe94cba72b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:13.1715841-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:36.0532374-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstance.json
index 196b944b5863..5563a153bad2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-111b92ff67a82a49bdc0a606a7d49f9e-537eb524457a354a-00",
+        "traceparent": "00-caf1a991720f9147b2057b4d73f14449-7cd86f2fbd44a646-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,26 +35,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "7506c8d4-6be4-4781-8416-b8d2c8e21fb5",
+        "apim-request-id": "59935077-7908-41d3-8ca6-d0e227d92dac",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:06 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e8bbe024-1328-4fd1-aa63-d6649a370769",
+        "Date": "Fri, 05 Feb 2021 17:56:04 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "591",
-        "X-Request-ID": "7506c8d4-6be4-4781-8416-b8d2c8e21fb5"
+        "x-envoy-upstream-service-time": "432",
+        "X-Request-ID": "59935077-7908-41d3-8ca6-d0e227d92dac"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e8bbe024-1328-4fd1-aa63-d6649a370769",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-52bcbca5aa1707439606ae2933c70acc-53c6b1b4342f4e4c-00",
+        "traceparent": "00-caf1a991720f9147b2057b4d73f14449-f3410fe5abf0f741-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -64,21 +64,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a83e9cda-66e8-4951-ae70-c3d214ab1204",
+        "apim-request-id": "bb346cf7-5dae-44bc-8b68-000ba404c08d",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "X-Request-ID": "a83e9cda-66e8-4951-ae70-c3d214ab1204"
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "bb346cf7-5dae-44bc-8b68-000ba404c08d"
       },
       "ResponseBody": {
-        "dataFeedId": "e8bbe024-1328-4fd1-aa63-d6649a370769",
+        "dataFeedId": "5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
         "dataFeedName": "dataFeedK8TE7pob",
         "metrics": [
           {
-            "metricId": "b0657db6-4a44-4dcb-b2d9-f7b61b6fb44a",
+            "metricId": "64e4571a-4be6-4e61-8a47-857f324788a9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -109,7 +109,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:07Z",
+        "createdTime": "2021-02-05T17:56:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -120,20 +120,93 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e8bbe024-1328-4fd1-aa63-d6649a370769",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-3aee27f173bbee4a9fcce4712078c248-df59721b1b45bd49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e13c32f88ac6d5ea5b178902177a07af",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "06d0c56c-74d4-410a-8697-2e68a6f598ec",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "06d0c56c-74d4-410a-8697-2e68a6f598ec"
+      },
+      "ResponseBody": {
+        "dataFeedId": "5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
+        "dataFeedName": "dataFeedK8TE7pob",
+        "metrics": [
+          {
+            "metricId": "64e4571a-4be6-4e61-8a47-857f324788a9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:05Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "701",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e2d43b00b7221548b04d393bc0b62b3a-8c57fbdd22eecb44-00",
+        "traceparent": "00-43e888ef6ad25f4cac9c7c0f11eed371-02781df5c17c2e4c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e13c32f88ac6d5ea5b178902177a07af",
+        "x-ms-client-request-id": "1482b96f2608daff2811f6403da56786",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -168,49 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f91b8148-6c30-4815-82c0-18444eb04e2f",
+        "apim-request-id": "02d33d73-8cfa-4ca9-a45a-dfa73b8b89a3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "741",
-        "X-Request-ID": "f91b8148-6c30-4815-82c0-18444eb04e2f"
+        "x-envoy-upstream-service-time": "519",
+        "X-Request-ID": "02d33d73-8cfa-4ca9-a45a-dfa73b8b89a3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e8bbe024-1328-4fd1-aa63-d6649a370769",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fd7fe522ac79f641b8db3f632c60c338-54e8993f0da38548-00",
+        "traceparent": "00-5153f57ae8a5e043a668dd2028ec894d-f25f83a08921f142-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1482b96f2608daff2811f6403da56786",
+        "x-ms-client-request-id": "91efec0e5b576413e1697c09161e141a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c64288e3-ce47-4b44-94a8-1f35b86923e9",
+        "apim-request-id": "b3e0f020-20a2-4c8d-8ab3-1daa65df652c",
         "Content-Length": "1113",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:07 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "193",
-        "X-Request-ID": "c64288e3-ce47-4b44-94a8-1f35b86923e9"
+        "x-envoy-upstream-service-time": "195",
+        "X-Request-ID": "b3e0f020-20a2-4c8d-8ab3-1daa65df652c"
       },
       "ResponseBody": {
-        "dataFeedId": "e8bbe024-1328-4fd1-aa63-d6649a370769",
+        "dataFeedId": "5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
         "dataFeedName": "dataFeedD0LVT9lA",
         "metrics": [
           {
-            "metricId": "b0657db6-4a44-4dcb-b2d9-f7b61b6fb44a",
+            "metricId": "64e4571a-4be6-4e61-8a47-857f324788a9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -244,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:07Z",
+        "createdTime": "2021-02-05T17:56:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -255,36 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e8bbe024-1328-4fd1-aa63-d6649a370769",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/5bb4df6d-e3dd-43f8-a3c7-605b3fdfb946",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-65da7b22e32aa84d9fd99c7eb549c871-038f15dea752c244-00",
+        "traceparent": "00-1ccb2ce9a61a3a4b887af0253ea2422a-90f7060daa676c4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "91efec0e5b576413e1697c09161e141a",
+        "x-ms-client-request-id": "cb29df3ecdabd1313262b9b593a997b6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "aec837c6-0f4c-4536-8e20-a1f536cb76ed",
+        "apim-request-id": "14452e0f-80f9-48b7-95db-9ca0ea1acec5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:08 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "325",
-        "X-Request-ID": "aec837c6-0f4c-4536-8e20-a1f536cb76ed"
+        "x-envoy-upstream-service-time": "351",
+        "X-Request-ID": "14452e0f-80f9-48b7-95db-9ca0ea1acec5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:08.4494973-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:06.6584533-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstanceAsync.json
index 6a59fd6d477b..aeb203fdf0ab 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6876593e95fb924c862f8da7485d2bd5-2b8a4032bdf3584d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-67c09ab19cd920439a81743fd4a95893-a658b2cc0be4c34f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "21ef7370006e3941a0109b3d144282e0",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "234ef3d7-4ec9-4134-9ba9-6d3824261d6f",
+        "apim-request-id": "55bfc364-b428-4f49-ade9-eef3bca304fa",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:24 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+        "Date": "Fri, 05 Feb 2021 17:58:37 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "434",
-        "x-request-id": "234ef3d7-4ec9-4134-9ba9-6d3824261d6f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1273",
+        "X-Request-ID": "55bfc364-b428-4f49-ade9-eef3bca304fa"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7e33a492c3e17243a59fb7a13ca709bc-c67867217717e54c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-67c09ab19cd920439a81743fd4a95893-cf34c1b69ea2b34f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "12650a48e37a7b85331186ae50f7f961",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "544847ca-cfa6-4cc6-9f58-1bee2aaa7c3a",
+        "apim-request-id": "dbb0caff-0d86-4765-8c4c-1d0147422f08",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:37 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "171",
+        "X-Request-ID": "dbb0caff-0d86-4765-8c4c-1d0147422f08"
+      },
+      "ResponseBody": {
+        "dataFeedId": "62133a78-2382-43c2-abef-3817818ff19e",
+        "dataFeedName": "dataFeedXFOvZwlg",
+        "metrics": [
+          {
+            "metricId": "e4d6f6dd-595a-47b6-a023-ec69c744d5b2",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:37Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-5d303fe19cdd5b43ba69946b4624b4ee-e6a63f59c29c514c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "cbd395211fb803488f1283fa43fdca18",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "21ef86e1-1aa6-4c13-bd7d-c6a95e25b1ee",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "x-request-id": "544847ca-cfa6-4cc6-9f58-1bee2aaa7c3a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "21ef86e1-1aa6-4c13-bd7d-c6a95e25b1ee"
       },
       "ResponseBody": {
-        "dataFeedId": "8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+        "dataFeedId": "62133a78-2382-43c2-abef-3817818ff19e",
         "dataFeedName": "dataFeedXFOvZwlg",
         "metrics": [
           {
-            "metricId": "5788bcda-d5a2-42df-9c3d-47d1dd4a6003",
+            "metricId": "e4d6f6dd-595a-47b6-a023-ec69c744d5b2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:24Z",
+        "createdTime": "2021-02-05T17:58:37Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "701",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-56ec0fc16eb52146883850ece32ca1c0-4148f8e558aa924f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e9246c094a0bab4fb2c0cb7f12169481-827ee010944fd04c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cbd395211fb803488f1283fa43fdca18",
+        "x-ms-client-request-id": "7bf1f68a8afb8dedee73ee5d7a92e9a8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -159,46 +241,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5c1012d3-53db-4c58-8061-b27b2205e0c1",
+        "apim-request-id": "42c2cb66-255c-4e75-b69b-a5c794bc856f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "523",
-        "x-request-id": "5c1012d3-53db-4c58-8061-b27b2205e0c1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "647",
+        "X-Request-ID": "42c2cb66-255c-4e75-b69b-a5c794bc856f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-df4f02613005be41b712f50e6887544c-6a101b169e59c549-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e1171cf6d66f714cb192ca2f621ba852-a318fa1232cc154b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7bf1f68a8afb8dedee73ee5d7a92e9a8",
+        "x-ms-client-request-id": "7e1c3916b66e2928c26182685f8a3836",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d9b0c487-4aa8-4b99-9804-cf7170b565ec",
+        "apim-request-id": "58c34b6f-829d-48a5-a734-6e39a5a82f56",
         "Content-Length": "1113",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:38 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "x-request-id": "d9b0c487-4aa8-4b99-9804-cf7170b565ec"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "58c34b6f-829d-48a5-a734-6e39a5a82f56"
       },
       "ResponseBody": {
-        "dataFeedId": "8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+        "dataFeedId": "62133a78-2382-43c2-abef-3817818ff19e",
         "dataFeedName": "dataFeedomqLSdeB",
         "metrics": [
           {
-            "metricId": "5788bcda-d5a2-42df-9c3d-47d1dd4a6003",
+            "metricId": "e4d6f6dd-595a-47b6-a023-ec69c744d5b2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -232,7 +317,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:24Z",
+        "createdTime": "2021-02-05T17:58:37Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -243,33 +328,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8a8599f0-12e1-4953-97b6-23bb5fc6594b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/62133a78-2382-43c2-abef-3817818ff19e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a8068180972c8e4ab5c2e80357c3e0e7-235089c4b9adb54c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ed075de63c522d41a5ff20349fe3df37-7a18f07f7e589045-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7e1c3916b66e2928c26182685f8a3836",
+        "x-ms-client-request-id": "59246d477e069765a846dd4431ea88fd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2d572d9e-3c7d-40f0-a436-b910d66df069",
+        "apim-request-id": "27a0eaa9-6766-4238-a3bb-9704f8aaf937",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "342",
-        "x-request-id": "2d572d9e-3c7d-40f0-a436-b910d66df069"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "287",
+        "X-Request-ID": "27a0eaa9-6766-4238-a3bb-9704f8aaf937"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:25.9090662-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:39.0491898-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstance.json
index 17831dc2b927..fe447c32c278 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d86abb93e172634495906cd8f8ed32ef-8fe29bb81a517f47-00",
+        "traceparent": "00-c156cfbbb426b04398397e04361defb0-9449c4a0dc7d254a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0a865242-5a7c-4218-b8ac-7179c066cbba",
+        "apim-request-id": "b726379e-310e-44a9-8a2a-278d6a47228d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:42 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aafadb86-7e8e-4481-bf37-819a26e0bed0",
+        "Date": "Fri, 05 Feb 2021 17:56:06 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7b63da9-af58-4d03-8fae-a14bb859168c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "398",
-        "X-Request-ID": "0a865242-5a7c-4218-b8ac-7179c066cbba"
+        "x-envoy-upstream-service-time": "478",
+        "X-Request-ID": "b726379e-310e-44a9-8a2a-278d6a47228d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aafadb86-7e8e-4481-bf37-819a26e0bed0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7b63da9-af58-4d03-8fae-a14bb859168c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c156cfbbb426b04398397e04361defb0-fccd7fdc4facdd47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1ebe987def23a8ff3340da96d4ebfe72",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7f82cbf8-72a7-41e9-b022-732af2bf1676",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "7f82cbf8-72a7-41e9-b022-732af2bf1676"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f7b63da9-af58-4d03-8fae-a14bb859168c",
+        "dataFeedName": "dataFeedPBG6xZRY",
+        "metrics": [
+          {
+            "metricId": "d3b9de6e-c8eb-41e1-b9f3-10cc7bed5fd0",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:07Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7b63da9-af58-4d03-8fae-a14bb859168c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7f9da26b572f7b4b9846237d87f541e3-d71506ed9f5d4d4e-00",
+        "traceparent": "00-166999aa1668464589fab61ec8144e07-55620419ceddf549-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1ebe987def23a8ff3340da96d4ebfe72",
+        "x-ms-client-request-id": "c150967e6a7643d3e9debe69134d4fed",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4bf4b5ef-6cda-4ec7-81dc-c92dd7426009",
+        "apim-request-id": "d896a6bd-75f1-4185-98c5-c886e50e41f9",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "200",
-        "X-Request-ID": "4bf4b5ef-6cda-4ec7-81dc-c92dd7426009"
+        "x-envoy-upstream-service-time": "197",
+        "X-Request-ID": "d896a6bd-75f1-4185-98c5-c886e50e41f9"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aafadb86-7e8e-4481-bf37-819a26e0bed0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7b63da9-af58-4d03-8fae-a14bb859168c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-81abf8b7fdd1c2459aabe8775baaa9ab-53f68a2e5a6dcd4c-00",
+        "traceparent": "00-1ee9987d2d501f41bdb59c302c249527-09d2f13446bbec4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c150967e6a7643d3e9debe69134d4fed",
+        "x-ms-client-request-id": "3b0132379cb637168869fdbc550f1a51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "997d79f5-9acf-4d7f-ad08-94072e1d37a5",
+        "apim-request-id": "68c01e4a-8340-48ad-a304-8fd9645341b2",
         "Content-Length": "1096",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "X-Request-ID": "997d79f5-9acf-4d7f-ad08-94072e1d37a5"
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "68c01e4a-8340-48ad-a304-8fd9645341b2"
       },
       "ResponseBody": {
-        "dataFeedId": "aafadb86-7e8e-4481-bf37-819a26e0bed0",
+        "dataFeedId": "f7b63da9-af58-4d03-8fae-a14bb859168c",
         "dataFeedName": "dataFeedwIeMyLSV",
         "metrics": [
           {
-            "metricId": "0637c53a-287b-45ad-bedc-7433b3145125",
+            "metricId": "d3b9de6e-c8eb-41e1-b9f3-10cc7bed5fd0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:42Z",
+        "createdTime": "2021-02-05T17:56:07Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aafadb86-7e8e-4481-bf37-819a26e0bed0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f7b63da9-af58-4d03-8fae-a14bb859168c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8df1689b27c313449e2d52c3ee2bf735-895320327f5b5d47-00",
+        "traceparent": "00-0127a977a8737247903ead514c777ca3-78ab9713d651ec47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3b0132379cb637168869fdbc550f1a51",
+        "x-ms-client-request-id": "ed6e04e2e26f12d8c47b3445319695e5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1fee1a88-a1ac-4aad-bf5f-af1e1bac935f",
+        "apim-request-id": "1eaa35cf-1e9c-4f57-b8f4-3ab508435a1d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "293",
-        "X-Request-ID": "1fee1a88-a1ac-4aad-bf5f-af1e1bac935f"
+        "x-envoy-upstream-service-time": "322",
+        "X-Request-ID": "1eaa35cf-1e9c-4f57-b8f4-3ab508435a1d"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:42.7913652-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:08.5000088-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstanceAsync.json
index 73e29e743a2d..81e594010fba 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3db53fb68baebf40b04c5574d340d34e-98bdfcb355df4049-00",
+        "traceparent": "00-8a4c5d30b40b964ba3c57268444693ce-98bc614a8e780845-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "ab229759-b674-4087-80c9-38d8e2ea2b3e",
+        "apim-request-id": "c129e3b8-3a0c-4a6b-b4e7-3b4b80e4d729",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:13 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d50e95fe-e26a-4dfc-bb81-8b62fdc1e640",
+        "Date": "Fri, 05 Feb 2021 17:58:44 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "643",
-        "X-Request-ID": "ab229759-b674-4087-80c9-38d8e2ea2b3e"
+        "x-envoy-upstream-service-time": "5642",
+        "X-Request-ID": "c129e3b8-3a0c-4a6b-b4e7-3b4b80e4d729"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d50e95fe-e26a-4dfc-bb81-8b62fdc1e640",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8a4c5d30b40b964ba3c57268444693ce-1dc1cd6accb4204d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9c92b57b393c595d5b6c9011ba5ed849",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0370d90e-b848-4c5e-90bc-8eece8a25cfe",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:45 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "0370d90e-b848-4c5e-90bc-8eece8a25cfe"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
+        "dataFeedName": "dataFeedoMLI0uTw",
+        "metrics": [
+          {
+            "metricId": "2562efe9-4606-41c7-a6d1-10cf9dbc14e2",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:44Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a1d6b1d3e1165a408eb0b731a7e65b88-01455e04be664349-00",
+        "traceparent": "00-fc5ddbd448f6074894f2b7f1589715b9-c7d86c0858d3544e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9c92b57b393c595d5b6c9011ba5ed849",
+        "x-ms-client-request-id": "c7875389705e2a1528a7c1593861276e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -82,49 +155,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "848858d7-55c9-476c-888d-0fbbb1a1cf7f",
+        "apim-request-id": "73ca2f68-196c-45a6-9c93-343edb786d2d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:13 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "196",
-        "X-Request-ID": "848858d7-55c9-476c-888d-0fbbb1a1cf7f"
+        "x-envoy-upstream-service-time": "182",
+        "X-Request-ID": "73ca2f68-196c-45a6-9c93-343edb786d2d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d50e95fe-e26a-4dfc-bb81-8b62fdc1e640",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-84879c62e37e794391a1a7d317e6ff23-fed1d7a2f5de354b-00",
+        "traceparent": "00-484ffb5bbba6134593da86b8926188a9-05edbd2b4278244c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c7875389705e2a1528a7c1593861276e",
+        "x-ms-client-request-id": "171d1d6fca26d5491dbe87e171d979dd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c651e9f0-22c9-4275-87e3-7b65a3420e9d",
+        "apim-request-id": "a82aa87a-5919-409d-8d18-691ff3d4bf4c",
         "Content-Length": "1096",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "179",
-        "X-Request-ID": "c651e9f0-22c9-4275-87e3-7b65a3420e9d"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "a82aa87a-5919-409d-8d18-691ff3d4bf4c"
       },
       "ResponseBody": {
-        "dataFeedId": "d50e95fe-e26a-4dfc-bb81-8b62fdc1e640",
+        "dataFeedId": "7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
         "dataFeedName": "dataFeedan2yRQdz",
         "metrics": [
           {
-            "metricId": "ccfe64fb-7f63-4f5e-ad36-25112f8d9470",
+            "metricId": "2562efe9-4606-41c7-a6d1-10cf9dbc14e2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -157,7 +230,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:14Z",
+        "createdTime": "2021-02-05T17:58:44Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -168,36 +241,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d50e95fe-e26a-4dfc-bb81-8b62fdc1e640",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e60d0df-3017-49c8-95e4-1d3bbb4ce5c3",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ef312c3d2e3ae14e804610d9985ff337-222ee523b5c24745-00",
+        "traceparent": "00-f475fb02ee3d674bb8081924dd733b62-e6ecd376316de44f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "171d1d6fca26d5491dbe87e171d979dd",
+        "x-ms-client-request-id": "01ab1d14be4b0a4fa0687395770320fa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4b39839b-80dc-4977-b108-251c4b173407",
+        "apim-request-id": "8d4952e3-00d2-4767-87ef-053a5699c314",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "323",
-        "X-Request-ID": "4b39839b-80dc-4977-b108-251c4b173407"
+        "x-envoy-upstream-service-time": "358",
+        "X-Request-ID": "8d4952e3-00d2-4767-87ef-053a5699c314"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:14.6182647-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:45.6503245-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstance.json
index 4e7ad3103607..ed3b79da08f9 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4d44b96a7ebc0146bc8f2ca290c5f9ac-f975651a7282374f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f312fe894d4b684d99c0b95ef39d7939-d5ef2e07b93ec54a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a4c0ef215656d982647ae745aa470d41",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "3e8ffedd-c972-4641-90ab-fb1eef382816",
+        "apim-request-id": "3210febf-d4ba-47f3-8067-b48919b6fb36",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:29 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/34090e7d-517c-44c1-9bb5-a5d130889659",
+        "Date": "Fri, 05 Feb 2021 17:56:08 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "399",
-        "x-request-id": "3e8ffedd-c972-4641-90ab-fb1eef382816"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "368",
+        "X-Request-ID": "3210febf-d4ba-47f3-8067-b48919b6fb36"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/34090e7d-517c-44c1-9bb5-a5d130889659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-96cbb0bc71bc3245b025cbefbb1be7fb-dd32d10eab474a4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f312fe894d4b684d99c0b95ef39d7939-4129df2c96306047-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7c5803870976c9a57b058bc1ac875a8f",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b2b0753c-2371-4d05-b5f9-44882c8897e1",
+        "apim-request-id": "700220c4-1e91-43c8-9304-938d8a4c31e6",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:08 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "700220c4-1e91-43c8-9304-938d8a4c31e6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
+        "dataFeedName": "dataFeedFDqU6ril",
+        "metrics": [
+          {
+            "metricId": "a7b227b4-75f7-4d40-ae00-73cf9d40038d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:09Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6bb9b637a9efed4ca07df21788f5aefa-bbf4dbb478c0e548-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a3ad32126a4ca4cb1d71b6f93a95f343",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b4b65fba-a80a-4160-9fca-b6d8f8b2c235",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:29 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "b2b0753c-2371-4d05-b5f9-44882c8897e1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "b4b65fba-a80a-4160-9fca-b6d8f8b2c235"
       },
       "ResponseBody": {
-        "dataFeedId": "34090e7d-517c-44c1-9bb5-a5d130889659",
+        "dataFeedId": "6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
         "dataFeedName": "dataFeedFDqU6ril",
         "metrics": [
           {
-            "metricId": "47388007-854c-4650-9035-410db7fe8e16",
+            "metricId": "a7b227b4-75f7-4d40-ae00-73cf9d40038d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:29Z",
+        "createdTime": "2021-02-05T17:56:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/34090e7d-517c-44c1-9bb5-a5d130889659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "609",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-99d550219ac81c4bacc1f5d94f0f1883-4e870aa04b2e7c4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6cfc5c4f3c768c4a8e0a2a85813ce57d-cc3833c8a4694347-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a3ad32126a4ca4cb1d71b6f93a95f343",
+        "x-ms-client-request-id": "6613296d1be518b84af62850cac12ddd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c14fa259-c7c7-4a64-b3a4-1a1eb4dda1de",
+        "apim-request-id": "aca06c78-644a-4ae5-8f8d-a88eb7e966d6",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "5676",
-        "x-request-id": "c14fa259-c7c7-4a64-b3a4-1a1eb4dda1de"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "440",
+        "X-Request-ID": "aca06c78-644a-4ae5-8f8d-a88eb7e966d6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/34090e7d-517c-44c1-9bb5-a5d130889659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e5e2b712de69a345a323f9a663a26f91-d1266b98984b0948-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0917826ea8e70745a3f49e108a3bb2a4-d8a7d1e7d4ef374c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6613296d1be518b84af62850cac12ddd",
+        "x-ms-client-request-id": "7732581f699a1df537b45e0552ab8fe6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "56cc6b12-13af-410b-8bc0-e598a1a76bed",
+        "apim-request-id": "326dbd6b-0725-4fb3-ae17-eda4118eddbf",
         "Content-Length": "1021",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "56cc6b12-13af-410b-8bc0-e598a1a76bed"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "326dbd6b-0725-4fb3-ae17-eda4118eddbf"
       },
       "ResponseBody": {
-        "dataFeedId": "34090e7d-517c-44c1-9bb5-a5d130889659",
+        "dataFeedId": "6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
         "dataFeedName": "dataFeedFDqU6ril",
         "metrics": [
           {
-            "metricId": "47388007-854c-4650-9035-410db7fe8e16",
+            "metricId": "a7b227b4-75f7-4d40-ae00-73cf9d40038d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:29Z",
+        "createdTime": "2021-02-05T17:56:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/34090e7d-517c-44c1-9bb5-a5d130889659",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/6f6493bc-fb72-40bb-a1dd-c34c5211b8e0",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d545270ede454a44bfacfe09e3a17382-52ce7096512c7742-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3ff5d4b528f2c94fbffb00fd22eebe5a-f8afd29752fb184b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7732581f699a1df537b45e0552ab8fe6",
+        "x-ms-client-request-id": "83534811f473f7aa7a955955417bd95c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bcd0a300-19fd-44aa-bdd2-641cb4d1a2a2",
+        "apim-request-id": "72039942-d075-486e-bcef-9b3b8a524904",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:35 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "301",
-        "x-request-id": "bcd0a300-19fd-44aa-bdd2-641cb4d1a2a2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "272",
+        "X-Request-ID": "72039942-d075-486e-bcef-9b3b8a524904"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:35.4532434-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:10.5120259-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 81c4b685a6a4..d7c77951f5c4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4100db37ccc0d3428ffd618d076aec69-0eacb562c9935e4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-88490549258fde42acd4b8fef5fded96-7f5bd9dbdc829a46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e44b3c17861f2088ca979b87ab46a735",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "92c6f34c-a00b-416b-a88b-ce0078827eda",
+        "apim-request-id": "c85607b8-4f5a-4536-b568-c693b60a1a9c",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:41 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/452e3824-4559-4a00-b401-4c24d77dc77d",
+        "Date": "Fri, 05 Feb 2021 17:58:46 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "684",
-        "x-request-id": "92c6f34c-a00b-416b-a88b-ce0078827eda"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "355",
+        "X-Request-ID": "c85607b8-4f5a-4536-b568-c693b60a1a9c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/452e3824-4559-4a00-b401-4c24d77dc77d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-977797e6310918418e31b6bccdde44dc-60ece07cea962c4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-88490549258fde42acd4b8fef5fded96-d93337c2a57d1544-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5156e59f6761857ca540659c58ffec80",
         "x-ms-return-client-request-id": "true"
@@ -58,21 +64,94 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c676018a-317c-4a67-b471-1d37f7250c1f",
+        "apim-request-id": "7ed1dfb2-3ceb-43b4-85cb-813d83edbff6",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "7ed1dfb2-3ceb-43b4-85cb-813d83edbff6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
+        "dataFeedName": "dataFeedmVI5VgYu",
+        "metrics": [
+          {
+            "metricId": "95b1ad65-4bad-4c5c-8023-e0de8b0645e9",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:46Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-38f2bdfbcd4d8f4cbf439b5ab13a0f38-8ae13fb32a1cc047-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "79220f0da9ee254f5da05f90208e1f53",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e36a3c97-7bb6-40ac-b397-580266111e7c",
         "Content-Length": "970",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "148",
-        "x-request-id": "c676018a-317c-4a67-b471-1d37f7250c1f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "e36a3c97-7bb6-40ac-b397-580266111e7c"
       },
       "ResponseBody": {
-        "dataFeedId": "452e3824-4559-4a00-b401-4c24d77dc77d",
+        "dataFeedId": "0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
         "dataFeedName": "dataFeedmVI5VgYu",
         "metrics": [
           {
-            "metricId": "a9426080-317c-4974-93d7-4de4f38e816e",
+            "metricId": "95b1ad65-4bad-4c5c-8023-e0de8b0645e9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -103,7 +182,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:41Z",
+        "createdTime": "2021-02-05T17:58:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -114,17 +193,20 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/452e3824-4559-4a00-b401-4c24d77dc77d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "609",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a9d2335723167947afdac1132e3b8015-fc8a4842b65ba747-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d04d673c4fcfaf4d9fb16c1365a5a893-7d130f2b84065d4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "79220f0da9ee254f5da05f90208e1f53",
+        "x-ms-client-request-id": "63af89f1f26daf58c0c53fde21ebc8ca",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +238,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1237c231-3de6-4117-bffc-353c6849eaec",
+        "apim-request-id": "8829f46c-2748-4705-8801-d93ef6350bf2",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "620",
-        "x-request-id": "1237c231-3de6-4117-bffc-353c6849eaec"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "520",
+        "X-Request-ID": "8829f46c-2748-4705-8801-d93ef6350bf2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/452e3824-4559-4a00-b401-4c24d77dc77d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-af4e033e7969a64699745dc388f1f8f9-561264adbe64b448-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8f663c46224dac48ad1cf4ca271d1f62-6f106ed81ae6ad49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "63af89f1f26daf58c0c53fde21ebc8ca",
+        "x-ms-client-request-id": "9b7a1aaa2e23f6479531f4c008ec6517",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7bb4d410-8966-4c06-a397-57f78f054676",
+        "apim-request-id": "fe226068-9780-4a7f-b06c-9ebdc3f84029",
         "Content-Length": "1021",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "x-request-id": "7bb4d410-8966-4c06-a397-57f78f054676"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "139",
+        "X-Request-ID": "fe226068-9780-4a7f-b06c-9ebdc3f84029"
       },
       "ResponseBody": {
-        "dataFeedId": "452e3824-4559-4a00-b401-4c24d77dc77d",
+        "dataFeedId": "0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
         "dataFeedName": "dataFeedmVI5VgYu",
         "metrics": [
           {
-            "metricId": "a9426080-317c-4974-93d7-4de4f38e816e",
+            "metricId": "95b1ad65-4bad-4c5c-8023-e0de8b0645e9",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -226,7 +311,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:41Z",
+        "createdTime": "2021-02-05T17:58:46Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -237,33 +322,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/452e3824-4559-4a00-b401-4c24d77dc77d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0f901ba9-6d7f-4b87-b1d9-12b3925af8f3",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9e0e6896a0e9c444a500aa7c501aca3c-389c73b718bac04c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-37ee328dd95ee741861af7f744302db9-455ff76896457644-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9b7a1aaa2e23f6479531f4c008ec6517",
+        "x-ms-client-request-id": "ceaa122188501a13b673b8286a700471",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0f2de5c1-e8cf-4f50-95f7-ee31045c35f7",
+        "apim-request-id": "6af52f52-a46f-4c20-881a-fc2615e7faff",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:42 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "281",
-        "x-request-id": "0f2de5c1-e8cf-4f50-95f7-ee31045c35f7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "316",
+        "X-Request-ID": "6af52f52-a46f-4c20-881a-fc2615e7faff"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:42.9675909-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:47.6294936-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstance.json
index 0bc3123eb4e7..e0a329793d9a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2bb84cc15a3a0849a7e80ab0e597eb5d-7ba521d3e61e4048-00",
+        "traceparent": "00-4754fcaa09bec9468025a351cc305468-031c47a1dd726a4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0e9ef26d-1e2c-4868-8a92-b9abb8b3befb",
+        "apim-request-id": "9757984a-7ade-4286-9964-665037f53927",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dd4d0b70-0898-4f07-aed7-56d4aa783f8a",
+        "Date": "Fri, 05 Feb 2021 17:56:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "413",
-        "X-Request-ID": "0e9ef26d-1e2c-4868-8a92-b9abb8b3befb"
+        "x-envoy-upstream-service-time": "568",
+        "X-Request-ID": "9757984a-7ade-4286-9964-665037f53927"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dd4d0b70-0898-4f07-aed7-56d4aa783f8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4754fcaa09bec9468025a351cc305468-cb1b43ef2bc7fa47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "eff2a650bdaeee0af8fed3a485096d0e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "43d80e43-2239-4751-b549-1775f8be9733",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:10 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "43d80e43-2239-4751-b549-1775f8be9733"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
+        "dataFeedName": "dataFeedRMf7oUHK",
+        "metrics": [
+          {
+            "metricId": "c0b14985-32a5-410c-aafb-d550cf2e3d06",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:11Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-668bcdf224142442b86a9cf7f125497c-f71e25266526cf4b-00",
+        "traceparent": "00-082b6a7d6b51954b8db3576de68f1176-e9512a9fef26b040-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "eff2a650bdaeee0af8fed3a485096d0e",
+        "x-ms-client-request-id": "556825390ea229413637cae0cc077649",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "daab41da-06f9-4c60-ac8d-a37accec5ba9",
+        "apim-request-id": "40846c48-405a-4f7c-9b73-6b7ee3f3b68e",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "185",
-        "X-Request-ID": "daab41da-06f9-4c60-ac8d-a37accec5ba9"
+        "x-envoy-upstream-service-time": "167",
+        "X-Request-ID": "40846c48-405a-4f7c-9b73-6b7ee3f3b68e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dd4d0b70-0898-4f07-aed7-56d4aa783f8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-02e9ba6235657745b790f15b1b7a384e-99a5feddc4ba944f-00",
+        "traceparent": "00-870a8e6cb0d6404ca2fa710bb734630b-3d26686c2c65e946-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "556825390ea229413637cae0cc077649",
+        "x-ms-client-request-id": "1e0f0238c9c3a02f02202f2e78dba1aa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d24e4f5b-1bf8-4622-89e5-97cf62571103",
+        "apim-request-id": "f61a43d4-42ab-42c8-a5f8-475722ad5d2d",
         "Content-Length": "1021",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:43 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "171",
-        "X-Request-ID": "d24e4f5b-1bf8-4622-89e5-97cf62571103"
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "f61a43d4-42ab-42c8-a5f8-475722ad5d2d"
       },
       "ResponseBody": {
-        "dataFeedId": "dd4d0b70-0898-4f07-aed7-56d4aa783f8a",
+        "dataFeedId": "b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
         "dataFeedName": "dataFeedRMf7oUHK",
         "metrics": [
           {
-            "metricId": "64f99d23-c839-409e-84c6-901431b7801c",
+            "metricId": "c0b14985-32a5-410c-aafb-d550cf2e3d06",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:43Z",
+        "createdTime": "2021-02-05T17:56:11Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dd4d0b70-0898-4f07-aed7-56d4aa783f8a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b38b219b-cf9e-4d5f-8f26-3a22bc06251f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9f635e9c220c044b839e0c2a553d8fd5-25567301eb425c43-00",
+        "traceparent": "00-dc8fda87360dd44b8571e648017055e2-6759b30f61892649-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1e0f0238c9c3a02f02202f2e78dba1aa",
+        "x-ms-client-request-id": "5504016c2bdd422565c8b876f22a22f1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ad693f57-64a9-4938-8065-c7d8612301ad",
+        "apim-request-id": "bc978523-e710-4e44-809e-c7383aed127f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "326",
-        "X-Request-ID": "ad693f57-64a9-4938-8065-c7d8612301ad"
+        "x-envoy-upstream-service-time": "341",
+        "X-Request-ID": "bc978523-e710-4e44-809e-c7383aed127f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:43.9524877-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:12.3911276-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 0224f87ec723..8fa68f7533c3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMongoDbDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "258",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6ed1de2673e2c241b9206fec926d4100-3cec1fa24e54854b-00",
+        "traceparent": "00-c740d74d424f9c418b0f6cd8ad7782fa-2702c4afc1d34e4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -35,32 +35,105 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6e5accd6-5ddd-45ee-a30c-1dd06d5e39c9",
+        "apim-request-id": "4d68bf71-9668-43dd-ad57-1b8ff7a0e39d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:14 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/78b6ebee-d656-4c4c-a628-67b29aa6e2ac",
+        "Date": "Fri, 05 Feb 2021 17:58:48 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/348bedcf-6035-4549-8821-0422fdf30214",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "453",
-        "X-Request-ID": "6e5accd6-5ddd-45ee-a30c-1dd06d5e39c9"
+        "x-envoy-upstream-service-time": "404",
+        "X-Request-ID": "4d68bf71-9668-43dd-ad57-1b8ff7a0e39d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/78b6ebee-d656-4c4c-a628-67b29aa6e2ac",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/348bedcf-6035-4549-8821-0422fdf30214",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-c740d74d424f9c418b0f6cd8ad7782fa-2e7faaa027b1d345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "850c937633883d0c2c910fcee00efd20",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "008b5d08-ea4c-469d-8b08-8e50e4d063e5",
+        "Content-Length": "970",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:48 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "008b5d08-ea4c-469d-8b08-8e50e4d063e5"
+      },
+      "ResponseBody": {
+        "dataFeedId": "348bedcf-6035-4549-8821-0422fdf30214",
+        "dataFeedName": "dataFeeddYF4Ln02",
+        "metrics": [
+          {
+            "metricId": "b320f837-249d-47d8-a1da-f79eaf9b2e2f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MongoDB",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:48Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "database": "database",
+          "command": "command"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/348bedcf-6035-4549-8821-0422fdf30214",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4d3aba89972e5547b5101fd725cf5f4a-fefbcac3b6d1604c-00",
+        "traceparent": "00-d26d6544c1baf04ba63236c49d491a0b-66b9e4abd159b049-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "850c937633883d0c2c910fcee00efd20",
+        "x-ms-client-request-id": "5916c88172ea7a71ea811cac157dcf27",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,49 +142,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "470b9a33-33c6-43d9-aa7f-67ac49c08b82",
+        "apim-request-id": "89c1580d-b2a1-4bbd-ab07-ebf8245d1643",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "169",
-        "X-Request-ID": "470b9a33-33c6-43d9-aa7f-67ac49c08b82"
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "89c1580d-b2a1-4bbd-ab07-ebf8245d1643"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/78b6ebee-d656-4c4c-a628-67b29aa6e2ac",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/348bedcf-6035-4549-8821-0422fdf30214",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8e917b3b65b7a544b52297d92021e873-f76d5885ecd1c64d-00",
+        "traceparent": "00-9b43dacd41084d4aa60e660ffadbbad7-335a52b8831d384f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5916c88172ea7a71ea811cac157dcf27",
+        "x-ms-client-request-id": "3eb20e494b3edebfee71b6c9a2848e05",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1f7efc45-15de-4c89-b3fd-ac077426ed4b",
+        "apim-request-id": "8c68c5ba-7e7b-4c5f-9f36-528e34117cae",
         "Content-Length": "1021",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "X-Request-ID": "1f7efc45-15de-4c89-b3fd-ac077426ed4b"
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "8c68c5ba-7e7b-4c5f-9f36-528e34117cae"
       },
       "ResponseBody": {
-        "dataFeedId": "78b6ebee-d656-4c4c-a628-67b29aa6e2ac",
+        "dataFeedId": "348bedcf-6035-4549-8821-0422fdf30214",
         "dataFeedName": "dataFeeddYF4Ln02",
         "metrics": [
           {
-            "metricId": "2f37b6c5-a284-4761-8686-f747bc50eead",
+            "metricId": "b320f837-249d-47d8-a1da-f79eaf9b2e2f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -142,7 +215,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:15Z",
+        "createdTime": "2021-02-05T17:58:48Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -153,36 +226,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/78b6ebee-d656-4c4c-a628-67b29aa6e2ac",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/348bedcf-6035-4549-8821-0422fdf30214",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a1074d03fb93fd4f89897daee3df6057-de00a4dcb334704e-00",
+        "traceparent": "00-0b2b887eabbe8d458282527995b4f23a-f49fe10a5f95d749-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3eb20e494b3edebfee71b6c9a2848e05",
+        "x-ms-client-request-id": "10f7dcf5776c03a822929a06166027af",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ffb0e570-e177-4cf9-9080-a6f4e78914c4",
+        "apim-request-id": "de1a6f78-d506-40a0-9c4c-894a32792b76",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "319",
-        "X-Request-ID": "ffb0e570-e177-4cf9-9080-a6f4e78914c4"
+        "x-envoy-upstream-service-time": "306",
+        "X-Request-ID": "de1a6f78-d506-40a0-9c4c-894a32792b76"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:15.8734519-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:48.9582328-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstance.json
index cd9b08c7cbc2..aafa68e32a8e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-280f70476adc8f4785b67771991335ef-e5cbdcabc984154c-00",
+        "traceparent": "00-3a4d0a18be2a254b81ec12bf92a66df3-f060071245920243-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,26 +34,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f4e8aa9b-7f63-4a2f-9ac8-364caeb4d2fb",
+        "apim-request-id": "0188ac51-5c8b-4230-8235-9d1465cede27",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:10 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4cc8641c-9be7-42e8-9134-491642dd7413",
+        "Date": "Fri, 05 Feb 2021 17:56:12 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "580",
-        "X-Request-ID": "f4e8aa9b-7f63-4a2f-9ac8-364caeb4d2fb"
+        "x-envoy-upstream-service-time": "480",
+        "X-Request-ID": "0188ac51-5c8b-4230-8235-9d1465cede27"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4cc8641c-9be7-42e8-9134-491642dd7413",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cb3046357b5c194e87c2cfb2a1643f4c-6617c09a86588342-00",
+        "traceparent": "00-3a4d0a18be2a254b81ec12bf92a66df3-cf06d38763702245-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -63,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7532c93a-5a67-4a6e-80d7-bd9432d4fd19",
+        "apim-request-id": "9c15cc68-293b-4829-ad62-cef6d47f865f",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "X-Request-ID": "7532c93a-5a67-4a6e-80d7-bd9432d4fd19"
+        "x-envoy-upstream-service-time": "251",
+        "X-Request-ID": "9c15cc68-293b-4829-ad62-cef6d47f865f"
       },
       "ResponseBody": {
-        "dataFeedId": "4cc8641c-9be7-42e8-9134-491642dd7413",
+        "dataFeedId": "9fff550f-761f-4471-91f9-ad9d9aa2644b",
         "dataFeedName": "dataFeedMjKRoDrV",
         "metrics": [
           {
-            "metricId": "3de96960-4283-45fa-b926-1d6873a6eeef",
+            "metricId": "26ef25aa-f597-4531-9ca9-3e72d686a7f6",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -108,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:10Z",
+        "createdTime": "2021-02-05T17:56:13Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,20 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4cc8641c-9be7-42e8-9134-491642dd7413",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8cce60731ac27a43a14c801770524ce0-f2111e7e60d63943-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1d28136dedb53765c656388f42c32994",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4c3ba4e3-52b3-4922-8226-9b987190304a",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:12 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "193",
+        "X-Request-ID": "4c3ba4e3-52b3-4922-8226-9b987190304a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "9fff550f-761f-4471-91f9-ad9d9aa2644b",
+        "dataFeedName": "dataFeedMjKRoDrV",
+        "metrics": [
+          {
+            "metricId": "26ef25aa-f597-4531-9ca9-3e72d686a7f6",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:13Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "673",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4b6cf61f0e62914ba33a3ee7f9b89a67-3d3f7099b6cd4141-00",
+        "traceparent": "00-d626ea88db54b04fbbe5af8af1fd9dc1-b38022d9a86d634c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1d28136dedb53765c656388f42c32994",
+        "x-ms-client-request-id": "e3e35d04485ee7d0b3e761a08a1a4014",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,49 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ccaaca43-8ec6-4f5a-9a8f-d3bd1f88e1cd",
+        "apim-request-id": "0f05ba48-3c36-409c-bc93-8eb0231d6f29",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:10 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "667",
-        "X-Request-ID": "ccaaca43-8ec6-4f5a-9a8f-d3bd1f88e1cd"
+        "x-envoy-upstream-service-time": "638",
+        "X-Request-ID": "0f05ba48-3c36-409c-bc93-8eb0231d6f29"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4cc8641c-9be7-42e8-9134-491642dd7413",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e76c8203c855d942ac9554eccb54a75e-b99a789506d9964b-00",
+        "traceparent": "00-afcc134d1df5924a9c05ded500bd8a11-03794b4d5ed8f948-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e3e35d04485ee7d0b3e761a08a1a4014",
+        "x-ms-client-request-id": "8428dda7590f984ae0f8fa60bc917b58",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "410af18a-b34a-4422-92f6-dc2a61e532f9",
+        "apim-request-id": "0e0c057d-8efd-477f-91b2-b7e3d40fe183",
         "Content-Length": "1085",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "X-Request-ID": "410af18a-b34a-4422-92f6-dc2a61e532f9"
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "0e0c057d-8efd-477f-91b2-b7e3d40fe183"
       },
       "ResponseBody": {
-        "dataFeedId": "4cc8641c-9be7-42e8-9134-491642dd7413",
+        "dataFeedId": "9fff550f-761f-4471-91f9-ad9d9aa2644b",
         "dataFeedName": "dataFeedHOwE4Mow",
         "metrics": [
           {
-            "metricId": "3de96960-4283-45fa-b926-1d6873a6eeef",
+            "metricId": "26ef25aa-f597-4531-9ca9-3e72d686a7f6",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -241,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:10Z",
+        "createdTime": "2021-02-05T17:56:13Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,36 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4cc8641c-9be7-42e8-9134-491642dd7413",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9fff550f-761f-4471-91f9-ad9d9aa2644b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4750c2cc5218ad4090a50d7d7ce4aa9e-7e5ff89a57340140-00",
+        "traceparent": "00-4cd6fc46925f3d4e9564c7c7ee8817a0-36932e994a6f1b48-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8428dda7590f984ae0f8fa60bc917b58",
+        "x-ms-client-request-id": "564180e24bd624d343406ace8cc5acab",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "51c47616-c1df-42cd-8bbd-0ba19e8ba5ba",
+        "apim-request-id": "ff045a81-7782-4b6b-973b-19156fc89de6",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:11 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "293",
-        "X-Request-ID": "51c47616-c1df-42cd-8bbd-0ba19e8ba5ba"
+        "x-envoy-upstream-service-time": "303",
+        "X-Request-ID": "ff045a81-7782-4b6b-973b-19156fc89de6"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:11.8401538-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:14.9540836-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstanceAsync.json
index c83b4ba71784..48b0a103c5ea 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-71d6f7c3badf2b44b06ec220c79a8e37-dedffbf853fdc743-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b4028d0186421a46b3ba9e84f514da58-0dee317a122cf641-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d4df3f82cce7c42d1527b37f1f5517f5",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "88b91094-1e07-4bdb-bef1-c7f3852f6cdb",
+        "apim-request-id": "3fed46a0-9e40-4ac9-8ea0-c3f6c4fa2b3b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:27 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57503901-429f-46ed-94c1-a377b2ea4b16",
+        "Date": "Fri, 05 Feb 2021 17:58:49 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "467",
-        "x-request-id": "88b91094-1e07-4bdb-bef1-c7f3852f6cdb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "554",
+        "X-Request-ID": "3fed46a0-9e40-4ac9-8ea0-c3f6c4fa2b3b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57503901-429f-46ed-94c1-a377b2ea4b16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e91131be34ecab43a04be2a77e565041-49dc2e7cbe668e41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b4028d0186421a46b3ba9e84f514da58-c95b899357b81e4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b5e9d29364c21537735c9e8a2c8d4c7b",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e6f39923-0815-4ee5-ab5a-dfea0c988f6a",
+        "apim-request-id": "472c47aa-0c95-4f20-a8de-30949f64313f",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:27 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "146",
-        "x-request-id": "e6f39923-0815-4ee5-ab5a-dfea0c988f6a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "472c47aa-0c95-4f20-a8de-30949f64313f"
       },
       "ResponseBody": {
-        "dataFeedId": "57503901-429f-46ed-94c1-a377b2ea4b16",
+        "dataFeedId": "f045c62c-2929-4e08-9270-e744326b4e28",
         "dataFeedName": "dataFeedbZHGE6Y9",
         "metrics": [
           {
-            "metricId": "37441283-d5f7-43fb-ad7e-4401b5548f65",
+            "metricId": "8ee044e9-17f6-411d-b94c-4bf85cf0cff7",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:28Z",
+        "createdTime": "2021-02-05T17:58:49Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57503901-429f-46ed-94c1-a377b2ea4b16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4c27c90382ffa94099cd5c2ca8c4b0cd-b3bc40c75a319243-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "012c480ce4a0d01b601237c4b164ed2f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a4e69ef2-93b8-4490-9fbd-0bebad27eb9d",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:50 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "a4e69ef2-93b8-4490-9fbd-0bebad27eb9d"
+      },
+      "ResponseBody": {
+        "dataFeedId": "f045c62c-2929-4e08-9270-e744326b4e28",
+        "dataFeedName": "dataFeedbZHGE6Y9",
+        "metrics": [
+          {
+            "metricId": "8ee044e9-17f6-411d-b94c-4bf85cf0cff7",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:49Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "673",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-97815f85be9aac4dabc7438e45429290-694809b322281649-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d2a9fee8bc44b24f8b61e3e1b8877f7f-31a77ec4ede4af40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "012c480ce4a0d01b601237c4b164ed2f",
+        "x-ms-client-request-id": "aea8253bc1551dde08c9608b2ea29888",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c36fb8f6-1292-4537-9cc6-a5306f974ae4",
+        "apim-request-id": "b774f102-9d6f-4e5c-b948-d2ab274a8efa",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "492",
-        "x-request-id": "c36fb8f6-1292-4537-9cc6-a5306f974ae4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "467",
+        "X-Request-ID": "b774f102-9d6f-4e5c-b948-d2ab274a8efa"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57503901-429f-46ed-94c1-a377b2ea4b16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e5960ec8546b074aa3ca63324d1d4eff-42c0b1ac3e5c9c4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7c6fe957c17a9d48b7717e8c82323fdd-b8661c896e349943-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "aea8253bc1551dde08c9608b2ea29888",
+        "x-ms-client-request-id": "d77237db1529af55b61954b02d73630f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "60234e08-6f8a-4482-97dd-9ed7d904f294",
+        "apim-request-id": "6496f67b-ca21-4c5f-95bd-c24733ac6e1e",
         "Content-Length": "1085",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "60234e08-6f8a-4482-97dd-9ed7d904f294"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "138",
+        "X-Request-ID": "6496f67b-ca21-4c5f-95bd-c24733ac6e1e"
       },
       "ResponseBody": {
-        "dataFeedId": "57503901-429f-46ed-94c1-a377b2ea4b16",
+        "dataFeedId": "f045c62c-2929-4e08-9270-e744326b4e28",
         "dataFeedName": "dataFeedTfakhKCZ",
         "metrics": [
           {
-            "metricId": "37441283-d5f7-43fb-ad7e-4401b5548f65",
+            "metricId": "8ee044e9-17f6-411d-b94c-4bf85cf0cff7",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:28Z",
+        "createdTime": "2021-02-05T17:58:49Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -239,33 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/57503901-429f-46ed-94c1-a377b2ea4b16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/f045c62c-2929-4e08-9270-e744326b4e28",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ec3cdd195f7eac43a0d14a5cd8bd2a71-8bfb1f74ffe48142-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-60b96366853e534cb96806c3d3b27279-6cbdbbf9d979774c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d77237db1529af55b61954b02d73630f",
+        "x-ms-client-request-id": "064f6e6e9de44b25690ef9d6838fa1be",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cb0069a4-ca10-4b60-ae31-383f1a02dabb",
+        "apim-request-id": "4f042ab0-7fd6-4c2f-b4b3-a7b6344c907b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:28 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "319",
-        "x-request-id": "cb0069a4-ca10-4b60-ae31-383f1a02dabb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "271",
+        "X-Request-ID": "4f042ab0-7fd6-4c2f-b4b3-a7b6344c907b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:29.1485392-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:50.9386366-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstance.json
index 0f3b315ce647..9c49b63e532f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-02d2b667fddd6c49a8e2fbc90a5da406-4c8965c675217d4d-00",
+        "traceparent": "00-b3e4943f31a84c478bf7a508664da36a-ab9f5e1663ade540-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "479809b3-fa23-4624-8140-becdfca4993e",
+        "apim-request-id": "197bf5e9-e570-40a3-b3da-a329e42d8fde",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c23afa85-b2d7-48fe-8a38-ba2abb9a1da9",
+        "Date": "Fri, 05 Feb 2021 17:56:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "420",
-        "X-Request-ID": "479809b3-fa23-4624-8140-becdfca4993e"
+        "x-envoy-upstream-service-time": "363",
+        "X-Request-ID": "197bf5e9-e570-40a3-b3da-a329e42d8fde"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c23afa85-b2d7-48fe-8a38-ba2abb9a1da9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b3e4943f31a84c478bf7a508664da36a-d2394820ee111c41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9623114137af59f7d6b64306ff904fad",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "38c2508c-b8c2-4fc5-84b3-7f35d81c0941",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:16 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "38c2508c-b8c2-4fc5-84b3-7f35d81c0941"
+      },
+      "ResponseBody": {
+        "dataFeedId": "4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
+        "dataFeedName": "dataFeedufEdZ9bD",
+        "metrics": [
+          {
+            "metricId": "134a1207-eb01-415f-a6b9-aa5b9c068692",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:15Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f366561535f59f448a7e552279b8dc5d-e067016ff2df3043-00",
+        "traceparent": "00-c7a3de3417dd8949acfa70777dfefe87-df51747b716ffc4a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9623114137af59f7d6b64306ff904fad",
+        "x-ms-client-request-id": "799dfd701d7c324528491ce4e07bee4c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "98cd29de-5356-4a7a-8a7d-606552bce680",
+        "apim-request-id": "52107c4d-8cf3-49c5-8af2-48f4e47c79de",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "171",
-        "X-Request-ID": "98cd29de-5356-4a7a-8a7d-606552bce680"
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "52107c4d-8cf3-49c5-8af2-48f4e47c79de"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c23afa85-b2d7-48fe-8a38-ba2abb9a1da9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9b27e750a7c7da47aeb08191ee956b05-7e8c09a0afed244e-00",
+        "traceparent": "00-0d937cfbf3ef654c81740f8dd3cd69a7-fe7e96c054c0c949-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "799dfd701d7c324528491ce4e07bee4c",
+        "x-ms-client-request-id": "b95d2cee3689e8e5079bd4a3cbe3119b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "fe18891a-3036-4101-9b41-ffa90182b507",
+        "apim-request-id": "39da0956-f22e-45aa-a082-635b686ec05c",
         "Content-Length": "1068",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "X-Request-ID": "fe18891a-3036-4101-9b41-ffa90182b507"
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "39da0956-f22e-45aa-a082-635b686ec05c"
       },
       "ResponseBody": {
-        "dataFeedId": "c23afa85-b2d7-48fe-8a38-ba2abb9a1da9",
+        "dataFeedId": "4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
         "dataFeedName": "dataFeedK9dbR1pa",
         "metrics": [
           {
-            "metricId": "36ad4778-668d-4fe7-b648-3b57ee103e36",
+            "metricId": "134a1207-eb01-415f-a6b9-aa5b9c068692",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:44Z",
+        "createdTime": "2021-02-05T17:56:15Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c23afa85-b2d7-48fe-8a38-ba2abb9a1da9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4c99747a-e77d-40e9-9d7c-a34e3f1ac5f9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9a5d0193cc072845aaa3542fa11ac589-7bde8f36bb464143-00",
+        "traceparent": "00-0b995e8b8444b543bce20dc9c4e9c484-3c980fb7da0d3a48-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b95d2cee3689e8e5079bd4a3cbe3119b",
+        "x-ms-client-request-id": "b6d9af8485b8236fcbf16d651a12795a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e7eb563c-f9bd-4a46-bb01-e820f5a2e474",
+        "apim-request-id": "405dfbd8-3045-4c7a-9e01-4ef9b0315283",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "360",
-        "X-Request-ID": "e7eb563c-f9bd-4a46-bb01-e820f5a2e474"
+        "X-Request-ID": "405dfbd8-3045-4c7a-9e01-4ef9b0315283"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:45.1649907-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:16.6941388-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstanceAsync.json
index 985d3d4e6c92..700e2ce3a5cd 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-13c3948221471a4d925bd300def1b3f2-d83b534b3c07da49-00",
+        "traceparent": "00-9170efff72e8304c828f676d99befa4c-77289b97689eb449-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "a1eebb9e-a55f-40c6-bf1e-8d692fa56d18",
+        "apim-request-id": "4cef21c1-6ee6-4c80-85d2-f914db70b576",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:16 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aab2e446-bd7e-441b-a331-1fbacad8851b",
+        "Date": "Fri, 05 Feb 2021 17:58:51 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa3b0a15-5108-464d-b058-dacd1e69f7c4",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "574",
-        "X-Request-ID": "a1eebb9e-a55f-40c6-bf1e-8d692fa56d18"
+        "x-envoy-upstream-service-time": "409",
+        "X-Request-ID": "4cef21c1-6ee6-4c80-85d2-f914db70b576"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aab2e446-bd7e-441b-a331-1fbacad8851b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa3b0a15-5108-464d-b058-dacd1e69f7c4",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9170efff72e8304c828f676d99befa4c-257590fbfe7a5c4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "af3f50789205024a1489d29054a57408",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "fa21bb83-b4b5-4162-93fb-104605767a34",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:51 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "fa21bb83-b4b5-4162-93fb-104605767a34"
+      },
+      "ResponseBody": {
+        "dataFeedId": "aa3b0a15-5108-464d-b058-dacd1e69f7c4",
+        "dataFeedName": "dataFeedl7EhFK5o",
+        "metrics": [
+          {
+            "metricId": "9484c107-3d86-4002-a5d9-058d251fbce2",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:51Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa3b0a15-5108-464d-b058-dacd1e69f7c4",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-43f1ab9ba7450b45889789848ad9ab76-0e5b1bdae448ca46-00",
+        "traceparent": "00-9c0c4a445c8ff8448f582de1949f037f-641a5023266f164e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "af3f50789205024a1489d29054a57408",
+        "x-ms-client-request-id": "ab542db0f2437421c0ad84ee65ca43d3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3486fc84-90ff-419b-8452-fe936f07c4c1",
+        "apim-request-id": "fefb0dcd-39d1-4d9a-a0d1-36c86c1a9ebf",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "196",
-        "X-Request-ID": "3486fc84-90ff-419b-8452-fe936f07c4c1"
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "fefb0dcd-39d1-4d9a-a0d1-36c86c1a9ebf"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aab2e446-bd7e-441b-a331-1fbacad8851b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa3b0a15-5108-464d-b058-dacd1e69f7c4",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5b61970df416154aa0b2f2d4d770ef70-2869fe546893be4b-00",
+        "traceparent": "00-8994e6571a1ebc43935fbbbdfba06f64-03d41e3dd5c78548-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ab542db0f2437421c0ad84ee65ca43d3",
+        "x-ms-client-request-id": "bc4dab5eb9addd82c99dc70924efee1f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "97f2ad0e-fe44-4848-ae3e-7468a08bbadc",
+        "apim-request-id": "37807cc1-7ab6-40de-9812-02170001bc16",
         "Content-Length": "1068",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "X-Request-ID": "97f2ad0e-fe44-4848-ae3e-7468a08bbadc"
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "37807cc1-7ab6-40de-9812-02170001bc16"
       },
       "ResponseBody": {
-        "dataFeedId": "aab2e446-bd7e-441b-a331-1fbacad8851b",
+        "dataFeedId": "aa3b0a15-5108-464d-b058-dacd1e69f7c4",
         "dataFeedName": "dataFeed4uzBfmWa",
         "metrics": [
           {
-            "metricId": "82e7c8a8-c44b-4512-b6ef-02ae11a35052",
+            "metricId": "9484c107-3d86-4002-a5d9-058d251fbce2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:16Z",
+        "createdTime": "2021-02-05T17:58:51Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aab2e446-bd7e-441b-a331-1fbacad8851b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/aa3b0a15-5108-464d-b058-dacd1e69f7c4",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-697912870ce17b46a100eb6a9f0acad4-ba3c88f0684dea4f-00",
+        "traceparent": "00-79e4422db043dc48ad31f141da2aa2f9-63819d3d946a2a47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "bc4dab5eb9addd82c99dc70924efee1f",
+        "x-ms-client-request-id": "56945c70961186b02ecbee580d5b9d4a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "70c63c77-85bb-467f-afb5-5e6842166146",
+        "apim-request-id": "c492d3e2-5162-4c24-82a9-55bf61127c61",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "344",
-        "X-Request-ID": "70c63c77-85bb-467f-afb5-5e6842166146"
+        "x-envoy-upstream-service-time": "295",
+        "X-Request-ID": "c492d3e2-5162-4c24-82a9-55bf61127c61"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:17.2607130-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:52.2464009-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstance.json
index 47344f6ec5f8..1e84fbbbdc4f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f8af820c0404ac43af9c27f481df25f1-3083721e9f62a849-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-356051b1e84afa4cba53abee204d8672-dde54a07c450ee42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "96ebd0eaa2a2c5ad100762028a2c8913",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d0422e1e-aad2-4d02-94cc-64a1c0e82c50",
+        "apim-request-id": "dd36ece2-d00d-41f4-b21e-5fb7c57877ad",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+        "Date": "Fri, 05 Feb 2021 17:56:17 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "347",
-        "x-request-id": "d0422e1e-aad2-4d02-94cc-64a1c0e82c50"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "541",
+        "X-Request-ID": "dd36ece2-d00d-41f4-b21e-5fb7c57877ad"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-441eb7357a84284baf4eebd33dd00b5a-2fcd7b0d53572f49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-356051b1e84afa4cba53abee204d8672-1e563709ce00a44a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3baa5e29d8922350b6ea621ddd8cea22",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c03c3245-e057-4938-a293-cd269509606e",
+        "apim-request-id": "7aa394ca-ef32-49be-af4d-647b2766bfd6",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:37 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "x-request-id": "c03c3245-e057-4938-a293-cd269509606e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "7aa394ca-ef32-49be-af4d-647b2766bfd6"
       },
       "ResponseBody": {
-        "dataFeedId": "9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+        "dataFeedId": "21e05349-2013-4885-b42d-ea3c4ebebe3a",
         "dataFeedName": "dataFeed4oc465FA",
         "metrics": [
           {
-            "metricId": "72527947-025a-432f-a45d-3180b0456dbd",
+            "metricId": "cbaafd2c-4d39-4fb9-a3da-aa03e5677cb0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:37Z",
+        "createdTime": "2021-02-05T17:56:17Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-99ca5925da56f34ba3fba7b5e016730b-8a7ce272b67ec446-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "07f77c71eaf44142690f4bdde1ad8d1e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "99e9f49b-184f-4e5e-818f-b898e1a090fd",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "99e9f49b-184f-4e5e-818f-b898e1a090fd"
+      },
+      "ResponseBody": {
+        "dataFeedId": "21e05349-2013-4885-b42d-ea3c4ebebe3a",
+        "dataFeedName": "dataFeed4oc465FA",
+        "metrics": [
+          {
+            "metricId": "cbaafd2c-4d39-4fb9-a3da-aa03e5677cb0",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:17Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "581",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d345b2df066bae4eb4fe86943589502e-c0b1f3274106fd45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-0a3b6d89ef49d24c927612a0938eb1a7-ac1cc97946c57049-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "07f77c71eaf44142690f4bdde1ad8d1e",
+        "x-ms-client-request-id": "588253383cb6129880c8dfb74090e783",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "29874bc4-7018-416b-b9e5-09d2e1be061a",
+        "apim-request-id": "e710a6e7-7dca-4891-b2e2-49e8614f855a",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "616",
-        "x-request-id": "29874bc4-7018-416b-b9e5-09d2e1be061a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "651",
+        "X-Request-ID": "e710a6e7-7dca-4891-b2e2-49e8614f855a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-caabf4c7f9339c4cad878f7ae0dd701c-c7006b82a1f3ba43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fcc9d9562973da42a993ec6ce9034677-21c28c6931386e45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "588253383cb6129880c8dfb74090e783",
+        "x-ms-client-request-id": "0e91401c82353e1e1c69d1838d724109",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "364d8c4a-a8ce-48c9-a26d-9b0ebb2f691b",
+        "apim-request-id": "7d305c32-8504-4a07-9b23-779be8d66cab",
         "Content-Length": "993",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "364d8c4a-a8ce-48c9-a26d-9b0ebb2f691b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "7d305c32-8504-4a07-9b23-779be8d66cab"
       },
       "ResponseBody": {
-        "dataFeedId": "9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+        "dataFeedId": "21e05349-2013-4885-b42d-ea3c4ebebe3a",
         "dataFeedName": "dataFeed4oc465FA",
         "metrics": [
           {
-            "metricId": "72527947-025a-432f-a45d-3180b0456dbd",
+            "metricId": "cbaafd2c-4d39-4fb9-a3da-aa03e5677cb0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:37Z",
+        "createdTime": "2021-02-05T17:56:17Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9e7b3ff3-f46f-490a-ab3c-559869b8f6aa",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/21e05349-2013-4885-b42d-ea3c4ebebe3a",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1fad45f0db520245a52bb28f851d854e-04ee7070e93cdd4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-da8eed2c1861aa4297b2bc1d67ac0813-d5893cf91b6fd640-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0e91401c82353e1e1c69d1838d724109",
+        "x-ms-client-request-id": "89e4445d9109346ce3e5872b0b8a01d9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c1f5d07d-6d49-43aa-85ae-2da1862dfc6e",
+        "apim-request-id": "9f60fd07-f900-4690-bcbd-03b1f45a6ad5",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:38 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:19 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "281",
-        "x-request-id": "c1f5d07d-6d49-43aa-85ae-2da1862dfc6e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "299",
+        "X-Request-ID": "9f60fd07-f900-4690-bcbd-03b1f45a6ad5"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:38.7445270-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:19.1675099-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
index b3c10d783482..86855b5023a1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-91ad7b4898f02e428561e94192b3a87e-5454776c87e1af40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cb8e0ed054f3a74db8820c400489e169-c730530d842f0a4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e5908b4264255962e8638b4e231193c2",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d75b2159-9de9-4bdd-9ebf-34a49e2e1e60",
+        "apim-request-id": "7990ea69-0011-4368-b243-6cbd65b4fc75",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:45 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0799c357-9832-4dfe-bdce-c99abd927ab3",
+        "Date": "Fri, 05 Feb 2021 17:58:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "628",
-        "x-request-id": "d75b2159-9de9-4bdd-9ebf-34a49e2e1e60"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "505",
+        "X-Request-ID": "7990ea69-0011-4368-b243-6cbd65b4fc75"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0799c357-9832-4dfe-bdce-c99abd927ab3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-13042d9cb4405c449d52f83b77d817f4-a739c0bd8ee3564a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cb8e0ed054f3a74db8820c400489e169-4290a7d42038d840-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9474fc15796c9a10effce93fa0809e18",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "962474d2-f9f1-4fa7-b30e-238362a329c8",
+        "apim-request-id": "bb287020-8584-4bfa-b2f3-b757d2013e84",
         "Content-Length": "942",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
+        "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "152",
-        "x-request-id": "962474d2-f9f1-4fa7-b30e-238362a329c8"
+        "X-Request-ID": "bb287020-8584-4bfa-b2f3-b757d2013e84"
       },
       "ResponseBody": {
-        "dataFeedId": "0799c357-9832-4dfe-bdce-c99abd927ab3",
+        "dataFeedId": "7f0e31c4-3605-4b01-8c40-9f49986e710d",
         "dataFeedName": "dataFeedqpBQAqLM",
         "metrics": [
           {
-            "metricId": "33aedd92-8e46-476e-9d0f-00f384931c66",
+            "metricId": "7d4beab9-c076-4491-baa0-ebedf60e1440",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:45Z",
+        "createdTime": "2021-02-05T17:58:53Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0799c357-9832-4dfe-bdce-c99abd927ab3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9d5ebf35952ce14bba941c98fd1db00b-53113c74986f3642-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4b3a59393fcb37954953aec5083ef21f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "bc0e0571-6334-4e84-ac30-2fc8071f6d3b",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:53 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "197",
+        "X-Request-ID": "bc0e0571-6334-4e84-ac30-2fc8071f6d3b"
+      },
+      "ResponseBody": {
+        "dataFeedId": "7f0e31c4-3605-4b01-8c40-9f49986e710d",
+        "dataFeedName": "dataFeedqpBQAqLM",
+        "metrics": [
+          {
+            "metricId": "7d4beab9-c076-4491-baa0-ebedf60e1440",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:53Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "581",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3236000371610642986cdb1bce65c272-5eec96a3aa58fd42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c50d0b0beb5f234984f518a0ffdc60d2-c2776b72098c3f42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4b3a59393fcb37954953aec5083ef21f",
+        "x-ms-client-request-id": "2d6287c259d7c87c7af5f5297a23b967",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "22841927-7272-45cd-bd98-ec35b05afa70",
+        "apim-request-id": "88c81e3d-59cc-4098-a7c6-8f1ecad55439",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "677",
-        "x-request-id": "22841927-7272-45cd-bd98-ec35b05afa70"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "665",
+        "X-Request-ID": "88c81e3d-59cc-4098-a7c6-8f1ecad55439"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0799c357-9832-4dfe-bdce-c99abd927ab3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-393f1fa2606350429c9078739245859c-584ef13549826946-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f0179eb9329a1f4ba44b7999a5b477ee-47cd2d50690cf942-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "2d6287c259d7c87c7af5f5297a23b967",
+        "x-ms-client-request-id": "c91472c548d6d6f7663d4a19cb4a91b1",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b8593fe9-3aa2-4b36-8015-7a4a25106735",
+        "apim-request-id": "bbcaf73c-0031-445b-981d-0f1a7f785631",
         "Content-Length": "993",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "x-request-id": "b8593fe9-3aa2-4b36-8015-7a4a25106735"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "143",
+        "X-Request-ID": "bbcaf73c-0031-445b-981d-0f1a7f785631"
       },
       "ResponseBody": {
-        "dataFeedId": "0799c357-9832-4dfe-bdce-c99abd927ab3",
+        "dataFeedId": "7f0e31c4-3605-4b01-8c40-9f49986e710d",
         "dataFeedName": "dataFeedqpBQAqLM",
         "metrics": [
           {
-            "metricId": "33aedd92-8e46-476e-9d0f-00f384931c66",
+            "metricId": "7d4beab9-c076-4491-baa0-ebedf60e1440",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:45Z",
+        "createdTime": "2021-02-05T17:58:53Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0799c357-9832-4dfe-bdce-c99abd927ab3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f0e31c4-3605-4b01-8c40-9f49986e710d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-59baa3c00bc4b84697e16189de61bdfd-a40ddca0fb2bce4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6abca44603a46945bb3688cae2009432-386bf30f262ab545-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c91472c548d6d6f7663d4a19cb4a91b1",
+        "x-ms-client-request-id": "187cc909711edf40dd72d0d5496cbc25",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0c7a10d3-a4d6-4e21-809d-1860b02af1cb",
+        "apim-request-id": "961873d9-7f28-4b29-9b35-24c5f9da3f89",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "279",
-        "x-request-id": "0c7a10d3-a4d6-4e21-809d-1860b02af1cb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "360",
+        "X-Request-ID": "961873d9-7f28-4b29-9b35-24c5f9da3f89"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:47.1164544-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:54.4317935-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstance.json
index 82ae6dcf736e..bb61e9fa5cc3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9dfce407f1adbf469087d46af3691d30-5f290131e0af964b-00",
+        "traceparent": "00-d0d0ffa0c7e61549a9a4362e66467904-cdeabcff91b84e49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "3f22cfe3-066e-4b50-827f-7beaa0ca034c",
+        "apim-request-id": "02b7d4d3-f897-4a35-9ac2-9f65934f169b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:45 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7422368e-4ca0-4e19-a327-5be5b5aaeddb",
+        "Date": "Fri, 05 Feb 2021 17:56:20 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0e44fc8f-c36b-4dbf-9856-b224047cdecd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "403",
-        "X-Request-ID": "3f22cfe3-066e-4b50-827f-7beaa0ca034c"
+        "x-envoy-upstream-service-time": "626",
+        "X-Request-ID": "02b7d4d3-f897-4a35-9ac2-9f65934f169b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7422368e-4ca0-4e19-a327-5be5b5aaeddb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0e44fc8f-c36b-4dbf-9856-b224047cdecd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d0d0ffa0c7e61549a9a4362e66467904-3dd8d6a584584849-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "789c3b4cf5dce44aeb85eac87e8310ec",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "bd406891-ec10-4d04-96d3-37e990fe1d8e",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:20 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "bd406891-ec10-4d04-96d3-37e990fe1d8e"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0e44fc8f-c36b-4dbf-9856-b224047cdecd",
+        "dataFeedName": "dataFeedETZh017F",
+        "metrics": [
+          {
+            "metricId": "fc6174eb-cc7a-4cf5-bf5e-06071bdf75c2",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:20Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0e44fc8f-c36b-4dbf-9856-b224047cdecd",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-88f2eefc909f9a4a8b1ff8018155d020-ab3434ac34cc1440-00",
+        "traceparent": "00-eadca6285d3e4840bafd4745e8e8931a-8db31eae80f8c543-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "789c3b4cf5dce44aeb85eac87e8310ec",
+        "x-ms-client-request-id": "417fcec8751e8d7e051d618cf52b694d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "55c32dff-4458-4307-9035-659149301aab",
+        "apim-request-id": "8596dcc8-8aef-43bc-b636-0f797e0fd8ab",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "190",
-        "X-Request-ID": "55c32dff-4458-4307-9035-659149301aab"
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "8596dcc8-8aef-43bc-b636-0f797e0fd8ab"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7422368e-4ca0-4e19-a327-5be5b5aaeddb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0e44fc8f-c36b-4dbf-9856-b224047cdecd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-12d4f8bdace542409e868e673f3a0194-f3ff37a917072a4e-00",
+        "traceparent": "00-3c33415dfd651f42bc69fbb66af867fc-a4ddb2b59b820549-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "417fcec8751e8d7e051d618cf52b694d",
+        "x-ms-client-request-id": "4959b4defc9918a4eaf54155def511ba",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1dcae923-6a1b-4ae5-9f18-f4dff5ed6268",
+        "apim-request-id": "5d4f5a83-8dcc-4591-a3aa-956fad6d361d",
         "Content-Length": "993",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "1dcae923-6a1b-4ae5-9f18-f4dff5ed6268"
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "5d4f5a83-8dcc-4591-a3aa-956fad6d361d"
       },
       "ResponseBody": {
-        "dataFeedId": "7422368e-4ca0-4e19-a327-5be5b5aaeddb",
+        "dataFeedId": "0e44fc8f-c36b-4dbf-9856-b224047cdecd",
         "dataFeedName": "dataFeedETZh017F",
         "metrics": [
           {
-            "metricId": "c2288a18-f739-42d8-9e70-13530fc111eb",
+            "metricId": "fc6174eb-cc7a-4cf5-bf5e-06071bdf75c2",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:45Z",
+        "createdTime": "2021-02-05T17:56:20Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7422368e-4ca0-4e19-a327-5be5b5aaeddb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0e44fc8f-c36b-4dbf-9856-b224047cdecd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-21680a8591c06d42b09048dca6a06508-abe1466067d09e46-00",
+        "traceparent": "00-0de2aabb7ccb4b4ab096bb3fa2471b51-b985f5178e8c1e44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4959b4defc9918a4eaf54155def511ba",
+        "x-ms-client-request-id": "7c7434da6169d6f3bd0e72be93beeec0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "365e8f9e-6717-4ab4-813d-4c68f0de87f0",
+        "apim-request-id": "48d0f192-c639-49e8-8b91-6233011a120b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:46 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:21 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "368",
-        "X-Request-ID": "365e8f9e-6717-4ab4-813d-4c68f0de87f0"
+        "x-envoy-upstream-service-time": "349",
+        "X-Request-ID": "48d0f192-c639-49e8-8b91-6233011a120b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:46.3591322-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:20.9972235-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
index eb19b4d7e68a..534d2b30b6cd 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateMySqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "230",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dcf86b702ada6f4a9ad7a24b3df3ea3e-fb736231dbc7874c-00",
+        "traceparent": "00-4b071aaba260d041bb3b9f7e594ae235-fd893e7bcfdc134b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "9f0cd89a-c675-4d97-bf21-1ba1bc13e2fa",
+        "apim-request-id": "d066930d-3383-4523-b29d-a52351f9a1a5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:17 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfcf1b2a-abd5-4f78-aa91-7c20bc1e4fb8",
+        "Date": "Fri, 05 Feb 2021 17:58:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/215057ae-26fe-4791-b2a0-463ae800a6e1",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "572",
-        "X-Request-ID": "9f0cd89a-c675-4d97-bf21-1ba1bc13e2fa"
+        "x-envoy-upstream-service-time": "688",
+        "X-Request-ID": "d066930d-3383-4523-b29d-a52351f9a1a5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfcf1b2a-abd5-4f78-aa91-7c20bc1e4fb8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/215057ae-26fe-4791-b2a0-463ae800a6e1",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4b071aaba260d041bb3b9f7e594ae235-1d6716d73dff834e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "fa56cad8c4702279c46d6901aeb774a6",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a0050354-b1ea-41c3-8787-3ae396ab2a61",
+        "Content-Length": "942",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "a0050354-b1ea-41c3-8787-3ae396ab2a61"
+      },
+      "ResponseBody": {
+        "dataFeedId": "215057ae-26fe-4791-b2a0-463ae800a6e1",
+        "dataFeedName": "dataFeedpP8MQhy5",
+        "metrics": [
+          {
+            "metricId": "8ad1304d-74cb-4a97-9fdc-2d6126bccd7d",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "MySql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:55Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/215057ae-26fe-4791-b2a0-463ae800a6e1",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-63bf48882fea2a499f19386fbf5ed3cb-c4c54eadf8b2034d-00",
+        "traceparent": "00-ecdc55190462434c9db5e080e3d19142-1911fcbabc40a240-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fa56cad8c4702279c46d6901aeb774a6",
+        "x-ms-client-request-id": "7c0441165609d25f9a0ce43201526676",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2a3fe864-3c5a-4e94-a46a-3d5fb108504c",
+        "apim-request-id": "74133400-5a18-4344-a1f5-7de80dc0093f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "X-Request-ID": "2a3fe864-3c5a-4e94-a46a-3d5fb108504c"
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "74133400-5a18-4344-a1f5-7de80dc0093f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfcf1b2a-abd5-4f78-aa91-7c20bc1e4fb8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/215057ae-26fe-4791-b2a0-463ae800a6e1",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d7c22ef2c2d7564ea963946930dc6823-4f8e5de8184ad048-00",
+        "traceparent": "00-e29ae92d51ef1d48af861a067f325251-e9be24a21ff3e849-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7c0441165609d25f9a0ce43201526676",
+        "x-ms-client-request-id": "3d56f953b1daabeb7642f4bccf04323f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6f28d22a-8e71-4497-a82d-60204f4e8444",
+        "apim-request-id": "3d43a3ec-a302-47a7-9b0f-35f27e857255",
         "Content-Length": "993",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "136",
-        "X-Request-ID": "6f28d22a-8e71-4497-a82d-60204f4e8444"
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "3d43a3ec-a302-47a7-9b0f-35f27e857255"
       },
       "ResponseBody": {
-        "dataFeedId": "dfcf1b2a-abd5-4f78-aa91-7c20bc1e4fb8",
+        "dataFeedId": "215057ae-26fe-4791-b2a0-463ae800a6e1",
         "dataFeedName": "dataFeedpP8MQhy5",
         "metrics": [
           {
-            "metricId": "5411c6af-99cf-4b4f-881d-06ebcb2164c8",
+            "metricId": "8ad1304d-74cb-4a97-9fdc-2d6126bccd7d",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:18Z",
+        "createdTime": "2021-02-05T17:58:55Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/dfcf1b2a-abd5-4f78-aa91-7c20bc1e4fb8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/215057ae-26fe-4791-b2a0-463ae800a6e1",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d9579573b3207142b83cf6c1dbb4b3a6-ac83e1e2355c3c4a-00",
+        "traceparent": "00-ef6e13f9fb2fa142a940b77c9127b8e0-0ecc97f83d07cc42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3d56f953b1daabeb7642f4bccf04323f",
+        "x-ms-client-request-id": "4300ad7d982081996a835f64df462072",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5e54256c-b49c-48b9-a92c-36ccf0ab3bd7",
+        "apim-request-id": "16c621c6-ffef-4190-b7a1-14f5b4e5deb4",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "285",
-        "X-Request-ID": "5e54256c-b49c-48b9-a92c-36ccf0ab3bd7"
+        "x-envoy-upstream-service-time": "360",
+        "X-Request-ID": "16c621c6-ffef-4190-b7a1-14f5b4e5deb4"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:18.5681786-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:56.1530958-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstance.json
index 098fd93f2acc..86642286ad35 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-06713be06044fc46813b43338e6642ff-524e434a80d83249-00",
+        "traceparent": "00-d2aada0433feee40b9eb1350885b9d5a-242ebd80cff1cc45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,26 +34,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "cd754f7f-e322-40c3-975c-a7cedd5b6d21",
+        "apim-request-id": "ec499758-2e7b-4b0e-b90e-140be5732020",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:14 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e745b9b-70bc-4dff-adaa-037012d4acf3",
+        "Date": "Fri, 05 Feb 2021 17:56:21 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "626",
-        "X-Request-ID": "cd754f7f-e322-40c3-975c-a7cedd5b6d21"
+        "x-envoy-upstream-service-time": "667",
+        "X-Request-ID": "ec499758-2e7b-4b0e-b90e-140be5732020"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e745b9b-70bc-4dff-adaa-037012d4acf3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c6f343bd58b2a547b3976e9d845d9687-9124154e760d4d46-00",
+        "traceparent": "00-d2aada0433feee40b9eb1350885b9d5a-b7949d9480d7064a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -63,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "950aadb4-c650-4560-9d45-30b63de44191",
+        "apim-request-id": "13431276-e6e6-44e9-ae64-cf2c5c7954d4",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "150",
-        "X-Request-ID": "950aadb4-c650-4560-9d45-30b63de44191"
+        "X-Request-ID": "13431276-e6e6-44e9-ae64-cf2c5c7954d4"
       },
       "ResponseBody": {
-        "dataFeedId": "7e745b9b-70bc-4dff-adaa-037012d4acf3",
+        "dataFeedId": "39dea600-eef1-48ec-a085-8ee589918ad0",
         "dataFeedName": "dataFeedCMDMtCuM",
         "metrics": [
           {
-            "metricId": "b92b5d1f-df1c-4271-bd39-3c55e317734d",
+            "metricId": "f7e59867-94ee-46a2-be16-78733357d0a0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -108,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:14Z",
+        "createdTime": "2021-02-05T17:56:21Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,20 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e745b9b-70bc-4dff-adaa-037012d4acf3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cc77ce966ff1eb439a79a67147ad2ee5-295bc14499d3244c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a612ad4bdda46289ae4c2f7a1174ffa8",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9d1b08d4-0ee8-49ce-9e56-db0a87c855f9",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:22 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "9d1b08d4-0ee8-49ce-9e56-db0a87c855f9"
+      },
+      "ResponseBody": {
+        "dataFeedId": "39dea600-eef1-48ec-a085-8ee589918ad0",
+        "dataFeedName": "dataFeedCMDMtCuM",
+        "metrics": [
+          {
+            "metricId": "f7e59867-94ee-46a2-be16-78733357d0a0",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:21Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "678",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-93b9b190df03b74aa73448f231f94b89-a9fa5c876892c145-00",
+        "traceparent": "00-18a4d79a168cef4b803e88e9ad26e72a-5375514268578846-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a612ad4bdda46289ae4c2f7a1174ffa8",
+        "x-ms-client-request-id": "79595538c134060fb6e5f28e1cbd46cc",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,49 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "74cdea6d-89b2-41e0-a2d6-59b0f605809f",
+        "apim-request-id": "e372f15f-2291-4256-98ba-9b4ab4689e2f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:14 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "553",
-        "X-Request-ID": "74cdea6d-89b2-41e0-a2d6-59b0f605809f"
+        "x-envoy-upstream-service-time": "520",
+        "X-Request-ID": "e372f15f-2291-4256-98ba-9b4ab4689e2f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e745b9b-70bc-4dff-adaa-037012d4acf3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-064d33cbb28f8e438f749533f18f2d00-486c1814c7a62842-00",
+        "traceparent": "00-e09baa92eb09874d928fec588c766361-2874af8f77d8f443-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "79595538c134060fb6e5f28e1cbd46cc",
+        "x-ms-client-request-id": "14e39244c93a059b72f60601098ed8e4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5639a179-e35d-4a21-b7c3-f425499f6715",
+        "apim-request-id": "8bdf4f97-1fe6-4df5-8545-94e89de92804",
         "Content-Length": "1090",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "188",
-        "X-Request-ID": "5639a179-e35d-4a21-b7c3-f425499f6715"
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "8bdf4f97-1fe6-4df5-8545-94e89de92804"
       },
       "ResponseBody": {
-        "dataFeedId": "7e745b9b-70bc-4dff-adaa-037012d4acf3",
+        "dataFeedId": "39dea600-eef1-48ec-a085-8ee589918ad0",
         "dataFeedName": "dataFeedGESwSuUa",
         "metrics": [
           {
-            "metricId": "b92b5d1f-df1c-4271-bd39-3c55e317734d",
+            "metricId": "f7e59867-94ee-46a2-be16-78733357d0a0",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -241,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:14Z",
+        "createdTime": "2021-02-05T17:56:21Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,36 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7e745b9b-70bc-4dff-adaa-037012d4acf3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/39dea600-eef1-48ec-a085-8ee589918ad0",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3e8c717d55e2604ba3137ed96af74839-87e64ffe876c9042-00",
+        "traceparent": "00-c02d39fab5151f429f3d8abce3d3f4bf-ae09bf95c9cd8549-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "14e39244c93a059b72f60601098ed8e4",
+        "x-ms-client-request-id": "98152aad944089e59e0befbeeafb46f0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8b0e229c-cbd7-43be-9e29-b94f164e652e",
+        "apim-request-id": "f1558041-2304-4bf0-8bc4-47acbd46a63b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:15 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "344",
-        "X-Request-ID": "8b0e229c-cbd7-43be-9e29-b94f164e652e"
+        "x-envoy-upstream-service-time": "337",
+        "X-Request-ID": "f1558041-2304-4bf0-8bc4-47acbd46a63b"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:15.9868902-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:23.4228657-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstanceAsync.json
index f5d39c9f0576..295a72d4f4c1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-93c185e0ea099f4fa0b827a194ca36fb-7c3bbfe3a4cad74f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-364a814470350047831854638a2fe9fa-1626b55feb9d2e4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ba95ee751347ab5b68d96f6b0c6247e0",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "174edca9-2bb8-45b9-9361-5a070673cbd8",
+        "apim-request-id": "63b7c4c1-e5dc-4cd7-af11-042dc827cb4f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+        "Date": "Fri, 05 Feb 2021 17:58:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "466",
-        "x-request-id": "174edca9-2bb8-45b9-9361-5a070673cbd8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "567",
+        "X-Request-ID": "63b7c4c1-e5dc-4cd7-af11-042dc827cb4f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-47144e54e9043e429bb33b7c338538b3-6a0736008c090c40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-364a814470350047831854638a2fe9fa-750b1cdd1a56b846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "06c786cc21c917b5664f1019aad6e997",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "baee0cc5-c407-444a-8b60-479553b02e97",
+        "apim-request-id": "a724ddd2-8c97-4ed0-a83b-e122ed9f0141",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "x-request-id": "baee0cc5-c407-444a-8b60-479553b02e97"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "a724ddd2-8c97-4ed0-a83b-e122ed9f0141"
       },
       "ResponseBody": {
-        "dataFeedId": "a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+        "dataFeedId": "ffd46abe-a45b-4156-b584-8047b498ba1c",
         "dataFeedName": "dataFeeduZB2TS5C",
         "metrics": [
           {
-            "metricId": "53c53d33-201b-448a-ba08-bc23cabc610a",
+            "metricId": "987a6dd1-fb72-4e1f-94a8-79c5d7f1357f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:31Z",
+        "createdTime": "2021-02-05T17:58:57Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-65640f3805d5f84ebf6038ed099bf8a3-5f2e94c6a1658c43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e4c512052d843e991affa66d9b825f4f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2b9d3512-46e0-479c-9865-6361adc40822",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "2b9d3512-46e0-479c-9865-6361adc40822"
+      },
+      "ResponseBody": {
+        "dataFeedId": "ffd46abe-a45b-4156-b584-8047b498ba1c",
+        "dataFeedName": "dataFeeduZB2TS5C",
+        "metrics": [
+          {
+            "metricId": "987a6dd1-fb72-4e1f-94a8-79c5d7f1357f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:57Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "678",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f5270e67c4abec42a35611efd161ed38-fac8b2e9fa890d49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3806147caf8d594ab98ee3ced2c8e8f8-a9ed940cb381c94b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e4c512052d843e991affa66d9b825f4f",
+        "x-ms-client-request-id": "cb9f8c8ab7335475397e53f802410091",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4bbf23ed-932a-471e-83b0-4382843b7726",
+        "apim-request-id": "15a2afc5-01d4-4ea6-9f0f-95bef933c034",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "521",
-        "x-request-id": "4bbf23ed-932a-471e-83b0-4382843b7726"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "473",
+        "X-Request-ID": "15a2afc5-01d4-4ea6-9f0f-95bef933c034"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bbdfd1d0d3e35a41a1d349e0b3e21e26-536ba1a7e0528c4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5c34c33175a1804987f318691f80cc19-bbaf2582ff8d624c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "cb9f8c8ab7335475397e53f802410091",
+        "x-ms-client-request-id": "f965d8f0639d9e5ced89ebc97a477be4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e16b26cd-a77d-4de6-9dd1-5fc5a9c105a3",
+        "apim-request-id": "dac1fdc2-76fa-4488-a85e-2fae2383870c",
         "Content-Length": "1090",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "150",
-        "x-request-id": "e16b26cd-a77d-4de6-9dd1-5fc5a9c105a3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "dac1fdc2-76fa-4488-a85e-2fae2383870c"
       },
       "ResponseBody": {
-        "dataFeedId": "a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+        "dataFeedId": "ffd46abe-a45b-4156-b584-8047b498ba1c",
         "dataFeedName": "dataFeedpcZqoBah",
         "metrics": [
           {
-            "metricId": "53c53d33-201b-448a-ba08-bc23cabc610a",
+            "metricId": "987a6dd1-fb72-4e1f-94a8-79c5d7f1357f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:31Z",
+        "createdTime": "2021-02-05T17:58:57Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -239,33 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a81f32d4-9a08-4b80-8dd9-e2939b8baf35",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ffd46abe-a45b-4156-b584-8047b498ba1c",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f3a17e87b79f8e45a7d6dbdb0235cd3f-e5ff4fcf1ea74f43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d75ce23c6f59d7458da0e6df040214af-3269470d4c4f7945-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f965d8f0639d9e5ced89ebc97a477be4",
+        "x-ms-client-request-id": "1e8fc0ef1d374d649c71aa05d9a13bd8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "13051c3e-78e6-43b0-bd70-c65a662ab6cb",
+        "apim-request-id": "5bcaf9cc-bae2-4e6b-8302-e9ee309274a2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "286",
-        "x-request-id": "13051c3e-78e6-43b0-bd70-c65a662ab6cb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "272",
+        "X-Request-ID": "5bcaf9cc-bae2-4e6b-8302-e9ee309274a2"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:32.2371309-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:58:58.5050149-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstance.json
index 4386d4a9808a..a2cbf6f88486 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-dbc5c93455de1d429e6015738fa95e91-8070cad1adaa8d44-00",
+        "traceparent": "00-ef287d2a8cde4c4f9204399b4db74134-523e3bcaa37cce4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "71547e6b-fd53-40a9-a0c0-a2c1ab6cd369",
+        "apim-request-id": "9ce50026-fc40-4fdc-bbd5-64858514cab4",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:47 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/07dd6845-b5df-4f75-bd7e-90a59b8a8d8d",
+        "Date": "Fri, 05 Feb 2021 17:56:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3a0d768-33c2-4956-8af9-fbf3476eb21f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "526",
-        "X-Request-ID": "71547e6b-fd53-40a9-a0c0-a2c1ab6cd369"
+        "x-envoy-upstream-service-time": "405",
+        "X-Request-ID": "9ce50026-fc40-4fdc-bbd5-64858514cab4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/07dd6845-b5df-4f75-bd7e-90a59b8a8d8d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3a0d768-33c2-4956-8af9-fbf3476eb21f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ef287d2a8cde4c4f9204399b4db74134-6c66dcd2f9ca334f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0a814dce89dcd4a4e45d33a57ba14003",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "586aa210-fd1c-4048-b49a-b0f55c9b4e09",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "586aa210-fd1c-4048-b49a-b0f55c9b4e09"
+      },
+      "ResponseBody": {
+        "dataFeedId": "c3a0d768-33c2-4956-8af9-fbf3476eb21f",
+        "dataFeedName": "dataFeedVnB7KDMz",
+        "metrics": [
+          {
+            "metricId": "da7898e6-ddc4-4b0e-99e3-d81575529f7a",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:24Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3a0d768-33c2-4956-8af9-fbf3476eb21f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0f93ae634156dd48af6901484c7452a9-e086413d7db43549-00",
+        "traceparent": "00-f88c9326f082fd4b8c5975d3f225c696-99125a6600e59e44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0a814dce89dcd4a4e45d33a57ba14003",
+        "x-ms-client-request-id": "fb4a8164a34c171c989852e4c18db2d9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9b57ea73-b366-47a3-9d1b-d4ce5998addd",
+        "apim-request-id": "4dd3de66-24fe-4d3c-a603-2cc74b4e0237",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "183",
-        "X-Request-ID": "9b57ea73-b366-47a3-9d1b-d4ce5998addd"
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "4dd3de66-24fe-4d3c-a603-2cc74b4e0237"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/07dd6845-b5df-4f75-bd7e-90a59b8a8d8d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3a0d768-33c2-4956-8af9-fbf3476eb21f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6e412f9536483443a6de50a60d9e5219-3962c6a4967dc746-00",
+        "traceparent": "00-3bac1f891ce43e478197cfca5e1aabd6-ec4563263dbbab4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fb4a8164a34c171c989852e4c18db2d9",
+        "x-ms-client-request-id": "8841e11617f1d35d6dae6bec8e4ae46f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "107ea4ab-40ea-490f-889e-1bb3577b2bb3",
+        "apim-request-id": "a74ebc5c-3b5c-4bb7-bad6-32b06881dc37",
         "Content-Length": "1073",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "168",
-        "X-Request-ID": "107ea4ab-40ea-490f-889e-1bb3577b2bb3"
+        "x-envoy-upstream-service-time": "191",
+        "X-Request-ID": "a74ebc5c-3b5c-4bb7-bad6-32b06881dc37"
       },
       "ResponseBody": {
-        "dataFeedId": "07dd6845-b5df-4f75-bd7e-90a59b8a8d8d",
+        "dataFeedId": "c3a0d768-33c2-4956-8af9-fbf3476eb21f",
         "dataFeedName": "dataFeedWCBjgz2f",
         "metrics": [
           {
-            "metricId": "b366c75f-ca59-495d-9e64-dbfb853460bf",
+            "metricId": "da7898e6-ddc4-4b0e-99e3-d81575529f7a",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:47Z",
+        "createdTime": "2021-02-05T17:56:24Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/07dd6845-b5df-4f75-bd7e-90a59b8a8d8d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c3a0d768-33c2-4956-8af9-fbf3476eb21f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3dbf25e15683df4b86f60b025df1b362-5094887c2f2fe94f-00",
+        "traceparent": "00-cf4249f3e6dcce488b8684f70a5ff731-940a33554df8094d-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8841e11617f1d35d6dae6bec8e4ae46f",
+        "x-ms-client-request-id": "6da2254483f12b3d316a724437c01257",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "11138d4c-5e4d-4d92-8614-6c8a3633baff",
+        "apim-request-id": "0018ed8a-c1ed-4d8a-a08f-4de7aa6092c2",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:47 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "279",
-        "X-Request-ID": "11138d4c-5e4d-4d92-8614-6c8a3633baff"
+        "x-envoy-upstream-service-time": "349",
+        "X-Request-ID": "0018ed8a-c1ed-4d8a-a08f-4de7aa6092c2"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:47.7217261-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:25.1633465-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstanceAsync.json
index 9b34b6c86335..c24a86c48489 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d05e0520fbf58e4b8f7f333e17b7c5f7-4b4a683558bb5a4f-00",
+        "traceparent": "00-48768f7af0413b439ed650457dd70f63-66758bd74ee9a84a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "bdbb8a47-780e-4d68-8ca6-2842dfe1f899",
+        "apim-request-id": "e63b02df-f218-47a7-84f3-11ba11690eb3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:18 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4d10d949-b359-4dd4-a8dc-6af7b2cee166",
+        "Date": "Fri, 05 Feb 2021 17:58:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "569",
-        "X-Request-ID": "bdbb8a47-780e-4d68-8ca6-2842dfe1f899"
+        "x-envoy-upstream-service-time": "628",
+        "X-Request-ID": "e63b02df-f218-47a7-84f3-11ba11690eb3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4d10d949-b359-4dd4-a8dc-6af7b2cee166",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-48768f7af0413b439ed650457dd70f63-fb9eacd3175a2e4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f7bcd34eecacd829181c0826275823da",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "39681111-3010-4a67-a0be-28a0794b725c",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:58:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "235",
+        "X-Request-ID": "39681111-3010-4a67-a0be-28a0794b725c"
+      },
+      "ResponseBody": {
+        "dataFeedId": "b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
+        "dataFeedName": "dataFeed1V6WOcCi",
+        "metrics": [
+          {
+            "metricId": "adbdd413-09db-4539-9ec3-0204dd6586ac",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:58:59Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a2f03010ea9e1d45854cd44b4a1598a3-142255f0d16b4640-00",
+        "traceparent": "00-a4f80efd8d2f424b82df1a7e6e993e37-086ca2f6ec14da44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f7bcd34eecacd829181c0826275823da",
+        "x-ms-client-request-id": "997f502b5e9e022259b7782253236924",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6c683171-9b86-49d7-8f20-b2702e551265",
+        "apim-request-id": "38b9c33c-4968-430e-9449-61d74ae318f7",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:18 GMT",
+        "Date": "Fri, 05 Feb 2021 17:58:59 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "179",
-        "X-Request-ID": "6c683171-9b86-49d7-8f20-b2702e551265"
+        "x-envoy-upstream-service-time": "264",
+        "X-Request-ID": "38b9c33c-4968-430e-9449-61d74ae318f7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4d10d949-b359-4dd4-a8dc-6af7b2cee166",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-23ede088beb54f40b50ec6f8539f1b28-a91b2051b44df342-00",
+        "traceparent": "00-6b4a856857451741ba08b67b5e5498d7-6cf06874ba2aea45-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "997f502b5e9e022259b7782253236924",
+        "x-ms-client-request-id": "01ab2dd307cdf68a68f20698d081f5d7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "38b742ff-4646-4d7a-a502-e7ddb0302af3",
+        "apim-request-id": "75efdea8-5232-48ad-8036-51d5d07c7262",
         "Content-Length": "1073",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "X-Request-ID": "38b742ff-4646-4d7a-a502-e7ddb0302af3"
+        "x-envoy-upstream-service-time": "267",
+        "X-Request-ID": "75efdea8-5232-48ad-8036-51d5d07c7262"
       },
       "ResponseBody": {
-        "dataFeedId": "4d10d949-b359-4dd4-a8dc-6af7b2cee166",
+        "dataFeedId": "b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
         "dataFeedName": "dataFeedQdjEvPPT",
         "metrics": [
           {
-            "metricId": "749892cf-87ba-444b-9465-3883d2cd9146",
+            "metricId": "adbdd413-09db-4539-9ec3-0204dd6586ac",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:19Z",
+        "createdTime": "2021-02-05T17:58:59Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4d10d949-b359-4dd4-a8dc-6af7b2cee166",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4e2be9d-b0e1-4a49-9110-190a9cb8f8b9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6bb3fd2fc049c24ea8a96ed0570b4030-e5d1d5276ff7c540-00",
+        "traceparent": "00-2350b9b2bf9d224686e8d6112c09d2e7-89db6d83f1c9824f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "01ab2dd307cdf68a68f20698d081f5d7",
+        "x-ms-client-request-id": "cee83f624e90ef14b1ba9df4740685f4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6ddaf3ee-75a8-4458-89a3-3344b78adcb8",
+        "apim-request-id": "cf40c315-a196-40e9-ba94-83c0adbf058d",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "280",
-        "X-Request-ID": "6ddaf3ee-75a8-4458-89a3-3344b78adcb8"
+        "x-envoy-upstream-service-time": "409",
+        "X-Request-ID": "cf40c315-a196-40e9-ba94-83c0adbf058d"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:19.8818127-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:00.3854215-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstance.json
index c6231b33d571..cfc89b8a27ec 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a5096e06f545b7449bf6a5822b2b71f9-7f67ce9e1778cb44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-450ab0b43561ed4a8122433b01fa000f-7ffc472003973441-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bd59132c866fad3b30ea3cee2db92636",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b3b61334-8e34-45b1-8488-f13ee490e86d",
+        "apim-request-id": "1046d944-a71c-46d3-955b-1f566f22fd96",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a6048850-930d-4774-a852-1ba13c9f0756",
+        "Date": "Fri, 05 Feb 2021 17:56:26 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "518",
-        "x-request-id": "b3b61334-8e34-45b1-8488-f13ee490e86d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "485",
+        "X-Request-ID": "1046d944-a71c-46d3-955b-1f566f22fd96"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a6048850-930d-4774-a852-1ba13c9f0756",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fa3d3bb3a0132747a201c958075761b3-8e98913b41d47347-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-450ab0b43561ed4a8122433b01fa000f-1c89192213712746-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f5b36e8dfeba2c5c484fa23e3579448d",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3fb89c72-78ec-4116-afce-a1f6ea12ddc0",
+        "apim-request-id": "0569060e-1256-4a0b-a8f6-f284504e8fe3",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:40 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "3fb89c72-78ec-4116-afce-a1f6ea12ddc0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "198",
+        "X-Request-ID": "0569060e-1256-4a0b-a8f6-f284504e8fe3"
       },
       "ResponseBody": {
-        "dataFeedId": "a6048850-930d-4774-a852-1ba13c9f0756",
+        "dataFeedId": "26fa49bb-48af-415d-a1b7-ea5be7800afd",
         "dataFeedName": "dataFeed5VXs05TH",
         "metrics": [
           {
-            "metricId": "c91e7545-3062-4af8-bf1b-6bbe06a45570",
+            "metricId": "5b1f282b-d560-4f1a-a1c5-551f19a18481",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:40Z",
+        "createdTime": "2021-02-05T17:56:26Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a6048850-930d-4774-a852-1ba13c9f0756",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b1d8de9ceb7f8e438af581be60d29263-b1ca9e7ee626024c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7b15a90f930ef0c24ee33e3293fa5539",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b791d52c-0630-4793-9f17-207e864a1b12",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:26 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "b791d52c-0630-4793-9f17-207e864a1b12"
+      },
+      "ResponseBody": {
+        "dataFeedId": "26fa49bb-48af-415d-a1b7-ea5be7800afd",
+        "dataFeedName": "dataFeed5VXs05TH",
+        "metrics": [
+          {
+            "metricId": "5b1f282b-d560-4f1a-a1c5-551f19a18481",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:26Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "586",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4e135eb20e008547a176db20be92aed8-ed78cb56b04ed84d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1cdb8fc15d6c4c49afb8231d55613629-b1ae76543fb46144-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7b15a90f930ef0c24ee33e3293fa5539",
+        "x-ms-client-request-id": "9cff2d82cbdc2ea5b62d7520e3fc77b6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1efa1a4e-6759-4bad-8551-6f5772ac2154",
+        "apim-request-id": "e7523e26-8db5-4062-8494-359a829c63a7",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "424",
-        "x-request-id": "1efa1a4e-6759-4bad-8551-6f5772ac2154"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "720",
+        "X-Request-ID": "e7523e26-8db5-4062-8494-359a829c63a7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a6048850-930d-4774-a852-1ba13c9f0756",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6ee063ecc69e5840a9527c2b2d9b8bdb-27210a6cdcee154d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-590e97baca1b8243b8c3cd66b687272a-9778e5509b5f2a40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9cff2d82cbdc2ea5b62d7520e3fc77b6",
+        "x-ms-client-request-id": "84dfaea6aaa3f927abc3a7d6bf2a984d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "3e231938-2f7a-4e53-97ce-8841d82d641e",
+        "apim-request-id": "33b39274-021a-4fc9-afb7-239b2b73bc4c",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "x-request-id": "3e231938-2f7a-4e53-97ce-8841d82d641e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "33b39274-021a-4fc9-afb7-239b2b73bc4c"
       },
       "ResponseBody": {
-        "dataFeedId": "a6048850-930d-4774-a852-1ba13c9f0756",
+        "dataFeedId": "26fa49bb-48af-415d-a1b7-ea5be7800afd",
         "dataFeedName": "dataFeed5VXs05TH",
         "metrics": [
           {
-            "metricId": "c91e7545-3062-4af8-bf1b-6bbe06a45570",
+            "metricId": "5b1f282b-d560-4f1a-a1c5-551f19a18481",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:40Z",
+        "createdTime": "2021-02-05T17:56:26Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/a6048850-930d-4774-a852-1ba13c9f0756",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/26fa49bb-48af-415d-a1b7-ea5be7800afd",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-535450dfb4f0ea40a4d64e96d7ff6721-da12ca5258702a4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-bb801288c4721b4f8d2e11881ee1350a-6a058b97a2168c46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "84dfaea6aaa3f927abc3a7d6bf2a984d",
+        "x-ms-client-request-id": "08bc69f9a87a43b103e6c5e11ea20d51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1ad2dd41-a0a6-4a2a-8756-ae5401c9cbe6",
+        "apim-request-id": "585ebc3b-ab08-4653-8c77-5b74995cd7b1",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:27 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "248",
-        "x-request-id": "1ad2dd41-a0a6-4a2a-8756-ae5401c9cbe6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "322",
+        "X-Request-ID": "585ebc3b-ab08-4653-8c77-5b74995cd7b1"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:41.8554756-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:27.4844686-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
index f2b11ebc4b6e..d50c192cb0d4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-01fc399d1b3ed947815cc8731de77f5f-96518952f01dc343-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9136641281d35f4eba659b6c343d1286-6360e473354d1f47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7be0a360b58c733d4ba3aa5a110bd516",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "561b2043-e9c2-4368-8f34-25ae2fe76365",
+        "apim-request-id": "cc5dee71-045c-4b76-8ef0-a91273d6d4a7",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eca38097-b0e1-4226-8353-65ed786ae214",
+        "Date": "Fri, 05 Feb 2021 17:59:01 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "528",
-        "x-request-id": "561b2043-e9c2-4368-8f34-25ae2fe76365"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "657",
+        "X-Request-ID": "cc5dee71-045c-4b76-8ef0-a91273d6d4a7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eca38097-b0e1-4226-8353-65ed786ae214",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-577a42f5bacc7c439af1423f3446d4e1-c6c015445490874e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9136641281d35f4eba659b6c343d1286-2171831ebbd1be4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "040a870e64de139cacf31a1cc486d584",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e4d39077-1a0d-4fd6-ade4-7c9912821557",
+        "apim-request-id": "0d92f5bb-d129-4cd1-86cf-f8dbb9775da6",
         "Content-Length": "947",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:01 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "e4d39077-1a0d-4fd6-ade4-7c9912821557"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "0d92f5bb-d129-4cd1-86cf-f8dbb9775da6"
       },
       "ResponseBody": {
-        "dataFeedId": "eca38097-b0e1-4226-8353-65ed786ae214",
+        "dataFeedId": "8f25300f-83f9-424b-9acc-44dedae8ce34",
         "dataFeedName": "dataFeedsW52uueZ",
         "metrics": [
           {
-            "metricId": "93146963-e290-477f-bd95-e135d2dbb7dc",
+            "metricId": "6b964588-3d06-4bad-adcc-d9fefbd821de",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:49Z",
+        "createdTime": "2021-02-05T17:59:01Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eca38097-b0e1-4226-8353-65ed786ae214",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-9d3cee2e15dc164b9b982c7adde8198c-3aa641730c9bf345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "71b7652292f1ec017243939012c98023",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ccd7b1fa-7657-433e-801e-7548726743ea",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:01 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "ccd7b1fa-7657-433e-801e-7548726743ea"
+      },
+      "ResponseBody": {
+        "dataFeedId": "8f25300f-83f9-424b-9acc-44dedae8ce34",
+        "dataFeedName": "dataFeedsW52uueZ",
+        "metrics": [
+          {
+            "metricId": "6b964588-3d06-4bad-adcc-d9fefbd821de",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:01Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "586",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-77d514ae12dd134fa6af65ef4f490ffc-774db1821692604e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-eeb7078ec2198547837cff11cae57803-28c9baffc9d55844-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "71b7652292f1ec017243939012c98023",
+        "x-ms-client-request-id": "f93d7cbf729cfbee07cdcf999a21afc4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b13d9a4a-61c6-4083-84bc-d8a3ddf7d082",
+        "apim-request-id": "bd71486f-2152-462c-8de1-c390ed186237",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "615",
-        "x-request-id": "b13d9a4a-61c6-4083-84bc-d8a3ddf7d082"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "661",
+        "X-Request-ID": "bd71486f-2152-462c-8de1-c390ed186237"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eca38097-b0e1-4226-8353-65ed786ae214",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-02b0a9648304d34393d6435f6392f0e5-df7b903b9aeef946-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-27ac847c45fc5541860b3dedcdf9f53d-d2bb435ef5233b48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f93d7cbf729cfbee07cdcf999a21afc4",
+        "x-ms-client-request-id": "ac3826cd64537b25861d929bd00b01e2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "7af5adcd-1403-499a-83d9-6fe5d0e30e25",
+        "apim-request-id": "4c569b82-3d93-45a2-b8f9-d267d15873b2",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "139",
-        "x-request-id": "7af5adcd-1403-499a-83d9-6fe5d0e30e25"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "4c569b82-3d93-45a2-b8f9-d267d15873b2"
       },
       "ResponseBody": {
-        "dataFeedId": "eca38097-b0e1-4226-8353-65ed786ae214",
+        "dataFeedId": "8f25300f-83f9-424b-9acc-44dedae8ce34",
         "dataFeedName": "dataFeedsW52uueZ",
         "metrics": [
           {
-            "metricId": "93146963-e290-477f-bd95-e135d2dbb7dc",
+            "metricId": "6b964588-3d06-4bad-adcc-d9fefbd821de",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:49Z",
+        "createdTime": "2021-02-05T17:59:01Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/eca38097-b0e1-4226-8353-65ed786ae214",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/8f25300f-83f9-424b-9acc-44dedae8ce34",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-663e6ea41344f74f8893121b5393c66b-8f0a206184dbe142-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-48e1060015137a44ade2f32fef60aed8-2097a0b82d298345-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ac3826cd64537b25861d929bd00b01e2",
+        "x-ms-client-request-id": "475df772dc49afe876bb6a23c3685251",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "868ab91d-52df-4c56-9b13-f138f915ea41",
+        "apim-request-id": "80bd59a1-9dcf-4874-bd47-80a8ae2cbbb8",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:02 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "270",
-        "x-request-id": "868ab91d-52df-4c56-9b13-f138f915ea41"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "356",
+        "X-Request-ID": "80bd59a1-9dcf-4874-bd47-80a8ae2cbbb8"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:50.7983746-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:02.8103772-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstance.json
index b930221797a4..1a8e99780f45 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bda770f242869644a249f2d5a29c8e9c-b9f80f7ecae7d144-00",
+        "traceparent": "00-60d53d8391e9b04d95ff6309075f88bf-96c845fcd9033e42-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b1aec5f2-bfce-40dd-bb14-8348505a504d",
+        "apim-request-id": "1bcfc30a-4cdd-46c8-922d-ae62762769af",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:48 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be862d80-9cec-4968-a895-40fd4f1d52e8",
+        "Date": "Fri, 05 Feb 2021 17:56:28 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/91d0983b-bbab-4723-a0f8-17ef1297eb4a",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "438",
-        "X-Request-ID": "b1aec5f2-bfce-40dd-bb14-8348505a504d"
+        "x-envoy-upstream-service-time": "481",
+        "X-Request-ID": "1bcfc30a-4cdd-46c8-922d-ae62762769af"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be862d80-9cec-4968-a895-40fd4f1d52e8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/91d0983b-bbab-4723-a0f8-17ef1297eb4a",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-60d53d8391e9b04d95ff6309075f88bf-c51220f22ba2fa4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4942d8b3d0a87c580da9d7cfd48e3472",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b592a3f8-1f81-4a3c-a7f0-21c35b75e7b7",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:28 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "b592a3f8-1f81-4a3c-a7f0-21c35b75e7b7"
+      },
+      "ResponseBody": {
+        "dataFeedId": "91d0983b-bbab-4723-a0f8-17ef1297eb4a",
+        "dataFeedName": "dataFeedAKUUH6zP",
+        "metrics": [
+          {
+            "metricId": "34ba71b4-4998-4c0a-8121-cee15e0b1241",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:28Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/91d0983b-bbab-4723-a0f8-17ef1297eb4a",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-10b356946b1b4747a60cd3088399aecb-4582ba54f042cd4e-00",
+        "traceparent": "00-441f4f1c63341d45950e2bf733d3df36-c3f55e639b80a14b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4942d8b3d0a87c580da9d7cfd48e3472",
+        "x-ms-client-request-id": "44b830f683ae1244e00633fff4e88839",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d83c7b81-34f4-4b3f-bf54-4f4f51bc4d35",
+        "apim-request-id": "f5abefcf-604d-4544-aac4-5c4c76c2baf0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "169",
-        "X-Request-ID": "d83c7b81-34f4-4b3f-bf54-4f4f51bc4d35"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "f5abefcf-604d-4544-aac4-5c4c76c2baf0"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be862d80-9cec-4968-a895-40fd4f1d52e8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/91d0983b-bbab-4723-a0f8-17ef1297eb4a",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0610147fed44f84b9eaf7681814ea613-5b3f7f3feacc0d49-00",
+        "traceparent": "00-22540339d9bba546a6be641bac2142bd-484f57ee7d48064b-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "44b830f683ae1244e00633fff4e88839",
+        "x-ms-client-request-id": "1d4871083564c911c7b6ea822fc06f06",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2a2e4a8b-0f4d-4621-9a21-93b3afbb4239",
+        "apim-request-id": "a5642abc-ac98-4ff7-a2a4-8ee4c71f92f6",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "134",
-        "X-Request-ID": "2a2e4a8b-0f4d-4621-9a21-93b3afbb4239"
+        "x-envoy-upstream-service-time": "244",
+        "X-Request-ID": "a5642abc-ac98-4ff7-a2a4-8ee4c71f92f6"
       },
       "ResponseBody": {
-        "dataFeedId": "be862d80-9cec-4968-a895-40fd4f1d52e8",
+        "dataFeedId": "91d0983b-bbab-4723-a0f8-17ef1297eb4a",
         "dataFeedName": "dataFeedAKUUH6zP",
         "metrics": [
           {
-            "metricId": "aae2cd09-0749-47f4-95f1-193949d202ce",
+            "metricId": "34ba71b4-4998-4c0a-8121-cee15e0b1241",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:48Z",
+        "createdTime": "2021-02-05T17:56:28Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/be862d80-9cec-4968-a895-40fd4f1d52e8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/91d0983b-bbab-4723-a0f8-17ef1297eb4a",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0887550c9831964c933b521543e648a3-2d949437ec169f42-00",
+        "traceparent": "00-0e9b9ac0b8b65f46ae55d89b1a3ac98e-102e4c5f183ec847-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1d4871083564c911c7b6ea822fc06f06",
+        "x-ms-client-request-id": "2844ee03134c30bb932f69a29d598725",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "95b5c87d-d559-4b36-a7fe-292e4b5e399d",
+        "apim-request-id": "6acbddbc-b7d5-4c49-a15c-558f31e740fa",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:48 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "372",
-        "X-Request-ID": "95b5c87d-d559-4b36-a7fe-292e4b5e399d"
+        "x-envoy-upstream-service-time": "344",
+        "X-Request-ID": "6acbddbc-b7d5-4c49-a15c-558f31e740fa"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:48.8543052-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:29.0092432-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 45c3ba3f6d8b..22a5ce403669 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdatePostgreSqlDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "235",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-52f67bb64e0bde468a58c1c70b211b99-a195b06d7d28434c-00",
+        "traceparent": "00-b96773575d81d948ac743613de01ba9d-4f5f04df16f18e49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b57d7ccf-bf00-491f-a26d-2e2550376104",
+        "apim-request-id": "2162d932-8bc2-45db-a792-a691a33ba371",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:19 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964483b6-bce2-47eb-bceb-08a1a86930e0",
+        "Date": "Fri, 05 Feb 2021 17:59:03 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30214824-d7fc-4d13-91ac-5f1bb8a341d5",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "377",
-        "X-Request-ID": "b57d7ccf-bf00-491f-a26d-2e2550376104"
+        "x-envoy-upstream-service-time": "635",
+        "X-Request-ID": "2162d932-8bc2-45db-a792-a691a33ba371"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964483b6-bce2-47eb-bceb-08a1a86930e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30214824-d7fc-4d13-91ac-5f1bb8a341d5",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b96773575d81d948ac743613de01ba9d-b1e4077d83a9744d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "1384f0aeacc2709f6f69f58d8ff9777e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d98f5c5c-dfb5-4bec-b7e1-46e696b847f6",
+        "Content-Length": "947",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:03 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "d98f5c5c-dfb5-4bec-b7e1-46e696b847f6"
+      },
+      "ResponseBody": {
+        "dataFeedId": "30214824-d7fc-4d13-91ac-5f1bb8a341d5",
+        "dataFeedName": "dataFeed5n2Ojw0t",
+        "metrics": [
+          {
+            "metricId": "28e0a6e3-ee2b-4fa2-889b-55aa1be4e37e",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "PostgreSql",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:03Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30214824-d7fc-4d13-91ac-5f1bb8a341d5",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-05fcc9a3e5ce4845ba70d5c01d831226-561b027a70bab84b-00",
+        "traceparent": "00-3308f2aded60ff44976d00b812bfe465-264daf1dfe2ddc49-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1384f0aeacc2709f6f69f58d8ff9777e",
+        "x-ms-client-request-id": "69dbf6da5fd19a2dd1141faa058aa01b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1785ab16-56f8-4fe8-aa64-1138e2c62397",
+        "apim-request-id": "af97360d-3927-4486-8a85-41c763f2bd6b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:19 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "X-Request-ID": "1785ab16-56f8-4fe8-aa64-1138e2c62397"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "af97360d-3927-4486-8a85-41c763f2bd6b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964483b6-bce2-47eb-bceb-08a1a86930e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30214824-d7fc-4d13-91ac-5f1bb8a341d5",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2542f803c4b0cb4694a2f7afc5a4358a-0c2126a585918a40-00",
+        "traceparent": "00-fd94ff84f9c29747a45d8c8e827403eb-18923600f5dd3445-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "69dbf6da5fd19a2dd1141faa058aa01b",
+        "x-ms-client-request-id": "e8edde398122e3ab8d510ee572c0cd2a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4a6ea0e2-b553-4c58-bf6f-f73937fbec36",
+        "apim-request-id": "4850cf13-08c0-4308-90f8-fcbfbbd7d43b",
         "Content-Length": "998",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "X-Request-ID": "4a6ea0e2-b553-4c58-bf6f-f73937fbec36"
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "4850cf13-08c0-4308-90f8-fcbfbbd7d43b"
       },
       "ResponseBody": {
-        "dataFeedId": "964483b6-bce2-47eb-bceb-08a1a86930e0",
+        "dataFeedId": "30214824-d7fc-4d13-91ac-5f1bb8a341d5",
         "dataFeedName": "dataFeed5n2Ojw0t",
         "metrics": [
           {
-            "metricId": "d743592b-5761-4d28-8602-16f7f7460e87",
+            "metricId": "28e0a6e3-ee2b-4fa2-889b-55aa1be4e37e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:20Z",
+        "createdTime": "2021-02-05T17:59:03Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/964483b6-bce2-47eb-bceb-08a1a86930e0",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/30214824-d7fc-4d13-91ac-5f1bb8a341d5",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fadc289ef24f3f4cabca5d07513190ab-f8cd486f530a6e45-00",
+        "traceparent": "00-e5de013d11abeb4f8bd46c787be47f83-03c34a27150a9744-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e8edde398122e3ab8d510ee572c0cd2a",
+        "x-ms-client-request-id": "6555bb9c2fbe4e7ec2ea42ae8df56be4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e33b8d65-5525-4e9e-9085-cc654a4692a0",
+        "apim-request-id": "92f3db3a-f948-41f1-899b-657098dc39af",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:20 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:04 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "289",
-        "X-Request-ID": "e33b8d65-5525-4e9e-9085-cc654a4692a0"
+        "x-envoy-upstream-service-time": "331",
+        "X-Request-ID": "92f3db3a-f948-41f1-899b-657098dc39af"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:21.0126751-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:04.4869276-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstance.json
index 87434b32abc4..438c8117a238 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c6184f241b25249bc3a895a35f2ef5e-afb7d26c71c05e42-00",
+        "traceparent": "00-78b8d9944392cb418e9e067c2f676fc0-8c4ca0d7b9d13c4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,26 +34,26 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "122dc37c-2d44-45bf-8780-a286749d4aba",
+        "apim-request-id": "a99d6656-65fb-47ea-8fb5-0a1c788de587",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fab30393-471f-4f9c-b4ca-879949ffc357",
+        "Date": "Fri, 05 Feb 2021 17:56:29 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "452",
-        "X-Request-ID": "122dc37c-2d44-45bf-8780-a286749d4aba"
+        "x-envoy-upstream-service-time": "618",
+        "X-Request-ID": "a99d6656-65fb-47ea-8fb5-0a1c788de587"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fab30393-471f-4f9c-b4ca-879949ffc357",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5da179feb7c68d42949de980a5872b9a-a46b2a0fae52d44b-00",
+        "traceparent": "00-78b8d9944392cb418e9e067c2f676fc0-9b8b786271107b46-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -63,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "59f55d26-f56e-423d-95d2-f8543825999e",
+        "apim-request-id": "e4c6bd0d-56a0-4cdc-aff6-76dc4e17653a",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "197",
-        "X-Request-ID": "59f55d26-f56e-423d-95d2-f8543825999e"
+        "x-envoy-upstream-service-time": "144",
+        "X-Request-ID": "e4c6bd0d-56a0-4cdc-aff6-76dc4e17653a"
       },
       "ResponseBody": {
-        "dataFeedId": "fab30393-471f-4f9c-b4ca-879949ffc357",
+        "dataFeedId": "2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
         "dataFeedName": "dataFeeddo7sgZHb",
         "metrics": [
           {
-            "metricId": "59562288-0478-4c25-852b-c49d576b1da6",
+            "metricId": "e2f8abe6-de53-48de-869d-f5f944cc6129",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -108,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:23Z",
+        "createdTime": "2021-02-05T17:56:30Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -118,20 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fab30393-471f-4f9c-b4ca-879949ffc357",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-fb7b7d3fe011d04dbf9244785bab11a7-b43f3c4423f2cd4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d52f2610d119c8f45c530690f036c21a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0e2a3664-5589-455b-b91b-84132d056357",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:30 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "0e2a3664-5589-455b-b91b-84132d056357"
+      },
+      "ResponseBody": {
+        "dataFeedId": "2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
+        "dataFeedName": "dataFeeddo7sgZHb",
+        "metrics": [
+          {
+            "metricId": "e2f8abe6-de53-48de-869d-f5f944cc6129",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:30Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "677",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8c375fd86e8d274a8af3df2b20c08777-01612f2ff08f094c-00",
+        "traceparent": "00-c3ae9f25deef91479b3d4bf0abadcbf0-8b4106751592074c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d52f2610d119c8f45c530690f036c21a",
+        "x-ms-client-request-id": "b01bb70f939e6acd59f2ec11b3d27771",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -165,49 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0c1c1cd1-9c0d-4c68-b213-40c85b912b77",
+        "apim-request-id": "baf2f2d5-c93f-4913-8b3e-f839fd30f007",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "705",
-        "X-Request-ID": "0c1c1cd1-9c0d-4c68-b213-40c85b912b77"
+        "x-envoy-upstream-service-time": "456",
+        "X-Request-ID": "baf2f2d5-c93f-4913-8b3e-f839fd30f007"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fab30393-471f-4f9c-b4ca-879949ffc357",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1d30ba99c6d17941a77d23fb6121f916-153ec03ea9e3a441-00",
+        "traceparent": "00-c4c9051ab9777e43bad75e8f8ea55cf6-69c0ca95455a2b44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b01bb70f939e6acd59f2ec11b3d27771",
+        "x-ms-client-request-id": "7ec5afc6d29c471dbf14892e4ea70cbe",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cc927bb8-20cd-40e5-9238-0bb3db7fee1e",
+        "apim-request-id": "f71c7f59-8737-4b71-802f-b8c836f5af38",
         "Content-Length": "1089",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 14:25:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:30 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "X-Request-ID": "cc927bb8-20cd-40e5-9238-0bb3db7fee1e"
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "f71c7f59-8737-4b71-802f-b8c836f5af38"
       },
       "ResponseBody": {
-        "dataFeedId": "fab30393-471f-4f9c-b4ca-879949ffc357",
+        "dataFeedId": "2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
         "dataFeedName": "dataFeedCfLcmpX8",
         "metrics": [
           {
-            "metricId": "59562288-0478-4c25-852b-c49d576b1da6",
+            "metricId": "e2f8abe6-de53-48de-869d-f5f944cc6129",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -241,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T14:25:23Z",
+        "createdTime": "2021-02-05T17:56:30Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -251,36 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/fab30393-471f-4f9c-b4ca-879949ffc357",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/2105d5c7-155e-4d5a-81f7-d0659d0c1b87",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7a20c4f12e97c6429f2c776f084fb3a2-155b47eb9558fc4b-00",
+        "traceparent": "00-42b42c12e3beb84797302800fb744f6d-642d45e988b88d4c-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7ec5afc6d29c471dbf14892e4ea70cbe",
+        "x-ms-client-request-id": "f5e7ace78da57d1259c47b27e4e31489",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4917db83-838a-474d-afe5-cf7f8c807646",
+        "apim-request-id": "700c9a22-5981-4b8a-9d37-a2757559d6c1",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 14:25:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:31 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "330",
-        "X-Request-ID": "4917db83-838a-474d-afe5-cf7f8c807646"
+        "x-envoy-upstream-service-time": "321",
+        "X-Request-ID": "700c9a22-5981-4b8a-9d37-a2757559d6c1"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T06:25:24.3503284-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:31.1495621-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstanceAsync.json
index c6e8352c2bf2..23ae9f5617fc 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d38e6a83b22aab4292f06b2e19b81dc2-32ebff81ce73c641-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b516901c5173624bb19722c1395f70bd-1e2877fd2d4b574a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7dc4f0e1f5e6ae3b308120f93192ca5c",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "daac2917-3fe7-4fd3-bd3e-12b2ec1c3374",
+        "apim-request-id": "2f88930a-cceb-4720-b192-45188415afa5",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:33 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+        "Date": "Fri, 05 Feb 2021 17:59:05 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "427",
-        "x-request-id": "daac2917-3fe7-4fd3-bd3e-12b2ec1c3374"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "378",
+        "X-Request-ID": "2f88930a-cceb-4720-b192-45188415afa5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-604762b2ad3087439730fd93011fbab8-5264acabfb778f4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b516901c5173624bb19722c1395f70bd-2b8276d6739bcf48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "f065a3cbc82db6783faf6af214e9396b",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "c769cd27-fa8c-4c78-9953-6be2eeccf4ea",
+        "apim-request-id": "c63fb784-9cb5-406c-962a-aa1f8947b1c1",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:33 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "c769cd27-fa8c-4c78-9953-6be2eeccf4ea"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "c63fb784-9cb5-406c-962a-aa1f8947b1c1"
       },
       "ResponseBody": {
-        "dataFeedId": "7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+        "dataFeedId": "710c7b7c-a14f-43a8-b8e7-40346197ad02",
         "dataFeedName": "dataFeedYc3bmMvk",
         "metrics": [
           {
-            "metricId": "bcc766a5-1d84-4c30-a62d-1088fb16f8d6",
+            "metricId": "8624751a-4f1c-4fc9-a3c3-7cbe136801f3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:34Z",
+        "createdTime": "2021-02-05T17:59:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4e45c7e7baf81a43ab38675848d61715-a9a9644746f4b242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "311f94256adaa39d1f3b0d24582a207f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2a5e7196-6a0a-427a-8d75-2d578103a2fe",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "2a5e7196-6a0a-427a-8d75-2d578103a2fe"
+      },
+      "ResponseBody": {
+        "dataFeedId": "710c7b7c-a14f-43a8-b8e7-40346197ad02",
+        "dataFeedName": "dataFeedYc3bmMvk",
+        "metrics": [
+          {
+            "metricId": "8624751a-4f1c-4fc9-a3c3-7cbe136801f3",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:05Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "677",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c11ee1e9d4edb54a8b2681c871ca83c6-c4d9c28ad9a2584e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9fcaaf4af83a01499726b1d78e3d9b4b-fa37ab804f4a5e45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "311f94256adaa39d1f3b0d24582a207f",
+        "x-ms-client-request-id": "6328f2116c5719b4770e3e378b499a46",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -156,46 +237,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "731ce777-9a3d-4401-8715-14899827fa09",
+        "apim-request-id": "b3fb82d9-20a4-4572-b91d-d640f375e50a",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "450",
-        "x-request-id": "731ce777-9a3d-4401-8715-14899827fa09"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "637",
+        "X-Request-ID": "b3fb82d9-20a4-4572-b91d-d640f375e50a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-add04ce694e04345b0b9e959e2b0dda5-a492f047121ae546-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4b41c231663a8f4d86d0ad8091894eb8-a4df916121439347-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6328f2116c5719b4770e3e378b499a46",
+        "x-ms-client-request-id": "9cd4b5489872608106c2d0f2ba545d14",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f051065e-689f-449a-bc36-25eb50862749",
+        "apim-request-id": "eea2cc36-38ca-4b05-849a-45a93bea2f91",
         "Content-Length": "1089",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:41:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "f051065e-689f-449a-bc36-25eb50862749"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "205",
+        "X-Request-ID": "eea2cc36-38ca-4b05-849a-45a93bea2f91"
       },
       "ResponseBody": {
-        "dataFeedId": "7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+        "dataFeedId": "710c7b7c-a14f-43a8-b8e7-40346197ad02",
         "dataFeedName": "dataFeedxwec9cgU",
         "metrics": [
           {
-            "metricId": "bcc766a5-1d84-4c30-a62d-1088fb16f8d6",
+            "metricId": "8624751a-4f1c-4fc9-a3c3-7cbe136801f3",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -229,7 +313,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:41:34Z",
+        "createdTime": "2021-02-05T17:59:05Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -239,33 +323,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f7abf3f-6965-4dfd-897b-1c906f7ea660",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/710c7b7c-a14f-43a8-b8e7-40346197ad02",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-713aa178b6adea4c92ac5f91b7ec777a-76c941952082b344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b2752c26bd7f744aba17fb57cbd34465-6aea87e1088d644f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9cd4b5489872608106c2d0f2ba545d14",
+        "x-ms-client-request-id": "21e0ea8fd5c0b813e006bacc2c6518d6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c2082d2d-4335-4c25-a063-00bcefa2df03",
+        "apim-request-id": "ff0004bb-a4e8-4233-bcf4-0eed046504d0",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:41:34 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "341",
-        "x-request-id": "c2082d2d-4335-4c25-a063-00bcefa2df03"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "339",
+        "X-Request-ID": "ff0004bb-a4e8-4233-bcf4-0eed046504d0"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:41:35.2930779-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:06.8905831-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstance.json
index ea496c61650e..99261b78ef9f 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-087b0c8cbad20247b3a44ed052077c93-d109ee50685fb542-00",
+        "traceparent": "00-72cad8a50d93964ea33c0f62ebe62adb-293d85fbb91c994f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "bcb2e58c-e445-43c3-82c3-2951b309bfe9",
+        "apim-request-id": "f219292f-45fa-49f1-bd8c-37962bd319fa",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:49 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f64aed8-d76d-4128-b379-b05dea2b8d66",
+        "Date": "Fri, 05 Feb 2021 17:56:31 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70020bfa-33c8-41f1-b62a-cec78294d07b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "382",
-        "X-Request-ID": "bcb2e58c-e445-43c3-82c3-2951b309bfe9"
+        "x-envoy-upstream-service-time": "353",
+        "X-Request-ID": "f219292f-45fa-49f1-bd8c-37962bd319fa"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f64aed8-d76d-4128-b379-b05dea2b8d66",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70020bfa-33c8-41f1-b62a-cec78294d07b",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-72cad8a50d93964ea33c0f62ebe62adb-deae5133b4bf324b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4bbe67ea2cef35234728037df7cc4854",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "fa4060e1-c577-479a-929f-787b6d6c028a",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:31 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "fa4060e1-c577-479a-929f-787b6d6c028a"
+      },
+      "ResponseBody": {
+        "dataFeedId": "70020bfa-33c8-41f1-b62a-cec78294d07b",
+        "dataFeedName": "dataFeedRl9VouPL",
+        "metrics": [
+          {
+            "metricId": "4850e1ea-b4f8-4229-820f-7f9a6a657696",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:31Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70020bfa-33c8-41f1-b62a-cec78294d07b",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7945d03b117e1c40a7681529e87489a5-b86e55dffdaabf4b-00",
+        "traceparent": "00-3b3fcc6ab903fc4b8747624fd211f7c5-73ef13925de66842-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4bbe67ea2cef35234728037df7cc4854",
+        "x-ms-client-request-id": "87355cae680fbc8aa1fe0f6e970c0bbf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3459e424-8068-4f51-ab59-ca41c7771671",
+        "apim-request-id": "cf20a4e9-a41e-43c7-bc74-ddc6980eaf39",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "160",
-        "X-Request-ID": "3459e424-8068-4f51-ab59-ca41c7771671"
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "cf20a4e9-a41e-43c7-bc74-ddc6980eaf39"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f64aed8-d76d-4128-b379-b05dea2b8d66",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70020bfa-33c8-41f1-b62a-cec78294d07b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a765796748a8c44ab3c17ac8f1358893-f67ea6341936a445-00",
+        "traceparent": "00-f831b2cfde3a2641ac8c253e6c1e8156-cb5409b8bc4a0e44-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "87355cae680fbc8aa1fe0f6e970c0bbf",
+        "x-ms-client-request-id": "341e63892c8f318195fee2af93a4d2f5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "70facb2e-f338-49a3-8366-387aa1aa9129",
+        "apim-request-id": "3b4cddc6-70c1-460d-9524-fa881a08c0af",
         "Content-Length": "1072",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "X-Request-ID": "70facb2e-f338-49a3-8366-387aa1aa9129"
+        "x-envoy-upstream-service-time": "177",
+        "X-Request-ID": "3b4cddc6-70c1-460d-9524-fa881a08c0af"
       },
       "ResponseBody": {
-        "dataFeedId": "7f64aed8-d76d-4128-b379-b05dea2b8d66",
+        "dataFeedId": "70020bfa-33c8-41f1-b62a-cec78294d07b",
         "dataFeedName": "dataFeedwYO3ctIS",
         "metrics": [
           {
-            "metricId": "f7f2a683-48c1-4d05-b1cd-cfc49fd86f7a",
+            "metricId": "4850e1ea-b4f8-4229-820f-7f9a6a657696",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:49Z",
+        "createdTime": "2021-02-05T17:56:31Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/7f64aed8-d76d-4128-b379-b05dea2b8d66",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/70020bfa-33c8-41f1-b62a-cec78294d07b",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-29ac39dc8586364e963255d65750797e-471b2b24f6a6974b-00",
+        "traceparent": "00-65c6a5b6da0c494fbe64562ed64637bc-19473cc1dae6674f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "341e63892c8f318195fee2af93a4d2f5",
+        "x-ms-client-request-id": "b2368902d76581f6dd02a9f01cb49e3b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "70552b5e-9181-4efa-a00f-70cdf8ee62c1",
+        "apim-request-id": "de06a501-20df-4221-b60a-5ce287ed9b48",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:49 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:32 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
         "x-envoy-upstream-service-time": "286",
-        "X-Request-ID": "70552b5e-9181-4efa-a00f-70cdf8ee62c1"
+        "X-Request-ID": "de06a501-20df-4221-b60a-5ce287ed9b48"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:50.0454167-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:32.5239760-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstanceAsync.json
index 8dfa96757d5d..700259ef0d01 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithEveryMemberAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ef9895eeb4ebd542a694894845e79235-06e6503c7eadf94b-00",
+        "traceparent": "00-8de6c3481bc29f4bba7a3c5b200d9e10-828b11c9b3ef564f-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d2cba59d-ac41-456e-a87f-11583355c600",
+        "apim-request-id": "3964477d-4675-406b-bb39-811b5cc81a27",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:20 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da8eb64e-2471-4196-83f8-6d35e308d58d",
+        "Date": "Fri, 05 Feb 2021 17:59:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06542fbb-c163-4a63-a632-0876072427fe",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "366",
-        "X-Request-ID": "d2cba59d-ac41-456e-a87f-11583355c600"
+        "x-envoy-upstream-service-time": "383",
+        "X-Request-ID": "3964477d-4675-406b-bb39-811b5cc81a27"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da8eb64e-2471-4196-83f8-6d35e308d58d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06542fbb-c163-4a63-a632-0876072427fe",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8de6c3481bc29f4bba7a3c5b200d9e10-291128a9bd878643-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "96bcb1cf8e98ecd0bc51543b68a98c26",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "7202f556-1ee0-47dd-8f05-ef88ed403c1e",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "7202f556-1ee0-47dd-8f05-ef88ed403c1e"
+      },
+      "ResponseBody": {
+        "dataFeedId": "06542fbb-c163-4a63-a632-0876072427fe",
+        "dataFeedName": "dataFeedhxzk8laj",
+        "metrics": [
+          {
+            "metricId": "ff28b0d0-a38b-448c-a0f2-25c7571a194f",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:07Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06542fbb-c163-4a63-a632-0876072427fe",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "470",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-228ded15c2c8334391c1192bdf4d58a8-1e25f0b468e4e348-00",
+        "traceparent": "00-39454124f7bc9b458f68f6c08e5931f5-c3c20c2fcfafaa48-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "96bcb1cf8e98ecd0bc51543b68a98c26",
+        "x-ms-client-request-id": "65904f8118a9e23c34b8a6db4e88869b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -81,49 +153,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "35b845f1-2d34-43d4-9a75-1f97e65b4189",
+        "apim-request-id": "2d5c6835-fba1-4314-bc23-5e8c0bac3cab",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "180",
-        "X-Request-ID": "35b845f1-2d34-43d4-9a75-1f97e65b4189"
+        "x-envoy-upstream-service-time": "186",
+        "X-Request-ID": "2d5c6835-fba1-4314-bc23-5e8c0bac3cab"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da8eb64e-2471-4196-83f8-6d35e308d58d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06542fbb-c163-4a63-a632-0876072427fe",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7737deb74f7e3d4c89fc25dfc9838019-16fadd885a940b4a-00",
+        "traceparent": "00-8afbd7d85bfac24f85060effa56bc9d3-c0f68be8dbe51842-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "65904f8118a9e23c34b8a6db4e88869b",
+        "x-ms-client-request-id": "fbbe2c02fd972d1bebd08b362b1636b6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "39b4c82b-3b92-4ee1-ab66-b1f856865791",
+        "apim-request-id": "ddfd01ff-f283-4bfa-a8ab-138db52d870a",
         "Content-Length": "1072",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "146",
-        "X-Request-ID": "39b4c82b-3b92-4ee1-ab66-b1f856865791"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "ddfd01ff-f283-4bfa-a8ab-138db52d870a"
       },
       "ResponseBody": {
-        "dataFeedId": "da8eb64e-2471-4196-83f8-6d35e308d58d",
+        "dataFeedId": "06542fbb-c163-4a63-a632-0876072427fe",
         "dataFeedName": "dataFeed8LKfUkkF",
         "metrics": [
           {
-            "metricId": "9c5cec28-87a3-40ab-9746-25c8516578cb",
+            "metricId": "ff28b0d0-a38b-448c-a0f2-25c7571a194f",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -156,7 +228,7 @@
         ],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:21Z",
+        "createdTime": "2021-02-05T17:59:07Z",
         "isAdmin": true,
         "actionLinkTemplate": "https://fakeurl.com/%datafeed/%metric",
         "dataSourceParameter": {
@@ -166,36 +238,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/da8eb64e-2471-4196-83f8-6d35e308d58d",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/06542fbb-c163-4a63-a632-0876072427fe",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b955a487dedcfa4d8b61d4858d83b65d-345cbbbe495fa549-00",
+        "traceparent": "00-af485dc75f857940bfe7fa24307e3d3b-e7e093a12fcb9f4e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fbbe2c02fd972d1bebd08b362b1636b6",
+        "x-ms-client-request-id": "8326d6ca99efb7dc74da61dfe7f49d34",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fbf54776-4a40-4c2b-be57-2b80ff1e8b7b",
+        "apim-request-id": "a0f0989f-ad44-4422-b870-10549c882ef8",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:21 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "283",
-        "X-Request-ID": "fbf54776-4a40-4c2b-be57-2b80ff1e8b7b"
+        "x-envoy-upstream-service-time": "297",
+        "X-Request-ID": "a0f0989f-ad44-4422-b870-10549c882ef8"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:22.4960101-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:08.2698365-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstance.json
index 6e58f857fc4b..2065adf7ebd7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-74e8d7ccbc06cb44aef589a017bf920d-b73108598bd14647-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1017aa691228e147906ad413245629a7-20fe936622b94747-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "25a30d960f30f6c8ab7688426fbcc21c",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "832de473-cd00-4cc5-9778-7b9e29eb01bc",
+        "apim-request-id": "adb3a4b2-0013-4c6e-8f5c-e4efd1a793c2",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:44 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c47d351d-8166-4b8d-adc6-0c21bdba651a",
+        "Date": "Fri, 05 Feb 2021 17:56:33 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "401",
-        "x-request-id": "832de473-cd00-4cc5-9778-7b9e29eb01bc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "679",
+        "X-Request-ID": "adb3a4b2-0013-4c6e-8f5c-e4efd1a793c2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c47d351d-8166-4b8d-adc6-0c21bdba651a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-558fd524e24e6040baad5e615a401608-8027cb10af861940-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1017aa691228e147906ad413245629a7-4f2f70488689184f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "268a216697b00a8483f3dbb014d8107b",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "cd0c3437-0bfe-4635-b60a-8499c7ffe492",
+        "apim-request-id": "02259f1b-383e-407a-87cf-3b9642c5d2d9",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:33 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "x-request-id": "cd0c3437-0bfe-4635-b60a-8499c7ffe492"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "02259f1b-383e-407a-87cf-3b9642c5d2d9"
       },
       "ResponseBody": {
-        "dataFeedId": "c47d351d-8166-4b8d-adc6-0c21bdba651a",
+        "dataFeedId": "d9e76df7-de95-4dd4-b53f-e735299ce622",
         "dataFeedName": "dataFeedG3RthPA9",
         "metrics": [
           {
-            "metricId": "c325d5ec-53c1-402e-b18c-03c7cf6b192d",
+            "metricId": "8ba15010-cd47-43c7-b08d-ac747c60af0e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:44Z",
+        "createdTime": "2021-02-05T17:56:33Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c47d351d-8166-4b8d-adc6-0c21bdba651a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-43cd78039bd3f347b16f2509dfd761d5-84b52553b30fed4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e206933a014c7dbf7aff43c7e47ae5af",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b10aca20-d4cd-400d-ab1d-dbd8466034b8",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:33 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "b10aca20-d4cd-400d-ab1d-dbd8466034b8"
+      },
+      "ResponseBody": {
+        "dataFeedId": "d9e76df7-de95-4dd4-b53f-e735299ce622",
+        "dataFeedName": "dataFeedG3RthPA9",
+        "metrics": [
+          {
+            "metricId": "8ba15010-cd47-43c7-b08d-ac747c60af0e",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:33Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "585",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bb92edfaa3f5ef4bafcec28a3bb2bb25-c40be58634ac4f44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-5e9a56e10953fb42a5c6e17443110865-ba103b79778f6545-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e206933a014c7dbf7aff43c7e47ae5af",
+        "x-ms-client-request-id": "d708f14845c0ffc68899a23d3417e1d2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "75f7efac-bd3f-42f9-bfbd-909d833899bd",
+        "apim-request-id": "294ad764-0caf-4c12-9fc4-b03c6c312d26",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "442",
-        "x-request-id": "75f7efac-bd3f-42f9-bfbd-909d833899bd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "515",
+        "X-Request-ID": "294ad764-0caf-4c12-9fc4-b03c6c312d26"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c47d351d-8166-4b8d-adc6-0c21bdba651a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b0d1ebc6f3c50a45976e3973bcaac32c-12b2dba4171a1d45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7cfa5521820c664e90f685e98c46e562-61bfb6a044dfdb49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d708f14845c0ffc68899a23d3417e1d2",
+        "x-ms-client-request-id": "db070c65e0b665cf620dabb153bc2508",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "f8514305-6721-47b6-9db4-398420f92193",
+        "apim-request-id": "839e7c84-60b3-4856-b5b8-f4c9ed7d2c85",
         "Content-Length": "997",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Thu, 31 Dec 2020 18:09:44 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "156",
-        "x-request-id": "f8514305-6721-47b6-9db4-398420f92193"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "839e7c84-60b3-4856-b5b8-f4c9ed7d2c85"
       },
       "ResponseBody": {
-        "dataFeedId": "c47d351d-8166-4b8d-adc6-0c21bdba651a",
+        "dataFeedId": "d9e76df7-de95-4dd4-b53f-e735299ce622",
         "dataFeedName": "dataFeedG3RthPA9",
         "metrics": [
           {
-            "metricId": "c325d5ec-53c1-402e-b18c-03c7cf6b192d",
+            "metricId": "8ba15010-cd47-43c7-b08d-ac747c60af0e",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-31T18:09:44Z",
+        "createdTime": "2021-02-05T17:56:33Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/c47d351d-8166-4b8d-adc6-0c21bdba651a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d9e76df7-de95-4dd4-b53f-e735299ce622",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3239693e2ecb7c4aaa4639cb7b7040af-43091db2c3bb0e48-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-24db15ee9acdb3419094e401f560949d-951cc30a4c5e6a41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "db070c65e0b665cf620dabb153bc2508",
+        "x-ms-client-request-id": "23672b0e39d0f5bbcd075ab35f814963",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fe212110-c693-473b-bbad-adb6ca3bd8d3",
+        "apim-request-id": "f629e988-42e6-4496-b67f-c9a7e79ecb8a",
         "Content-Length": "0",
-        "Date": "Thu, 31 Dec 2020 18:09:45 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:34 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "306",
-        "x-request-id": "fe212110-c693-473b-bbad-adb6ca3bd8d3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "292",
+        "X-Request-ID": "f629e988-42e6-4496-b67f-c9a7e79ecb8a"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-31T10:09:45.3334904-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:34.8334935-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstanceAsync.json
index 17176fc802aa..e5761792e0d7 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-26a5dd0ba4ea604e8d0df4fe4d185b0d-ddd30cc4b670074c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2876042d04b5bf46acbe919a82a25c49-7f73d4672ae4f748-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "da77991cfe05878e95a430b25c8ff92d",
         "x-ms-return-client-request-id": "true"
@@ -31,25 +34,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2e857964-720d-47fc-92de-4b952cd0a6cc",
+        "apim-request-id": "e4d67cf2-b374-4eab-a0bb-68e6c22a439b",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:57 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4841961-2171-4828-906c-bf87479a2ad8",
+        "Date": "Fri, 05 Feb 2021 17:59:08 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "519",
-        "x-request-id": "2e857964-720d-47fc-92de-4b952cd0a6cc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "547",
+        "X-Request-ID": "e4d67cf2-b374-4eab-a0bb-68e6c22a439b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4841961-2171-4828-906c-bf87479a2ad8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-216771b9d1e4874bb4b9933b346772c8-a5a01544a4e3ea49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2876042d04b5bf46acbe919a82a25c49-98263db3dc882343-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "070b663926eb738a43f71339fbd611ab",
         "x-ms-return-client-request-id": "true"
@@ -57,21 +63,21 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "bd6b28e9-54cd-42f8-abf3-b2b12ed3cb73",
+        "apim-request-id": "12e55ba7-087b-41ae-a06c-3f03719b0229",
         "Content-Length": "946",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "bd6b28e9-54cd-42f8-abf3-b2b12ed3cb73"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "12e55ba7-087b-41ae-a06c-3f03719b0229"
       },
       "ResponseBody": {
-        "dataFeedId": "b4841961-2171-4828-906c-bf87479a2ad8",
+        "dataFeedId": "461a0fe7-215c-4ba2-a850-f15a86dd0b88",
         "dataFeedName": "dataFeedjQqsIhT9",
         "metrics": [
           {
-            "metricId": "97ec0905-40b7-4910-b20e-5b8a4d156568",
+            "metricId": "74b295f8-4e00-4617-bc4f-8476f35452de",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -102,7 +108,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:58Z",
+        "createdTime": "2021-02-05T17:59:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -112,17 +118,92 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4841961-2171-4828-906c-bf87479a2ad8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-28b32514e4a731438113aeac835f8b2b-5e943fa022473849-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "74fe3d9a89791549414fb76454e519d7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9c0afc97-09bb-437b-a673-c005160218cf",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "9c0afc97-09bb-437b-a673-c005160218cf"
+      },
+      "ResponseBody": {
+        "dataFeedId": "461a0fe7-215c-4ba2-a850-f15a86dd0b88",
+        "dataFeedName": "dataFeedjQqsIhT9",
+        "metrics": [
+          {
+            "metricId": "74b295f8-4e00-4617-bc4f-8476f35452de",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:09Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "585",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-801cd93797033a4da207e770ffbbcd3d-f045a266b8629e4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fd29a017e9bca24fa45c0fa40212075a-c1705f46e9869049-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "74fe3d9a89791549414fb76454e519d7",
+        "x-ms-client-request-id": "af4898ce80edf6db0e04960eeb558bbf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -153,46 +234,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "51a4f2b3-2738-4fa4-9c47-4268d6dee023",
+        "apim-request-id": "5849785f-0347-47d9-b320-8d11bc74c886",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "635",
-        "x-request-id": "51a4f2b3-2738-4fa4-9c47-4268d6dee023"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "602",
+        "X-Request-ID": "5849785f-0347-47d9-b320-8d11bc74c886"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4841961-2171-4828-906c-bf87479a2ad8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-aeae2a2b3453f44b97a39f4183f30ad4-c9513fcdd4adb44d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ce6339bb412b544ca5af1695daed0e78-cb7161fac404fb4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "af4898ce80edf6db0e04960eeb558bbf",
+        "x-ms-client-request-id": "1e1885928490afb41cf5c69c6f261e5d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6dbb90ee-991f-4a21-b768-3c4145398a2e",
+        "apim-request-id": "d9d090af-e01f-4c33-89bc-8215d277015e",
         "Content-Length": "997",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Wed, 30 Dec 2020 23:22:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "x-request-id": "6dbb90ee-991f-4a21-b768-3c4145398a2e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "d9d090af-e01f-4c33-89bc-8215d277015e"
       },
       "ResponseBody": {
-        "dataFeedId": "b4841961-2171-4828-906c-bf87479a2ad8",
+        "dataFeedId": "461a0fe7-215c-4ba2-a850-f15a86dd0b88",
         "dataFeedName": "dataFeedjQqsIhT9",
         "metrics": [
           {
-            "metricId": "97ec0905-40b7-4910-b20e-5b8a4d156568",
+            "metricId": "74b295f8-4e00-4617-bc4f-8476f35452de",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -223,7 +307,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2020-12-30T23:22:58Z",
+        "createdTime": "2021-02-05T17:59:09Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -233,33 +317,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b4841961-2171-4828-906c-bf87479a2ad8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/461a0fe7-215c-4ba2-a850-f15a86dd0b88",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-eb1210ffa07fda42afdc0073e001586a-6d2d03142a5c5a44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201223.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c2b385497618f442a61463130d15ce69-3f41fad66439a44d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1e1885928490afb41cf5c69c6f261e5d",
+        "x-ms-client-request-id": "636a3bdd628e19be62086675f23b29eb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b5623213-bab4-4695-b727-0c8ed30542ab",
+        "apim-request-id": "a657cfa4-bb7d-459b-a283-47e768327cc2",
         "Content-Length": "0",
-        "Date": "Wed, 30 Dec 2020 23:22:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "275",
-        "x-request-id": "b5623213-bab4-4695-b727-0c8ed30542ab"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "292",
+        "X-Request-ID": "a657cfa4-bb7d-459b-a283-47e768327cc2"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2020-12-30T15:22:59.6855841-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:10.3443050-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstance.json
index 079c17d212c6..77e40cbe10a8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstance.json
@@ -8,9 +8,9 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-203974853266424ca0a97e7afdbc1413-26cf9c5d4a780646-00",
+        "traceparent": "00-d6af798f549d684c8063e317781a3b07-999d1d5aeda97a41-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c52c117d-7126-457c-b6a1-e828d2e6eea7",
+        "apim-request-id": "d97f0fc1-4226-4cf9-9954-e5c67604fc3b",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:50 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4fd46c8e-4f47-4556-af4f-ce646ece31c6",
+        "Date": "Fri, 05 Feb 2021 17:56:35 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "389",
-        "X-Request-ID": "c52c117d-7126-457c-b6a1-e828d2e6eea7"
+        "x-envoy-upstream-service-time": "734",
+        "X-Request-ID": "d97f0fc1-4226-4cf9-9954-e5c67604fc3b"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4fd46c8e-4f47-4556-af4f-ce646ece31c6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d6af798f549d684c8063e317781a3b07-4005ca347a3eea4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "11ab45cf59510cfc8283e65f11af43ce",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "9da53423-d31f-45b6-aadb-a36f86de4beb",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:56:36 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "211",
+        "X-Request-ID": "9da53423-d31f-45b6-aadb-a36f86de4beb"
+      },
+      "ResponseBody": {
+        "dataFeedId": "0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
+        "dataFeedName": "dataFeedpZPdVNQe",
+        "metrics": [
+          {
+            "metricId": "96a06099-3e46-409c-b526-0f6e117cff2c",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:56:35Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ff1b160ca57de14babf610b191e708a2-085a1f09c27f584c-00",
+        "traceparent": "00-5c871341f0045a42af0e4cc208a1319b-bec83d379f06b14a-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "11ab45cf59510cfc8283e65f11af43ce",
+        "x-ms-client-request-id": "ee5bfb41d0119ff0abc0abdfd5177acb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7939572e-4d48-481b-83ac-b2a0c4254922",
+        "apim-request-id": "3bbafb25-0e32-41bf-b33a-d16a098fc7f3",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "150",
-        "X-Request-ID": "7939572e-4d48-481b-83ac-b2a0c4254922"
+        "x-envoy-upstream-service-time": "176",
+        "X-Request-ID": "3bbafb25-0e32-41bf-b33a-d16a098fc7f3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4fd46c8e-4f47-4556-af4f-ce646ece31c6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-61350e1d9b19504fbd2f9f70be946f4f-c1f208ede8dda64f-00",
+        "traceparent": "00-3fb61fac4aa8174b85a99bf7f9acdc9d-12cbaf11965de842-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ee5bfb41d0119ff0abc0abdfd5177acb",
+        "x-ms-client-request-id": "da6453e4081ba2d969f6a8fc63be6a56",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "a7da9e40-cb04-4aec-b97b-20957e8c1e96",
+        "apim-request-id": "20e03598-ab16-4f18-a3c6-d5e360bbff8d",
         "Content-Length": "997",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:52:50 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "X-Request-ID": "a7da9e40-cb04-4aec-b97b-20957e8c1e96"
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "20e03598-ab16-4f18-a3c6-d5e360bbff8d"
       },
       "ResponseBody": {
-        "dataFeedId": "4fd46c8e-4f47-4556-af4f-ce646ece31c6",
+        "dataFeedId": "0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
         "dataFeedName": "dataFeedpZPdVNQe",
         "metrics": [
           {
-            "metricId": "4e534b2d-ed1c-4999-a8b3-91ddcb9b2f63",
+            "metricId": "96a06099-3e46-409c-b526-0f6e117cff2c",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:52:50Z",
+        "createdTime": "2021-02-05T17:56:35Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/4fd46c8e-4f47-4556-af4f-ce646ece31c6",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/0a5afd6a-7cf8-4df5-a7d9-1c01db265c20",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c79890da9b15024f8cdfa3c36743e179-9da89aa022eaef45-00",
+        "traceparent": "00-15688043e841d045bde8c7a1e215727a-843d267beef81347-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "da6453e4081ba2d969f6a8fc63be6a56",
+        "x-ms-client-request-id": "d9b076ba3043fe10550b6591ae1c366a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c6b918e2-ab2d-4c88-9b00-8687594d11ac",
+        "apim-request-id": "62715c52-0d3c-40d1-852a-dd5970dafaad",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:52:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:56:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "293",
-        "X-Request-ID": "c6b918e2-ab2d-4c88-9b00-8687594d11ac"
+        "x-envoy-upstream-service-time": "370",
+        "X-Request-ID": "62715c52-0d3c-40d1-852a-dd5970dafaad"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:52:51.1570437-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:56:36.6561327-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstanceAsync.json
index 2b147d60e387..094f948b39e3 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/DataFeedLiveTests/UpdateSqlServerDataFeedWithMinimumSetupAndNewInstanceAsync.json
@@ -8,9 +8,9 @@
         "Content-Length": "234",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-69179ad9b223f143b55bb1f2b37cac1c-66e75f836df54e4f-00",
+        "traceparent": "00-bcf4d58c2f5f9649927a5cb0ba3ebeba-beef62f543ee1540-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
@@ -34,32 +34,104 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d7c554bd-3234-43c1-91e5-52cda78d4dcf",
+        "apim-request-id": "61e00e43-b0b3-4e61-b290-463f7e267435",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:22 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0df7375-7308-4417-b87c-0f4005df50fb",
+        "Date": "Fri, 05 Feb 2021 17:59:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "399",
-        "X-Request-ID": "d7c554bd-3234-43c1-91e5-52cda78d4dcf"
+        "x-envoy-upstream-service-time": "569",
+        "X-Request-ID": "61e00e43-b0b3-4e61-b290-463f7e267435"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0df7375-7308-4417-b87c-0f4005df50fb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-bcf4d58c2f5f9649927a5cb0ba3ebeba-a9f3298f7d9fbc46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9698fc16a4def208afc017e02eee2cf2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2505528c-6454-45cf-a2e2-c9236e94a0b7",
+        "Content-Length": "946",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "2505528c-6454-45cf-a2e2-c9236e94a0b7"
+      },
+      "ResponseBody": {
+        "dataFeedId": "89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
+        "dataFeedName": "dataFeedUDnNGcwm",
+        "metrics": [
+          {
+            "metricId": "9f6ffb16-5ec6-453b-8227-47f4d24dc4cb",
+            "metricName": "cost",
+            "metricDisplayName": "cost",
+            "metricDescription": ""
+          }
+        ],
+        "dimension": [],
+        "dataStartFrom": "2020-08-01T00:00:00Z",
+        "dataSourceType": "SqlServer",
+        "timestampColumn": "",
+        "startOffsetInSeconds": 0,
+        "maxQueryPerMinute": 30.0,
+        "granularityName": "Daily",
+        "granularityAmount": null,
+        "allUpIdentification": null,
+        "needRollup": "NoRollup",
+        "fillMissingPointType": "PreviousValue",
+        "fillMissingPointValue": 0.0,
+        "rollUpMethod": "None",
+        "rollUpColumns": [],
+        "dataFeedDescription": "",
+        "stopRetryAfterInSeconds": -1,
+        "minRetryIntervalInSeconds": -1,
+        "maxConcurrency": -1,
+        "viewMode": "Private",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "viewers": [],
+        "creator": "foo@contoso.com",
+        "status": "Active",
+        "createdTime": "2021-02-05T17:59:11Z",
+        "isAdmin": true,
+        "actionLinkTemplate": "",
+        "dataSourceParameter": {
+          "connectionString": "Sanitized",
+          "query": "query"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "99",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7f0c2d356ee1e147b6153dc6f2b19e4d-a75d98f4694c7f42-00",
+        "traceparent": "00-6991d9b3e7469542b58b7074d31458dc-cea002310bb18d47-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9698fc16a4def208afc017e02eee2cf2",
+        "x-ms-client-request-id": "00bb799bcf08c8b948abb2aa8a9f4319",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -68,49 +140,49 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bbdd56af-3cf4-455d-93b2-679ae50b728d",
+        "apim-request-id": "1bae308c-457d-437c-84d4-94e4b58bf13f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "170",
-        "X-Request-ID": "bbdd56af-3cf4-455d-93b2-679ae50b728d"
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "1bae308c-457d-437c-84d4-94e4b58bf13f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0df7375-7308-4417-b87c-0f4005df50fb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f09097c700dfc44282c870eb63150597-91b684b9c65f0247-00",
+        "traceparent": "00-4380309ff8526c42a1691ba77ade5798-4b5ea99c0920b74e-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "00bb799bcf08c8b948abb2aa8a9f4319",
+        "x-ms-client-request-id": "8f99237d3d8958dfdc00543df979666c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "10186c80-8461-47d3-9e6a-d179d2bbbf67",
+        "apim-request-id": "f1c34cc2-d7eb-4f56-b584-ed4aad2e7148",
         "Content-Length": "997",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Mon, 01 Feb 2021 15:53:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "X-Request-ID": "10186c80-8461-47d3-9e6a-d179d2bbbf67"
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "f1c34cc2-d7eb-4f56-b584-ed4aad2e7148"
       },
       "ResponseBody": {
-        "dataFeedId": "e0df7375-7308-4417-b87c-0f4005df50fb",
+        "dataFeedId": "89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
         "dataFeedName": "dataFeedUDnNGcwm",
         "metrics": [
           {
-            "metricId": "c5af831a-ef36-4cb8-bd9b-9ab26104ec4c",
+            "metricId": "9f6ffb16-5ec6-453b-8227-47f4d24dc4cb",
             "metricName": "cost",
             "metricDisplayName": "cost",
             "metricDescription": ""
@@ -141,7 +213,7 @@
         "viewers": [],
         "creator": "foo@contoso.com",
         "status": "Active",
-        "createdTime": "2021-02-01T15:53:23Z",
+        "createdTime": "2021-02-05T17:59:11Z",
         "isAdmin": true,
         "actionLinkTemplate": "",
         "dataSourceParameter": {
@@ -151,36 +223,36 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/e0df7375-7308-4417-b87c-0f4005df50fb",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/89b126e1-7fcd-45cb-9c69-d1f29a8b5cc2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f74b5484c5d85a40a37a21e5e3869885-034e03f9f4f45a49-00",
+        "traceparent": "00-596eb61a4088544781145a172e0cea8c-3ca7e74aca66b249-00",
         "User-Agent": [
-          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210201.1",
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8f99237d3d8958dfdc00543df979666c",
+        "x-ms-client-request-id": "fc80fdb9ce6c470542cf4d32f15e670f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f977ae63-0863-4b5f-add1-2dd3ff1ad79a",
+        "apim-request-id": "895ceff3-226b-4277-bbce-5d52b8977d1f",
         "Content-Length": "0",
-        "Date": "Mon, 01 Feb 2021 15:53:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "333",
-        "X-Request-ID": "f977ae63-0863-4b5f-add1-2dd3ff1ad79a"
+        "x-envoy-upstream-service-time": "286",
+        "X-Request-ID": "895ceff3-226b-4277-bbce-5d52b8977d1f"
       },
       "ResponseBody": []
     }
   ],
   "Variables": {
-    "DateTimeOffsetNow": "2021-02-01T07:53:23.6113771-08:00",
+    "DateTimeOffsetNow": "2021-02-05T09:59:11.8193176-08:00",
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False).json
index b2de6362b7e9..d6c52c683617 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9ecb83b560c0e74dba92013a2da54cde-c315018bd34d4944-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-458159ebbde04e4ca2a7f847edb36f64-b8fe5a7458d0cf42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6ee714c28e157e946a8f0d2ece061343",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "a7ab43b1-0ea5-4af9-b261-251af45eb9fd",
+        "apim-request-id": "49f9530b-934a-49cc-b26e-3acb1734df2c",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:52 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/55b43741-6fbe-466d-8bbc-367dbed8e877",
+        "Date": "Fri, 05 Feb 2021 17:59:46 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1e580bb-477b-4069-8e8c-12f883085f50",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "451",
-        "x-request-id": "a7ab43b1-0ea5-4af9-b261-251af45eb9fd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "311",
+        "X-Request-ID": "49f9530b-934a-49cc-b26e-3acb1734df2c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/55b43741-6fbe-466d-8bbc-367dbed8e877",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1e580bb-477b-4069-8e8c-12f883085f50",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-de7dff4c5380f443aa5c166da137b875-44914f1c25b32147-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-458159ebbde04e4ca2a7f847edb36f64-ed5182ab2d20d44d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c58fd6cdf9579d1583dff47563ea6443",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "6d2c5f6a-aaf1-4c3b-8d53-b911cac1f60e",
+        "apim-request-id": "5e24c9ca-1c6d-4dba-b878-99d8ef8f58f1",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "x-request-id": "6d2c5f6a-aaf1-4c3b-8d53-b911cac1f60e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "5e24c9ca-1c6d-4dba-b878-99d8ef8f58f1"
       },
       "ResponseBody": {
-        "hookId": "55b43741-6fbe-466d-8bbc-367dbed8e877",
+        "hookId": "d1e580bb-477b-4069-8e8c-12f883085f50",
         "hookName": "hooki7HPq1VT",
         "hookType": "Email",
         "externalLink": "",
@@ -79,27 +85,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/55b43741-6fbe-466d-8bbc-367dbed8e877",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1e580bb-477b-4069-8e8c-12f883085f50",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2b909d072f325f4c8cdc01b396b96831-249ebbd40b925540-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-efb6117ded9b434890bdee863eccefdc-d10096c87eb69a42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "1bb5b6865317ec5648ba41e62d081537",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "33f7e9b3-4e32-44c2-a4f1-87b99f70dc1c",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "150",
+        "X-Request-ID": "33f7e9b3-4e32-44c2-a4f1-87b99f70dc1c"
+      },
+      "ResponseBody": {
+        "hookId": "d1e580bb-477b-4069-8e8c-12f883085f50",
+        "hookName": "hooki7HPq1VT",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1e580bb-477b-4069-8e8c-12f883085f50",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ecf9b1423c3ff744aae8fd2caddbd200-bd1d964a342c064a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "007f371e668dc9fdfe49ea359a1e1b7f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "d32bca23-89e6-4b97-82e3-308c7e8641ca",
+        "apim-request-id": "a5edcb27-ba13-4cb7-9047-2a5bc3683cba",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "208",
-        "x-request-id": "d32bca23-89e6-4b97-82e3-308c7e8641ca"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "189",
+        "X-Request-ID": "a5edcb27-ba13-4cb7-9047-2a5bc3683cba"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False)Async.json
index 06c967828fc1..d0a5d1b31525 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b475e2e6df665b4c8460cc5543db3e69-cde91ba7c3459749-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a834157e322e7449d545cdeb7757642-cdfc5a5f32f56244-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2b092b1ded82cfc72e0e670d8ec91b12",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "432003c1-4932-4af8-b9b7-97acf2993920",
+        "apim-request-id": "e72cefe9-268a-49c5-b3c9-428812faeed5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:01 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/74322285-6c09-4188-aae0-131b92680bbd",
+        "Date": "Fri, 05 Feb 2021 18:00:10 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d95690bc-1018-4b8c-b077-c248914f632b",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "458",
-        "x-request-id": "432003c1-4932-4af8-b9b7-97acf2993920"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "561",
+        "X-Request-ID": "e72cefe9-268a-49c5-b3c9-428812faeed5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/74322285-6c09-4188-aae0-131b92680bbd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d95690bc-1018-4b8c-b077-c248914f632b",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-be9be24b88abbf448fb87b1a78a727ef-25204f12b3daf849-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a834157e322e7449d545cdeb7757642-e0985403d3fc9244-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "22d72000d618d73e588b0fa661eb07b9",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "15c1c147-9b14-4958-af8e-4c265ed3eb29",
+        "apim-request-id": "3675531e-dc72-46b4-bcae-f33beee96055",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:01 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:11 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "x-request-id": "15c1c147-9b14-4958-af8e-4c265ed3eb29"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "141",
+        "X-Request-ID": "3675531e-dc72-46b4-bcae-f33beee96055"
       },
       "ResponseBody": {
-        "hookId": "74322285-6c09-4188-aae0-131b92680bbd",
+        "hookId": "d95690bc-1018-4b8c-b077-c248914f632b",
         "hookName": "hookcY2nIDTu",
         "hookType": "Email",
         "externalLink": "",
@@ -79,27 +85,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/74322285-6c09-4188-aae0-131b92680bbd",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d95690bc-1018-4b8c-b077-c248914f632b",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ef1f47b4a2fe14499a2831c64990b753-c7446e11aae9844c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b9b596d01baeeb448cd343d5e2331150-245eb060732f0b4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "9843a98a1953b165e25fe021deda1d2a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f6524348-36e6-4abc-b22c-621c957d7ec6",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:11 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "151",
+        "X-Request-ID": "f6524348-36e6-4abc-b22c-621c957d7ec6"
+      },
+      "ResponseBody": {
+        "hookId": "d95690bc-1018-4b8c-b077-c248914f632b",
+        "hookName": "hookcY2nIDTu",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d95690bc-1018-4b8c-b077-c248914f632b",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d9534df80884bf498cbbe482947adb63-936c6dfe5e89314a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "ebda97bc685447e3ed31d2f6de206d42",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "09f4c773-7114-406a-83f2-e90f838b778b",
+        "apim-request-id": "15e44bf4-7a3e-42b9-8b14-ec1b61e735bc",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:01 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:12 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "191",
-        "x-request-id": "09f4c773-7114-406a-83f2-e90f838b778b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "15e44bf4-7a3e-42b9-8b14-ec1b61e735bc"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True).json
index 6d16ae6ebc8d..b47928389806 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "111",
         "Content-Type": "application/json",
-        "traceparent": "00-f4d35256b20bd643b37826710c0bc39c-df435bf705482141-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b62e7bd735094e4792c64b4f3d35977c-5a05be95fd10ed49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "407627c58510cb5c5251e527b74ea891",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,45 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "fee12905-e9c3-4ec4-984e-c962013cfbf8",
+        "apim-request-id": "be201e8e-a344-4642-b4e5-a4e3650df7b4",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2f5ee5ac-f511-4d97-8ce1-19ebeef6461c",
+        "Date": "Fri, 05 Feb 2021 17:59:45 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "463",
-        "x-request-id": "fee12905-e9c3-4ec4-984e-c962013cfbf8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "252",
+        "X-Request-ID": "be201e8e-a344-4642-b4e5-a4e3650df7b4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2f5ee5ac-f511-4d97-8ce1-19ebeef6461c",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-49cdce1a12f4e640b4c455158fca1aea-3bbf8036b295cc4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b62e7bd735094e4792c64b4f3d35977c-6ca075d13de4bb42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "e8478d1a334f0fe90d95f094229f8839",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "43219df2-77c5-4ca8-ad1f-01dbc2c666d5",
+        "apim-request-id": "3b2b0426-cffe-4633-b490-7119010800d4",
         "Content-Length": "244",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "76",
-        "x-request-id": "43219df2-77c5-4ca8-ad1f-01dbc2c666d5"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "102",
+        "X-Request-ID": "3b2b0426-cffe-4633-b490-7119010800d4"
       },
       "ResponseBody": {
-        "hookId": "2f5ee5ac-f511-4d97-8ce1-19ebeef6461c",
+        "hookId": "cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
         "hookName": "hookcOKzRhKj",
         "hookType": "Email",
         "externalLink": "",
@@ -77,26 +83,72 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2f5ee5ac-f511-4d97-8ce1-19ebeef6461c",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-e9b4e3de707b8b439579223c10c5f357-2e669e5281784b4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-54c2d621abe4d34eac2b67b0f859c573-7d443128f8080b4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "7d665441d57981dbaec1311d3d76b8c2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "4f2b93be-c5d7-43c8-a899-000c0eadc36c",
+        "Content-Length": "244",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:46 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "92",
+        "X-Request-ID": "4f2b93be-c5d7-43c8-a899-000c0eadc36c"
+      },
+      "ResponseBody": {
+        "hookId": "cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
+        "hookName": "hookcOKzRhKj",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cfb28ddb-337d-44a7-b48b-b9b2723af5a2",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-d29d50a11fb84c4eb0ca750dcd171c75-31f253b22e32ba47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "46c0b7de573192483d66327b94c7a8b3",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4124b4fb-84f6-437d-9e1d-b37fe7df0192",
+        "apim-request-id": "f5cf8b88-6ac1-4101-a5fb-097ca40ddc5e",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:51 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:46 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "108",
-        "x-request-id": "4124b4fb-84f6-437d-9e1d-b37fe7df0192"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "121",
+        "X-Request-ID": "f5cf8b88-6ac1-4101-a5fb-097ca40ddc5e"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True)Async.json
index 3899410bdc49..1535099e1cee 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithMinimumSetup(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "111",
         "Content-Type": "application/json",
-        "traceparent": "00-3e926a1e3ce1754eb64f698ccd0c6e50-25363e8c96ff6344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-544d6115ed86a241a551c3c3bd18ef7f-1a502ad304b8e34e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "650ea4f7ea8fa04a4748e3dce690c1c6",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,45 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "623d0af6-762f-492e-b8dd-2795d7e29f25",
+        "apim-request-id": "4b769657-9052-465e-b819-7464801300a2",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:00 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/253b3d1e-edb5-449e-9487-7ae5da17f856",
+        "Date": "Fri, 05 Feb 2021 18:00:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d02684b3-c12f-4f85-ac73-882abe6fcb64",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "442",
-        "x-request-id": "623d0af6-762f-492e-b8dd-2795d7e29f25"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "480",
+        "X-Request-ID": "4b769657-9052-465e-b819-7464801300a2"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/253b3d1e-edb5-449e-9487-7ae5da17f856",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d02684b3-c12f-4f85-ac73-882abe6fcb64",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-9890bea8f3e11a438dda732e68bcdc22-ab451a3bdb17144b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-544d6115ed86a241a551c3c3bd18ef7f-3286d5a670afcd4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "3c64a701bbed41a735ec2d4d0eb81584",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "162c36f7-cda6-4603-ac8a-87a368028424",
+        "apim-request-id": "51f66282-a7bb-457a-95fc-ee447af2f59c",
         "Content-Length": "244",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:00 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "162c36f7-cda6-4603-ac8a-87a368028424"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "74",
+        "X-Request-ID": "51f66282-a7bb-457a-95fc-ee447af2f59c"
       },
       "ResponseBody": {
-        "hookId": "253b3d1e-edb5-449e-9487-7ae5da17f856",
+        "hookId": "d02684b3-c12f-4f85-ac73-882abe6fcb64",
         "hookName": "hookEC4kq5sF",
         "hookType": "Email",
         "externalLink": "",
@@ -77,26 +83,72 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/253b3d1e-edb5-449e-9487-7ae5da17f856",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d02684b3-c12f-4f85-ac73-882abe6fcb64",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-bfdc9a6444192b46868fcaa6b399f25b-010652aee1f0e84c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7f8b87a7c81ac34d962b73de86df139f-ca53e4c7e301d84b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "9460ae45da873ac2393864c6cf9b925a",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "ad288758-2c83-4906-b48d-679b05387145",
+        "Content-Length": "244",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:10 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "78",
+        "X-Request-ID": "ad288758-2c83-4906-b48d-679b05387145"
+      },
+      "ResponseBody": {
+        "hookId": "d02684b3-c12f-4f85-ac73-882abe6fcb64",
+        "hookName": "hookEC4kq5sF",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d02684b3-c12f-4f85-ac73-882abe6fcb64",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-d68f78f5ddd1e545824a62f47473ba3e-cdfac5fa3693c44e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "1b482e2ef2d53b89fdcd2fa3bcfc918e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "6a9e925e-6821-4b70-8498-5eb0555daefe",
+        "apim-request-id": "c73f5208-61a6-41b4-a49e-c4c0bd91ab15",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:00 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "108",
-        "x-request-id": "6a9e925e-6821-4b70-8498-5eb0555daefe"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "91",
+        "X-Request-ID": "c73f5208-61a6-41b4-a49e-c4c0bd91ab15"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembers.json
index 20c55fc61dfb..38afd5dd5ddb 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembers.json
@@ -8,8 +8,11 @@
         "Content-Length": "216",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-34a68b800caa404ebe64e5f27d6eecd3-1dc5207aec758a46-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02641f942d395749b37dd3006040048f-f28cc87c88ed3048-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5dd6d5298f1147cda30d3708915df97b",
         "x-ms-return-client-request-id": "true"
@@ -28,25 +31,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f06f791d-4c13-4f86-a553-a69e9d96d9b4",
+        "apim-request-id": "030ddff0-be60-4c2a-9220-8b80282cd5aa",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:52 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/f2dad10c-c809-4cc8-a267-82726b1d5f14",
+        "Date": "Fri, 05 Feb 2021 17:59:22 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b0fdc96-69d8-4933-a729-5f830c61317f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "244",
-        "x-request-id": "f06f791d-4c13-4f86-a553-a69e9d96d9b4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "338",
+        "X-Request-ID": "030ddff0-be60-4c2a-9220-8b80282cd5aa"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/f2dad10c-c809-4cc8-a267-82726b1d5f14",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b0fdc96-69d8-4933-a729-5f830c61317f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ab12429721140448948a1445173e71a2-d72ac5e830cd2246-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-02641f942d395749b37dd3006040048f-735fd99d0c13f649-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "3d6c0bfcda192e778c1fb184b3342b92",
         "x-ms-return-client-request-id": "true"
@@ -54,17 +60,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5cf0051c-69e0-4197-9660-3a591089df4f",
+        "apim-request-id": "e13ac418-77b1-4123-bf16-c6af35a05b13",
         "Content-Length": "293",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:34:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "x-request-id": "5cf0051c-69e0-4197-9660-3a591089df4f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "e13ac418-77b1-4123-bf16-c6af35a05b13"
       },
       "ResponseBody": {
-        "hookId": "f2dad10c-c809-4cc8-a267-82726b1d5f14",
+        "hookId": "8b0fdc96-69d8-4933-a729-5f830c61317f",
         "hookName": "hookZV8qsw09",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -81,27 +87,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/f2dad10c-c809-4cc8-a267-82726b1d5f14",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b0fdc96-69d8-4933-a729-5f830c61317f",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-01e5d5b178cbca4ab6622c03b8a15574-d79987afe068f944-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-17bd81927bdc21479070fb1caf1bb20b-2873081b466e8947-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b0389bacd4bb3884ffd5600cd0146d96",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "790e14d1-e637-48eb-a875-86cb41d8f361",
+        "Content-Length": "293",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:23 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "187",
+        "X-Request-ID": "790e14d1-e637-48eb-a875-86cb41d8f361"
+      },
+      "ResponseBody": {
+        "hookId": "8b0fdc96-69d8-4933-a729-5f830c61317f",
+        "hookName": "hookZV8qsw09",
+        "hookType": "Email",
+        "externalLink": "http://fake.endpoint.com",
+        "description": "This hook was created to test the .NET client.",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b0fdc96-69d8-4933-a729-5f830c61317f",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a55fb847f195a843a2fed4328f1a5f16-01f5abb79592ae44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "8233c7c1c5f34fa25da7d0f2de49936e",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "e59a7c1d-a5f9-4152-8c52-d991c654b4d2",
+        "apim-request-id": "23f98c4e-74f6-4f6a-ba6d-169e60cb5e28",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:23 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "185",
-        "x-request-id": "e59a7c1d-a5f9-4152-8c52-d991c654b4d2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "23f98c4e-74f6-4f6a-ba6d-169e60cb5e28"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembersAsync.json
index 8d48b9bf7941..6cc454af7418 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetEmailNotificationHookWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "216",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-87b2c3a1c59da9479df44591fedd5d76-e5ca43d5ff90de40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6c9185f3466bb4489207237b5ff3bd93-338182643dd0cf47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "407cce05394e2e6d0077cf419e351e0e",
         "x-ms-return-client-request-id": "true"
@@ -28,25 +31,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "75145f32-d500-497b-a8d1-2dc3d5cce145",
+        "apim-request-id": "47506933-7ed7-457c-a329-79842aa3b9d4",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:22 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/913a06d2-a085-476e-96c7-0ea4cf3b404b",
+        "Date": "Fri, 05 Feb 2021 17:59:50 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/0246b77c-77c5-4e8a-b6a6-e52f18e07923",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "472",
-        "x-request-id": "75145f32-d500-497b-a8d1-2dc3d5cce145"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "310",
+        "X-Request-ID": "47506933-7ed7-457c-a329-79842aa3b9d4"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/913a06d2-a085-476e-96c7-0ea4cf3b404b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/0246b77c-77c5-4e8a-b6a6-e52f18e07923",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f738cfbcdc96c248b4ca1a4ccab53449-3419fe4f850e9a47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6c9185f3466bb4489207237b5ff3bd93-8971a862ed715d42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a7f44bd82db67b16a5e9b9e6cf5ed223",
         "x-ms-return-client-request-id": "true"
@@ -54,17 +60,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4221f103-a2e6-4481-bbe4-47bf23bf41d2",
+        "apim-request-id": "3a36d447-6376-4273-a620-42edf9fef117",
         "Content-Length": "293",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "x-request-id": "4221f103-a2e6-4481-bbe4-47bf23bf41d2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "3a36d447-6376-4273-a620-42edf9fef117"
       },
       "ResponseBody": {
-        "hookId": "913a06d2-a085-476e-96c7-0ea4cf3b404b",
+        "hookId": "0246b77c-77c5-4e8a-b6a6-e52f18e07923",
         "hookName": "hook6PLetwXA",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -81,27 +87,74 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/913a06d2-a085-476e-96c7-0ea4cf3b404b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/0246b77c-77c5-4e8a-b6a6-e52f18e07923",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-82d53b4892da984bb15ab44ab009e939-6ca88493aeb8cf45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-043d1f60d6273640a327bc50f4992fee-2a7a2b2f8b8e6c47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c0e4375892bbff2086376d76da339d8f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "8d479fef-8555-4524-80fc-0ada83b8fdf1",
+        "Content-Length": "293",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:51 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "8d479fef-8555-4524-80fc-0ada83b8fdf1"
+      },
+      "ResponseBody": {
+        "hookId": "0246b77c-77c5-4e8a-b6a6-e52f18e07923",
+        "hookName": "hook6PLetwXA",
+        "hookType": "Email",
+        "externalLink": "http://fake.endpoint.com",
+        "description": "This hook was created to test the .NET client.",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/0246b77c-77c5-4e8a-b6a6-e52f18e07923",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-98573356c812c945b6939875c9c2744f-7c07378d9196da46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "af81efa88ad3d779b7009b647f875fa1",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ee3998ea-d7b0-4685-babd-95ec1d2ec32b",
+        "apim-request-id": "3d8f0406-b784-4eb7-b428-ef38f30e0635",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:22 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:51 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "171",
-        "x-request-id": "ee3998ea-d7b0-4685-babd-95ec1d2ec32b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "3d8f0406-b784-4eb7-b428-ef38f30e0635"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetup.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetup.json
index 7001c1e9bbec..89299d0c2376 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetup.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetup.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c5eaf60d654d334abee56220726d793e-1876c013594a1d49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-93ef5a4c05fa2745b6fe4a81bca3817e-8529eb8b5185364e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "6aafb23160219ff3c9d57c9f4a372110",
         "x-ms-return-client-request-id": "true"
@@ -23,25 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "88da424d-589e-494d-ba12-92a4521ec327",
+        "apim-request-id": "262b155f-e711-4722-baa1-cb32f263774f",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:53 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/fa71c985-fcf3-47cc-9c74-daa3845d3374",
+        "Date": "Fri, 05 Feb 2021 17:59:24 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d3fdb5da-82d5-486a-a234-821d87966757",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "838",
-        "x-request-id": "88da424d-589e-494d-ba12-92a4521ec327"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "867",
+        "X-Request-ID": "262b155f-e711-4722-baa1-cb32f263774f"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/fa71c985-fcf3-47cc-9c74-daa3845d3374",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d3fdb5da-82d5-486a-a234-821d87966757",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-e97ef2e700d69f4cbe9aff434e6c4df6-31fbcefcf6f61149-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-93ef5a4c05fa2745b6fe4a81bca3817e-a624eaa4fe8caa46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bddb60bf0af21f483df04fed6e3710eb",
         "x-ms-return-client-request-id": "true"
@@ -49,17 +55,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4fc273f4-7abb-4425-9d79-8f52a2bab574",
+        "apim-request-id": "7b34ced7-733f-436a-b7b9-a213e8ff96ab",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:34:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:24 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "x-request-id": "4fc273f4-7abb-4425-9d79-8f52a2bab574"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "7b34ced7-733f-436a-b7b9-a213e8ff96ab"
       },
       "ResponseBody": {
-        "hookId": "fa71c985-fcf3-47cc-9c74-daa3845d3374",
+        "hookId": "d3fdb5da-82d5-486a-a234-821d87966757",
         "hookName": "hookBk7jff1D",
         "hookType": "Webhook",
         "externalLink": "",
@@ -78,27 +84,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/fa71c985-fcf3-47cc-9c74-daa3845d3374",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d3fdb5da-82d5-486a-a234-821d87966757",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9918667171af964b9692101db3d5d67a-e38f439ceecd1544-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-50ece11995b7e348a1293eb5ce42348d-2fe5d95814f94c40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "dd1e8843ac2e5caba6681b1dbae9561c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a4aed718-7ac4-432d-a32e-d70ca99f05fe",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:24 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "a4aed718-7ac4-432d-a32e-d70ca99f05fe"
+      },
+      "ResponseBody": {
+        "hookId": "d3fdb5da-82d5-486a-a234-821d87966757",
+        "hookName": "hookBk7jff1D",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d3fdb5da-82d5-486a-a234-821d87966757",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-822f52fbef9f7f4c8e4e96274c6db916-a6d3e5f10f3b7a45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "c094d0c3a77626b769902c3110063192",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b4955b03-2194-4612-aae2-d3aa6b8e10bd",
+        "apim-request-id": "f4cc6ed2-e8f4-40d5-973c-43c97a802a2e",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:25 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "x-request-id": "b4955b03-2194-4612-aae2-d3aa6b8e10bd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "194",
+        "X-Request-ID": "f4cc6ed2-e8f4-40d5-973c-43c97a802a2e"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetupAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetupAsync.json
index 705bdb3da675..c59730c537e2 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetupAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithMinimumSetupAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f3e415192570b04e808313cf74f416ca-07a0629547b25d45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-31d37e2b5a90024586fc3750fa3a7d9b-f839c3f91c5b644e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "330cb546ab8eb830f539dfd94e1dbcb4",
         "x-ms-return-client-request-id": "true"
@@ -23,25 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "2cd8838e-9f37-4143-b728-5639371cbd68",
+        "apim-request-id": "e3cb036f-15a8-4598-8afd-4d503731dc79",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:23 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c60c6b52-307b-42ae-99d0-293b24c36f16",
+        "Date": "Fri, 05 Feb 2021 17:59:52 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a74deb7e-b31e-4288-8afa-de8acd37b342",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1340",
-        "x-request-id": "2cd8838e-9f37-4143-b728-5639371cbd68"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "864",
+        "X-Request-ID": "e3cb036f-15a8-4598-8afd-4d503731dc79"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c60c6b52-307b-42ae-99d0-293b24c36f16",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a74deb7e-b31e-4288-8afa-de8acd37b342",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c7c36e5e3c2864478d5317142a3ed653-89088ab881c01840-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-31d37e2b5a90024586fc3750fa3a7d9b-aeea479d0f45db44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c5fd67a7746a7e0ee81a26f209ff5e59",
         "x-ms-return-client-request-id": "true"
@@ -49,17 +55,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "318315ec-a9ff-40fa-b06b-4959f6e7a864",
+        "apim-request-id": "688642c1-16f9-43aa-8272-31061c6eb2c6",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:23 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "133",
-        "x-request-id": "318315ec-a9ff-40fa-b06b-4959f6e7a864"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "688642c1-16f9-43aa-8272-31061c6eb2c6"
       },
       "ResponseBody": {
-        "hookId": "c60c6b52-307b-42ae-99d0-293b24c36f16",
+        "hookId": "a74deb7e-b31e-4288-8afa-de8acd37b342",
         "hookName": "hookkkKbUn4V",
         "hookType": "Webhook",
         "externalLink": "",
@@ -78,27 +84,76 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/c60c6b52-307b-42ae-99d0-293b24c36f16",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a74deb7e-b31e-4288-8afa-de8acd37b342",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a894c4d281b8ff4394661d761634d188-ac07cad8b77c8746-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b35783fb04f9cd48ad8e29d05a3aeea6-7e2feac80ed9a74b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "7fc18b6651fe31137dcaf3f9270314f0",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "04a47daf-aeb1-4821-9054-0240fc83d5cb",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:52 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "04a47daf-aeb1-4821-9054-0240fc83d5cb"
+      },
+      "ResponseBody": {
+        "hookId": "a74deb7e-b31e-4288-8afa-de8acd37b342",
+        "hookName": "hookkkKbUn4V",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a74deb7e-b31e-4288-8afa-de8acd37b342",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ec67079001574247b0bf273945023025-e78f520f74d3474a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "990d45b018dcd1c7a78e4a74843eaef5",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "efd4d837-9662-46ca-a18d-af0678e90e9b",
+        "apim-request-id": "b0dc4f80-ed14-4842-a525-1cbe6df778c5",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:24 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:52 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "169",
-        "x-request-id": "efd4d837-9662-46ca-a18d-af0678e90e9b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "X-Request-ID": "b0dc4f80-ed14-4842-a525-1cbe6df778c5"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembers.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembers.json
index 2523c1150d88..a7142bcc293d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembers.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembers.json
@@ -8,8 +8,11 @@
         "Content-Length": "336",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bc53c9a3372c8d4da660150b8bbdcf48-9607a29a3333004f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d82563e210722c47bfec01f18fbbdacd-ad38ad934c5b3442-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "68a29e9331eb79b61978960dd32be951",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e4b79573-537f-4472-b869-7a5ced07a3af",
+        "apim-request-id": "c640a93a-9ea8-4c17-aa91-59e9a7ab26ad",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/468fefb4-48a7-45f3-9004-712970dd8de4",
+        "Date": "Fri, 05 Feb 2021 17:59:25 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/508b95cc-0da1-4446-bfc9-123a8b8d94e6",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "907",
-        "x-request-id": "e4b79573-537f-4472-b869-7a5ced07a3af"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "662",
+        "X-Request-ID": "c640a93a-9ea8-4c17-aa91-59e9a7ab26ad"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/468fefb4-48a7-45f3-9004-712970dd8de4",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/508b95cc-0da1-4446-bfc9-123a8b8d94e6",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-52edbc4701702943a7c94f3055168a1b-57282944f536ee4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-d82563e210722c47bfec01f18fbbdacd-cff7508e9a0ef342-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e851da46b527a8d763988b67940c5010",
         "x-ms-return-client-request-id": "true"
@@ -58,17 +64,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "adfc3067-3942-4904-9779-afeefa3ca709",
+        "apim-request-id": "543fdd5c-3b13-4fc3-83a9-64ac1b1aa1bb",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:34:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "141",
-        "x-request-id": "adfc3067-3942-4904-9779-afeefa3ca709"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "543fdd5c-3b13-4fc3-83a9-64ac1b1aa1bb"
       },
       "ResponseBody": {
-        "hookId": "468fefb4-48a7-45f3-9004-712970dd8de4",
+        "hookId": "508b95cc-0da1-4446-bfc9-123a8b8d94e6",
         "hookName": "hookRe41alng",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
@@ -90,27 +96,79 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/468fefb4-48a7-45f3-9004-712970dd8de4",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/508b95cc-0da1-4446-bfc9-123a8b8d94e6",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-715380db248f084eb6cf35379a0d8971-43b85477b6ca754d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-90fbb9a40a42e14b93770ffaff3e2a75-739e202809e7d843-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d08079f40fb960c783e01e2c3691f5f5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "2be1c225-0975-48a8-be21-83e2289db46d",
+        "Content-Length": "433",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:26 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "2be1c225-0975-48a8-be21-83e2289db46d"
+      },
+      "ResponseBody": {
+        "hookId": "508b95cc-0da1-4446-bfc9-123a8b8d94e6",
+        "hookName": "hookRe41alng",
+        "hookType": "Webhook",
+        "externalLink": "http://fake.endpoint.com",
+        "description": "This hook was created to test the .NET client.",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "fakeUsername",
+          "password": "fakePassword",
+          "headers": {
+            "key1": "value1",
+            "key2": "value2"
+          },
+          "certificateKey": "",
+          "certificatePassword": "certPassword"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/508b95cc-0da1-4446-bfc9-123a8b8d94e6",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-fe2d0c916a02ac498ecafae1b504a406-5ae66271559e0042-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "24c0215e7904dec0c7f90553a64fe50c",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1b8dcb05-9862-4efe-aab9-341927f8051a",
+        "apim-request-id": "cbff339c-2ef8-429a-83f4-0a548cea15e6",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:26 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "170",
-        "x-request-id": "1b8dcb05-9862-4efe-aab9-341927f8051a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "183",
+        "X-Request-ID": "cbff339c-2ef8-429a-83f4-0a548cea15e6"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembersAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembersAsync.json
index 421715488b2c..ea8c69c67117 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembersAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/CreateAndGetWebNotificationHookWithOptionalMembersAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "336",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-696eeebffe97ca4795b426484eb5d0d3-3756a8fe8ae1c044-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-86223155377c194fa7f20882c48caf49-8613aaa99a357b4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "2b03f93d6e345a6817b09e61a06d523f",
         "x-ms-return-client-request-id": "true"
@@ -32,25 +35,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d9928e20-8317-474b-b387-f4f6daff3279",
+        "apim-request-id": "c8d9494f-0a28-4edc-952f-91f10daa5544",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:25 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ca9e6309-4a89-48be-96f0-8a40ff91813b",
+        "Date": "Fri, 05 Feb 2021 17:59:53 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "955",
-        "x-request-id": "d9928e20-8317-474b-b387-f4f6daff3279"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "848",
+        "X-Request-ID": "c8d9494f-0a28-4edc-952f-91f10daa5544"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ca9e6309-4a89-48be-96f0-8a40ff91813b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-05f466a15a20dd498c5ce0945e756c1c-504431cf45d8634c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-86223155377c194fa7f20882c48caf49-a16af6b44dff854b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "38e96b9b2a24beb5978e01f0ae0c7dce",
         "x-ms-return-client-request-id": "true"
@@ -58,17 +64,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5db8ab67-3475-4225-8576-3c6eb20ad5a6",
+        "apim-request-id": "3b29bcba-ad0e-46d8-a48b-d2666b08664d",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:53 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "151",
-        "x-request-id": "5db8ab67-3475-4225-8576-3c6eb20ad5a6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "3b29bcba-ad0e-46d8-a48b-d2666b08664d"
       },
       "ResponseBody": {
-        "hookId": "ca9e6309-4a89-48be-96f0-8a40ff91813b",
+        "hookId": "33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
         "hookName": "hookJAH8Q20b",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
@@ -90,27 +96,79 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ca9e6309-4a89-48be-96f0-8a40ff91813b",
-      "RequestMethod": "DELETE",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
+      "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5222c36c6e147146be938ee75783f00b-e4de667045446c47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ecb3b00b1e0d344d8bde2514185d97a5-75c36bd22f03d547-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "55c2cfacaec1872fb661640ca726d281",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d2738f0f-962c-4779-a920-874052465608",
+        "Content-Length": "433",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:54 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "d2738f0f-962c-4779-a920-874052465608"
+      },
+      "ResponseBody": {
+        "hookId": "33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
+        "hookName": "hookJAH8Q20b",
+        "hookType": "Webhook",
+        "externalLink": "http://fake.endpoint.com",
+        "description": "This hook was created to test the .NET client.",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "fakeUsername",
+          "password": "fakePassword",
+          "headers": {
+            "key1": "value1",
+            "key2": "value2"
+          },
+          "certificateKey": "",
+          "certificatePassword": "certPassword"
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/33d6a7dd-0e9a-41d5-abdc-515d83f0fcd0",
+      "RequestMethod": "DELETE",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b641fe9ae8da644f8443bc29d5730efe-966769d24e44724a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d5e1d40781fb1323434594a56c78ab0b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c955a687-40ac-4b9d-80df-32266db42a2c",
+        "apim-request-id": "aab4df03-9021-46e2-842c-749d43b5b895",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:25 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:54 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "c955a687-40ac-4b9d-80df-32266db42a2c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "178",
+        "X-Request-ID": "aab4df03-9021-46e2-842c-749d43b5b895"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False).json
index eb15a226dc42..dd83f657ca65 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False).json
@@ -8,10 +8,13 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5fa6b604aef7b84488e0991a87f7454c-1250efc9c65cdd43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-aacc47cb1c12cf41936cf3c0cea3cbf0-d51811314c6cc54d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "64d04e1b2390fa8ee7aae637a94a7110",
+        "x-ms-client-request-id": "270f073b068196046d3220f69c3db8aa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,69 +22,121 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hookWRCFiNC3"
+        "hookName": "hookYNnXVxqT"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f7089c59-d069-4fe9-9f86-ebfe7adda680",
+        "apim-request-id": "dbe6f4c2-6162-4dca-9261-92ab4307c178",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:55 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2466fbd7-b3fb-4064-be16-75db83a44633",
+        "Date": "Fri, 05 Feb 2021 18:38:18 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1aa215d0-5411-498b-9bf4-fbfd4b8b8481",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "909",
-        "x-request-id": "f7089c59-d069-4fe9-9f86-ebfe7adda680"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1030",
+        "X-Request-ID": "dbe6f4c2-6162-4dca-9261-92ab4307c178"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2466fbd7-b3fb-4064-be16-75db83a44633",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1aa215d0-5411-498b-9bf4-fbfd4b8b8481",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-aacc47cb1c12cf41936cf3c0cea3cbf0-39ba2dc6562fba4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "856cc4854945c8378189770998406e9f",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "be5452d6-21f5-4cf9-b3b8-a4c96c6132b1",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:18 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "164",
+        "X-Request-ID": "be5452d6-21f5-4cf9-b3b8-a4c96c6132b1"
+      },
+      "ResponseBody": {
+        "hookId": "1aa215d0-5411-498b-9bf4-fbfd4b8b8481",
+        "hookName": "hookYNnXVxqT",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1aa215d0-5411-498b-9bf4-fbfd4b8b8481",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d6e415d28f18044b8acf0cee47c1b744-e38c5dea32b2b542-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-2bfaa65db1903445a9f24c199cf4f603-bb509eeb757b7e46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "64f753485747674b57ef0bed2dccc2dc",
+        "x-ms-client-request-id": "2dcca871b9d5bf3218ec687c821e9619",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fb2259aa-9ff7-418f-bb9a-29c391074487",
+        "apim-request-id": "aa7926e0-84fe-45cd-9e76-3922d4d63d40",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:55 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "188",
-        "x-request-id": "fb2259aa-9ff7-418f-bb9a-29c391074487"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "172",
+        "X-Request-ID": "aa7926e0-84fe-45cd-9e76-3922d4d63d40"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2466fbd7-b3fb-4064-be16-75db83a44633",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1aa215d0-5411-498b-9bf4-fbfd4b8b8481",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-db913993fbc25f4c8bc44a212b43f9fd-cecf215dde45374f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-52b54767bca1804fb166da07d67255e8-937b176777a0024c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "da17eb6813653f825fcaab0929bf71a1",
+        "x-ms-client-request-id": "7dc005308a8df2fecf47a6f88efafd2d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "6c363125-2e1c-43a5-a63a-1c7fba071de0",
+        "apim-request-id": "4aec277e-795c-4789-8f50-dc18078e8fe4",
         "Content-Length": "65",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:55 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:18 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "67",
-        "x-request-id": "6c363125-2e1c-43a5-a63a-1c7fba071de0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "60",
+        "X-Request-ID": "4aec277e-795c-4789-8f50-dc18078e8fe4"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -94,6 +149,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1151349271"
+    "RandomSeed": "123706078"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False)Async.json
index 7d50355d39f1..11814098ef1c 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(False)Async.json
@@ -8,10 +8,13 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5bc5e33d7241e344af3eadeb5b3c0591-d5f4b1f3e6cac84c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f358ef126f09aa40b4e7090d57b10075-0f8fd7e230248140-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "bbf3db86ed78cf2d5898d717db5b6680",
+        "x-ms-client-request-id": "5b5b11056cf2458086f60e557b7801ee",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,69 +22,121 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hookiAxngrOL"
+        "hookName": "hookFWrD073j"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b0b776bc-6d8a-450f-a947-686c158f5cb7",
+        "apim-request-id": "a21df98f-4ee3-44f9-bcfa-61417a2dd375",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23b35bb3-79fb-442f-882f-2bf933e96cd7",
+        "Date": "Fri, 05 Feb 2021 18:38:21 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2a8b3ab-e45b-47e2-9e06-af470890b8b2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1109",
-        "x-request-id": "b0b776bc-6d8a-450f-a947-686c158f5cb7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "926",
+        "X-Request-ID": "a21df98f-4ee3-44f9-bcfa-61417a2dd375"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23b35bb3-79fb-442f-882f-2bf933e96cd7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2a8b3ab-e45b-47e2-9e06-af470890b8b2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-f358ef126f09aa40b4e7090d57b10075-f886ee2e89d79740-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "4db622dc13f5d28ab80ebdf70cad10b9",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "724d005f-2110-4deb-8913-c0b3bdd453a1",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:22 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "163",
+        "X-Request-ID": "724d005f-2110-4deb-8913-c0b3bdd453a1"
+      },
+      "ResponseBody": {
+        "hookId": "d2a8b3ab-e45b-47e2-9e06-af470890b8b2",
+        "hookName": "hookFWrD073j",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2a8b3ab-e45b-47e2-9e06-af470890b8b2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-76f5c5c46e49c249b5cead64f3163a98-ee0da63f4e850c43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e49635c3b124014f8fb90f4df9eb689e-7da47aa370f65149-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3d84c4d454821319a94cd3921b85ace7",
+        "x-ms-client-request-id": "dc8d59f4c35f0a000ee8181fd23ea632",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c94d0fe1-892d-4824-acc9-3138f259d886",
+        "apim-request-id": "b25f03d8-58fb-42f8-a6f3-70b4316aff01",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "202",
-        "x-request-id": "c94d0fe1-892d-4824-acc9-3138f259d886"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "165",
+        "X-Request-ID": "b25f03d8-58fb-42f8-a6f3-70b4316aff01"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23b35bb3-79fb-442f-882f-2bf933e96cd7",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2a8b3ab-e45b-47e2-9e06-af470890b8b2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1947e388251b5642b8c834615dce7265-52da790ad5ea4f4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a404c6c6d598e64480f56f9097ea1ed3-4610b0cbaa886e47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b19cc64fcffa4bb3c949e45cb42666fe",
+        "x-ms-client-request-id": "e47ec1d31e0df1118789a3e4ae8838d8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "d588436e-a85f-4d3d-8617-c8d0f33d706c",
+        "apim-request-id": "a5560280-b2fb-4e27-b630-6e9048315d86",
         "Content-Length": "65",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:05 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:22 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "82",
-        "x-request-id": "d588436e-a85f-4d3d-8617-c8d0f33d706c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "57",
+        "X-Request-ID": "a5560280-b2fb-4e27-b630-6e9048315d86"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -94,6 +149,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "474852715"
+    "RandomSeed": "2085916499"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True).json
index c0cc82f7faae..4773269a9e2b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True).json
@@ -8,9 +8,12 @@
         "Authorization": "Sanitized",
         "Content-Length": "98",
         "Content-Type": "application/json",
-        "traceparent": "00-074e64461da5d942af6f1e2ee10caab1-bc53d2eaf6cd9249-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "6a62303ef0604f30f14bece3772ede84",
+        "traceparent": "00-d75112a8bd6ad749a18ee12b52f87a6d-75f7c383bdd4d848-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "a6aec1c98e1df7f548cf2790bfa5a69f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -18,67 +21,118 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hookzKGBJdT1"
+        "hookName": "hookB4Q4Ldg1"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0b4a85de-1707-42da-9c59-99fd2f98b2c0",
+        "apim-request-id": "c8a9ed2a-a2a9-4ea6-b6b2-2e717ab9fa32",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ad81480b-d124-4fe6-b784-2dda8aed45b2",
+        "Date": "Fri, 05 Feb 2021 18:38:16 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b4eda08f-b123-42fe-9507-eec2444d0a35",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1351",
-        "x-request-id": "0b4a85de-1707-42da-9c59-99fd2f98b2c0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1064",
+        "X-Request-ID": "c8a9ed2a-a2a9-4ea6-b6b2-2e717ab9fa32"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ad81480b-d124-4fe6-b784-2dda8aed45b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b4eda08f-b123-42fe-9507-eec2444d0a35",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-d75112a8bd6ad749a18ee12b52f87a6d-9f11f400f4b26f4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "f8989ac0b6762d546eb0b29e0b228b4b",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "064a2148-c9de-4fc9-acba-d82592412553",
+        "Content-Length": "317",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:16 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "94",
+        "X-Request-ID": "064a2148-c9de-4fc9-acba-d82592412553"
+      },
+      "ResponseBody": {
+        "hookId": "b4eda08f-b123-42fe-9507-eec2444d0a35",
+        "hookName": "hookB4Q4Ldg1",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b4eda08f-b123-42fe-9507-eec2444d0a35",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-a584b07430b24148ae2920d39bd42500-fbd245f17fb5b548-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "7ffc5847d534bd69da1f61f4b2f073fe",
+        "traceparent": "00-cac8ab59dd26aa4b851fc12e914ae620-566fc4660915bf47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "8f46a1a343cc4db4000b3799d959dbaf",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "354d4938-6381-4456-a5e7-83cfbaaf0de2",
+        "apim-request-id": "9d1d29b8-64d6-437a-8734-e00e5accd4ac",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:54 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "137",
-        "x-request-id": "354d4938-6381-4456-a5e7-83cfbaaf0de2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "103",
+        "X-Request-ID": "9d1d29b8-64d6-437a-8734-e00e5accd4ac"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ad81480b-d124-4fe6-b784-2dda8aed45b2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b4eda08f-b123-42fe-9507-eec2444d0a35",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-c729dd95c3767b4ba65d2cddcef5878c-b28f508e64b39341-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "0cb558388178a16b65860370eda8f500",
+        "traceparent": "00-aa7607952f79114fbe3618cb5cfa6972-70e8f4fcc44aa942-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "44af7ade002c12c56d81376ddb56eb26",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "ea74f487-a676-419b-b5c4-25410d68c2c2",
+        "apim-request-id": "2aa025e1-8588-4b88-903a-caed6d0fe6ae",
         "Content-Length": "65",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:54 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:17 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "14",
-        "x-request-id": "ea74f487-a676-419b-b5c4-25410d68c2c2"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "13",
+        "X-Request-ID": "2aa025e1-8588-4b88-903a-caed6d0fe6ae"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -89,6 +143,6 @@
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "1778881748"
+    "RandomSeed": "35717952"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True)Async.json
index 5f417e63d197..08f2ddfc281a 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/DeleteNotificationHook(True)Async.json
@@ -8,9 +8,12 @@
         "Authorization": "Sanitized",
         "Content-Length": "98",
         "Content-Type": "application/json",
-        "traceparent": "00-39a13e9c998aba4ab7c3450ec69537e2-dbc1986739ceac43-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "35642def37f78ca7bec17ead2c50a9d3",
+        "traceparent": "00-b31951985b1f9046be6d5ba36738d229-00663783d0552648-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "1d1dc9315320e3d37b9f8c4d045369d9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -18,67 +21,118 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hooksY0I60Zn"
+        "hookName": "hookqK2hfmVz"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "d2248f93-00cb-494e-ba76-f64f412ea1fd",
+        "apim-request-id": "05691e3f-99fe-4b46-9ae8-36d419091835",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:03 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/dffb2c83-24ea-4311-8d6a-59f3ba9bb470",
+        "Date": "Fri, 05 Feb 2021 18:38:20 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e7996535-76b3-4e2b-b3ac-da4cc2c45991",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1039",
-        "x-request-id": "d2248f93-00cb-494e-ba76-f64f412ea1fd"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1121",
+        "X-Request-ID": "05691e3f-99fe-4b46-9ae8-36d419091835"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/dffb2c83-24ea-4311-8d6a-59f3ba9bb470",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e7996535-76b3-4e2b-b3ac-da4cc2c45991",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-b31951985b1f9046be6d5ba36738d229-005dbb78a90e964e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "1c4c45f3fc962a0a0138c8605f293418",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "b25f4e2e-6fc4-4c93-ab58-e4bc292fb2a6",
+        "Content-Length": "317",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:38:20 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "72",
+        "X-Request-ID": "b25f4e2e-6fc4-4c93-ab58-e4bc292fb2a6"
+      },
+      "ResponseBody": {
+        "hookId": "e7996535-76b3-4e2b-b3ac-da4cc2c45991",
+        "hookName": "hookqK2hfmVz",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e7996535-76b3-4e2b-b3ac-da4cc2c45991",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-c60f9bc99a07284a82136d0287c3bd09-2a9a1c63090aa445-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "c68dbafb8d33239cce4f7cd1e58a5abc",
+        "traceparent": "00-8c473cb451eed448855268b32c09cacb-b30cdd6b67f2b447-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "a4346c1d97d1495231e4312cc401dddd",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b8992cd0-06b8-4116-a478-86495f9b7c55",
+        "apim-request-id": "34537faa-a58b-41e9-b721-4b129e9c84b7",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:03 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "119",
-        "x-request-id": "b8992cd0-06b8-4116-a478-86495f9b7c55"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "101",
+        "X-Request-ID": "34537faa-a58b-41e9-b721-4b129e9c84b7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/dffb2c83-24ea-4311-8d6a-59f3ba9bb470",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e7996535-76b3-4e2b-b3ac-da4cc2c45991",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-51119c6c1982364b81ee27b067c28f55-ab4fb515178d1447-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "bef9bff2efe17595b801d035caf1928d",
+        "traceparent": "00-69fe65ce31a3a84994108b8cea7994e4-1773bc8304810845-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "7acc2e51529034b0bff21be78a728452",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 404,
       "ResponseHeaders": {
-        "apim-request-id": "48488ad7-a213-44d4-a0db-fe7bd3d46ce3",
+        "apim-request-id": "01bfc24b-5fa6-4c28-b5aa-7372cbd0628b",
         "Content-Length": "65",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:03 GMT",
+        "Date": "Fri, 05 Feb 2021 18:38:20 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "18",
-        "x-request-id": "48488ad7-a213-44d4-a0db-fe7bd3d46ce3"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "13",
+        "X-Request-ID": "01bfc24b-5fa6-4c28-b5aa-7372cbd0628b"
       },
       "ResponseBody": {
         "code": "ERROR_INVALID_PARAMETER",
@@ -89,6 +143,6 @@
   "Variables": {
     "METRICSADVISOR_ACCOUNT_NAME": "js-metrics-advisor",
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
-    "RandomSeed": "863409976"
+    "RandomSeed": "971355174"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilter.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilter.json
index 91321dde2ed3..71f6196498f5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilter.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilter.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4c989abe088d9a49a91f08e0824dcda1-b766c248f88a084d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-63ae4438964e8e48ad6a1740ea46d5bf-d66a5d585d27f846-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "bd160889dc6a32922c1042c524af2ce4",
         "x-ms-return-client-request-id": "true"
@@ -23,24 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e7b77a3e-6fb4-4802-891c-ea83b66381b6",
+        "apim-request-id": "ebd4918f-278c-44a2-8284-be5a87a12872",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7709f055-bfcd-4e8d-b76c-cfc6e6c1c1a3",
+        "Date": "Fri, 05 Feb 2021 17:59:27 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5e164a58-26a7-419d-8d04-69dc24140f4f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "789",
-        "x-request-id": "e7b77a3e-6fb4-4802-891c-ea83b66381b6"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "1369",
+        "X-Request-ID": "ebd4918f-278c-44a2-8284-be5a87a12872"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks?hookName=ookJUzPVW",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5e164a58-26a7-419d-8d04-69dc24140f4f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-63ae4438964e8e48ad6a1740ea46d5bf-e771a7ba4e8af24b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "e21ec2ca2aca4c477643c4f431a016f7",
         "x-ms-return-client-request-id": "true"
@@ -48,19 +55,65 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "ed28246e-294f-4d4a-a02e-aacdbdd17c5b",
+        "apim-request-id": "4564cde8-0621-4958-804e-8cfc9a1d8c01",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:28 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "153",
+        "X-Request-ID": "4564cde8-0621-4958-804e-8cfc9a1d8c01"
+      },
+      "ResponseBody": {
+        "hookId": "5e164a58-26a7-419d-8d04-69dc24140f4f",
+        "hookName": "hookJUzPVWd7",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks?hookName=ookJUzPVW",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-bc5103fbd456304d8181b705fd9ce768-48cdc725e19f454c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f92ac83b9ebc2faa6489e8b5a1d5bc9d",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "0682b1ea-b12a-403f-8b45-da9c6d7e7909",
         "Content-Length": "325",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:34:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "95",
-        "x-request-id": "ed28246e-294f-4d4a-a02e-aacdbdd17c5b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "100",
+        "X-Request-ID": "0682b1ea-b12a-403f-8b45-da9c6d7e7909"
       },
       "ResponseBody": {
         "value": [
           {
-            "hookId": "7709f055-bfcd-4e8d-b76c-cfc6e6c1c1a3",
+            "hookId": "5e164a58-26a7-419d-8d04-69dc24140f4f",
             "hookName": "hookJUzPVWd7",
             "hookType": "Webhook",
             "externalLink": "",
@@ -82,27 +135,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7709f055-bfcd-4e8d-b76c-cfc6e6c1c1a3",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5e164a58-26a7-419d-8d04-69dc24140f4f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-59b9ab1bc6116949b3ec3fd7f1f0d263-05577ebfb4f04d4f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7217ac713bba2d409fae312300dcc3f3-c64eec23b103ee41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f92ac83b9ebc2faa6489e8b5a1d5bc9d",
+        "x-ms-client-request-id": "f80f29dea8065f1fc1ca4726179e018c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f2afcf5a-d912-4aec-b325-d5d10c70322c",
+        "apim-request-id": "d61b5769-2fdc-4146-86eb-7f3d484eefef",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:34:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "x-request-id": "f2afcf5a-d912-4aec-b325-d5d10c70322c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "d61b5769-2fdc-4146-86eb-7f3d484eefef"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilterAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilterAsync.json
index 18483449ae61..54013afb066b 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilterAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/GetHooksWithOptionalNameFilterAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-274607324ff8d14db9cd02411877ecaf-7aa7923cc95a7644-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-570868ed9d75b04f94c31cd78ecaed5e-58ebe57767f05b42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "25d4e315ccad54916b6af9c400c60f30",
         "x-ms-return-client-request-id": "true"
@@ -23,24 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "b65bfad6-ae2a-41ab-92c8-47267d6b8a40",
+        "apim-request-id": "8c4585d2-921c-4160-93a5-7bd3d96c7c6c",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2eb3aefb-d63b-4864-815f-11aa35b04a74",
+        "Date": "Fri, 05 Feb 2021 17:59:55 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ccbdc5fa-2cbf-480b-a0cf-d9daed8c0963",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1020",
-        "x-request-id": "b65bfad6-ae2a-41ab-92c8-47267d6b8a40"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "820",
+        "X-Request-ID": "8c4585d2-921c-4160-93a5-7bd3d96c7c6c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks?hookName=ookiJABft",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ccbdc5fa-2cbf-480b-a0cf-d9daed8c0963",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-570868ed9d75b04f94c31cd78ecaed5e-6fec73edcae75c40-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "50ab1473755e1f289ca3541bb8f6dd4a",
         "x-ms-return-client-request-id": "true"
@@ -48,19 +55,65 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "09d62e2d-1968-4012-b081-3dbbfbc8df9d",
+        "apim-request-id": "a9de949f-2678-46b1-b9a9-4fcd3ba594af",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:55 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "168",
+        "X-Request-ID": "a9de949f-2678-46b1-b9a9-4fcd3ba594af"
+      },
+      "ResponseBody": {
+        "hookId": "ccbdc5fa-2cbf-480b-a0cf-d9daed8c0963",
+        "hookName": "hookiJABftAm",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks?hookName=ookiJABft",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8b3230db3092f5408fe826e5996f5565-ccb2d885bc3a9e42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f6171b3209aa655a3c87b8c1d90dfcf7",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "02435367-1be6-4e58-ba38-b91105a97f95",
         "Content-Length": "325",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "95",
-        "x-request-id": "09d62e2d-1968-4012-b081-3dbbfbc8df9d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "108",
+        "X-Request-ID": "02435367-1be6-4e58-ba38-b91105a97f95"
       },
       "ResponseBody": {
         "value": [
           {
-            "hookId": "2eb3aefb-d63b-4864-815f-11aa35b04a74",
+            "hookId": "ccbdc5fa-2cbf-480b-a0cf-d9daed8c0963",
             "hookName": "hookiJABftAm",
             "hookType": "Webhook",
             "externalLink": "",
@@ -82,27 +135,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2eb3aefb-d63b-4864-815f-11aa35b04a74",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ccbdc5fa-2cbf-480b-a0cf-d9daed8c0963",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-10332a0fd451f04b816bbf3b99e16d89-f1ef50557a15604b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-9a02c640ab01b045a82ea40c72a149d9-31dfbc996bc74a45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f6171b3209aa655a3c87b8c1d90dfcf7",
+        "x-ms-client-request-id": "b079dc24e1cc9f41bab5890a78759c74",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2a528dc9-3e60-4e67-8810-eb6ce9f8a648",
+        "apim-request-id": "e8c50d06-d572-416a-813c-7f6549e91f0f",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:30 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:55 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "184",
-        "x-request-id": "2a528dc9-3e60-4e67-8810-eb6ce9f8a648"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "215",
+        "X-Request-ID": "e8c50d06-d572-416a-813c-7f6549e91f0f"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstance.json
index 806a1a8087a9..b638351cde41 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-513e98c29bb9824ba36a0553cc00a390-653d7a43e6176441-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8d9966de965caa40a59710b25e1d8670-e4461ef70528064d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5a00061810b6332d6b205bbd1b12768b",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "fe272538-8095-4da8-8055-f2027f54d9e8",
+        "apim-request-id": "d6063f8b-7b23-40a2-b1b6-355f7c6ca65c",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:04 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+        "Date": "Fri, 05 Feb 2021 17:59:28 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "5542",
-        "x-request-id": "fe272538-8095-4da8-8055-f2027f54d9e8"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "296",
+        "X-Request-ID": "d6063f8b-7b23-40a2-b1b6-355f7c6ca65c"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1eb0b0bd9452b0478f46a7d30f54d8d4-d78df7bc5413a045-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8d9966de965caa40a59710b25e1d8670-713e7355d7a7d241-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "d77b157f3e8f5628221dad1b475f5e74",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b9493e69-43c7-4f0c-ad33-d6eecfc33f9c",
+        "apim-request-id": "4d4b68a5-f3ef-4137-8e7e-5103b33a2f83",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:04 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:28 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "147",
-        "x-request-id": "b9493e69-43c7-4f0c-ad33-d6eecfc33f9c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "4d4b68a5-f3ef-4137-8e7e-5103b33a2f83"
       },
       "ResponseBody": {
-        "hookId": "d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+        "hookId": "23f3ddc9-6069-4ba5-8e87-e4212110de09",
         "hookName": "hookAcxnNIKY",
         "hookType": "Email",
         "externalLink": "",
@@ -79,17 +85,64 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-8699a801dbaaa34798ba2eb3526f6fed-0ee95f5ec7894b45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "5d13c8252faf49f6a478aa60b0007e13",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "af177901-fe36-4649-bf9e-af5237808189",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:29 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "af177901-fe36-4649-bf9e-af5237808189"
+      },
+      "ResponseBody": {
+        "hookId": "23f3ddc9-6069-4ba5-8e87-e4212110de09",
+        "hookName": "hookAcxnNIKY",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "234",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-092d13a6aabc15458e0b622526444299-d464b147bd9cb749-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-46af14e2b2269946aa5a1e66423c0521-f0bd57941013f34d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5d13c8252faf49f6a478aa60b0007e13",
+        "x-ms-client-request-id": "123e66c7d175d9d7dda938996312ec0b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +160,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f6f6dd6f-7a39-4b86-8bef-f84215d4f7cc",
+        "apim-request-id": "5f76e398-a433-48ba-8357-df8477860002",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "475",
-        "x-request-id": "f6f6dd6f-7a39-4b86-8bef-f84215d4f7cc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "277",
+        "X-Request-ID": "5f76e398-a433-48ba-8357-df8477860002"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4fb08fbad965c84186172efd02a3e5cf-8ccd54af6a5a1f44-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-22407e21259ddb4bb3effd98481fdc80-90873fc0e9261a4a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "123e66c7d175d9d7dda938996312ec0b",
+        "x-ms-client-request-id": "5397e7c119fe4fdc1e31321694c8a622",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "11741be1-8936-489d-acad-fd97fcb75b10",
+        "apim-request-id": "370c1a50-a5cf-4421-b1c0-2fbbb8d3b5cb",
         "Content-Length": "311",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "130",
-        "x-request-id": "11741be1-8936-489d-acad-fd97fcb75b10"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "136",
+        "X-Request-ID": "370c1a50-a5cf-4421-b1c0-2fbbb8d3b5cb"
       },
       "ResponseBody": {
-        "hookId": "d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+        "hookId": "23f3ddc9-6069-4ba5-8e87-e4212110de09",
         "hookName": "hookAcxnNIKY",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -160,27 +216,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d83030fd-6dd8-4817-aaa9-ea7c76c91371",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/23f3ddc9-6069-4ba5-8e87-e4212110de09",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2933ca97e3bf974cab114f4786caf4bf-a7e70f3659f17643-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c7a82ca5fcc3ab42ba688fa1698fb5e7-d90b2a5759212a43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5397e7c119fe4fdc1e31321694c8a622",
+        "x-ms-client-request-id": "e0539a9e4b2153fef13a7f06f75de692",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "938ad2e5-1f48-4ee4-809d-d08a6a3dc1dc",
+        "apim-request-id": "bc19f4db-43f8-425a-9dc5-b1d62d23879a",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:05 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:29 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "173",
-        "x-request-id": "938ad2e5-1f48-4ee4-809d-d08a6a3dc1dc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "bc19f4db-43f8-425a-9dc5-b1d62d23879a"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstanceAsync.json
index 0e8a42383367..fe21fc2773af 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-31a5da0403762b4282fb82f7ff619cb0-3c044f5e5e221a42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-519eb86b1e721a4491183bbabe8ef80b-e690db6fc8456b4c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "ce20e4c46180a62bfc5b1c87d135846b",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "95a0e21b-f73e-41cd-b474-c9e3f588c45d",
+        "apim-request-id": "77f441cb-bd86-4cc5-8aec-6a8d9d6e8024",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:30 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/bf5864d4-4270-479b-9233-6dc93b9c373f",
+        "Date": "Fri, 05 Feb 2021 17:59:56 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "469",
-        "x-request-id": "95a0e21b-f73e-41cd-b474-c9e3f588c45d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "271",
+        "X-Request-ID": "77f441cb-bd86-4cc5-8aec-6a8d9d6e8024"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/bf5864d4-4270-479b-9233-6dc93b9c373f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1f9d05e78ffac446bac13f93a5a9ebcd-23626592cd4a4b40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-519eb86b1e721a4491183bbabe8ef80b-4b9f4e67995dcb44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "5369c5dfeda4b1a12bf20cb0b3ead8b6",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d560a8ed-7ffc-4a31-8c9a-0e5d774dc121",
+        "apim-request-id": "ee88ad47-64a4-407e-ae20-2eebd4fa514c",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "d560a8ed-7ffc-4a31-8c9a-0e5d774dc121"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "195",
+        "X-Request-ID": "ee88ad47-64a4-407e-ae20-2eebd4fa514c"
       },
       "ResponseBody": {
-        "hookId": "bf5864d4-4270-479b-9233-6dc93b9c373f",
+        "hookId": "5111f772-8abc-43bd-958b-074f8219c4d9",
         "hookName": "hookB07vsv5L",
         "hookType": "Email",
         "externalLink": "",
@@ -79,17 +85,64 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/bf5864d4-4270-479b-9233-6dc93b9c373f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cb0432b473235a4f9ec0de25e60f4150-bdfc94a727504049-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9186b9c93de55dd1635cfdf7171ae7e4",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "90f7bb6c-97dd-477d-80ba-b9db7cf8bf69",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:56 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "204",
+        "X-Request-ID": "90f7bb6c-97dd-477d-80ba-b9db7cf8bf69"
+      },
+      "ResponseBody": {
+        "hookId": "5111f772-8abc-43bd-958b-074f8219c4d9",
+        "hookName": "hookB07vsv5L",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "234",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-6b67159d4b7502468c01558e99e6432d-e9dd545640ed1b4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-6e52e34abe55cb4d87ef45c1ef24a2b2-750723dbb8e08245-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9186b9c93de55dd1635cfdf7171ae7e4",
+        "x-ms-client-request-id": "434821a04eccd7b3436fa28d547bf312",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +160,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "3f796fce-4974-4d86-add5-3eb16a4e2720",
+        "apim-request-id": "a79cc3df-8712-41a1-939f-6a33e56830cb",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:56 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "448",
-        "x-request-id": "3f796fce-4974-4d86-add5-3eb16a4e2720"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "286",
+        "X-Request-ID": "a79cc3df-8712-41a1-939f-6a33e56830cb"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/bf5864d4-4270-479b-9233-6dc93b9c373f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3ed30300ff6434469721f1cd073189f7-f8d1f66854a2284b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b9a7d2bec573b442bc7f4c9cca75643d-889d68f3f02cb945-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "434821a04eccd7b3436fa28d547bf312",
+        "x-ms-client-request-id": "18bd6582f3afa186f30cef47efa99a11",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8bdb3097-91d6-4720-8aba-a519b3ccb336",
+        "apim-request-id": "1aed40fd-d835-417e-9dbd-2a254296410b",
         "Content-Length": "311",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:31 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "154",
-        "x-request-id": "8bdb3097-91d6-4720-8aba-a519b3ccb336"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "1aed40fd-d835-417e-9dbd-2a254296410b"
       },
       "ResponseBody": {
-        "hookId": "bf5864d4-4270-479b-9233-6dc93b9c373f",
+        "hookId": "5111f772-8abc-43bd-958b-074f8219c4d9",
         "hookName": "hookB07vsv5L",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -160,27 +216,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/bf5864d4-4270-479b-9233-6dc93b9c373f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/5111f772-8abc-43bd-958b-074f8219c4d9",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7ed88d98f9027a42ab0b7aa56561786f-e3127b8de6a60244-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-422152e51270474ebb556fdc0c7838ef-0ca26402bb822e45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "18bd6582f3afa186f30cef47efa99a11",
+        "x-ms-client-request-id": "9210280b95a17bea05af4d769b4409e8",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f47b4384-a2ad-409c-a067-8d2d80f1716f",
+        "apim-request-id": "e0e7053e-8cfd-4579-b6c2-14fa09e1eb40",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:32 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:57 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "161",
-        "x-request-id": "f47b4384-a2ad-409c-a067-8d2d80f1716f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "185",
+        "X-Request-ID": "e0e7053e-8cfd-4579-b6c2-14fa09e1eb40"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstance.json
index 68fe1d37e451..7378e1514007 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstance.json
@@ -8,7 +8,7 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-ddd76618b9cf334dbe525aa4bfb69097-84f3a5cd810c7c4b-00",
+        "traceparent": "00-1dfab2fc39f3a443b5004a402a42d955-1aa6ba8e163cbd43-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -29,32 +29,76 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "1a72918d-cbf8-4677-bf6e-8dd3a8f55df5",
+        "apim-request-id": "18b1af66-d503-47ae-b200-eb0e46f21ffe",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:51 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d0fe331-6a7c-4c92-b86a-9b891fc032ca",
+        "Date": "Fri, 05 Feb 2021 17:59:35 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b88e991d-6d8c-4768-ba5e-15d755301b12",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1380",
-        "X-Request-ID": "1a72918d-cbf8-4677-bf6e-8dd3a8f55df5"
+        "x-envoy-upstream-service-time": "5332",
+        "X-Request-ID": "18b1af66-d503-47ae-b200-eb0e46f21ffe"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d0fe331-6a7c-4c92-b86a-9b891fc032ca",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b88e991d-6d8c-4768-ba5e-15d755301b12",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-1dfab2fc39f3a443b5004a402a42d955-1c7085cd6c86bf49-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f57bf8a97d890c353c46fd3efdd34abb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "d4f1cd48-5e74-4783-b1d3-c17e80a5f29c",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:35 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "169",
+        "X-Request-ID": "d4f1cd48-5e74-4783-b1d3-c17e80a5f29c"
+      },
+      "ResponseBody": {
+        "hookId": "b88e991d-6d8c-4768-ba5e-15d755301b12",
+        "hookName": "hookUQmZOMP7",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b88e991d-6d8c-4768-ba5e-15d755301b12",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "172",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1ebaae1c9f7a874f9c64ae70f2cc8832-7804a3a7300b1440-00",
+        "traceparent": "00-2a37196f0881524e84558608921b435e-00d33a4b2683a84e-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f57bf8a97d890c353c46fd3efdd34abb",
+        "x-ms-client-request-id": "8bf80d63954ad81d7a41239bb6fc9d26",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,45 +113,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1ff1f6ce-e71e-475b-86dd-199a705a01b7",
+        "apim-request-id": "a804676a-92ec-414d-a32d-fd52a0e89034",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:52 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "799",
-        "X-Request-ID": "1ff1f6ce-e71e-475b-86dd-199a705a01b7"
+        "x-envoy-upstream-service-time": "285",
+        "X-Request-ID": "a804676a-92ec-414d-a32d-fd52a0e89034"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d0fe331-6a7c-4c92-b86a-9b891fc032ca",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b88e991d-6d8c-4768-ba5e-15d755301b12",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-71562186b94cde4584cb8e7d1701dfbb-f982131efa087c46-00",
+        "traceparent": "00-e0f56f2b26b07a4a820fd85ab5e680e0-c585092f494edc40-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8bf80d63954ad81d7a41239bb6fc9d26",
+        "x-ms-client-request-id": "c6b4fd10d9bd7a0db01b82c429e19eef",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9ba95803-190b-43bd-9348-31694a13c6af",
+        "apim-request-id": "094f6939-5d58-42c6-8bbb-38a4cbe50db3",
         "Content-Length": "275",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:45:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:35 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "917",
-        "X-Request-ID": "9ba95803-190b-43bd-9348-31694a13c6af"
+        "x-envoy-upstream-service-time": "173",
+        "X-Request-ID": "094f6939-5d58-42c6-8bbb-38a4cbe50db3"
       },
       "ResponseBody": {
-        "hookId": "7d0fe331-6a7c-4c92-b86a-9b891fc032ca",
+        "hookId": "b88e991d-6d8c-4768-ba5e-15d755301b12",
         "hookName": "hookUQmZOMP7",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -123,30 +167,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d0fe331-6a7c-4c92-b86a-9b891fc032ca",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b88e991d-6d8c-4768-ba5e-15d755301b12",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-251026a6dcb1174b8a910a2ffc2c60d4-93942507eb3d0447-00",
+        "traceparent": "00-0855c32884b44e4ea50ef2b7554551c5-5c4312ffb7ab9e40-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c6b4fd10d9bd7a0db01b82c429e19eef",
+        "x-ms-client-request-id": "26672c777b8014c7daa27a4859995540",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f42d2748-34cd-48d6-8746-a6d1efbceec3",
+        "apim-request-id": "3b776635-9d9b-40d4-aafc-1e915dc9f545",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:53 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:36 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "200",
-        "X-Request-ID": "f42d2748-34cd-48d6-8746-a6d1efbceec3"
+        "x-envoy-upstream-service-time": "232",
+        "X-Request-ID": "3b776635-9d9b-40d4-aafc-1e915dc9f545"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstanceAsync.json
index 6292e11beb0d..08b6bef97130 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithEveryMemberAndNewInstanceAsync.json
@@ -8,7 +8,7 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8dc47793741523418b144001c439765d-9e9ee288bd62c449-00",
+        "traceparent": "00-d717d55de9ea0540901fb860be378d87-4a04fb2e1c957c44-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -29,32 +29,76 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "bb9e5f39-8f4b-45c6-b552-38ec206e1aea",
+        "apim-request-id": "5c9f4798-1718-455d-b443-eab19f0263b5",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:55 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3f56426b-0e25-4bf3-a0fe-5da102a28a7a",
+        "Date": "Fri, 05 Feb 2021 17:59:57 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a24601be-b279-43c2-809f-eee8d3fa4a12",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "475",
-        "X-Request-ID": "bb9e5f39-8f4b-45c6-b552-38ec206e1aea"
+        "x-envoy-upstream-service-time": "340",
+        "X-Request-ID": "5c9f4798-1718-455d-b443-eab19f0263b5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3f56426b-0e25-4bf3-a0fe-5da102a28a7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a24601be-b279-43c2-809f-eee8d3fa4a12",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-d717d55de9ea0540901fb860be378d87-12449764c763fb4b-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d956a96ead8c15698f2a6a3fb1718028",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "47670d09-8c1c-4a21-a87d-0f86b185d893",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:57 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "140",
+        "X-Request-ID": "47670d09-8c1c-4a21-a87d-0f86b185d893"
+      },
+      "ResponseBody": {
+        "hookId": "a24601be-b279-43c2-809f-eee8d3fa4a12",
+        "hookName": "hookVP4lqQzg",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a24601be-b279-43c2-809f-eee8d3fa4a12",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "172",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-345c621ced763442a885e421e7bc0a61-26a62bdc5e08b646-00",
+        "traceparent": "00-713f5ef1165aeb4b801f49ad72f21be1-46dcc244df0a744c-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "d956a96ead8c15698f2a6a3fb1718028",
+        "x-ms-client-request-id": "e22fc4c07025ca970b6d4f6d0131effb",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -69,45 +113,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0ddc5eed-aee1-4a25-a06c-c1eb2b5cb931",
+        "apim-request-id": "dbd8079e-60ce-4892-95bc-d931afa20760",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:55 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "273",
-        "X-Request-ID": "0ddc5eed-aee1-4a25-a06c-c1eb2b5cb931"
+        "x-envoy-upstream-service-time": "431",
+        "X-Request-ID": "dbd8079e-60ce-4892-95bc-d931afa20760"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3f56426b-0e25-4bf3-a0fe-5da102a28a7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a24601be-b279-43c2-809f-eee8d3fa4a12",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-52c3effb9ad785408cfcacffd232fa38-a6f21f8dad1a944c-00",
+        "traceparent": "00-f6094fb6f4165842afb3beb71222c367-f2964a0faeb6dc49-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e22fc4c07025ca970b6d4f6d0131effb",
+        "x-ms-client-request-id": "dcc38dca14a316b6a2899b31dd900b84",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "60ec3b06-240c-42ea-b980-2ea736518a7d",
+        "apim-request-id": "c933eec7-fec9-4575-9646-349dc60b742b",
         "Content-Length": "275",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:45:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "178",
-        "X-Request-ID": "60ec3b06-240c-42ea-b980-2ea736518a7d"
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "c933eec7-fec9-4575-9646-349dc60b742b"
       },
       "ResponseBody": {
-        "hookId": "3f56426b-0e25-4bf3-a0fe-5da102a28a7a",
+        "hookId": "a24601be-b279-43c2-809f-eee8d3fa4a12",
         "hookName": "hookVP4lqQzg",
         "hookType": "Email",
         "externalLink": "http://fake.endpoint.com",
@@ -123,30 +167,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3f56426b-0e25-4bf3-a0fe-5da102a28a7a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a24601be-b279-43c2-809f-eee8d3fa4a12",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f085723215702042b2a1e4c8613748ac-32cb35a0722d4848-00",
+        "traceparent": "00-68f6951fd9588440aecfc8b5128a1d10-e0c651f59e80024d-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "dcc38dca14a316b6a2899b31dd900b84",
+        "x-ms-client-request-id": "0b00e1fb4e3afe54128ccd1f5efb135d",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ed044fd0-d6a8-41ea-9f7e-3197a6d42248",
+        "apim-request-id": "58b3a31c-c69e-4b30-80a4-3dfb6525d958",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:58 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "205",
-        "X-Request-ID": "ed044fd0-d6a8-41ea-9f7e-3197a6d42248"
+        "x-envoy-upstream-service-time": "169",
+        "X-Request-ID": "58b3a31c-c69e-4b30-80a4-3dfb6525d958"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False).json
index 13797b1b4e98..411804ad20db 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False).json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-841b5adebd578e4d9e505a250a0d46cc-37de2244ebf8904c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-51cb3785c066984291666686465282c3-fa1b6826c8cf4948-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "a292f2076d2e0e12fa978ca259aa0159",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "6256ed07-2b0b-4aa9-8850-91694a2af411",
+        "apim-request-id": "36643b2b-7ea2-4b0f-958a-06cc8115cdfe",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:58 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+        "Date": "Fri, 05 Feb 2021 17:59:49 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "420",
-        "x-request-id": "6256ed07-2b0b-4aa9-8850-91694a2af411"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "258",
+        "X-Request-ID": "36643b2b-7ea2-4b0f-958a-06cc8115cdfe"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a0a7c640f8ab0847a365f7ae0cf01766-2fff3414f962994b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-51cb3785c066984291666686465282c3-b1e01e0de47ec140-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "32bce9cb1b7f4f844d657c32ffe8b4a6",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "479ee495-77b6-453f-bedf-0738b7fc5f9d",
+        "apim-request-id": "0ac98475-7310-4036-8b62-b3bc353e85df",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "479ee495-77b6-453f-bedf-0738b7fc5f9d"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "0ac98475-7310-4036-8b62-b3bc353e85df"
       },
       "ResponseBody": {
-        "hookId": "d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+        "hookId": "7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
         "hookName": "hookC674MsBm",
         "hookType": "Email",
         "externalLink": "",
@@ -79,17 +85,64 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-4ed73f56c6a7b04d95f6567ed3685f54-a4b7bb25b2e60641-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9dad8b2f9ea0141f6102ad68bf1a76ad",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "565d7041-cbb4-4c33-bea7-c696e13a9b31",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:49 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "565d7041-cbb4-4c33-bea7-c696e13a9b31"
+      },
+      "ResponseBody": {
+        "hookId": "7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
+        "hookName": "hookC674MsBm",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "164",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c416ed305505e649a4c14f930a2ffdad-a717ba61585bf04f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-4df84d22c9eb80419cfd7a40393cd8be-c7c6db485e03e146-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9dad8b2f9ea0141f6102ad68bf1a76ad",
+        "x-ms-client-request-id": "5e619fc13007eb866e4254c8f1e00e11",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +160,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "b907e470-ec0e-4c70-92d3-ba648102013e",
+        "apim-request-id": "5c3db48e-2938-4cd2-98da-a65faf0736a8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:49 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "475",
-        "x-request-id": "b907e470-ec0e-4c70-92d3-ba648102013e"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "345",
+        "X-Request-ID": "5c3db48e-2938-4cd2-98da-a65faf0736a8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c223e9017f48d4c82f90fe508e890fa-f146d0b5547b4c4a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-b53d282b267cbd40adafceb140b402a9-86f3a80df4e1da41-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5e619fc13007eb866e4254c8f1e00e11",
+        "x-ms-client-request-id": "ce73e5e363fc2cb8caa7d07d6e1c8f33",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "1828672e-faa3-45c7-b074-1671489cfe75",
+        "apim-request-id": "0666016e-77fc-41b8-a7f9-0465e57d1632",
         "Content-Length": "241",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:58 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "153",
-        "x-request-id": "1828672e-faa3-45c7-b074-1671489cfe75"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "0666016e-77fc-41b8-a7f9-0465e57d1632"
       },
       "ResponseBody": {
-        "hookId": "d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+        "hookId": "7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
         "hookName": "hookC674MsBm",
         "hookType": "Email",
         "externalLink": "",
@@ -160,27 +216,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d1069da5-4df9-47b7-ba4c-b033c1b61ab2",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/7d163c7b-a5b4-4c25-9efc-3e9e1988d31e",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2fbab1794984d2448cde305ac0fdc59b-9e66dc0bb316d84b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-524aaa57885ac54db4be37497589ba5f-fd24f7ed7d332a47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ce73e5e363fc2cb8caa7d07d6e1c8f33",
+        "x-ms-client-request-id": "5f70ceef5587ff9f04c12f5d49562381",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "c18e66b5-9695-4a4f-b27d-3f6a68977aea",
+        "apim-request-id": "33392316-c185-4d17-919d-1f4516fb3f09",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:59 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:50 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "178",
-        "x-request-id": "c18e66b5-9695-4a4f-b27d-3f6a68977aea"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "162",
+        "X-Request-ID": "33392316-c185-4d17-919d-1f4516fb3f09"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False)Async.json
index b4e24c719402..413f392895cb 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(False)Async.json
@@ -8,8 +8,11 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-17aa1811054a724e922c26f76e2662fd-eea13f43cec0124a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dadd49d6a61f9d4190bf117a97418c78-9b69508c210c3642-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c0bd03356926376ce3a9e715abff87c9",
         "x-ms-return-client-request-id": "true"
@@ -26,25 +29,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "30cd3d97-fa3c-4f8a-bf93-68e85b033c58",
+        "apim-request-id": "6d249135-37ca-4446-b702-7c23811a7944",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:08 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/02f55334-6fff-403b-bff2-e5018d5aff4a",
+        "Date": "Fri, 05 Feb 2021 18:00:15 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "483",
-        "x-request-id": "30cd3d97-fa3c-4f8a-bf93-68e85b033c58"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "644",
+        "X-Request-ID": "6d249135-37ca-4446-b702-7c23811a7944"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/02f55334-6fff-403b-bff2-e5018d5aff4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1eb0388008540447acad0647b922fc75-25c053039ed6014c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-dadd49d6a61f9d4190bf117a97418c78-a12fea41efdab343-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c62e59d08cb008599cd3e9b613ff4fc5",
         "x-ms-return-client-request-id": "true"
@@ -52,17 +58,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "9e06d55b-efdd-4504-b452-b8fbf39d651f",
+        "apim-request-id": "ba4bd22c-52c8-4400-b3b4-f09ca2ec83fa",
         "Content-Length": "223",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:08 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:15 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "150",
-        "x-request-id": "9e06d55b-efdd-4504-b452-b8fbf39d651f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "181",
+        "X-Request-ID": "ba4bd22c-52c8-4400-b3b4-f09ca2ec83fa"
       },
       "ResponseBody": {
-        "hookId": "02f55334-6fff-403b-bff2-e5018d5aff4a",
+        "hookId": "3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
         "hookName": "hookVHsNsODG",
         "hookType": "Email",
         "externalLink": "",
@@ -79,17 +85,64 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/02f55334-6fff-403b-bff2-e5018d5aff4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cceec87376cc564fadddd0ce3454844b-02a05bfbc5a03d45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "9cb46fdd3675aff098307a07dc4a5902",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "43b6c392-0ff6-448d-b4b0-6128c63af43c",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:15 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "158",
+        "X-Request-ID": "43b6c392-0ff6-448d-b4b0-6128c63af43c"
+      },
+      "ResponseBody": {
+        "hookId": "3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
+        "hookName": "hookVHsNsODG",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "164",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c71425f13e7c34d8fb5bddaddd04531-4ef79ae651d73743-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-cd982335da18c7469da4cf71ad19fc6c-302fad3c3d001248-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9cb46fdd3675aff098307a07dc4a5902",
+        "x-ms-client-request-id": "93b80610dadda9bdaab4235380b623e3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +160,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "dc32b85e-1736-4b12-aeeb-3b088073d3d1",
+        "apim-request-id": "b323021c-a313-480e-a198-4635b9c8c9b5",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:08 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "403",
-        "x-request-id": "dc32b85e-1736-4b12-aeeb-3b088073d3d1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "551",
+        "X-Request-ID": "b323021c-a313-480e-a198-4635b9c8c9b5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/02f55334-6fff-403b-bff2-e5018d5aff4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3259457b79a38a44b77a1c76b8937d53-139a8baff2375548-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e97fe436b0e3784297bd2d5ef43dde7f-0e4c045f4a716244-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "93b80610dadda9bdaab4235380b623e3",
+        "x-ms-client-request-id": "3b37225aea4b9954687f2d8011512b51",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "297c7c66-f8dd-4e77-9a5e-70c4b0b87e55",
+        "apim-request-id": "7d8dadc1-0950-40f9-b5a0-4d47d84c53eb",
         "Content-Length": "241",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:09 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "175",
-        "x-request-id": "297c7c66-f8dd-4e77-9a5e-70c4b0b87e55"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "146",
+        "X-Request-ID": "7d8dadc1-0950-40f9-b5a0-4d47d84c53eb"
       },
       "ResponseBody": {
-        "hookId": "02f55334-6fff-403b-bff2-e5018d5aff4a",
+        "hookId": "3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
         "hookName": "hookVHsNsODG",
         "hookType": "Email",
         "externalLink": "",
@@ -160,27 +216,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/02f55334-6fff-403b-bff2-e5018d5aff4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/3d30f9f4-a871-4b3e-90c1-d1d0c265a690",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-add587392ec7b944bc0cd25e2726edd5-c02911d62c156d42-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-a797b4469daf11469f0404c97d411add-6b0d742c28ac4c4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3b37225aea4b9954687f2d8011512b51",
+        "x-ms-client-request-id": "0da5e77abc4602e8b10af2c0129d2fe2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "8d9b1a1b-c6b5-4479-a227-29a421df665b",
+        "apim-request-id": "d1dfc87d-42ce-414c-a847-f0709903f0bf",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:09 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:16 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "158",
-        "x-request-id": "8d9b1a1b-c6b5-4479-a227-29a421df665b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "174",
+        "X-Request-ID": "d1dfc87d-42ce-414c-a847-f0709903f0bf"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True).json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True).json
index 9e78ccaf7155..085c3fb3fd2d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True).json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True).json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "111",
         "Content-Type": "application/json",
-        "traceparent": "00-4a28e62d2889e946970ed18ebdbe678e-f0a4fd8a2d1a9d45-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-50685e27bd1d7f4182a83ed58c6b7d92-69ac8a5690248a4e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "62c34e7ef571d4504f4d00cc323f3955",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,88 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "e16d3d51-b3b0-4af0-98de-cea79460ea98",
+        "apim-request-id": "c1974c58-a508-4697-a1d8-e28d727eb511",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:56 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/92624463-715e-4328-9fce-5a8e5e8b7adf",
+        "Date": "Fri, 05 Feb 2021 17:59:47 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "404",
-        "x-request-id": "e16d3d51-b3b0-4af0-98de-cea79460ea98"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "251",
+        "X-Request-ID": "c1974c58-a508-4697-a1d8-e28d727eb511"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/92624463-715e-4328-9fce-5a8e5e8b7adf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-e92a31f784d073408626f6bba9343b2e-892984924d8ee448-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-50685e27bd1d7f4182a83ed58c6b7d92-4de48ccaef572143-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "8f78cdcffe7cf0da7d7e476753a102fe",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4086623c-f2dd-428f-81e0-ea6a42d2d2ec",
+        "apim-request-id": "3eb8040f-db31-46ef-8aa2-eacbed78009d",
+        "Content-Length": "244",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:47 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "79",
+        "X-Request-ID": "3eb8040f-db31-46ef-8aa2-eacbed78009d"
+      },
+      "ResponseBody": {
+        "hookId": "a8a0087c-f713-4335-ba50-225325696e68",
+        "hookName": "hookmKAYdTxX",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-ed8237405d04e5428eba98861f22c36f-afeddc888a5ecb46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "b879dcf176f133863c429918a53f107a",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a887b90a-5a9f-450e-a07d-e7cfb9c8af61",
         "Content-Length": "244",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:56 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:47 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "92",
-        "x-request-id": "4086623c-f2dd-428f-81e0-ea6a42d2d2ec"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "80",
+        "X-Request-ID": "a887b90a-5a9f-450e-a07d-e7cfb9c8af61"
       },
       "ResponseBody": {
-        "hookId": "92624463-715e-4328-9fce-5a8e5e8b7adf",
+        "hookId": "a8a0087c-f713-4335-ba50-225325696e68",
         "hookName": "hookmKAYdTxX",
         "hookType": "Email",
         "externalLink": "",
@@ -77,16 +126,19 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/92624463-715e-4328-9fce-5a8e5e8b7adf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "164",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-af8709950d9ae349ac9d0571aaff636c-85b2cd92eecf2146-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "b879dcf176f133863c429918a53f107a",
+        "traceparent": "00-1dbd69585980d641b94623a4a0d5ecfc-6593edce0fe0d145-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "03aa63aa73bb7f6a74d2e5f2ade980ad",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -104,41 +156,44 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "0ddb3a63-ef6c-44e6-a42d-8cd818ac3d8a",
+        "apim-request-id": "b9abf4f3-b0ac-4431-8e45-49bcb6c3bab8",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "371",
-        "x-request-id": "0ddb3a63-ef6c-44e6-a42d-8cd818ac3d8a"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "219",
+        "X-Request-ID": "b9abf4f3-b0ac-4431-8e45-49bcb6c3bab8"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/92624463-715e-4328-9fce-5a8e5e8b7adf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-745bb564e2efff4a840fb589ec6caaef-bf3a9b0855aa004a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "03aa63aa73bb7f6a74d2e5f2ade980ad",
+        "traceparent": "00-90dcad4c6d3e5c45b9281145046fa113-75294854c52ff94c-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "55db014a81c658644645533964c24b3e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "4a9f1cf6-df2e-4777-9471-edcaae5ba979",
+        "apim-request-id": "51672105-a753-467a-8382-718dc4f1dab3",
         "Content-Length": "262",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:58:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "84",
-        "x-request-id": "4a9f1cf6-df2e-4777-9471-edcaae5ba979"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "72",
+        "X-Request-ID": "51672105-a753-467a-8382-718dc4f1dab3"
       },
       "ResponseBody": {
-        "hookId": "92624463-715e-4328-9fce-5a8e5e8b7adf",
+        "hookId": "a8a0087c-f713-4335-ba50-225325696e68",
         "hookName": "hookmKAYdTxX",
         "hookType": "Email",
         "externalLink": "",
@@ -156,26 +211,29 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/92624463-715e-4328-9fce-5a8e5e8b7adf",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a8a0087c-f713-4335-ba50-225325696e68",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-1a54c10340bc414daa8b5115753dbbc4-ed97f10a89c6344b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "55db014a81c658644645533964c24b3e",
+        "traceparent": "00-78ce3c1a43629640a5ebe4d0cbe666b4-1295bc3ecb6ccb48-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "efbdcd6dfff77d4272f9441e91948553",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "902ec39d-a6e8-4214-98a6-5cb89a3180a7",
+        "apim-request-id": "a73ba7ad-687d-4608-a8c4-77aa72d4c690",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:58:57 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:48 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "96",
-        "x-request-id": "902ec39d-a6e8-4214-98a6-5cb89a3180a7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "105",
+        "X-Request-ID": "a73ba7ad-687d-4608-a8c4-77aa72d4c690"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True)Async.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True)Async.json
index 7e58deeb8d3a..a9e2d381969e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True)Async.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndGetInstance(True)Async.json
@@ -8,8 +8,11 @@
         "Authorization": "Sanitized",
         "Content-Length": "111",
         "Content-Type": "application/json",
-        "traceparent": "00-64cc109196ccc648a39d154a01ff1a1b-6461b11bbf8c0141-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8c9d5f8256d00f429d5d10512a9a471e-a5116ca229f57445-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "5f4947188a4c7c5caa8c925bb0ab44f1",
         "x-ms-return-client-request-id": "true"
       },
@@ -25,42 +28,88 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f773df11-9ab7-4148-aee5-42aa84176cda",
+        "apim-request-id": "7cee91fb-0a3a-4f64-ae02-858f29bdbd0d",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:05 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f395ec9-0758-4293-8cda-fc49a0347efe",
+        "Date": "Fri, 05 Feb 2021 18:00:13 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "245",
-        "x-request-id": "f773df11-9ab7-4148-aee5-42aa84176cda"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "544",
+        "X-Request-ID": "7cee91fb-0a3a-4f64-ae02-858f29bdbd0d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f395ec9-0758-4293-8cda-fc49a0347efe",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-4cae71fb607d8241bd86851a3e49547e-0d77a32833859344-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-8c9d5f8256d00f429d5d10512a9a471e-7033a7b1c1f5e848-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-ms-client-request-id": "f298c26b80b396e32e0f8bee0e46e68f",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "513c31b7-afbf-4556-bb8f-b6de2ed6f7fb",
+        "apim-request-id": "49dd1eb0-aa73-429f-ad7f-a884432a066a",
+        "Content-Length": "244",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:13 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "49dd1eb0-aa73-429f-ad7f-a884432a066a"
+      },
+      "ResponseBody": {
+        "hookId": "25332683-31ed-49e8-a191-97bea4cc16e4",
+        "hookName": "hooksvvcRVbp",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "94dc466b-52e4-4678-892d-70a0c45c5f42"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Authorization": "Sanitized",
+        "traceparent": "00-0ca9cbe2efd35244923e9b3fd2ebcbc1-6d6740df4bc98e43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "2c793c85cc2677135d82020e383c1cb8",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "610124f2-842b-41a6-a90c-7e2ab7d359c6",
         "Content-Length": "244",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:06 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:13 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "91",
-        "x-request-id": "513c31b7-afbf-4556-bb8f-b6de2ed6f7fb"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "93",
+        "X-Request-ID": "610124f2-842b-41a6-a90c-7e2ab7d359c6"
       },
       "ResponseBody": {
-        "hookId": "1f395ec9-0758-4293-8cda-fc49a0347efe",
+        "hookId": "25332683-31ed-49e8-a191-97bea4cc16e4",
         "hookName": "hooksvvcRVbp",
         "hookType": "Email",
         "externalLink": "",
@@ -77,16 +126,19 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f395ec9-0758-4293-8cda-fc49a0347efe",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
         "Content-Length": "164",
         "Content-Type": "application/merge-patch\u002Bjson",
-        "traceparent": "00-0e3674a1edaf2843b8cb33c1bb94a91e-3fad290267ddc248-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "2c793c85cc2677135d82020e383c1cb8",
+        "traceparent": "00-0bfb43d1ceace24ab63a4bfd7f404cb0-512bf466f6b30747-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "20ce9555c236980a64b3303dfe6d6e64",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -104,41 +156,44 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bc2921d1-1aa2-43f2-a1ad-087e42e093a4",
+        "apim-request-id": "7d4d8aac-61f8-43c2-ba82-8a28d6f24e67",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:06 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "411",
-        "x-request-id": "bc2921d1-1aa2-43f2-a1ad-087e42e093a4"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "442",
+        "X-Request-ID": "7d4d8aac-61f8-43c2-ba82-8a28d6f24e67"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f395ec9-0758-4293-8cda-fc49a0347efe",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-ddcd4e2dc5a52f4dbd177f2434a64a63-a997b71c49d37a4c-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "20ce9555c236980a64b3303dfe6d6e64",
+        "traceparent": "00-4d699d6cdbb6d6498188af3330bddd35-b97c5d402a68cd42-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "73d602a517329fcbae2194307dd45df2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "608d0420-dbfe-4c23-bb61-5a2e7090d9f1",
+        "apim-request-id": "f7eb567a-2e2b-426c-a2f5-d82fbda68062",
         "Content-Length": "262",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 19 Jan 2021 17:59:06 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "79",
-        "x-request-id": "608d0420-dbfe-4c23-bb61-5a2e7090d9f1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "80",
+        "X-Request-ID": "f7eb567a-2e2b-426c-a2f5-d82fbda68062"
       },
       "ResponseBody": {
-        "hookId": "1f395ec9-0758-4293-8cda-fc49a0347efe",
+        "hookId": "25332683-31ed-49e8-a191-97bea4cc16e4",
         "hookName": "hooksvvcRVbp",
         "hookType": "Email",
         "externalLink": "",
@@ -156,26 +211,29 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f395ec9-0758-4293-8cda-fc49a0347efe",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/25332683-31ed-49e8-a191-97bea4cc16e4",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Authorization": "Sanitized",
-        "traceparent": "00-62bc9006f57cd143abc7b235627bd9c8-fc905e4c4f455b4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210119.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
-        "x-ms-client-request-id": "73d602a517329fcbae2194307dd45df2",
+        "traceparent": "00-c19854d75b019d439d752e7a2b472971-10b598e2bf7a7648-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-ms-client-request-id": "7898d3f2c677c35932e1c7729cd578ef",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2650425f-ff19-4a78-b602-a5ba663db30b",
+        "apim-request-id": "bf8e1961-54d1-4ae5-a7c7-0e50bc52b1e2",
         "Content-Length": "0",
-        "Date": "Tue, 19 Jan 2021 17:59:06 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:14 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "98",
-        "x-request-id": "2650425f-ff19-4a78-b602-a5ba663db30b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "155",
+        "X-Request-ID": "bf8e1961-54d1-4ae5-a7c7-0e50bc52b1e2"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstance.json
index 46fe42e8277b..ad8716b6a9f8 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstance.json
@@ -8,7 +8,7 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4b21b61be32c844c9187f907d3a67d41-5cb13a6bc118144c-00",
+        "traceparent": "00-eefb8b6e08ea564581dacbb6169ffcd5-af35be7d2554814a-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -29,32 +29,76 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "c9ab5ee0-a1e3-4314-a379-5af7833040d0",
+        "apim-request-id": "e657b3e1-60f6-4f11-9e3d-f546aeee3e71",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:54 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b3de37b-c142-407c-abde-a0e60c0f4c7f",
+        "Date": "Fri, 05 Feb 2021 17:59:36 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/35b07ba7-4210-497e-a1f8-12996ae4d00d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "584",
-        "X-Request-ID": "c9ab5ee0-a1e3-4314-a379-5af7833040d0"
+        "x-envoy-upstream-service-time": "271",
+        "X-Request-ID": "e657b3e1-60f6-4f11-9e3d-f546aeee3e71"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b3de37b-c142-407c-abde-a0e60c0f4c7f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/35b07ba7-4210-497e-a1f8-12996ae4d00d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-eefb8b6e08ea564581dacbb6169ffcd5-fcc06b282d56d741-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "0f169c7dfdf448108d13c02ab16defeb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "f9792d3c-2766-47d3-b0c6-84d6566fdbc8",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:36 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "f9792d3c-2766-47d3-b0c6-84d6566fdbc8"
+      },
+      "ResponseBody": {
+        "hookId": "35b07ba7-4210-497e-a1f8-12996ae4d00d",
+        "hookName": "hookZ2hZl0KY",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/35b07ba7-4210-497e-a1f8-12996ae4d00d",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "67",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9408134e15005540bd0937f4e8077e64-82b2fc5a18a87145-00",
+        "traceparent": "00-e8018fd3184c864fbd39017167ee078b-18ef6f447104ee48-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0f169c7dfdf448108d13c02ab16defeb",
+        "x-ms-client-request-id": "b0512a454bf18679612b39d58d67e7fa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -67,45 +111,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "865c6b5d-af92-4766-841d-edbf6e692993",
+        "apim-request-id": "854a38fa-32ef-4884-92f5-f9120012c6d6",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "247",
-        "X-Request-ID": "865c6b5d-af92-4766-841d-edbf6e692993"
+        "x-envoy-upstream-service-time": "276",
+        "X-Request-ID": "854a38fa-32ef-4884-92f5-f9120012c6d6"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b3de37b-c142-407c-abde-a0e60c0f4c7f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/35b07ba7-4210-497e-a1f8-12996ae4d00d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-79c64e4b05d605498e239cb2ee535a9e-49eb708547032a49-00",
+        "traceparent": "00-bcbb57d059f737459ba64533b1b63c33-6484c970ab3c4c45-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b0512a454bf18679612b39d58d67e7fa",
+        "x-ms-client-request-id": "4148c7bf187f637079cac1df655ceb6c",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "593f4c61-bcb5-47e2-9c7c-28a8e35370a4",
+        "apim-request-id": "028992b9-9894-40c7-a78b-e2bb20a4476b",
         "Content-Length": "205",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:45:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "593f4c61-bcb5-47e2-9c7c-28a8e35370a4"
+        "x-envoy-upstream-service-time": "149",
+        "X-Request-ID": "028992b9-9894-40c7-a78b-e2bb20a4476b"
       },
       "ResponseBody": {
-        "hookId": "8b3de37b-c142-407c-abde-a0e60c0f4c7f",
+        "hookId": "35b07ba7-4210-497e-a1f8-12996ae4d00d",
         "hookName": "hookZ2hZl0KY",
         "hookType": "Email",
         "externalLink": "",
@@ -121,30 +165,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8b3de37b-c142-407c-abde-a0e60c0f4c7f",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/35b07ba7-4210-497e-a1f8-12996ae4d00d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fb13d46d860246419044b674dd461466-fd76f92bbee7cc4c-00",
+        "traceparent": "00-f2b0d9dfaf25374aa07bc426f336c0a7-bebe688101b04545-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4148c7bf187f637079cac1df655ceb6c",
+        "x-ms-client-request-id": "56716d5ca1ba32872290aec8c33abb26",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f019995d-b960-4970-add4-52002cf7330e",
+        "apim-request-id": "2e8e0b17-78a2-4d9e-8f8c-c08703938c59",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:54 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:37 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "205",
-        "X-Request-ID": "f019995d-b960-4970-add4-52002cf7330e"
+        "x-envoy-upstream-service-time": "178",
+        "X-Request-ID": "2e8e0b17-78a2-4d9e-8f8c-c08703938c59"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstanceAsync.json
index daab7437054a..3be62ea166a5 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateEmailNotificationHookWithMinimumSetupAndNewInstanceAsync.json
@@ -8,7 +8,7 @@
         "Content-Length": "111",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-083af79f0c817545867068253af277f1-8fa6a589233ca446-00",
+        "traceparent": "00-ea6638e1ecde064295d9357e29ccd1d3-a2f6a04b6da16240-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -29,32 +29,76 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "0e51d388-5be9-40d8-9009-07a6731127f9",
+        "apim-request-id": "b70a139f-dbb3-4275-ab85-683e1a819d3d",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:56 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b5f6e0c8-0af3-459e-8971-255228d00006",
+        "Date": "Fri, 05 Feb 2021 17:59:59 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "363",
-        "X-Request-ID": "0e51d388-5be9-40d8-9009-07a6731127f9"
+        "x-envoy-upstream-service-time": "257",
+        "X-Request-ID": "b70a139f-dbb3-4275-ab85-683e1a819d3d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b5f6e0c8-0af3-459e-8971-255228d00006",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ea6638e1ecde064295d9357e29ccd1d3-27ce55ed0a660745-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "e1086ca71fc92c242b1baa9a11909c57",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "77511943-08a3-4248-afc6-02c61cb327e6",
+        "Content-Length": "223",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:59 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "154",
+        "X-Request-ID": "77511943-08a3-4248-afc6-02c61cb327e6"
+      },
+      "ResponseBody": {
+        "hookId": "2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
+        "hookName": "hookq2zTBpvt",
+        "hookType": "Email",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "toList": [
+            "fake1@email.com",
+            "fake2@email.com"
+          ]
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "67",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-d6dc7d52db2c9441a47bf95904b19a21-5b065e7405d2374e-00",
+        "traceparent": "00-52c71d3b9b4ad74f998f1126e58291e3-1bdf77ec30cf764c-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e1086ca71fc92c242b1baa9a11909c57",
+        "x-ms-client-request-id": "75df18c0504f452f83de69456d75ed49",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -67,45 +111,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "1c27c512-18b1-4945-b327-16dd83b1f8e9",
+        "apim-request-id": "20660c1c-1e66-4ab9-bb79-9003a11ef14d",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:57 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "463",
-        "X-Request-ID": "1c27c512-18b1-4945-b327-16dd83b1f8e9"
+        "x-envoy-upstream-service-time": "780",
+        "X-Request-ID": "20660c1c-1e66-4ab9-bb79-9003a11ef14d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b5f6e0c8-0af3-459e-8971-255228d00006",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0b89020a852a724f8f690bffa3bedcc4-482aff31dfcfd740-00",
+        "traceparent": "00-91c16aa2ce81994ba6301b22e937e23f-58dabbc36ebe3643-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "75df18c0504f452f83de69456d75ed49",
+        "x-ms-client-request-id": "faaf6aa5f6990474bed42b0c782f37c3",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "d8bbad06-4adb-4f4d-834f-9e5b71688707",
+        "apim-request-id": "ee67620d-4292-40d2-9386-6c9ee8d1d8b6",
         "Content-Length": "205",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:45:57 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "155",
-        "X-Request-ID": "d8bbad06-4adb-4f4d-834f-9e5b71688707"
+        "x-envoy-upstream-service-time": "147",
+        "X-Request-ID": "ee67620d-4292-40d2-9386-6c9ee8d1d8b6"
       },
       "ResponseBody": {
-        "hookId": "b5f6e0c8-0af3-459e-8971-255228d00006",
+        "hookId": "2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
         "hookName": "hookq2zTBpvt",
         "hookType": "Email",
         "externalLink": "",
@@ -121,30 +165,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b5f6e0c8-0af3-459e-8971-255228d00006",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/2d82cdcd-703c-4af8-b8a1-7e9d0d3ec4d8",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-5847167db147b844886aa31658d6e8f8-76afaf3cf9246545-00",
+        "traceparent": "00-c75594d863ca6a4181e807685416e694-9dfce285f8408d41-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "faaf6aa5f6990474bed42b0c782f37c3",
+        "x-ms-client-request-id": "576cf3bfee3757173cc35eeab5debfb5",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "35e7d48a-ec01-46a8-9088-614c1f7e5ee6",
+        "apim-request-id": "c1167139-13b4-4afd-b9a1-e1cbc3b1ba6d",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:45:57 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:00 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "177",
-        "X-Request-ID": "35e7d48a-ec01-46a8-9088-614c1f7e5ee6"
+        "x-envoy-upstream-service-time": "179",
+        "X-Request-ID": "c1167139-13b4-4afd-b9a1-e1cbc3b1ba6d"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstance.json
index 1474eb7808ac..57665e08cde0 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstance.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0660fcad516945428b631ca1c5570af3-486c6e19a4f7ca40-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e0c4ccf7ef064a40a7929ce33ff8e1ca-c017ad439680d34c-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "80014993b788eb0383a0adacb3165602",
+        "x-ms-client-request-id": "7f2d33c6861b10edae647b3792e1b73e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,48 +19,48 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hook00eMAFQT"
+        "hookName": "hookXj9lYlGt"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "09711147-8fa1-43b4-804a-1b03af24180a",
+        "apim-request-id": "342dd110-ddee-4096-98c8-8152727208e7",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:10 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
+        "Date": "Fri, 05 Feb 2021 18:44:05 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "888",
-        "x-request-id": "09711147-8fa1-43b4-804a-1b03af24180a"
+        "x-envoy-upstream-service-time": "1166",
+        "x-request-id": "342dd110-ddee-4096-98c8-8152727208e7"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-c5b4e388c3e2ae489ed24e95e1f7b9f7-4f70b0ec688bd741-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-e0c4ccf7ef064a40a7929ce33ff8e1ca-e2ee78367686284a-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c81da1f83eb97baf3e76f5492e1c5c4c",
+        "x-ms-client-request-id": "281d216ef24d65ff349ece0e7f5a93c9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "052224ba-ed1b-4ffc-b325-77224ed030c7",
+        "apim-request-id": "73db1d80-aa10-400f-8d60-ecb186ae56c7",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:11 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "138",
-        "x-request-id": "052224ba-ed1b-4ffc-b325-77224ed030c7"
+        "x-envoy-upstream-service-time": "236",
+        "x-request-id": "73db1d80-aa10-400f-8d60-ecb186ae56c7"
       },
       "ResponseBody": {
-        "hookId": "cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
-        "hookName": "hook00eMAFQT",
+        "hookId": "26b0df26-d959-43f8-ac51-6504b9e54027",
+        "hookName": "hookXj9lYlGt",
         "hookType": "Webhook",
         "externalLink": "",
         "description": "",
@@ -78,17 +78,60 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-56688f8653dced4dbf07c966fc5d0538-b7c1b6221628ef4a-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d3a7bc2efbdf6fe8765293b28f145d96",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "28f53579-6282-4080-8853-0734ea2985da",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:44:06 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "x-content-type-options": "nosniff",
+        "x-envoy-upstream-service-time": "311",
+        "x-request-id": "28f53579-6282-4080-8853-0734ea2985da"
+      },
+      "ResponseBody": {
+        "hookId": "26b0df26-d959-43f8-ac51-6504b9e54027",
+        "hookName": "hookXj9lYlGt",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "356",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-541528b5eeab1940b7d9c83e478e3245-2c2f302f456b0f4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-019456af4baf3942ba23e7c8cf0cad81-0532ac49bb1aac4d-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5ed064c4cb734df5cd14169c7ac1b694",
+        "x-ms-client-request-id": "23b9459bf8d2d44334c84b7cb8de9054",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -104,49 +147,49 @@
           "certificatePassword": "certPassword"
         },
         "hookType": "Webhook",
-        "hookName": "hook00eMAFQT",
+        "hookName": "hookXj9lYlGt",
         "description": "This hook was created to test the .NET client.",
         "externalLink": "http://fake.endpoint.com"
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "cd2f261b-c836-4366-8b1a-1642942e4c91",
+        "apim-request-id": "d381e629-a779-4132-9dec-aa648aff2671",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:12 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1053",
-        "x-request-id": "cd2f261b-c836-4366-8b1a-1642942e4c91"
+        "x-envoy-upstream-service-time": "874",
+        "x-request-id": "d381e629-a779-4132-9dec-aa648aff2671"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-4ca8a64672ea5145bee3da9397c7a377-d1b90b2f4ba3e44f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-f4ebbb4d82ab25418875cb652114d511-5fcd261017e6d347-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "0fb42e21dc98547b99864111c1babc67",
+        "x-ms-client-request-id": "d509b1d0e43a735e38adb1fb5e4cd520",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "dbde36a0-eafb-4454-915f-0c3d9cd20518",
+        "apim-request-id": "3e8e7737-b00b-41e5-ab42-49fe71b47b03",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:12 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:07 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "140",
-        "x-request-id": "dbde36a0-eafb-4454-915f-0c3d9cd20518"
+        "x-envoy-upstream-service-time": "149",
+        "x-request-id": "3e8e7737-b00b-41e5-ab42-49fe71b47b03"
       },
       "ResponseBody": {
-        "hookId": "cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
-        "hookName": "hook00eMAFQT",
+        "hookId": "26b0df26-d959-43f8-ac51-6504b9e54027",
+        "hookName": "hookXj9lYlGt",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
         "description": "This hook was created to test the .NET client.",
@@ -167,27 +210,27 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/cd2219e1-3e73-4326-a8ba-a31429c1e6bd",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/26b0df26-d959-43f8-ac51-6504b9e54027",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f9bbb7ea1e97b54484487743f1a5fd39-53bad4b80634304f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-110d13293b085e4dba14d8ebd7bd7b42-e5f2f10892382e40-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "4fe76043f7462d8eabcffba42813007d",
+        "x-ms-client-request-id": "397238416fa135f679d39e17af6cb797",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9738c4cc-4d42-49f9-b3e4-811b75b51b3f",
+        "apim-request-id": "8918f303-d7c4-4ec4-b413-34332e18dd02",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:12 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "162",
-        "x-request-id": "9738c4cc-4d42-49f9-b3e4-811b75b51b3f"
+        "x-envoy-upstream-service-time": "189",
+        "x-request-id": "8918f303-d7c4-4ec4-b413-34332e18dd02"
       },
       "ResponseBody": []
     }
@@ -197,6 +240,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "1965114190"
+    "RandomSeed": "1431313978"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstanceAsync.json
index 49cd6adfb451..d191e7a03f0d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndGetInstanceAsync.json
@@ -8,10 +8,10 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-bf7e3de38099a341be210c3c45b5a11c-691bce82fadfee49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c61daf4375d1fc4184587e55fecce3d9-95182dd909e63b47-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "197d9614a08adb01a90da16ffcfd25da",
+        "x-ms-client-request-id": "14714b46a963038a7946b4d90acfc1d7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -19,48 +19,48 @@
           "endpoint": "http://contoso.com"
         },
         "hookType": "Webhook",
-        "hookName": "hookt9w9f2cN"
+        "hookName": "hookpK0fDvKZ"
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "36212011-909f-40ec-a033-f3419281d661",
+        "apim-request-id": "4d549475-3a4c-4775-8c13-631f021d8f00",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:37 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
+        "Date": "Fri, 05 Feb 2021 18:44:09 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "995",
-        "x-request-id": "36212011-909f-40ec-a033-f3419281d661"
+        "x-envoy-upstream-service-time": "741",
+        "x-request-id": "4d549475-3a4c-4775-8c13-631f021d8f00"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-2e1d4d34c27e4b4eba015d9418141fbc-ee68c8f9e24e1e47-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c61daf4375d1fc4184587e55fecce3d9-60ab7ed9f3f64341-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "ecbc2adebf371e4712a15bb52660fd35",
+        "x-ms-client-request-id": "c33426ee83f4681816253b66c8350a56",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "5cb151d5-2b7d-4fa4-9e35-46176ff9f424",
+        "apim-request-id": "85a5bca8-e7ef-4566-9362-fac70315314d",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:37 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "5cb151d5-2b7d-4fa4-9e35-46176ff9f424"
+        "x-envoy-upstream-service-time": "163",
+        "x-request-id": "85a5bca8-e7ef-4566-9362-fac70315314d"
       },
       "ResponseBody": {
-        "hookId": "b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
-        "hookName": "hookt9w9f2cN",
+        "hookId": "1f20aded-4466-4215-a770-8efb2dfba70f",
+        "hookName": "hookpK0fDvKZ",
         "hookType": "Webhook",
         "externalLink": "",
         "description": "",
@@ -78,17 +78,60 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-cca9c67e9f15fe4fb4d485d91703753b-d3812a4f6814c546-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "d785b99fb19018587cba688c141f8a71",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "75399c38-5a95-461d-a486-1aaa5d48a3bf",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:44:09 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "x-content-type-options": "nosniff",
+        "x-envoy-upstream-service-time": "180",
+        "x-request-id": "75399c38-5a95-461d-a486-1aaa5d48a3bf"
+      },
+      "ResponseBody": {
+        "hookId": "1f20aded-4466-4215-a770-8efb2dfba70f",
+        "hookName": "hookpK0fDvKZ",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "356",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3cb2b34881296c45a083742afee88095-56318a99fffc0049-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-c8c2c2906d31144d962120fd3e56afbf-3d90864e38a5b048-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "6a923ccb8c365fd15a1518a27ded07f6",
+        "x-ms-client-request-id": "53bf8733e41cc2be3209fd3d6d243a43",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -104,49 +147,49 @@
           "certificatePassword": "certPassword"
         },
         "hookType": "Webhook",
-        "hookName": "hookt9w9f2cN",
+        "hookName": "hookpK0fDvKZ",
         "description": "This hook was created to test the .NET client.",
         "externalLink": "http://fake.endpoint.com"
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "a5ad0672-0757-4cef-8dc3-83fe5eba9d81",
+        "apim-request-id": "3fdc6f4b-49e6-491c-a566-8f9dddf90318",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:39 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1297",
-        "x-request-id": "a5ad0672-0757-4cef-8dc3-83fe5eba9d81"
+        "x-envoy-upstream-service-time": "714",
+        "x-request-id": "3fdc6f4b-49e6-491c-a566-8f9dddf90318"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-0631dfdf1c43d4499fcf8272ae3908e1-73d956c6070ca14b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-01e842bce58af34eacc3cba6c3609281-1105c0fa7fda474c-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "b795ed11b75b54774f5f06e8444bb449",
+        "x-ms-client-request-id": "503a5d3bea4a3c46ce1b47391b8c53f7",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "b927aa54-27a4-4db0-81a3-c50c564fa73a",
+        "apim-request-id": "d3ef2092-f1a7-405e-bfd5-752b9d7309c9",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:39 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "246",
-        "x-request-id": "b927aa54-27a4-4db0-81a3-c50c564fa73a"
+        "x-envoy-upstream-service-time": "145",
+        "x-request-id": "d3ef2092-f1a7-405e-bfd5-752b9d7309c9"
       },
       "ResponseBody": {
-        "hookId": "b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
-        "hookName": "hookt9w9f2cN",
+        "hookId": "1f20aded-4466-4215-a770-8efb2dfba70f",
+        "hookName": "hookpK0fDvKZ",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
         "description": "This hook was created to test the .NET client.",
@@ -167,27 +210,27 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/b7b16b83-c0fa-4bd0-ba10-64d1b2e0f8d9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/1f20aded-4466-4215-a770-8efb2dfba70f",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f3b855ed95d21e479a038c0c52b77a0c-6b1ffbaf528c0b4d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-7b78abe2619bdf48ac84f70197092d38-0ed5481b459b5a41-00",
+        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "c0a46c0fbb6a51a3585d9122a6a4a025",
+        "x-ms-client-request-id": "4132c99ab776bb3afbc2a587b41aab58",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "4216ee97-4a44-420e-82c9-1b20f4e3d39d",
+        "apim-request-id": "01dff0fc-ad9a-409c-8f5c-10a24d349894",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:39 GMT",
+        "Date": "Fri, 05 Feb 2021 18:44:10 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "218",
-        "x-request-id": "4216ee97-4a44-420e-82c9-1b20f4e3d39d"
+        "x-envoy-upstream-service-time": "163",
+        "x-request-id": "01dff0fc-ad9a-409c-8f5c-10a24d349894"
       },
       "ResponseBody": []
     }
@@ -197,6 +240,6 @@
     "METRICSADVISOR_ENDPOINT_SUFFIX": null,
     "METRICSADVISOR_PRIMARY_API_KEY": "Sanitized",
     "METRICSADVISOR_SUBSCRIPTION_KEY": "Sanitized",
-    "RandomSeed": "2052677506"
+    "RandomSeed": "1815519689"
   }
 }
\ No newline at end of file
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstance.json
index 8a9430c7892b..344afb245d4d 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstance.json
@@ -8,7 +8,7 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-a16e4419b448ea45b68bae3c935cb8d7-abd959ac05277346-00",
+        "traceparent": "00-46d3d05c6a3d9b47bffa4b37898951f5-01e87f27c5234b40-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -26,32 +26,78 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "71fc732f-abb8-4025-87b8-e5aadddf40d5",
+        "apim-request-id": "79c3030b-3a70-461e-b6c6-4619442ed296",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:40 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e4366592-3ea4-4e6b-be9a-2b2ddc053950",
+        "Date": "Fri, 05 Feb 2021 17:59:38 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1159",
-        "X-Request-ID": "71fc732f-abb8-4025-87b8-e5aadddf40d5"
+        "x-envoy-upstream-service-time": "639",
+        "X-Request-ID": "79c3030b-3a70-461e-b6c6-4619442ed296"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e4366592-3ea4-4e6b-be9a-2b2ddc053950",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-46d3d05c6a3d9b47bffa4b37898951f5-87033077d0e25742-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "a3ff6dad6ba81c270ee4c1c99d0e96fc",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "447c353d-1d5f-40d2-a5d1-3db72105fa06",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:38 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "152",
+        "X-Request-ID": "447c353d-1d5f-40d2-a5d1-3db72105fa06"
+      },
+      "ResponseBody": {
+        "hookId": "6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
+        "hookName": "hookFVanV9iZ",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "310",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-82b5709488810646b4316de17f70dba0-3a180d40dae5154e-00",
+        "traceparent": "00-c9fde0155a2bf140956b8cad88d0037e-e2f24c4c87427445-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "a3ff6dad6ba81c270ee4c1c99d0e96fc",
+        "x-ms-client-request-id": "bb9d5fd69b32cad6b72b41a2980c02da",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,45 +117,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "7416ca5c-caf2-45a4-b717-716bae08578a",
+        "apim-request-id": "539d004f-69bc-4e88-8d0b-26702ab5408a",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:39 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1096",
-        "X-Request-ID": "7416ca5c-caf2-45a4-b717-716bae08578a"
+        "x-envoy-upstream-service-time": "1641",
+        "X-Request-ID": "539d004f-69bc-4e88-8d0b-26702ab5408a"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e4366592-3ea4-4e6b-be9a-2b2ddc053950",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-560a8b188f21d349a36e4f9ca6a49188-b98cc5e4b3bf8b48-00",
+        "traceparent": "00-3c3c8ffbb1aeaa418f3edd755b23f1d4-c9426b143eb2d449-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "bb9d5fd69b32cad6b72b41a2980c02da",
+        "x-ms-client-request-id": "fa76c7997c76dc8db2c9d4f12f527dae",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "e12d7d8c-303c-4da2-88ca-e47f8aaef233",
+        "apim-request-id": "5d3a05d0-d317-40e2-832e-41e41d91dcae",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:57:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "166",
-        "X-Request-ID": "e12d7d8c-303c-4da2-88ca-e47f8aaef233"
+        "x-envoy-upstream-service-time": "145",
+        "X-Request-ID": "5d3a05d0-d317-40e2-832e-41e41d91dcae"
       },
       "ResponseBody": {
-        "hookId": "e4366592-3ea4-4e6b-be9a-2b2ddc053950",
+        "hookId": "6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
         "hookName": "hookFVanV9iZ",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
@@ -131,30 +177,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/e4366592-3ea4-4e6b-be9a-2b2ddc053950",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/6d7cb14d-dcdd-49b9-a19b-a38e9d70de39",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1a31587a8b2eca488e4dac5565091169-99af6fd4df64fe40-00",
+        "traceparent": "00-c02a9bdde9187943814609a7f4442e62-19474474213ed844-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "fa76c7997c76dc8db2c9d4f12f527dae",
+        "x-ms-client-request-id": "f41d4ddf3f1411ca9634ec7d2a858301",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "fe5b681c-2d23-46c8-9f67-f138ae0b0b21",
+        "apim-request-id": "3f9474cf-05f5-4399-a9ae-371841147505",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:40 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "184",
-        "X-Request-ID": "fe5b681c-2d23-46c8-9f67-f138ae0b0b21"
+        "x-envoy-upstream-service-time": "157",
+        "X-Request-ID": "3f9474cf-05f5-4399-a9ae-371841147505"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstanceAsync.json
index 588be6f2f0c2..c22d42c63dc4 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithEveryMemberAndNewInstanceAsync.json
@@ -8,7 +8,7 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-b98fb2dff68dd54b9bc1eed5890dd1cf-da52408d37f4ef4d-00",
+        "traceparent": "00-6f603099dae9f944bf324d338dcef173-76475ebb6857904d-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -26,32 +26,78 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "424d5482-ff69-40a0-be11-9b95d25040be",
+        "apim-request-id": "3b2507dc-45e6-4818-8c4c-9218d0dfedf3",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ba1eb033-e09b-4528-9833-f01fbb41d2e9",
+        "Date": "Fri, 05 Feb 2021 18:00:02 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/50e3e09d-3d5c-4664-9a58-843a092a4110",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "852",
-        "X-Request-ID": "424d5482-ff69-40a0-be11-9b95d25040be"
+        "x-envoy-upstream-service-time": "1380",
+        "X-Request-ID": "3b2507dc-45e6-4818-8c4c-9218d0dfedf3"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ba1eb033-e09b-4528-9833-f01fbb41d2e9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/50e3e09d-3d5c-4664-9a58-843a092a4110",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-6f603099dae9f944bf324d338dcef173-1f375e4abf994545-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "7467bfd9f7651387052972d91fdaa013",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "c172f247-5632-4d3e-b875-32ceb535318b",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:02 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "159",
+        "X-Request-ID": "c172f247-5632-4d3e-b875-32ceb535318b"
+      },
+      "ResponseBody": {
+        "hookId": "50e3e09d-3d5c-4664-9a58-843a092a4110",
+        "hookName": "hookgFrirZRH",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/50e3e09d-3d5c-4664-9a58-843a092a4110",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "310",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-fcac3e3b14cf5c469b47b1895224b2d2-0c1cd616d57d184a-00",
+        "traceparent": "00-707afedaf0bed345b02eb00575260bbf-a4411b6336e89741-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "7467bfd9f7651387052972d91fdaa013",
+        "x-ms-client-request-id": "55aae559f3b1c40e29fbaf4ea611fafa",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -71,45 +117,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "dc30cdbc-04de-4f29-8e73-1a066acedaa7",
+        "apim-request-id": "b9248b2a-3e64-4fe2-beec-a2b4dcdafbce",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:43 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "907",
-        "X-Request-ID": "dc30cdbc-04de-4f29-8e73-1a066acedaa7"
+        "x-envoy-upstream-service-time": "960",
+        "X-Request-ID": "b9248b2a-3e64-4fe2-beec-a2b4dcdafbce"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ba1eb033-e09b-4528-9833-f01fbb41d2e9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/50e3e09d-3d5c-4664-9a58-843a092a4110",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-197f3915ecc59c41bcd76a84e409351e-f0e67ad2ba51a74d-00",
+        "traceparent": "00-c10a9535cbb3444da6a5b47678ebdaa0-479cf7e71d3d2843-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "55aae559f3b1c40e29fbaf4ea611fafa",
+        "x-ms-client-request-id": "e3df9fb7ea32cced3733180fa9662459",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8376cb89-ce88-44a4-a63b-dd3bb5fe7993",
+        "apim-request-id": "ceacdcfe-4cae-48cf-8391-8905edc24560",
         "Content-Length": "433",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:57:44 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "170",
-        "X-Request-ID": "8376cb89-ce88-44a4-a63b-dd3bb5fe7993"
+        "x-envoy-upstream-service-time": "169",
+        "X-Request-ID": "ceacdcfe-4cae-48cf-8391-8905edc24560"
       },
       "ResponseBody": {
-        "hookId": "ba1eb033-e09b-4528-9833-f01fbb41d2e9",
+        "hookId": "50e3e09d-3d5c-4664-9a58-843a092a4110",
         "hookName": "hookgFrirZRH",
         "hookType": "Webhook",
         "externalLink": "http://fake.endpoint.com",
@@ -131,30 +177,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/ba1eb033-e09b-4528-9833-f01fbb41d2e9",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/50e3e09d-3d5c-4664-9a58-843a092a4110",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-9de85c344e1e30448d37cce598e522bb-6e8015e0154bc24e-00",
+        "traceparent": "00-649bbeddfa18ac4b88d29e44418c5052-4c6ee6320c0de946-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "e3df9fb7ea32cced3733180fa9662459",
+        "x-ms-client-request-id": "e6139e7df1f6e572b1a34b6947386cf4",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "50419aed-d11e-4b55-a6b2-c631a9f561bc",
+        "apim-request-id": "2233f7bb-9f85-4235-8514-71b5f857ff07",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:44 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:03 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "176",
-        "X-Request-ID": "50419aed-d11e-4b55-a6b2-c631a9f561bc"
+        "x-envoy-upstream-service-time": "175",
+        "X-Request-ID": "2233f7bb-9f85-4235-8514-71b5f857ff07"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstance.json
index 7907e21040de..554dd47dc14e 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstance.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-cd854d29afc2104b944e6172e327ba0b-a9b989804fe73f4b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-559b596ec2e7fe4d8747f43ef5a7993f-982638e98a64bf44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "0a5a20d9eab796c8a788161433c533f9",
         "x-ms-return-client-request-id": "true"
@@ -23,25 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "4b860520-9bd0-43ab-939a-3acb5955cc1b",
+        "apim-request-id": "859ad93d-549f-40eb-8ca9-47efa4f54774",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:16 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8e68aa47-76fd-4787-815b-96e8cd86c08e",
+        "Date": "Fri, 05 Feb 2021 17:59:41 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "807",
-        "x-request-id": "4b860520-9bd0-43ab-939a-3acb5955cc1b"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "883",
+        "X-Request-ID": "859ad93d-549f-40eb-8ca9-47efa4f54774"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8e68aa47-76fd-4787-815b-96e8cd86c08e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8b0ad09dfbc71845ab41260b5fd85f4a-6ec831b1a885714b-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-559b596ec2e7fe4d8747f43ef5a7993f-1d0332f3902ae347-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "c8be40cd3d36606d0dfb622e5d915155",
         "x-ms-return-client-request-id": "true"
@@ -49,17 +55,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "403c70c9-fa52-457a-a4bb-7e58b6f319c1",
+        "apim-request-id": "4bf02964-58e9-43a7-af14-b107f77e87d8",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:16 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:41 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "145",
-        "x-request-id": "403c70c9-fa52-457a-a4bb-7e58b6f319c1"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "137",
+        "X-Request-ID": "4bf02964-58e9-43a7-af14-b107f77e87d8"
       },
       "ResponseBody": {
-        "hookId": "8e68aa47-76fd-4787-815b-96e8cd86c08e",
+        "hookId": "73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
         "hookName": "hookekWSvc3w",
         "hookType": "Webhook",
         "externalLink": "",
@@ -78,17 +84,66 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8e68aa47-76fd-4787-815b-96e8cd86c08e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-ee82fb8f9b8ae948bf753c3da5c72ea6-0d566ee9bb07bc47-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "3d8a13b013078850ad43c06f8c1a7d09",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "e73bddca-d177-4626-981a-72a79ef85f5b",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:41 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "142",
+        "X-Request-ID": "e73bddca-d177-4626-981a-72a79ef85f5b"
+      },
+      "ResponseBody": {
+        "hookId": "73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
+        "hookName": "hookekWSvc3w",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "231",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-49db7245bbbbf349a69b5a7cd730dbf8-ee1dbe623709d54a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-3278b6d252bfda4983caacb819e972e8-c6a6c81bb75f844e-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3d8a13b013078850ad43c06f8c1a7d09",
+        "x-ms-client-request-id": "8cdd859622639c96b2fafdbb879a3916",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +162,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "5dfb87cf-a666-40bd-8435-cb8499cae5c0",
+        "apim-request-id": "78ad5fca-1b43-4446-9159-c529ff2f0fd5",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "932",
-        "x-request-id": "5dfb87cf-a666-40bd-8435-cb8499cae5c0"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "811",
+        "X-Request-ID": "78ad5fca-1b43-4446-9159-c529ff2f0fd5"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8e68aa47-76fd-4787-815b-96e8cd86c08e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-614c9ddd1b4d8e4ca857c4cda1bf3f4a-b9f83fca21370c41-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-ac84c7b2bac8414c9681c7872b31fc5a-d9838fca465e804a-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "8cdd859622639c96b2fafdbb879a3916",
+        "x-ms-client-request-id": "1f64c037f63abaf1ef361bf37cfdd3f2",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "0d43d501-56f6-41fb-a9cd-227d4775223f",
+        "apim-request-id": "94cbd12b-6625-473d-a4f9-a35d81884d13",
         "Content-Length": "308",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "152",
-        "x-request-id": "0d43d501-56f6-41fb-a9cd-227d4775223f"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "170",
+        "X-Request-ID": "94cbd12b-6625-473d-a4f9-a35d81884d13"
       },
       "ResponseBody": {
-        "hookId": "8e68aa47-76fd-4787-815b-96e8cd86c08e",
+        "hookId": "73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
         "hookName": "hookekWSvc3w",
         "hookType": "Webhook",
         "externalLink": "",
@@ -161,27 +219,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8e68aa47-76fd-4787-815b-96e8cd86c08e",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/73efc2b1-826f-414b-85d5-6fe7fbc16e8d",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-f01eeb6c38e7604c9e16bf962cf89014-fa9f2a08f454f94d-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-67c15d91f4f64d45a542fc57b1831f6a-53d52a8736317044-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "1f64c037f63abaf1ef361bf37cfdd3f2",
+        "x-ms-client-request-id": "d797597ec4b38df27dee8a0d15940012",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "ac292373-ef44-4611-ad8a-11233e3eb16c",
+        "apim-request-id": "4b75b328-f95b-41dc-8c05-990b4b6f59b0",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:17 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:42 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "168",
-        "x-request-id": "ac292373-ef44-4611-ad8a-11233e3eb16c"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "181",
+        "X-Request-ID": "4b75b328-f95b-41dc-8c05-990b4b6f59b0"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstanceAsync.json
index 46ec63a43a14..27d13f5fd108 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndGetInstanceAsync.json
@@ -8,8 +8,11 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-75c7d111da07d74db4d24926b6e26dd5-615801154d60814a-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a6a6740abbcc64ebe1cda301551b4fb-42a7a73cba53c947-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "eaa8bb9e71ad8b31709ae5c916419863",
         "x-ms-return-client-request-id": "true"
@@ -23,25 +26,28 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "f9af6f1b-516d-4495-8996-fef559d5bfd7",
+        "apim-request-id": "fd5bce47-523c-41f1-ac7e-197e85d42559",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:43 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+        "Date": "Fri, 05 Feb 2021 18:00:04 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "788",
-        "x-request-id": "f9af6f1b-516d-4495-8996-fef559d5bfd7"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "796",
+        "X-Request-ID": "fd5bce47-523c-41f1-ac7e-197e85d42559"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3381386be28c9346a68b4893b13d652a-08bcb822bde4ed4e-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-1a6a6740abbcc64ebe1cda301551b4fb-f01759c6fb1dab43-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
         "x-ms-client-request-id": "b0e11ffe7c97e7ce94f3c124e87a2485",
         "x-ms-return-client-request-id": "true"
@@ -49,17 +55,17 @@
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "505cb7c5-8200-4eb7-a5a1-e6d369e6dfcc",
+        "apim-request-id": "714cd729-f311-4abf-82f1-44a83efbd757",
         "Content-Length": "296",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:43 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:05 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "139",
-        "x-request-id": "505cb7c5-8200-4eb7-a5a1-e6d369e6dfcc"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "160",
+        "X-Request-ID": "714cd729-f311-4abf-82f1-44a83efbd757"
       },
       "ResponseBody": {
-        "hookId": "8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+        "hookId": "d205df6c-ad43-4304-807a-014ecfc1d6e2",
         "hookName": "hookzfnMg6Ri",
         "hookType": "Webhook",
         "externalLink": "",
@@ -78,17 +84,66 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-a749728d93bf00428a62fc3a78c7bcc5-facc3307ffbf1e44-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "58b1cf9bd0fc37be1527f33ae766c8fa",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "1b10e6c8-46d6-48b0-a626-2c9b04e60e8b",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:05 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "156",
+        "X-Request-ID": "1b10e6c8-46d6-48b0-a626-2c9b04e60e8b"
+      },
+      "ResponseBody": {
+        "hookId": "d205df6c-ad43-4304-807a-014ecfc1d6e2",
+        "hookName": "hookzfnMg6Ri",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "231",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-8285c2a2b1342048b0177e2990c005c1-62dc7275b2dfff49-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-912b7f564a283845acb60ae5b80a9a42-9e24cd09248d0e46-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "58b1cf9bd0fc37be1527f33ae766c8fa",
+        "x-ms-client-request-id": "05b926943aa72256edc055baaf0da2f6",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -107,42 +162,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "f287879f-606e-4929-a897-3cc04f7dba47",
+        "apim-request-id": "24e40cf2-1a78-4cfc-b07d-5ec3b44c96bb",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:44 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "1168",
-        "x-request-id": "f287879f-606e-4929-a897-3cc04f7dba47"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "796",
+        "X-Request-ID": "24e40cf2-1a78-4cfc-b07d-5ec3b44c96bb"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-50949000a7452a478416b661d5fc9130-fc84a275bfdf794f-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-78c1f10b67ae384aa21696769de1a214-cbd22143b102eb4d-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "05b926943aa72256edc055baaf0da2f6",
+        "x-ms-client-request-id": "462d60753f902d6660aa9a6f8893ff2e",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "2d008a9f-ac9b-44f7-8042-e949a5345f60",
+        "apim-request-id": "7617abac-14a9-4888-bddc-1453100c8a66",
         "Content-Length": "308",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Tue, 15 Dec 2020 01:35:44 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "142",
-        "x-request-id": "2d008a9f-ac9b-44f7-8042-e949a5345f60"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "167",
+        "X-Request-ID": "7617abac-14a9-4888-bddc-1453100c8a66"
       },
       "ResponseBody": {
-        "hookId": "8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+        "hookId": "d205df6c-ad43-4304-807a-014ecfc1d6e2",
         "hookName": "hookzfnMg6Ri",
         "hookType": "Webhook",
         "externalLink": "",
@@ -161,27 +219,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/8fe4684e-cded-4bf0-a25d-a3270b7b2f4a",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d205df6c-ad43-4304-807a-014ecfc1d6e2",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-44a3a3de70f52c40ac106ac3ba52eb68-d86f32de0c3e8942-00",
-        "User-Agent": "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20201214.1 (.NET Framework 4.8.4250.0; Microsoft Windows 10.0.19042 )",
+        "traceparent": "00-fc19f1bd74a363419dcf844974b57a49-cee811a3247df242-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "462d60753f902d6660aa9a6f8893ff2e",
+        "x-ms-client-request-id": "c290c72a1fc160dd798f6a3b7b048708",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "96f8cefc-bb18-4f58-98c0-1566111c67fa",
+        "apim-request-id": "fd41b83a-c707-4ca3-86f9-1ebec65d43ba",
         "Content-Length": "0",
-        "Date": "Tue, 15 Dec 2020 01:35:45 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:06 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
-        "x-content-type-options": "nosniff",
-        "x-envoy-upstream-service-time": "161",
-        "x-request-id": "96f8cefc-bb18-4f58-98c0-1566111c67fa"
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "221",
+        "X-Request-ID": "fd41b83a-c707-4ca3-86f9-1ebec65d43ba"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstance.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstance.json
index 945e41e73500..0ffd2918d2b1 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstance.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstance.json
@@ -8,7 +8,7 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-3507ad4166bdf1459cc3baf05d8b8ba6-e3f94b44dd5ad04d-00",
+        "traceparent": "00-b0443c1b02ec4b4e932cbacb63c9a45a-52ab0d942a577644-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -26,32 +26,78 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "653cde38-f286-4d87-8a5b-907a59b3ae1e",
+        "apim-request-id": "8ef71db4-27b2-4091-a1b3-afd66c1b637d",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:56:39 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/087a3cdd-e22a-4a69-83f2-104e1020ec6b",
+        "Date": "Fri, 05 Feb 2021 17:59:43 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a7db3d75-48df-405b-b198-8d00158a75eb",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1242",
-        "X-Request-ID": "653cde38-f286-4d87-8a5b-907a59b3ae1e"
+        "x-envoy-upstream-service-time": "833",
+        "X-Request-ID": "8ef71db4-27b2-4091-a1b3-afd66c1b637d"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/087a3cdd-e22a-4a69-83f2-104e1020ec6b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a7db3d75-48df-405b-b198-8d00158a75eb",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-b0443c1b02ec4b4e932cbacb63c9a45a-51fcd9f1ea05fe4f-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "042ca0f2c66834b39cddb2782630d5cb",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "56d27701-ab9a-4b0e-b53a-593da903925a",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 17:59:44 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "181",
+        "X-Request-ID": "56d27701-ab9a-4b0e-b53a-593da903925a"
+      },
+      "ResponseBody": {
+        "hookId": "a7db3d75-48df-405b-b198-8d00158a75eb",
+        "hookName": "hookx9S5k93N",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a7db3d75-48df-405b-b198-8d00158a75eb",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "98",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-11eac6d3172ef24d84bd94fd535ee8f2-385c5944906aba4e-00",
+        "traceparent": "00-0dfd21100af31948985d18548e02deb6-2ed2f5c25826a441-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "042ca0f2c66834b39cddb2782630d5cb",
+        "x-ms-client-request-id": "5492fd1af0520b18996f185bce974a09",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -63,45 +109,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "37107b6a-0b45-4924-bd19-b8fd0cc54486",
+        "apim-request-id": "08b5fab4-2161-4b86-b160-871b14c3556e",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:56:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "1971",
-        "X-Request-ID": "37107b6a-0b45-4924-bd19-b8fd0cc54486"
+        "x-envoy-upstream-service-time": "596",
+        "X-Request-ID": "08b5fab4-2161-4b86-b160-871b14c3556e"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/087a3cdd-e22a-4a69-83f2-104e1020ec6b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a7db3d75-48df-405b-b198-8d00158a75eb",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-59a79dbf8472764ba05a77a969ee745b-93461bc3605b7844-00",
+        "traceparent": "00-4847432cddad2a45b4e8b07637f19a00-5f2385f241e3b746-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "5492fd1af0520b18996f185bce974a09",
+        "x-ms-client-request-id": "aeb6107272e1eefe54873a368d41b79b",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "bf12a26c-c91d-4d96-a1a8-51502f685125",
+        "apim-request-id": "4884f987-34b6-44b7-b058-4deb1086e8a1",
         "Content-Length": "308",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:56:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:44 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "149",
-        "X-Request-ID": "bf12a26c-c91d-4d96-a1a8-51502f685125"
+        "x-envoy-upstream-service-time": "187",
+        "X-Request-ID": "4884f987-34b6-44b7-b058-4deb1086e8a1"
       },
       "ResponseBody": {
-        "hookId": "087a3cdd-e22a-4a69-83f2-104e1020ec6b",
+        "hookId": "a7db3d75-48df-405b-b198-8d00158a75eb",
         "hookName": "hookx9S5k93N",
         "hookType": "Webhook",
         "externalLink": "",
@@ -120,30 +166,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/087a3cdd-e22a-4a69-83f2-104e1020ec6b",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/a7db3d75-48df-405b-b198-8d00158a75eb",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-37bf179d33923b4cacc1ab971f4a91f6-0a7354d658e58d41-00",
+        "traceparent": "00-80af7d11eb3a22438807d2d809de5c72-f9c913cedf58ec45-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "aeb6107272e1eefe54873a368d41b79b",
+        "x-ms-client-request-id": "7e2e7d2f31d302e187216af8ae586504",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "2817c372-2352-4264-b705-455b0994b4a0",
+        "apim-request-id": "f3d99d6b-44b6-4756-bbff-d7b4a0da34e0",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:56:41 GMT",
+        "Date": "Fri, 05 Feb 2021 17:59:45 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "192",
-        "X-Request-ID": "2817c372-2352-4264-b705-455b0994b4a0"
+        "x-envoy-upstream-service-time": "195",
+        "X-Request-ID": "f3d99d6b-44b6-4756-bbff-d7b4a0da34e0"
       },
       "ResponseBody": []
     }
diff --git a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstanceAsync.json b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstanceAsync.json
index 6121e94c2c71..55de95878f37 100644
--- a/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstanceAsync.json
+++ b/sdk/metricsadvisor/Azure.AI.MetricsAdvisor/tests/SessionRecords/NotificationHookLiveTests/UpdateWebNotificationHookWithMinimumSetupAndNewInstanceAsync.json
@@ -8,7 +8,7 @@
         "Content-Length": "98",
         "Content-Type": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-493cc09e2d26194d85f66fa0919516cf-2ad095269786214d-00",
+        "traceparent": "00-edf76162bc7cd94d9f3f12c97e82fd0d-50ed4a84e2c3e840-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
@@ -26,32 +26,78 @@
       },
       "StatusCode": 201,
       "ResponseHeaders": {
-        "apim-request-id": "613cbbe7-50ad-400c-a5df-6856c10010f3",
+        "apim-request-id": "db3bf5ec-0a0a-4093-8c0d-ba5f15c02a21",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:45 GMT",
-        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2d84af9-8bce-495c-89f6-b1c7f0b18bd8",
+        "Date": "Fri, 05 Feb 2021 18:00:07 GMT",
+        "Location": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d833d336-a81d-4668-8a41-51cf66bcbc64",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "910",
-        "X-Request-ID": "613cbbe7-50ad-400c-a5df-6856c10010f3"
+        "x-envoy-upstream-service-time": "1038",
+        "X-Request-ID": "db3bf5ec-0a0a-4093-8c0d-ba5f15c02a21"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2d84af9-8bce-495c-89f6-b1c7f0b18bd8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d833d336-a81d-4668-8a41-51cf66bcbc64",
+      "RequestMethod": "GET",
+      "RequestHeaders": {
+        "Accept": "application/json",
+        "Ocp-Apim-Subscription-Key": "Sanitized",
+        "traceparent": "00-edf76162bc7cd94d9f3f12c97e82fd0d-3f2b2c959939ac45-00",
+        "User-Agent": [
+          "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
+          "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
+        ],
+        "x-api-key": "Sanitized",
+        "x-ms-client-request-id": "f03b8607175d6aea506a8c323607dbb2",
+        "x-ms-return-client-request-id": "true"
+      },
+      "RequestBody": null,
+      "StatusCode": 200,
+      "ResponseHeaders": {
+        "apim-request-id": "a6209a17-1692-487a-a6b0-b129b8a609e6",
+        "Content-Length": "296",
+        "Content-Type": "application/json; charset=utf-8",
+        "Date": "Fri, 05 Feb 2021 18:00:07 GMT",
+        "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+        "X-Content-Type-Options": "nosniff",
+        "x-envoy-upstream-service-time": "148",
+        "X-Request-ID": "a6209a17-1692-487a-a6b0-b129b8a609e6"
+      },
+      "ResponseBody": {
+        "hookId": "d833d336-a81d-4668-8a41-51cf66bcbc64",
+        "hookName": "hookaIjy8EJb",
+        "hookType": "Webhook",
+        "externalLink": "",
+        "description": "",
+        "admins": [
+          "foo@contoso.com"
+        ],
+        "hookParameter": {
+          "endpoint": "http://contoso.com",
+          "username": "",
+          "password": "",
+          "headers": {},
+          "certificateKey": "",
+          "certificatePassword": ""
+        }
+      }
+    },
+    {
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d833d336-a81d-4668-8a41-51cf66bcbc64",
       "RequestMethod": "PATCH",
       "RequestHeaders": {
         "Accept": "application/json",
         "Content-Length": "98",
         "Content-Type": "application/merge-patch\u002Bjson",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1ef6adf74f9043478adfe623e159a1ba-e2c965b4cc231541-00",
+        "traceparent": "00-09696cd736579748b5af6e8c7c9eae54-439a7145a92ed245-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "f03b8607175d6aea506a8c323607dbb2",
+        "x-ms-client-request-id": "9a5b7d44319d5999d9040639921dafd9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": {
@@ -63,45 +109,45 @@
       },
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "9e3a4ea0-76c3-4612-ab8e-4245c28e123f",
+        "apim-request-id": "58963d09-520b-4820-8a77-06869aa85fd1",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:45 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:08 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "873",
-        "X-Request-ID": "9e3a4ea0-76c3-4612-ab8e-4245c28e123f"
+        "x-envoy-upstream-service-time": "1139",
+        "X-Request-ID": "58963d09-520b-4820-8a77-06869aa85fd1"
       },
       "ResponseBody": []
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2d84af9-8bce-495c-89f6-b1c7f0b18bd8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d833d336-a81d-4668-8a41-51cf66bcbc64",
       "RequestMethod": "GET",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-1c24dd3769b0c0429cfddd8a4fb64cec-c7918bff8529024d-00",
+        "traceparent": "00-e6aff302b101d747a442c82ed868a2c8-e30c2804425cad46-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "9a5b7d44319d5999d9040639921dafd9",
+        "x-ms-client-request-id": "3b9ee1e9341601071436f3692d3f3ce9",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 200,
       "ResponseHeaders": {
-        "apim-request-id": "8f4347db-ae73-44df-a066-bf402c8dc2ea",
+        "apim-request-id": "fa59222e-b835-46b2-90af-b51f0e31d382",
         "Content-Length": "308",
         "Content-Type": "application/json; charset=utf-8",
-        "Date": "Fri, 05 Feb 2021 15:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "157",
-        "X-Request-ID": "8f4347db-ae73-44df-a066-bf402c8dc2ea"
+        "x-envoy-upstream-service-time": "166",
+        "X-Request-ID": "fa59222e-b835-46b2-90af-b51f0e31d382"
       },
       "ResponseBody": {
-        "hookId": "d2d84af9-8bce-495c-89f6-b1c7f0b18bd8",
+        "hookId": "d833d336-a81d-4668-8a41-51cf66bcbc64",
         "hookName": "hookaIjy8EJb",
         "hookType": "Webhook",
         "externalLink": "",
@@ -120,30 +166,30 @@
       }
     },
     {
-      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d2d84af9-8bce-495c-89f6-b1c7f0b18bd8",
+      "RequestUri": "https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/hooks/d833d336-a81d-4668-8a41-51cf66bcbc64",
       "RequestMethod": "DELETE",
       "RequestHeaders": {
         "Accept": "application/json",
         "Ocp-Apim-Subscription-Key": "Sanitized",
-        "traceparent": "00-7909c7d6195db24bb16613769a5e5694-66f6dc304201034c-00",
+        "traceparent": "00-441c7c961e1f3346988306cb9c7a86da-3a61432af8725b47-00",
         "User-Agent": [
           "azsdk-net-AI.MetricsAdvisor/1.0.0-alpha.20210205.1",
           "(.NET Core 4.6.29518.01; Microsoft Windows 10.0.19042 )"
         ],
         "x-api-key": "Sanitized",
-        "x-ms-client-request-id": "3b9ee1e9341601071436f3692d3f3ce9",
+        "x-ms-client-request-id": "4074009a7542d615ece1165811b0d832",
         "x-ms-return-client-request-id": "true"
       },
       "RequestBody": null,
       "StatusCode": 204,
       "ResponseHeaders": {
-        "apim-request-id": "bf71d85a-5e69-4e73-a9e9-957704de2d1f",
+        "apim-request-id": "f80b5d18-265e-4493-b465-514cfc996407",
         "Content-Length": "0",
-        "Date": "Fri, 05 Feb 2021 15:57:47 GMT",
+        "Date": "Fri, 05 Feb 2021 18:00:09 GMT",
         "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
         "X-Content-Type-Options": "nosniff",
-        "x-envoy-upstream-service-time": "189",
-        "X-Request-ID": "bf71d85a-5e69-4e73-a9e9-957704de2d1f"
+        "x-envoy-upstream-service-time": "161",
+        "X-Request-ID": "f80b5d18-265e-4493-b465-514cfc996407"
       },
       "ResponseBody": []
     }