diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index 7d713afcc734..f71c047013a6 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -2993,7 +2993,7 @@ packages:
     dev: false
 
   /array-flatten/1.1.1:
-    resolution: {integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=}
+    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
     dev: false
 
   /array-includes/3.1.5:
@@ -3248,7 +3248,7 @@ packages:
     dev: false
 
   /buffer-equal-constant-time/1.0.1:
-    resolution: {integrity: sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=}
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
     dev: false
 
   /buffer-from/1.1.2:
@@ -3398,7 +3398,7 @@ packages:
     dev: false
 
   /charenc/0.0.2:
-    resolution: {integrity: sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=}
+    resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
     dev: false
 
   /check-error/1.0.2:
@@ -3532,7 +3532,7 @@ packages:
     dev: false
 
   /concat-map/0.0.1:
-    resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
     dev: false
 
   /concurrently/6.5.1:
@@ -3595,7 +3595,7 @@ packages:
     dev: false
 
   /cookie-signature/1.0.6:
-    resolution: {integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw=}
+    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
     dev: false
 
   /cookie/0.4.2:
@@ -3697,7 +3697,7 @@ packages:
     dev: false
 
   /crypt/0.0.2:
-    resolution: {integrity: sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=}
+    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
 
   /csv-parse/5.3.0:
@@ -3951,7 +3951,7 @@ packages:
     dependencies:
       semver: 7.3.7
       shelljs: 0.8.5
-      typescript: 4.9.0-dev.20220915
+      typescript: 4.9.0-dev.20220918
     dev: false
 
   /ecdsa-sig-formatter/1.0.11:
@@ -3961,11 +3961,11 @@ packages:
     dev: false
 
   /edge-launcher/1.2.2:
-    resolution: {integrity: sha1-60Cq+9Bnpup27/+rBke81VCbN7I=}
+    resolution: {integrity: sha512-JcD5WBi3BHZXXVSSeEhl6sYO8g5cuynk/hifBzds2Bp4JdzCGLNMHgMCKu5DvrO1yatMgF0goFsxXRGus0yh1g==}
     dev: false
 
   /ee-first/1.1.1:
-    resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=}
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
     dev: false
 
   /electron-to-chromium/1.4.247:
@@ -4849,7 +4849,7 @@ packages:
     dev: false
 
   /fresh/0.5.2:
-    resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=}
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
     engines: {node: '>= 0.6'}
     dev: false
 
@@ -4989,7 +4989,7 @@ packages:
     dev: false
 
   /github-from-package/0.0.0:
-    resolution: {integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=}
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
     dev: false
 
   /glob-parent/5.1.2:
@@ -6386,7 +6386,7 @@ packages:
     dev: false
 
   /media-typer/0.3.0:
-    resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=}
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
     dev: false
 
@@ -6396,7 +6396,7 @@ packages:
     dev: false
 
   /merge-descriptors/1.0.1:
-    resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=}
+    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
     dev: false
 
   /merge-source-map/1.1.0:
@@ -6817,7 +6817,7 @@ packages:
     dev: false
 
   /noms/0.0.0:
-    resolution: {integrity: sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=}
+    resolution: {integrity: sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==}
     dependencies:
       inherits: 2.0.4
       readable-stream: 1.0.34
@@ -8883,8 +8883,8 @@ packages:
     hasBin: true
     dev: false
 
-  /typescript/4.9.0-dev.20220915:
-    resolution: {integrity: sha512-LF91yAKWayNiea7oza0gyHyPEVIkorxhbjWV6k/nDtseepQxGM8MZVjKGFleko0Ve4Fha8vQhnxRPkF8NftIHA==}
+  /typescript/4.9.0-dev.20220918:
+    resolution: {integrity: sha512-ZaAeBYbVpmM9j0d35AlKqqM4Z2aVSEdjEF9U3barRlWUZ0kJQHjTOaLRIckqwiks8rxa0viyXGt/A8bCgkk8yQ==}
     engines: {node: '>=4.2.0'}
     hasBin: true
     dev: false
@@ -9007,7 +9007,7 @@ packages:
     dev: false
 
   /utils-merge/1.0.1:
-    resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
     dev: false
 
@@ -11455,7 +11455,7 @@ packages:
     dev: false
 
   file:projects/arm-datadog.tgz:
-    resolution: {integrity: sha512-v1ENZYnSLJ7hrgQWsld0WDWneanYZ4VTjBI/gmMScNwEW+8bI9r+GnHoIN01F/lhXNPiMOUuBMjO1IEg0c+59Q==, tarball: file:projects/arm-datadog.tgz}
+    resolution: {integrity: sha512-CxB+FZs1sZYESJgQKGC83TWqSvYRxsuiRnknRVQZcsyMXYxkQe9s4m43tgyywbcLswZ6MMVV9YHcCmNYCGGNfw==, tarball: file:projects/arm-datadog.tgz}
     name: '@rush-temp/arm-datadog'
     version: 0.0.0
     dependencies:
@@ -11466,6 +11466,8 @@ packages:
       '@rollup/plugin-json': 4.1.0_rollup@2.79.0
       '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.0
       '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.0
+      '@types/chai': 4.3.3
+      chai: 4.3.6
       cross-env: 7.0.3
       mkdirp: 1.0.4
       mocha: 7.2.0
@@ -11477,7 +11479,6 @@ packages:
       uglify-js: 3.17.0
     transitivePeerDependencies:
       - '@types/node'
-      - encoding
       - supports-color
     dev: false
 
diff --git a/sdk/datadog/arm-datadog/_meta.json b/sdk/datadog/arm-datadog/_meta.json
index 7547be0e647b..a0062147e6ec 100644
--- a/sdk/datadog/arm-datadog/_meta.json
+++ b/sdk/datadog/arm-datadog/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "e6a2296d02ec6c4b2c32479198bfbcb9b16ea247",
-  "readme": "specification\\datadog\\resource-manager\\readme.md",
-  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\datadog\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true",
+  "commit": "2e48c102980cfe2a330e634fd018dc6646c02183",
+  "readme": "specification/datadog/resource-manager/readme.md",
+  "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/datadog/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.2.6",
-  "use": "@autorest/typescript@6.0.0-alpha.19.20220408.1"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2",
+  "use": "@autorest/typescript@6.0.0-rc.1"
 }
\ No newline at end of file
diff --git a/sdk/datadog/arm-datadog/package.json b/sdk/datadog/arm-datadog/package.json
index d40d87a4868d..4eb989e97533 100644
--- a/sdk/datadog/arm-datadog/package.json
+++ b/sdk/datadog/arm-datadog/package.json
@@ -3,7 +3,7 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for MicrosoftDatadogClient.",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -40,9 +40,13 @@
     "uglify-js": "^3.4.9",
     "rimraf": "^3.0.0",
     "@azure/identity": "^2.0.1",
-    "@azure-tools/test-recorder": "^1.0.0",
+    "@azure-tools/test-recorder": "^2.0.0",
+    "@azure-tools/test-credential": "^1.0.0",
     "mocha": "^7.1.1",
-    "cross-env": "^7.0.2"
+    "@types/chai": "^4.2.8",
+    "chai": "^4.2.0",
+    "cross-env": "^7.0.2",
+    "@azure/dev-tool": "^1.0.0"
   },
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/datadog/arm-datadog",
   "repository": {
@@ -93,9 +97,8 @@
     "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
     "unit-test:browser": "echo skipped",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
-    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
-    "integration-test:browser": "echo skipped",
-    "docs": "echo skipped"
+    "integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
+    "integration-test:browser": "echo skipped"
   },
   "sideEffects": false,
   "//metadata": {
@@ -106,13 +109,5 @@
       }
     ]
   },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-datadog?view=azure-node-preview"
-  }
-}
+  "autoPublish": true
+}
\ No newline at end of file
diff --git a/sdk/datadog/arm-datadog/review/arm-datadog.api.md b/sdk/datadog/arm-datadog/review/arm-datadog.api.md
index 47ceb477acb2..c6cb724d30eb 100644
--- a/sdk/datadog/arm-datadog/review/arm-datadog.api.md
+++ b/sdk/datadog/arm-datadog/review/arm-datadog.api.md
@@ -129,10 +129,10 @@ export interface DatadogOrganizationProperties {
     apiKey?: string;
     applicationKey?: string;
     enterpriseAppId?: string;
-    readonly id?: string;
+    id?: string;
     linkingAuthCode?: string;
     linkingClientId?: string;
-    readonly name?: string;
+    name?: string;
     redirectUri?: string;
 }
 
@@ -202,91 +202,62 @@ export interface IdentityProperties {
 
 // @public
 export enum KnownCreatedByType {
-    // (undocumented)
     Application = "Application",
-    // (undocumented)
     Key = "Key",
-    // (undocumented)
     ManagedIdentity = "ManagedIdentity",
-    // (undocumented)
     User = "User"
 }
 
 // @public
 export enum KnownLiftrResourceCategories {
-    // (undocumented)
     MonitorLogs = "MonitorLogs",
-    // (undocumented)
     Unknown = "Unknown"
 }
 
 // @public
 export enum KnownManagedIdentityTypes {
-    // (undocumented)
     SystemAssigned = "SystemAssigned",
-    // (undocumented)
     UserAssigned = "UserAssigned"
 }
 
 // @public
 export enum KnownMarketplaceSubscriptionStatus {
-    // (undocumented)
     Active = "Active",
-    // (undocumented)
     Provisioning = "Provisioning",
-    // (undocumented)
     Suspended = "Suspended",
-    // (undocumented)
     Unsubscribed = "Unsubscribed"
 }
 
 // @public
 export enum KnownMonitoringStatus {
-    // (undocumented)
     Disabled = "Disabled",
-    // (undocumented)
     Enabled = "Enabled"
 }
 
 // @public
 export enum KnownProvisioningState {
-    // (undocumented)
     Accepted = "Accepted",
-    // (undocumented)
     Canceled = "Canceled",
-    // (undocumented)
     Creating = "Creating",
-    // (undocumented)
     Deleted = "Deleted",
-    // (undocumented)
     Deleting = "Deleting",
-    // (undocumented)
     Failed = "Failed",
-    // (undocumented)
     NotSpecified = "NotSpecified",
-    // (undocumented)
     Succeeded = "Succeeded",
-    // (undocumented)
     Updating = "Updating"
 }
 
 // @public
 export enum KnownSingleSignOnStates {
-    // (undocumented)
     Disable = "Disable",
-    // (undocumented)
     Enable = "Enable",
-    // (undocumented)
     Existing = "Existing",
-    // (undocumented)
     Initial = "Initial"
 }
 
 // @public
 export enum KnownTagAction {
-    // (undocumented)
     Exclude = "Exclude",
-    // (undocumented)
     Include = "Include"
 }
 
diff --git a/sdk/datadog/arm-datadog/src/microsoftDatadogClient.ts b/sdk/datadog/arm-datadog/src/microsoftDatadogClient.ts
index 83a352087e90..defb0d3c7ea6 100644
--- a/sdk/datadog/arm-datadog/src/microsoftDatadogClient.ts
+++ b/sdk/datadog/arm-datadog/src/microsoftDatadogClient.ts
@@ -8,6 +8,11 @@
 
 import * as coreClient from "@azure/core-client";
 import * as coreRestPipeline from "@azure/core-rest-pipeline";
+import {
+  PipelineRequest,
+  PipelineResponse,
+  SendRequest
+} from "@azure/core-rest-pipeline";
 import * as coreAuth from "@azure/core-auth";
 import {
   MarketplaceAgreementsImpl,
@@ -57,7 +62,7 @@ export class MicrosoftDatadogClient extends coreClient.ServiceClient {
       credential: credentials
     };
 
-    const packageDetails = `azsdk-js-arm-datadog/3.0.1`;
+    const packageDetails = `azsdk-js-arm-datadog/3.0.2`;
     const userAgentPrefix =
       options.userAgentOptions && options.userAgentOptions.userAgentPrefix
         ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -104,12 +109,41 @@ export class MicrosoftDatadogClient extends coreClient.ServiceClient {
 
     // Assigning values to Constant parameters
     this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2021-03-01";
+    this.apiVersion = options.apiVersion || "2022-06-01";
     this.marketplaceAgreements = new MarketplaceAgreementsImpl(this);
     this.monitors = new MonitorsImpl(this);
     this.operations = new OperationsImpl(this);
     this.tagRules = new TagRulesImpl(this);
     this.singleSignOnConfigurations = new SingleSignOnConfigurationsImpl(this);
+    this.addCustomApiVersionPolicy(options.apiVersion);
+  }
+
+  /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
+  private addCustomApiVersionPolicy(apiVersion?: string) {
+    if (!apiVersion) {
+      return;
+    }
+    const apiVersionPolicy = {
+      name: "CustomApiVersionPolicy",
+      async sendRequest(
+        request: PipelineRequest,
+        next: SendRequest
+      ): Promise<PipelineResponse> {
+        const param = request.url.split("?");
+        if (param.length > 1) {
+          const newParams = param[1].split("&").map((item) => {
+            if (item.indexOf("api-version") > -1) {
+              return "api-version=" + apiVersion;
+            } else {
+              return item;
+            }
+          });
+          request.url = param[0] + "?" + newParams.join("&");
+        }
+        return next(request);
+      }
+    };
+    this.pipeline.addPolicy(apiVersionPolicy);
   }
 
   marketplaceAgreements: MarketplaceAgreements;
diff --git a/sdk/datadog/arm-datadog/src/models/index.ts b/sdk/datadog/arm-datadog/src/models/index.ts
index 4382d9c5c8b5..077731a05fae 100644
--- a/sdk/datadog/arm-datadog/src/models/index.ts
+++ b/sdk/datadog/arm-datadog/src/models/index.ts
@@ -319,16 +319,10 @@ export interface MonitorProperties {
 
 /** Datadog organization properties */
 export interface DatadogOrganizationProperties {
-  /**
-   * Name of the Datadog organization.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly name?: string;
-  /**
-   * Id of the Datadog organization.
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly id?: string;
+  /** Name of the Datadog organization. */
+  name?: string;
+  /** Id of the Datadog organization. */
+  id?: string;
   /** The auth code used to linking to an existing datadog organization. */
   linkingAuthCode?: string;
   /** The client_id from an existing in exchange for an auth token to link organization. */
@@ -507,9 +501,13 @@ export interface DatadogSingleSignOnProperties {
 
 /** Known values of {@link CreatedByType} that the service accepts. */
 export enum KnownCreatedByType {
+  /** User */
   User = "User",
+  /** Application */
   Application = "Application",
+  /** ManagedIdentity */
   ManagedIdentity = "ManagedIdentity",
+  /** Key */
   Key = "Key"
 }
 
@@ -527,14 +525,23 @@ export type CreatedByType = string;
 
 /** Known values of {@link ProvisioningState} that the service accepts. */
 export enum KnownProvisioningState {
+  /** Accepted */
   Accepted = "Accepted",
+  /** Creating */
   Creating = "Creating",
+  /** Updating */
   Updating = "Updating",
+  /** Deleting */
   Deleting = "Deleting",
+  /** Succeeded */
   Succeeded = "Succeeded",
+  /** Failed */
   Failed = "Failed",
+  /** Canceled */
   Canceled = "Canceled",
+  /** Deleted */
   Deleted = "Deleted",
+  /** NotSpecified */
   NotSpecified = "NotSpecified"
 }
 
@@ -557,7 +564,9 @@ export type ProvisioningState = string;
 
 /** Known values of {@link MonitoringStatus} that the service accepts. */
 export enum KnownMonitoringStatus {
+  /** Enabled */
   Enabled = "Enabled",
+  /** Disabled */
   Disabled = "Disabled"
 }
 
@@ -573,9 +582,13 @@ export type MonitoringStatus = string;
 
 /** Known values of {@link MarketplaceSubscriptionStatus} that the service accepts. */
 export enum KnownMarketplaceSubscriptionStatus {
+  /** Provisioning */
   Provisioning = "Provisioning",
+  /** Active */
   Active = "Active",
+  /** Suspended */
   Suspended = "Suspended",
+  /** Unsubscribed */
   Unsubscribed = "Unsubscribed"
 }
 
@@ -593,7 +606,9 @@ export type MarketplaceSubscriptionStatus = string;
 
 /** Known values of {@link LiftrResourceCategories} that the service accepts. */
 export enum KnownLiftrResourceCategories {
+  /** Unknown */
   Unknown = "Unknown",
+  /** MonitorLogs */
   MonitorLogs = "MonitorLogs"
 }
 
@@ -609,7 +624,9 @@ export type LiftrResourceCategories = string;
 
 /** Known values of {@link ManagedIdentityTypes} that the service accepts. */
 export enum KnownManagedIdentityTypes {
+  /** SystemAssigned */
   SystemAssigned = "SystemAssigned",
+  /** UserAssigned */
   UserAssigned = "UserAssigned"
 }
 
@@ -625,7 +642,9 @@ export type ManagedIdentityTypes = string;
 
 /** Known values of {@link TagAction} that the service accepts. */
 export enum KnownTagAction {
+  /** Include */
   Include = "Include",
+  /** Exclude */
   Exclude = "Exclude"
 }
 
@@ -641,9 +660,13 @@ export type TagAction = string;
 
 /** Known values of {@link SingleSignOnStates} that the service accepts. */
 export enum KnownSingleSignOnStates {
+  /** Initial */
   Initial = "Initial",
+  /** Enable */
   Enable = "Enable",
+  /** Disable */
   Disable = "Disable",
+  /** Existing */
   Existing = "Existing"
 }
 
diff --git a/sdk/datadog/arm-datadog/src/models/mappers.ts b/sdk/datadog/arm-datadog/src/models/mappers.ts
index 46b9c4dae1f7..c9aac343d459 100644
--- a/sdk/datadog/arm-datadog/src/models/mappers.ts
+++ b/sdk/datadog/arm-datadog/src/models/mappers.ts
@@ -856,14 +856,12 @@ export const DatadogOrganizationProperties: coreClient.CompositeMapper = {
     modelProperties: {
       name: {
         serializedName: "name",
-        readOnly: true,
         type: {
           name: "String"
         }
       },
       id: {
         serializedName: "id",
-        readOnly: true,
         type: {
           name: "String"
         }
diff --git a/sdk/datadog/arm-datadog/src/models/parameters.ts b/sdk/datadog/arm-datadog/src/models/parameters.ts
index 87b66fb1b926..2621a1f7eea2 100644
--- a/sdk/datadog/arm-datadog/src/models/parameters.ts
+++ b/sdk/datadog/arm-datadog/src/models/parameters.ts
@@ -61,7 +61,7 @@ export const subscriptionId: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2021-03-01",
+    defaultValue: "2022-06-01",
     isConstant: true,
     serializedName: "api-version",
     type: {
diff --git a/sdk/datadog/arm-datadog/src/operations/operations.ts b/sdk/datadog/arm-datadog/src/operations/operations.ts
index 068b3256f755..869136858679 100644
--- a/sdk/datadog/arm-datadog/src/operations/operations.ts
+++ b/sdk/datadog/arm-datadog/src/operations/operations.ts
@@ -34,7 +34,7 @@ export class OperationsImpl implements Operations {
   }
 
   /**
-   * List all operations provided by Microsoft.Datadog for the 2021-03-01 api version.
+   * List all operations provided by Microsoft.Datadog for the 2022-06-01 api version.
    * @param options The options parameters.
    */
   public list(
@@ -76,7 +76,7 @@ export class OperationsImpl implements Operations {
   }
 
   /**
-   * List all operations provided by Microsoft.Datadog for the 2021-03-01 api version.
+   * List all operations provided by Microsoft.Datadog for the 2022-06-01 api version.
    * @param options The options parameters.
    */
   private _list(
diff --git a/sdk/datadog/arm-datadog/src/operationsInterfaces/operations.ts b/sdk/datadog/arm-datadog/src/operationsInterfaces/operations.ts
index accb65d930a9..498b71f6ae66 100644
--- a/sdk/datadog/arm-datadog/src/operationsInterfaces/operations.ts
+++ b/sdk/datadog/arm-datadog/src/operationsInterfaces/operations.ts
@@ -13,7 +13,7 @@ import { OperationResult, OperationsListOptionalParams } from "../models";
 /** Interface representing a Operations. */
 export interface Operations {
   /**
-   * List all operations provided by Microsoft.Datadog for the 2021-03-01 api version.
+   * List all operations provided by Microsoft.Datadog for the 2022-06-01 api version.
    * @param options The options parameters.
    */
   list(
diff --git a/sdk/datadog/arm-datadog/test/sampleTest.ts b/sdk/datadog/arm-datadog/test/sampleTest.ts
index 7ed89b043e1b..25aeb3ebcc36 100644
--- a/sdk/datadog/arm-datadog/test/sampleTest.ts
+++ b/sdk/datadog/arm-datadog/test/sampleTest.ts
@@ -7,35 +7,30 @@
  */
 
 import {
-  env,
-  record,
-  RecorderEnvironmentSetup,
-  Recorder
+  Recorder,
+  RecorderStartOptions,
+  env
 } from "@azure-tools/test-recorder";
-import * as assert from "assert";
+import { assert } from "chai";
+import { Context } from "mocha";
 
-const recorderEnvSetup: RecorderEnvironmentSetup = {
-  replaceableVariables: {
-    AZURE_CLIENT_ID: "azure_client_id",
-    AZURE_CLIENT_SECRET: "azure_client_secret",
-    AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
-    SUBSCRIPTION_ID: "azure_subscription_id"
-  },
-  customizationsOnRecordings: [
-    (recording: any): any =>
-      recording.replace(
-        /"access_token":"[^"]*"/g,
-        `"access_token":"access_token"`
-      )
-  ],
-  queryParametersToSkip: []
+const replaceableVariables: Record<string, string> = {
+  AZURE_CLIENT_ID: "azure_client_id",
+  AZURE_CLIENT_SECRET: "azure_client_secret",
+  AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888",
+  SUBSCRIPTION_ID: "azure_subscription_id"
+};
+
+const recorderOptions: RecorderStartOptions = {
+  envSetupForPlayback: replaceableVariables
 };
 
 describe("My test", () => {
   let recorder: Recorder;
 
-  beforeEach(async function() {
-    recorder = record(this, recorderEnvSetup);
+  beforeEach(async function(this: Context) {
+    recorder = new Recorder(this.currentTest);
+    await recorder.start(recorderOptions);
   });
 
   afterEach(async function() {
diff --git a/sdk/datadog/arm-datadog/tsconfig.json b/sdk/datadog/arm-datadog/tsconfig.json
index e10856bd8d0b..3e6ae96443f3 100644
--- a/sdk/datadog/arm-datadog/tsconfig.json
+++ b/sdk/datadog/arm-datadog/tsconfig.json
@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-datadog": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"