From f65a5631306e8d1d1adc14b2161c41d0b6306c42 Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Fri, 10 Apr 2026 14:33:34 +0000
Subject: [PATCH] Regenerate client from commit 7a71442 of spec repo

---
 .generator/schemas/v2/openapi.yaml            |  616 +++++++++
 .../ListFleetAgentTracers.java                |   25 +
 .../fleet-automation/ListFleetClusters.java   |   25 +
 .../ListFleetInstrumentedPods.java            |   25 +
 .../v2/fleet-automation/ListFleetTracers.java |   25 +
 .../com/datadog/api/client/ApiClient.java     |    4 +
 .../api/client/v2/api/FleetAutomationApi.java | 1120 +++++++++++++++--
 .../v2/model/FleetClusterAttributes.java      |  701 +++++++++++
 .../v2/model/FleetClustersResponse.java       |  175 +++
 .../v2/model/FleetClustersResponseData.java   |  205 +++
 .../FleetClustersResponseDataAttributes.java  |  151 +++
 .../v2/model/FleetClustersResponseMeta.java   |  136 ++
 .../FleetInstrumentedPodGroupAttributes.java  |  445 +++++++
 .../model/FleetInstrumentedPodsResponse.java  |  147 +++
 .../FleetInstrumentedPodsResponseData.java    |  207 +++
 ...nstrumentedPodsResponseDataAttributes.java |  155 +++
 .../v2/model/FleetTracerAttributes.java       |  401 ++++++
 .../client/v2/model/FleetTracersResponse.java |  175 +++
 .../v2/model/FleetTracersResponseData.java    |  204 +++
 .../FleetTracersResponseDataAttributes.java   |  151 +++
 .../v2/model/FleetTracersResponseMeta.java    |  135 ++
 ...er_returns_User_created_response_test.json |    2 +-
 ...reate_a_user_returns_null_access_role.json |    2 +-
 ...th_metadata_deserializes_successfully.json |    2 +-
 ...your_organization_returns_OK_response.json |    2 +-
 ...ount_config_returns_Conflict_response.json |    2 +-
 ...t_config_returns_Bad_Request_response.json |    2 +-
 ...nt_config_returns_No_Content_response.json |    2 +-
 ...unt_config_returns_Not_Found_response.json |    2 +-
 ...turns_AWS_External_ID_object_response.json |    2 +-
 ...g_returns_AWS_Account_object_response.json |    2 +-
 ...t_config_returns_Bad_Request_response.json |    2 +-
 ...unt_config_returns_Not_Found_response.json |    2 +-
 ...s_AWS_Namespaces_List_object_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 ...s_AWS_Namespaces_List_object_response.json |    2 +-
 ...g_returns_AWS_Account_object_response.json |    2 +-
 ...t_config_returns_Bad_Request_response.json |    2 +-
 ...ive_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Archive_case_returns_OK_response.json  |    2 +-
 ...ign_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Assign_case_returns_OK_response.json   |    2 +-
 ...e_datastore_items_returns_OK_response.json |    2 +-
 ...re_items_returns_Bad_Request_response.json |    2 +-
 ...e_datastore_items_returns_OK_response.json |    2 +-
 ..._deletion_request_returns_OK_response.json |    2 +-
 ...ent_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Comment_case_returns_OK_response.json  |    2 +-
 ...eturns_AWS_CCM_Config_object_response.json |    4 +-
 ..._CCM_config_returns_Conflict_response.json |    4 +-
 ...nd_task_created_successfully_response.json |    2 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 ..._options_returns_Bad_Request_response.json |    2 +-
 ...can_options_returns_Conflict_response.json |    2 +-
 .../Create_App_returns_Created_response.json  |    2 +-
 ...can_options_returns_Conflict_response.json |    2 +-
 ...te_Org_Connection_returns_OK_response.json |    2 +-
 ...ing_Rule_returns_Bad_Request_response.json |    4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |    4 +-
 ...should_save_match_returns_OK_response.json |    4 +-
 ...m_framework_returns_Conflict_response.json |    6 +-
 ..._custom_framework_returns_OK_response.json |    4 +-
 ...e_a_dataset_returns_Conflict_response.json |    4 +-
 ...restriction_query_returns_OK_response.json |    2 +-
 ...t_returns_AWS_Account_object_response.json |    2 +-
 ...integration_returns_Conflict_response.json |    4 +-
 ...ncident_type_returns_CREATED_response.json |    2 +-
 ...ase_type_returns_Bad_Request_response.json |    2 +-
 ...ion_template_returns_Created_response.json |    2 +-
 ...with_a_permission_returns_OK_response.json |    2 +-
 ..._deletion_request_returns_OK_response.json |    2 +-
 ...CM_config_returns_No_Content_response.json |    2 +-
 .../v2/Delete_App_returns_OK_response.json    |    2 +-
 ...ete_Multiple_Apps_returns_OK_response.json |    2 +-
 ...te_Org_Connection_returns_OK_response.json |    2 +-
 ...te_Scanning_Group_returns_OK_response.json |    2 +-
 ...ete_Scanning_Rule_returns_OK_response.json |    4 +-
 ..._exclusion_filter_returns_OK_response.json |    2 +-
 ...case_type_returns_NotContent_response.json |    2 +-
 ...elete_a_case_type_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    2 +-
 ...a_dataset_returns_No_Content_response.json |    2 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...egration_returns_Bad_Request_response.json |    2 +-
 ..._an_incident_type_returns_OK_response.json |    2 +-
 ..._comment_returns_Bad_Request_response.json |    2 +-
 ...e_comment_returns_No_Content_response.json |    2 +-
 ...se_comment_returns_Not_Found_response.json |    2 +-
 ..._from_case_returns_Not_Found_response.json |    2 +-
 ...tribute_from_case_returns_OK_response.json |    2 +-
 ...s_config_returns_Bad_Request_response.json |    2 +-
 ...es_config_returns_No_Content_response.json |    2 +-
 ...te_datastore_item_returns_OK_response.json |    2 +-
 .../Delete_datastore_returns_OK_response.json |    2 +-
 ...tion_rule_returns_No_Content_response.json |    2 +-
 ..._template_returns_No_Content_response.json |    2 +-
 .../Edit_a_dataset_returns_OK_response.json   |    2 +-
 ...turns_AWS_External_ID_object_response.json |    2 +-
 ...sk_by_id_returns_Bad_Request_response.json |    2 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 ..._AWS_scan_options_returns_OK_response.json |    2 +-
 .../v2/Get_App_returns_Gone_response.json     |    2 +-
 ..._a_critical_asset_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    2 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...restriction_query_returns_OK_response.json |    2 +-
 ...gle_dataset_by_ID_returns_OK_response.json |    2 +-
 ...specific_pipeline_returns_OK_response.json |    2 +-
 ...nfig_of_case_type_returns_OK_response.json |    2 +-
 .../Get_all_datasets_returns_OK_response.json |    2 +-
 ...D_returns_AWS_Account_object_response.json |    2 +-
 ...onfig_ID_returns_Bad_Request_response.json |    2 +-
 ..._config_ID_returns_Not_Found_response.json |    2 +-
 .../v2/Get_datastore_returns_OK_response.json |    2 +-
 ...notification_rule_returns_OK_response.json |    2 +-
 ...fication_template_returns_OK_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 ...details_of_a_case_returns_OK_response.json |    2 +-
 ...king_issue_returns_Not_Found_response.json |    2 +-
 ...or_tracking_issue_returns_OK_response.json |    2 +-
 ...deletion_requests_returns_OK_response.json |    2 +-
 ..._AWS_scan_options_returns_OK_response.json |    2 +-
 ...t_Scanning_Groups_returns_OK_response.json |    6 +-
 ...retention_filters_returns_OK_response.json |    2 +-
 ...t_datastore_items_returns_OK_response.json |    2 +-
 ...t_historical_jobs_returns_OK_response.json |    2 +-
 ...otification_rules_returns_OK_response.json |    2 +-
 ...WS_Logs_Services_List_object_response.json |    2 +-
 .../List_permissions_returns_OK_response.json |    2 +-
 .../List_pipelines_returns_OK_response.json   |    2 +-
 ...restriction_query_returns_OK_response.json |    2 +-
 ...ptions_returns_Bad_Request_response_2.json |    2 +-
 ...n_Options_returns_No_Content_response.json |    2 +-
 ...an_Options_returns_Not_Found_response.json |    2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |    2 +-
 ..._Options_returns_Bad_Request_response.json |    2 +-
 ...an_Options_returns_Not_Found_response.json |    2 +-
 ..._GCP_Scan_Options_returns_OK_response.json |    2 +-
 ...options_enabled_successfully_response.json |    2 +-
 ..._Options_returns_Bad_Request_response.json |    2 +-
 ...can_Options_returns_Conflict_response.json |    2 +-
 ..._AWS_Scan_Options_returns_OK_response.json |    2 +-
 ...can_Options_returns_Conflict_response.json |    2 +-
 ...nd_task_created_successfully_response.json |    2 +-
 ...and_task_returns_Bad_Request_response.json |    2 +-
 .../Publish_App_returns_Created_response.json |    2 +-
 ...r_Groups_returns_Bad_Request_response.json |    4 +-
 .../Reorder_Groups_returns_OK_response.json   |    6 +-
 ...permission_returns_Not_found_response.json |    2 +-
 ...g_job_returns_Status_created_response.json |    2 +-
 ...ive_case_returns_Bad_Request_response.json |    2 +-
 .../Unarchive_case_returns_OK_response.json   |    2 +-
 ...ign_case_returns_Bad_Request_response.json |    2 +-
 .../v2/Unassign_case_returns_OK_response.json |    2 +-
 .../v2/Unpublish_App_returns_OK_response.json |    2 +-
 ...ptions_returns_Bad_Request_response_2.json |    2 +-
 ...n_options_returns_No_Content_response.json |    2 +-
 ...an_options_returns_Not_Found_response.json |    2 +-
 ...date_App_returns_Bad_Request_response.json |    2 +-
 .../v2/Update_App_returns_OK_response.json    |    2 +-
 ..._options_returns_Bad_Request_response.json |    2 +-
 ...an_options_returns_Not_Found_response.json |    2 +-
 ..._GCP_scan_options_returns_OK_response.json |    2 +-
 ...nnection_returns_Bad_Request_response.json |    2 +-
 ...Connection_returns_Not_Found_response.json |    2 +-
 ...te_Scanning_Group_returns_OK_response.json |    4 +-
 ...ing_Rule_returns_Bad_Request_response.json |    4 +-
 ...ate_Scanning_Rule_returns_OK_response.json |    4 +-
 ...tom_Rule_returns_Bad_Request_response.json |    2 +-
 ...a_WAF_Custom_Rule_returns_OK_response.json |    2 +-
 ...n_filter_returns_Bad_Request_response.json |    2 +-
 ..._exclusion_filter_returns_OK_response.json |    2 +-
 ..._a_critical_asset_returns_OK_response.json |    2 +-
 ..._custom_framework_returns_OK_response.json |    4 +-
 ...n_filter_returns_Bad_Request_response.json |    2 +-
 ...pipeline_returns_Bad_Request_response.json |    2 +-
 ...n_filter_returns_Bad_Request_response.json |    2 +-
 ..._retention_filter_returns_OK_response.json |    2 +-
 ...r_with_trace_rate_returns_OK_response.json |    2 +-
 ..._filters_returns_Bad_Request_response.json |    2 +-
 ...retention_filters_returns_OK_response.json |    2 +-
 ...e_a_role_returns_Bad_Request_response.json |    2 +-
 ...ate_a_role_returns_Not_found_response.json |    2 +-
 .../v2/Update_a_role_returns_OK_response.json |    2 +-
 ...n_returns_AWS_Account_object_response.json |    2 +-
 ...Workflow_returns_Bad_request_response.json |    2 +-
 ...cessfully_updated_a_workflow_response.json |    2 +-
 ...e_case_attributes_returns_OK_response.json |    2 +-
 ...ttribute_returns_Bad_Request_response.json |    2 +-
 ..._attribute_returns_Not_Found_response.json |    2 +-
 ..._custom_attribute_returns_OK_response.json |    2 +-
 ..._case_description_returns_OK_response.json |    2 +-
 ...priority_returns_Bad_Request_response.json |    2 +-
 ...ate_case_priority_returns_OK_response.json |    2 +-
 ...e_status_returns_Bad_Request_response.json |    2 +-
 ...pdate_case_status_returns_OK_response.json |    2 +-
 ...se_title_returns_Bad_Request_response.json |    2 +-
 ...Update_case_title_returns_OK_response.json |    2 +-
 .../Update_datastore_returns_OK_response.json |    2 +-
 ...fication_template_returns_OK_response.json |    2 +-
 ...an_issue_returns_Bad_Request_response.json |    2 +-
 ...state_of_an_issue_returns_OK_response.json |    2 +-
 .../client/v2/api/fleet_automation.feature    |   90 ++
 .../com/datadog/api/client/v2/api/undo.json   |   24 +
 204 files changed, 5470 insertions(+), 274 deletions(-)
 create mode 100644 examples/v2/fleet-automation/ListFleetAgentTracers.java
 create mode 100644 examples/v2/fleet-automation/ListFleetClusters.java
 create mode 100644 examples/v2/fleet-automation/ListFleetInstrumentedPods.java
 create mode 100644 examples/v2/fleet-automation/ListFleetTracers.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetClusterAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetClustersResponse.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseData.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseDataAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseMeta.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodGroupAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponse.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseData.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseDataAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetTracerAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetTracersResponse.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseData.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseDataAttributes.java
 create mode 100644 src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseMeta.java

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 9d0d2013a25..9913a8c2361 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -27071,6 +27071,155 @@ components:
           format: int64
           type: integer
       type: object
+    FleetClusterAttributes:
+      description: Attributes of a Kubernetes cluster in the fleet.
+      properties:
+        agent_versions:
+          description: Datadog Agent versions running in the cluster.
+          items:
+            description: A Datadog Agent version string.
+            type: string
+          type: array
+        api_key_names:
+          description: API key names used by agents in the cluster.
+          items:
+            description: An API key name.
+            type: string
+          type: array
+        api_key_uuids:
+          description: API key UUIDs used by agents in the cluster.
+          items:
+            description: An API key UUID.
+            type: string
+          type: array
+        cloud_providers:
+          description: Cloud providers hosting the cluster.
+          items:
+            description: A cloud provider name.
+            type: string
+          type: array
+        cluster_name:
+          description: The name of the Kubernetes cluster.
+          example: "production-us-east-1"
+          type: string
+        enabled_products:
+          description: Datadog products enabled in the cluster.
+          items:
+            description: A Datadog product name.
+            type: string
+          type: array
+        envs:
+          description: Environments associated with the cluster.
+          items:
+            description: An environment name.
+            type: string
+          type: array
+        first_seen_at:
+          description: Timestamp when the cluster was first seen.
+          format: int64
+          type: integer
+        install_method_tool:
+          description: The tool used to install agents in the cluster.
+          example: "helm"
+          type: string
+        node_count:
+          description: Total number of nodes in the cluster.
+          example: 25
+          format: int64
+          type: integer
+        node_count_by_status:
+          $ref: "#/components/schemas/FleetClusterNodeCountByStatus"
+        operating_systems:
+          description: Operating systems of nodes in the cluster.
+          items:
+            description: An operating system name.
+            type: string
+          type: array
+        otel_collector_distributions:
+          description: OpenTelemetry collector distributions in the cluster.
+          items:
+            description: An OpenTelemetry collector distribution name.
+            type: string
+          type: array
+        otel_collector_versions:
+          description: OpenTelemetry collector versions in the cluster.
+          items:
+            description: An OpenTelemetry collector version string.
+            type: string
+          type: array
+        pod_count_by_state:
+          $ref: "#/components/schemas/FleetClusterPodCountByState"
+        services:
+          description: Services running in the cluster.
+          items:
+            description: A service name.
+            type: string
+          type: array
+        teams:
+          description: Teams associated with the cluster.
+          items:
+            description: A team name.
+            type: string
+          type: array
+      type: object
+    FleetClusterNodeCountByStatus:
+      additionalProperties:
+        format: int64
+        type: integer
+      description: Node counts grouped by status.
+      type: object
+    FleetClusterPodCountByState:
+      additionalProperties:
+        format: int64
+        type: integer
+      description: Pod counts grouped by state.
+      type: object
+    FleetClustersResponse:
+      description: Response containing a paginated list of fleet clusters.
+      properties:
+        data:
+          $ref: "#/components/schemas/FleetClustersResponseData"
+        meta:
+          $ref: "#/components/schemas/FleetClustersResponseMeta"
+      required:
+        - data
+      type: object
+    FleetClustersResponseData:
+      description: The response data containing status and clusters array.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/FleetClustersResponseDataAttributes"
+        id:
+          description: Status identifier.
+          example: "done"
+          type: string
+        type:
+          description: Resource type.
+          example: "status"
+          type: string
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    FleetClustersResponseDataAttributes:
+      description: Attributes of the fleet clusters response containing the list of clusters.
+      properties:
+        clusters:
+          description: Array of clusters matching the query criteria.
+          items:
+            $ref: "#/components/schemas/FleetClusterAttributes"
+          type: array
+      type: object
+    FleetClustersResponseMeta:
+      description: Metadata for the list of clusters response.
+      properties:
+        total_filtered_count:
+          description: Total number of clusters matching the filter criteria across all pages.
+          example: 12
+          format: int64
+          type: integer
+      type: object
     FleetConfigurationFile:
       description: A configuration file for an integration.
       properties:
@@ -27420,6 +27569,93 @@ components:
           example: "postgres"
           type: string
       type: object
+    FleetInstrumentedPodGroupAttributes:
+      description: Attributes of a group of instrumented pods targeted for SSI injection.
+      properties:
+        applied_target:
+          additionalProperties: {}
+          description: The SSI injection target configuration applied to the pod group.
+          type: object
+        applied_target_name:
+          description: The name of the applied SSI injection target.
+          example: "my-injection-target"
+          type: string
+        injected_tags:
+          description: Tags injected into the pods by the Admission Controller.
+          items:
+            description: An injected tag string.
+            type: string
+          type: array
+        kube_ownerref_kind:
+          description: The kind of the Kubernetes owner reference.
+          example: "Deployment"
+          type: string
+        kube_ownerref_name:
+          description: The name of the Kubernetes owner reference (deployment, statefulset, etc.).
+          example: "inventory-service"
+          type: string
+        lib_injection_annotations:
+          description: Library injection annotations on the pod group.
+          items:
+            description: A library injection annotation string.
+            type: string
+          type: array
+        namespace:
+          description: The Kubernetes namespace of the pod group.
+          example: "default"
+          type: string
+        pod_count:
+          description: Total number of pods in the group.
+          example: 3
+          format: int64
+          type: integer
+        pod_names:
+          description: Names of the individual pods in the group.
+          items:
+            description: A Kubernetes pod name.
+            type: string
+          type: array
+        tags:
+          additionalProperties:
+            type: string
+          description: Additional tags associated with the pod group.
+          type: object
+      type: object
+    FleetInstrumentedPodsResponse:
+      description: Response containing instrumented pods for a Kubernetes cluster.
+      properties:
+        data:
+          $ref: "#/components/schemas/FleetInstrumentedPodsResponseData"
+      required:
+        - data
+      type: object
+    FleetInstrumentedPodsResponseData:
+      description: The response data containing the cluster name and instrumented pod groups.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/FleetInstrumentedPodsResponseDataAttributes"
+        id:
+          description: The cluster name identifier.
+          example: "production-us-east-1"
+          type: string
+        type:
+          description: Resource type.
+          example: "cluster_name"
+          type: string
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    FleetInstrumentedPodsResponseDataAttributes:
+      description: Attributes of the instrumented pods response containing the list of pod groups.
+      properties:
+        groups:
+          description: Array of instrumented pod groups in the cluster.
+          items:
+            $ref: "#/components/schemas/FleetInstrumentedPodGroupAttributes"
+          type: array
+      type: object
     FleetIntegrationDetails:
       description: Detailed information about a single integration.
       properties:
@@ -27729,6 +27965,98 @@ components:
       required:
         - data
       type: object
+    FleetTracerAttributes:
+      description: Attributes of a fleet tracer representing a service instance reporting telemetry.
+      properties:
+        env:
+          description: The environment the tracer is reporting from.
+          example: "production"
+          type: string
+        hostname:
+          description: The hostname where the tracer is running.
+          example: "my-hostname"
+          type: string
+        language:
+          description: The programming language of the traced application.
+          example: "java"
+          type: string
+        language_version:
+          description: The version of the programming language runtime.
+          example: "17.0.1"
+          type: string
+        remote_config_status:
+          description: The remote configuration status of the tracer.
+          example: "connected"
+          type: string
+        runtime_ids:
+          description: Runtime identifiers for the tracer instances.
+          items:
+            description: A runtime identifier for a tracer instance.
+            type: string
+          type: array
+        service:
+          description: The telemetry-derived service name reported by the tracer.
+          example: "inventory-service"
+          type: string
+        service_hostname:
+          description: The service hostname reported by the tracer.
+          example: "my-service-host"
+          type: string
+        service_version:
+          description: The version of the traced service.
+          example: "2.1.0"
+          type: string
+        tracer_version:
+          description: The version of the Datadog tracer library.
+          example: "1.32.0"
+          type: string
+      type: object
+    FleetTracersResponse:
+      description: Response containing a paginated list of fleet tracers.
+      properties:
+        data:
+          $ref: "#/components/schemas/FleetTracersResponseData"
+        meta:
+          $ref: "#/components/schemas/FleetTracersResponseMeta"
+      required:
+        - data
+      type: object
+    FleetTracersResponseData:
+      description: The response data containing status and tracers array.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/FleetTracersResponseDataAttributes"
+        id:
+          description: Status identifier.
+          example: "done"
+          type: string
+        type:
+          description: Resource type.
+          example: "status"
+          type: string
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    FleetTracersResponseDataAttributes:
+      description: Attributes of the fleet tracers response containing the list of tracers.
+      properties:
+        tracers:
+          description: Array of tracers matching the query criteria.
+          items:
+            $ref: "#/components/schemas/FleetTracerAttributes"
+          type: array
+      type: object
+    FleetTracersResponseMeta:
+      description: Metadata for the list of tracers response.
+      properties:
+        total_filtered_count:
+          description: Total number of tracers matching the filter criteria across all pages.
+          example: 42
+          format: int64
+          type: integer
+      type: object
     FormTrigger:
       description: "Trigger a workflow from a Form."
       properties:
@@ -75614,6 +75942,214 @@ paths:
       x-unstable: |-
         This endpoint is in Preview and may introduce breaking changes.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/unstable/fleet/agents/{agent_key}/tracers:
+    get:
+      description: |-
+        Retrieve a paginated list of tracers for a specific agent.
+
+        This endpoint returns tracers associated with a given agent key, identified by the
+        agent's hostname. Use this to discover telemetry-derived service names for a particular host.
+      operationId: ListFleetAgentTracers
+      parameters:
+        - description: The unique identifier (agent key) for the Datadog Agent.
+          in: path
+          name: agent_key
+          required: true
+          schema:
+            type: string
+        - description: Page number for pagination (starts at 0).
+          in: query
+          name: page_number
+          required: false
+          schema:
+            default: 0
+            format: int64
+            minimum: 0
+            type: integer
+        - description: Number of results per page (must be greater than 0 and less than or equal to 100).
+          in: query
+          name: page_size
+          required: false
+          schema:
+            default: 10
+            format: int64
+            maximum: 100
+            minimum: 1
+            type: integer
+        - description: Attribute to sort by.
+          in: query
+          name: sort_attribute
+          required: false
+          schema:
+            type: string
+        - description: Sort order (true for descending, false for ascending).
+          in: query
+          name: sort_descending
+          required: false
+          schema:
+            default: true
+            type: boolean
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/FleetTracersResponse"
+          description: OK
+        "400":
+          $ref: "#/components/responses/BadRequestResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedResponse"
+        "403":
+          $ref: "#/components/responses/ForbiddenResponse"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: List tracers for a specific agent
+      tags:
+        - Fleet Automation
+      "x-permission":
+        operator: AND
+        permissions:
+          - hosts_read
+      x-unstable: |-
+        This endpoint is in Preview and may introduce breaking changes.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/unstable/fleet/clusters:
+    get:
+      description: |-
+        Retrieve a paginated list of Kubernetes clusters in the fleet.
+
+        This endpoint returns clusters with metadata including node counts, agent versions,
+        enabled products, and associated services. Use the `page_number` and `page_size`
+        query parameters to paginate through results.
+      operationId: ListFleetClusters
+      parameters:
+        - description: Page number for pagination (starts at 0).
+          in: query
+          name: page_number
+          required: false
+          schema:
+            default: 0
+            format: int64
+            minimum: 0
+            type: integer
+        - description: Number of results per page (must be greater than 0 and less than or equal to 100).
+          in: query
+          name: page_size
+          required: false
+          schema:
+            default: 10
+            format: int64
+            maximum: 100
+            minimum: 1
+            type: integer
+        - description: Attribute to sort by.
+          in: query
+          name: sort_attribute
+          required: false
+          schema:
+            type: string
+        - description: Sort order (true for descending, false for ascending).
+          in: query
+          name: sort_descending
+          required: false
+          schema:
+            type: boolean
+        - description: Filter string for narrowing down cluster results.
+          example: "cluster_name:production"
+          in: query
+          name: filter
+          required: false
+          schema:
+            type: string
+        - description: Comma-separated list of tags to filter clusters.
+          in: query
+          name: tags
+          required: false
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/FleetClustersResponse"
+          description: OK
+        "400":
+          $ref: "#/components/responses/BadRequestResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedResponse"
+        "403":
+          $ref: "#/components/responses/ForbiddenResponse"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: List all fleet clusters
+      tags:
+        - Fleet Automation
+      "x-permission":
+        operator: AND
+        permissions:
+          - hosts_read
+      x-unstable: |-
+        This endpoint is in Preview and may introduce breaking changes.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/unstable/fleet/clusters/{cluster_name}/instrumented_pods:
+    get:
+      description: |-
+        Retrieve the list of pods targeted for Single Step Instrumentation (SSI) injection
+        in a specific Kubernetes cluster.
+
+        This endpoint returns pod groups organized by owner reference (deployment, statefulset, etc.)
+        with their injection annotations and applied targets. Use the clusters list endpoint
+        to discover available cluster names.
+      operationId: ListFleetInstrumentedPods
+      parameters:
+        - description: The name of the Kubernetes cluster.
+          in: path
+          name: cluster_name
+          required: true
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/FleetInstrumentedPodsResponse"
+          description: OK
+        "400":
+          $ref: "#/components/responses/BadRequestResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedResponse"
+        "403":
+          $ref: "#/components/responses/ForbiddenResponse"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: List instrumented pods for a cluster
+      tags:
+        - Fleet Automation
+      "x-permission":
+        operator: AND
+        permissions:
+          - hosts_read
+      x-unstable: |-
+        This endpoint is in Preview and may introduce breaking changes.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/unstable/fleet/deployments:
     get:
       description: |-
@@ -76406,6 +76942,86 @@ paths:
       x-unstable: |-
         This endpoint is in Preview and may introduce breaking changes.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
+  /api/unstable/fleet/tracers:
+    get:
+      description: |-
+        Retrieve a paginated list of all fleet tracers.
+
+        This endpoint returns telemetry-derived service names from the SDK telemetry pipeline.
+        These names may differ from span-derived names in APM and are useful for querying
+        service library configurations.
+        Use the `page_number` and `page_size` query parameters to paginate through results.
+      operationId: ListFleetTracers
+      parameters:
+        - description: Page number for pagination (starts at 0).
+          in: query
+          name: page_number
+          required: false
+          schema:
+            default: 0
+            format: int64
+            minimum: 0
+            type: integer
+        - description: Number of results per page (must be greater than 0 and less than or equal to 100).
+          in: query
+          name: page_size
+          required: false
+          schema:
+            default: 10
+            format: int64
+            maximum: 100
+            minimum: 1
+            type: integer
+        - description: Attribute to sort by.
+          in: query
+          name: sort_attribute
+          required: false
+          schema:
+            type: string
+        - description: Sort order (true for descending, false for ascending).
+          in: query
+          name: sort_descending
+          required: false
+          schema:
+            default: true
+            type: boolean
+        - description: Filter string for narrowing down tracer results.
+          example: "hostname:my-host OR env:prod"
+          in: query
+          name: filter
+          required: false
+          schema:
+            type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/FleetTracersResponse"
+          description: OK
+        "400":
+          $ref: "#/components/responses/BadRequestResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedResponse"
+        "403":
+          $ref: "#/components/responses/ForbiddenResponse"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+      summary: List all fleet tracers
+      tags:
+        - Fleet Automation
+      "x-permission":
+        operator: AND
+        permissions:
+          - hosts_read
+      x-unstable: |-
+        This endpoint is in Preview and may introduce breaking changes.
+        If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/actions-datastores:
     get:
       description: Lists all datastores for the organization.
diff --git a/examples/v2/fleet-automation/ListFleetAgentTracers.java b/examples/v2/fleet-automation/ListFleetAgentTracers.java
new file mode 100644
index 00000000000..834a3b0113d
--- /dev/null
+++ b/examples/v2/fleet-automation/ListFleetAgentTracers.java
@@ -0,0 +1,25 @@
+// List tracers for a specific agent returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.FleetAutomationApi;
+import com.datadog.api.client.v2.model.FleetTracersResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.listFleetAgentTracers", true);
+    FleetAutomationApi apiInstance = new FleetAutomationApi(defaultClient);
+
+    try {
+      FleetTracersResponse result = apiInstance.listFleetAgentTracers("agent_key");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling FleetAutomationApi#listFleetAgentTracers");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/fleet-automation/ListFleetClusters.java b/examples/v2/fleet-automation/ListFleetClusters.java
new file mode 100644
index 00000000000..83848117e67
--- /dev/null
+++ b/examples/v2/fleet-automation/ListFleetClusters.java
@@ -0,0 +1,25 @@
+// List all fleet clusters returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.FleetAutomationApi;
+import com.datadog.api.client.v2.model.FleetClustersResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.listFleetClusters", true);
+    FleetAutomationApi apiInstance = new FleetAutomationApi(defaultClient);
+
+    try {
+      FleetClustersResponse result = apiInstance.listFleetClusters();
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling FleetAutomationApi#listFleetClusters");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/fleet-automation/ListFleetInstrumentedPods.java b/examples/v2/fleet-automation/ListFleetInstrumentedPods.java
new file mode 100644
index 00000000000..0264981d8a2
--- /dev/null
+++ b/examples/v2/fleet-automation/ListFleetInstrumentedPods.java
@@ -0,0 +1,25 @@
+// List instrumented pods for a cluster returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.FleetAutomationApi;
+import com.datadog.api.client.v2.model.FleetInstrumentedPodsResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.listFleetInstrumentedPods", true);
+    FleetAutomationApi apiInstance = new FleetAutomationApi(defaultClient);
+
+    try {
+      FleetInstrumentedPodsResponse result = apiInstance.listFleetInstrumentedPods("cluster_name");
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling FleetAutomationApi#listFleetInstrumentedPods");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/examples/v2/fleet-automation/ListFleetTracers.java b/examples/v2/fleet-automation/ListFleetTracers.java
new file mode 100644
index 00000000000..fb94ed56818
--- /dev/null
+++ b/examples/v2/fleet-automation/ListFleetTracers.java
@@ -0,0 +1,25 @@
+// List all fleet tracers returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.FleetAutomationApi;
+import com.datadog.api.client.v2.model.FleetTracersResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    defaultClient.setUnstableOperationEnabled("v2.listFleetTracers", true);
+    FleetAutomationApi apiInstance = new FleetAutomationApi(defaultClient);
+
+    try {
+      FleetTracersResponse result = apiInstance.listFleetTracers();
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling FleetAutomationApi#listFleetTracers");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/ApiClient.java b/src/main/java/com/datadog/api/client/ApiClient.java
index 5effe4c2a03..c3e8abea7fc 100644
--- a/src/main/java/com/datadog/api/client/ApiClient.java
+++ b/src/main/java/com/datadog/api/client/ApiClient.java
@@ -759,9 +759,13 @@ public class ApiClient {
           put("v2.getFleetDeployment", false);
           put("v2.getFleetSchedule", false);
           put("v2.listFleetAgents", false);
+          put("v2.listFleetAgentTracers", false);
           put("v2.listFleetAgentVersions", false);
+          put("v2.listFleetClusters", false);
           put("v2.listFleetDeployments", false);
+          put("v2.listFleetInstrumentedPods", false);
           put("v2.listFleetSchedules", false);
+          put("v2.listFleetTracers", false);
           put("v2.triggerFleetSchedule", false);
           put("v2.updateFleetSchedule", false);
           put("v2.createOpenAPI", false);
diff --git a/src/main/java/com/datadog/api/client/v2/api/FleetAutomationApi.java b/src/main/java/com/datadog/api/client/v2/api/FleetAutomationApi.java
index 474d1ad21ac..c3babafbe6b 100644
--- a/src/main/java/com/datadog/api/client/v2/api/FleetAutomationApi.java
+++ b/src/main/java/com/datadog/api/client/v2/api/FleetAutomationApi.java
@@ -7,14 +7,17 @@
 import com.datadog.api.client.v2.model.FleetAgentInfoResponse;
 import com.datadog.api.client.v2.model.FleetAgentVersionsResponse;
 import com.datadog.api.client.v2.model.FleetAgentsResponse;
+import com.datadog.api.client.v2.model.FleetClustersResponse;
 import com.datadog.api.client.v2.model.FleetDeploymentConfigureCreateRequest;
 import com.datadog.api.client.v2.model.FleetDeploymentPackageUpgradeCreateRequest;
 import com.datadog.api.client.v2.model.FleetDeploymentResponse;
 import com.datadog.api.client.v2.model.FleetDeploymentsResponse;
+import com.datadog.api.client.v2.model.FleetInstrumentedPodsResponse;
 import com.datadog.api.client.v2.model.FleetScheduleCreateRequest;
 import com.datadog.api.client.v2.model.FleetSchedulePatchRequest;
 import com.datadog.api.client.v2.model.FleetScheduleResponse;
 import com.datadog.api.client.v2.model.FleetSchedulesResponse;
+import com.datadog.api.client.v2.model.FleetTracersResponse;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.core.GenericType;
 import java.util.ArrayList;
@@ -1696,27 +1699,509 @@ public CompletableFuture<ApiResponse<FleetAgentsResponse>> listFleetAgentsWithHt
         new GenericType<FleetAgentsResponse>() {});
   }
 
+  /** Manage optional parameters to listFleetAgentTracers. */
+  public static class ListFleetAgentTracersOptionalParameters {
+    private Long pageNumber;
+    private Long pageSize;
+    private String sortAttribute;
+    private Boolean sortDescending;
+
+    /**
+     * Set pageNumber.
+     *
+     * @param pageNumber Page number for pagination (starts at 0). (optional, default to 0)
+     * @return ListFleetAgentTracersOptionalParameters
+     */
+    public ListFleetAgentTracersOptionalParameters pageNumber(Long pageNumber) {
+      this.pageNumber = pageNumber;
+      return this;
+    }
+
+    /**
+     * Set pageSize.
+     *
+     * @param pageSize Number of results per page (must be greater than 0 and less than or equal to
+     *     100). (optional, default to 10)
+     * @return ListFleetAgentTracersOptionalParameters
+     */
+    public ListFleetAgentTracersOptionalParameters pageSize(Long pageSize) {
+      this.pageSize = pageSize;
+      return this;
+    }
+
+    /**
+     * Set sortAttribute.
+     *
+     * @param sortAttribute Attribute to sort by. (optional)
+     * @return ListFleetAgentTracersOptionalParameters
+     */
+    public ListFleetAgentTracersOptionalParameters sortAttribute(String sortAttribute) {
+      this.sortAttribute = sortAttribute;
+      return this;
+    }
+
+    /**
+     * Set sortDescending.
+     *
+     * @param sortDescending Sort order (true for descending, false for ascending). (optional,
+     *     default to true)
+     * @return ListFleetAgentTracersOptionalParameters
+     */
+    public ListFleetAgentTracersOptionalParameters sortDescending(Boolean sortDescending) {
+      this.sortDescending = sortDescending;
+      return this;
+    }
+  }
+
+  /**
+   * List tracers for a specific agent.
+   *
+   * <p>See {@link #listFleetAgentTracersWithHttpInfo}.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @return FleetTracersResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetTracersResponse listFleetAgentTracers(String agentKey) throws ApiException {
+    return listFleetAgentTracersWithHttpInfo(
+            agentKey, new ListFleetAgentTracersOptionalParameters())
+        .getData();
+  }
+
+  /**
+   * List tracers for a specific agent.
+   *
+   * <p>See {@link #listFleetAgentTracersWithHttpInfoAsync}.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @return CompletableFuture&lt;FleetTracersResponse&gt;
+   */
+  public CompletableFuture<FleetTracersResponse> listFleetAgentTracersAsync(String agentKey) {
+    return listFleetAgentTracersWithHttpInfoAsync(
+            agentKey, new ListFleetAgentTracersOptionalParameters())
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * List tracers for a specific agent.
+   *
+   * <p>See {@link #listFleetAgentTracersWithHttpInfo}.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @param parameters Optional parameters for the request.
+   * @return FleetTracersResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetTracersResponse listFleetAgentTracers(
+      String agentKey, ListFleetAgentTracersOptionalParameters parameters) throws ApiException {
+    return listFleetAgentTracersWithHttpInfo(agentKey, parameters).getData();
+  }
+
+  /**
+   * List tracers for a specific agent.
+   *
+   * <p>See {@link #listFleetAgentTracersWithHttpInfoAsync}.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;FleetTracersResponse&gt;
+   */
+  public CompletableFuture<FleetTracersResponse> listFleetAgentTracersAsync(
+      String agentKey, ListFleetAgentTracersOptionalParameters parameters) {
+    return listFleetAgentTracersWithHttpInfoAsync(agentKey, parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Retrieve a paginated list of tracers for a specific agent.
+   *
+   * <p>This endpoint returns tracers associated with a given agent key, identified by the agent's
+   * hostname. Use this to discover telemetry-derived service names for a particular host.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;FleetTracersResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<FleetTracersResponse> listFleetAgentTracersWithHttpInfo(
+      String agentKey, ListFleetAgentTracersOptionalParameters parameters) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetAgentTracers";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'agentKey' is set
+    if (agentKey == null) {
+      throw new ApiException(
+          400, "Missing the required parameter 'agentKey' when calling listFleetAgentTracers");
+    }
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    // create path and map variables
+    String localVarPath =
+        "/api/unstable/fleet/agents/{agent_key}/tracers"
+            .replaceAll("\\{" + "agent_key" + "\\}", apiClient.escapeString(agentKey.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.FleetAutomationApi.listFleetAgentTracers",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetTracersResponse>() {});
+  }
+
+  /**
+   * List tracers for a specific agent.
+   *
+   * <p>See {@link #listFleetAgentTracersWithHttpInfo}.
+   *
+   * @param agentKey The unique identifier (agent key) for the Datadog Agent. (required)
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetTracersResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<FleetTracersResponse>>
+      listFleetAgentTracersWithHttpInfoAsync(
+          String agentKey, ListFleetAgentTracersOptionalParameters parameters) {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetAgentTracers";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<FleetTracersResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+
+    // verify the required parameter 'agentKey' is set
+    if (agentKey == null) {
+      CompletableFuture<ApiResponse<FleetTracersResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400, "Missing the required parameter 'agentKey' when calling listFleetAgentTracers"));
+      return result;
+    }
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    // create path and map variables
+    String localVarPath =
+        "/api/unstable/fleet/agents/{agent_key}/tracers"
+            .replaceAll("\\{" + "agent_key" + "\\}", apiClient.escapeString(agentKey.toString()));
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.FleetAutomationApi.listFleetAgentTracers",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<FleetTracersResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetTracersResponse>() {});
+  }
+
+  /**
+   * List all available Agent versions.
+   *
+   * <p>See {@link #listFleetAgentVersionsWithHttpInfo}.
+   *
+   * @return FleetAgentVersionsResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetAgentVersionsResponse listFleetAgentVersions() throws ApiException {
+    return listFleetAgentVersionsWithHttpInfo().getData();
+  }
+
+  /**
+   * List all available Agent versions.
+   *
+   * <p>See {@link #listFleetAgentVersionsWithHttpInfoAsync}.
+   *
+   * @return CompletableFuture&lt;FleetAgentVersionsResponse&gt;
+   */
+  public CompletableFuture<FleetAgentVersionsResponse> listFleetAgentVersionsAsync() {
+    return listFleetAgentVersionsWithHttpInfoAsync()
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Retrieve a list of all available Datadog Agent versions.
+   *
+   * <p>This endpoint returns the available Agent versions that can be deployed to your fleet. These
+   * versions are used when creating deployments or configuring schedules for automated Agent
+   * upgrades.
+   *
+   * @return ApiResponse&lt;FleetAgentVersionsResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<FleetAgentVersionsResponse> listFleetAgentVersionsWithHttpInfo()
+      throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetAgentVersions";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = null;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/agent_versions";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.FleetAutomationApi.listFleetAgentVersions",
+            localVarPath,
+            new ArrayList<Pair>(),
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetAgentVersionsResponse>() {});
+  }
+
+  /**
+   * List all available Agent versions.
+   *
+   * <p>See {@link #listFleetAgentVersionsWithHttpInfo}.
+   *
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetAgentVersionsResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<FleetAgentVersionsResponse>>
+      listFleetAgentVersionsWithHttpInfoAsync() {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetAgentVersions";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<FleetAgentVersionsResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/agent_versions";
+
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.FleetAutomationApi.listFleetAgentVersions",
+              localVarPath,
+              new ArrayList<Pair>(),
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<FleetAgentVersionsResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetAgentVersionsResponse>() {});
+  }
+
+  /** Manage optional parameters to listFleetClusters. */
+  public static class ListFleetClustersOptionalParameters {
+    private Long pageNumber;
+    private Long pageSize;
+    private String sortAttribute;
+    private Boolean sortDescending;
+    private String filter;
+    private String tags;
+
+    /**
+     * Set pageNumber.
+     *
+     * @param pageNumber Page number for pagination (starts at 0). (optional, default to 0)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters pageNumber(Long pageNumber) {
+      this.pageNumber = pageNumber;
+      return this;
+    }
+
+    /**
+     * Set pageSize.
+     *
+     * @param pageSize Number of results per page (must be greater than 0 and less than or equal to
+     *     100). (optional, default to 10)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters pageSize(Long pageSize) {
+      this.pageSize = pageSize;
+      return this;
+    }
+
+    /**
+     * Set sortAttribute.
+     *
+     * @param sortAttribute Attribute to sort by. (optional)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters sortAttribute(String sortAttribute) {
+      this.sortAttribute = sortAttribute;
+      return this;
+    }
+
+    /**
+     * Set sortDescending.
+     *
+     * @param sortDescending Sort order (true for descending, false for ascending). (optional)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters sortDescending(Boolean sortDescending) {
+      this.sortDescending = sortDescending;
+      return this;
+    }
+
+    /**
+     * Set filter.
+     *
+     * @param filter Filter string for narrowing down cluster results. (optional)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters filter(String filter) {
+      this.filter = filter;
+      return this;
+    }
+
+    /**
+     * Set tags.
+     *
+     * @param tags Comma-separated list of tags to filter clusters. (optional)
+     * @return ListFleetClustersOptionalParameters
+     */
+    public ListFleetClustersOptionalParameters tags(String tags) {
+      this.tags = tags;
+      return this;
+    }
+  }
+
   /**
-   * List all available Agent versions.
+   * List all fleet clusters.
    *
-   * <p>See {@link #listFleetAgentVersionsWithHttpInfo}.
+   * <p>See {@link #listFleetClustersWithHttpInfo}.
    *
-   * @return FleetAgentVersionsResponse
+   * @return FleetClustersResponse
    * @throws ApiException if fails to make API call
    */
-  public FleetAgentVersionsResponse listFleetAgentVersions() throws ApiException {
-    return listFleetAgentVersionsWithHttpInfo().getData();
+  public FleetClustersResponse listFleetClusters() throws ApiException {
+    return listFleetClustersWithHttpInfo(new ListFleetClustersOptionalParameters()).getData();
   }
 
   /**
-   * List all available Agent versions.
+   * List all fleet clusters.
    *
-   * <p>See {@link #listFleetAgentVersionsWithHttpInfoAsync}.
+   * <p>See {@link #listFleetClustersWithHttpInfoAsync}.
    *
-   * @return CompletableFuture&lt;FleetAgentVersionsResponse&gt;
+   * @return CompletableFuture&lt;FleetClustersResponse&gt;
    */
-  public CompletableFuture<FleetAgentVersionsResponse> listFleetAgentVersionsAsync() {
-    return listFleetAgentVersionsWithHttpInfoAsync()
+  public CompletableFuture<FleetClustersResponse> listFleetClustersAsync() {
+    return listFleetClustersWithHttpInfoAsync(new ListFleetClustersOptionalParameters())
         .thenApply(
             response -> {
               return response.getData();
@@ -1724,13 +2209,45 @@ public CompletableFuture<FleetAgentVersionsResponse> listFleetAgentVersionsAsync
   }
 
   /**
-   * Retrieve a list of all available Datadog Agent versions.
+   * List all fleet clusters.
    *
-   * <p>This endpoint returns the available Agent versions that can be deployed to your fleet. These
-   * versions are used when creating deployments or configuring schedules for automated Agent
-   * upgrades.
+   * <p>See {@link #listFleetClustersWithHttpInfo}.
    *
-   * @return ApiResponse&lt;FleetAgentVersionsResponse&gt;
+   * @param parameters Optional parameters for the request.
+   * @return FleetClustersResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetClustersResponse listFleetClusters(ListFleetClustersOptionalParameters parameters)
+      throws ApiException {
+    return listFleetClustersWithHttpInfo(parameters).getData();
+  }
+
+  /**
+   * List all fleet clusters.
+   *
+   * <p>See {@link #listFleetClustersWithHttpInfoAsync}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;FleetClustersResponse&gt;
+   */
+  public CompletableFuture<FleetClustersResponse> listFleetClustersAsync(
+      ListFleetClustersOptionalParameters parameters) {
+    return listFleetClustersWithHttpInfoAsync(parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Retrieve a paginated list of Kubernetes clusters in the fleet.
+   *
+   * <p>This endpoint returns clusters with metadata including node counts, agent versions, enabled
+   * products, and associated services. Use the <code>page_number</code> and <code>page_size</code>
+   * query parameters to paginate through results.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;FleetClustersResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -1744,26 +2261,40 @@ public CompletableFuture<FleetAgentVersionsResponse> listFleetAgentVersionsAsync
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<FleetAgentVersionsResponse> listFleetAgentVersionsWithHttpInfo()
-      throws ApiException {
+  public ApiResponse<FleetClustersResponse> listFleetClustersWithHttpInfo(
+      ListFleetClustersOptionalParameters parameters) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "listFleetAgentVersions";
+    String operationId = "listFleetClusters";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
       throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
     }
     Object localVarPostBody = null;
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    String filter = parameters.filter;
+    String tags = parameters.tags;
     // create path and map variables
-    String localVarPath = "/api/unstable/fleet/agent_versions";
+    String localVarPath = "/api/unstable/fleet/clusters";
 
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter", filter));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "tags", tags));
+
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.FleetAutomationApi.listFleetAgentVersions",
+            "v2.FleetAutomationApi.listFleetClusters",
             localVarPath,
-            new ArrayList<Pair>(),
+            localVarQueryParams,
             localVarHeaderParams,
             new HashMap<String, String>(),
             new String[] {"application/json"},
@@ -1776,47 +2307,62 @@ public ApiResponse<FleetAgentVersionsResponse> listFleetAgentVersionsWithHttpInf
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<FleetAgentVersionsResponse>() {});
+        new GenericType<FleetClustersResponse>() {});
   }
 
   /**
-   * List all available Agent versions.
+   * List all fleet clusters.
    *
-   * <p>See {@link #listFleetAgentVersionsWithHttpInfo}.
+   * <p>See {@link #listFleetClustersWithHttpInfo}.
    *
-   * @return CompletableFuture&lt;ApiResponse&lt;FleetAgentVersionsResponse&gt;&gt;
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetClustersResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<FleetAgentVersionsResponse>>
-      listFleetAgentVersionsWithHttpInfoAsync() {
+  public CompletableFuture<ApiResponse<FleetClustersResponse>> listFleetClustersWithHttpInfoAsync(
+      ListFleetClustersOptionalParameters parameters) {
     // Check if unstable operation is enabled
-    String operationId = "listFleetAgentVersions";
+    String operationId = "listFleetClusters";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<FleetAgentVersionsResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<FleetClustersResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
     }
     Object localVarPostBody = null;
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    String filter = parameters.filter;
+    String tags = parameters.tags;
     // create path and map variables
-    String localVarPath = "/api/unstable/fleet/agent_versions";
+    String localVarPath = "/api/unstable/fleet/clusters";
 
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter", filter));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "tags", tags));
+
     Invocation.Builder builder;
     try {
       builder =
           apiClient.createBuilder(
-              "v2.FleetAutomationApi.listFleetAgentVersions",
+              "v2.FleetAutomationApi.listFleetClusters",
               localVarPath,
-              new ArrayList<Pair>(),
+              localVarQueryParams,
               localVarHeaderParams,
               new HashMap<String, String>(),
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<FleetAgentVersionsResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<FleetClustersResponse>> result = new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -1828,7 +2374,7 @@ public ApiResponse<FleetAgentVersionsResponse> listFleetAgentVersionsWithHttpInf
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<FleetAgentVersionsResponse>() {});
+        new GenericType<FleetClustersResponse>() {});
   }
 
   /** Manage optional parameters to listFleetDeployments. */
@@ -1910,9 +2456,158 @@ public FleetDeploymentsResponse listFleetDeployments(
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;FleetDeploymentsResponse&gt;
    */
-  public CompletableFuture<FleetDeploymentsResponse> listFleetDeploymentsAsync(
-      ListFleetDeploymentsOptionalParameters parameters) {
-    return listFleetDeploymentsWithHttpInfoAsync(parameters)
+  public CompletableFuture<FleetDeploymentsResponse> listFleetDeploymentsAsync(
+      ListFleetDeploymentsOptionalParameters parameters) {
+    return listFleetDeploymentsWithHttpInfoAsync(parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Retrieve a list of all deployments for fleet automation. Use the <code>page_size</code> and
+   * <code>page_offset</code> parameters to paginate results.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;FleetDeploymentsResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<FleetDeploymentsResponse> listFleetDeploymentsWithHttpInfo(
+      ListFleetDeploymentsOptionalParameters parameters) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetDeployments";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = null;
+    Long pageSize = parameters.pageSize;
+    Long pageOffset = parameters.pageOffset;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/deployments";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_offset", pageOffset));
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.FleetAutomationApi.listFleetDeployments",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetDeploymentsResponse>() {});
+  }
+
+  /**
+   * List all deployments.
+   *
+   * <p>See {@link #listFleetDeploymentsWithHttpInfo}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetDeploymentsResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<FleetDeploymentsResponse>>
+      listFleetDeploymentsWithHttpInfoAsync(ListFleetDeploymentsOptionalParameters parameters) {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetDeployments";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<FleetDeploymentsResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+    Long pageSize = parameters.pageSize;
+    Long pageOffset = parameters.pageOffset;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/deployments";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_offset", pageOffset));
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.FleetAutomationApi.listFleetDeployments",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<FleetDeploymentsResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetDeploymentsResponse>() {});
+  }
+
+  /**
+   * List instrumented pods for a cluster.
+   *
+   * <p>See {@link #listFleetInstrumentedPodsWithHttpInfo}.
+   *
+   * @param clusterName The name of the Kubernetes cluster. (required)
+   * @return FleetInstrumentedPodsResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetInstrumentedPodsResponse listFleetInstrumentedPods(String clusterName)
+      throws ApiException {
+    return listFleetInstrumentedPodsWithHttpInfo(clusterName).getData();
+  }
+
+  /**
+   * List instrumented pods for a cluster.
+   *
+   * <p>See {@link #listFleetInstrumentedPodsWithHttpInfoAsync}.
+   *
+   * @param clusterName The name of the Kubernetes cluster. (required)
+   * @return CompletableFuture&lt;FleetInstrumentedPodsResponse&gt;
+   */
+  public CompletableFuture<FleetInstrumentedPodsResponse> listFleetInstrumentedPodsAsync(
+      String clusterName) {
+    return listFleetInstrumentedPodsWithHttpInfoAsync(clusterName)
         .thenApply(
             response -> {
               return response.getData();
@@ -1920,11 +2615,15 @@ public CompletableFuture<FleetDeploymentsResponse> listFleetDeploymentsAsync(
   }
 
   /**
-   * Retrieve a list of all deployments for fleet automation. Use the <code>page_size</code> and
-   * <code>page_offset</code> parameters to paginate results.
+   * Retrieve the list of pods targeted for Single Step Instrumentation (SSI) injection in a
+   * specific Kubernetes cluster.
    *
-   * @param parameters Optional parameters for the request.
-   * @return ApiResponse&lt;FleetDeploymentsResponse&gt;
+   * <p>This endpoint returns pod groups organized by owner reference (deployment, statefulset,
+   * etc.) with their injection annotations and applied targets. Use the clusters list endpoint to
+   * discover available cluster names.
+   *
+   * @param clusterName The name of the Kubernetes cluster. (required)
+   * @return ApiResponse&lt;FleetInstrumentedPodsResponse&gt;
    * @throws ApiException if fails to make API call
    * @http.response.details
    *     <table border="1">
@@ -1934,35 +2633,40 @@ public CompletableFuture<FleetDeploymentsResponse> listFleetDeploymentsAsync(
    *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
    *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
    *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
    *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
    *     </table>
    */
-  public ApiResponse<FleetDeploymentsResponse> listFleetDeploymentsWithHttpInfo(
-      ListFleetDeploymentsOptionalParameters parameters) throws ApiException {
+  public ApiResponse<FleetInstrumentedPodsResponse> listFleetInstrumentedPodsWithHttpInfo(
+      String clusterName) throws ApiException {
     // Check if unstable operation is enabled
-    String operationId = "listFleetDeployments";
+    String operationId = "listFleetInstrumentedPods";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
       throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
     }
     Object localVarPostBody = null;
-    Long pageSize = parameters.pageSize;
-    Long pageOffset = parameters.pageOffset;
+
+    // verify the required parameter 'clusterName' is set
+    if (clusterName == null) {
+      throw new ApiException(
+          400,
+          "Missing the required parameter 'clusterName' when calling listFleetInstrumentedPods");
+    }
     // create path and map variables
-    String localVarPath = "/api/unstable/fleet/deployments";
+    String localVarPath =
+        "/api/unstable/fleet/clusters/{cluster_name}/instrumented_pods"
+            .replaceAll(
+                "\\{" + "cluster_name" + "\\}", apiClient.escapeString(clusterName.toString()));
 
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_offset", pageOffset));
-
     Invocation.Builder builder =
         apiClient.createBuilder(
-            "v2.FleetAutomationApi.listFleetDeployments",
+            "v2.FleetAutomationApi.listFleetInstrumentedPods",
             localVarPath,
-            localVarQueryParams,
+            new ArrayList<Pair>(),
             localVarHeaderParams,
             new HashMap<String, String>(),
             new String[] {"application/json"},
@@ -1975,54 +2679,65 @@ public ApiResponse<FleetDeploymentsResponse> listFleetDeploymentsWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<FleetDeploymentsResponse>() {});
+        new GenericType<FleetInstrumentedPodsResponse>() {});
   }
 
   /**
-   * List all deployments.
+   * List instrumented pods for a cluster.
    *
-   * <p>See {@link #listFleetDeploymentsWithHttpInfo}.
+   * <p>See {@link #listFleetInstrumentedPodsWithHttpInfo}.
    *
-   * @param parameters Optional parameters for the request.
-   * @return CompletableFuture&lt;ApiResponse&lt;FleetDeploymentsResponse&gt;&gt;
+   * @param clusterName The name of the Kubernetes cluster. (required)
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetInstrumentedPodsResponse&gt;&gt;
    */
-  public CompletableFuture<ApiResponse<FleetDeploymentsResponse>>
-      listFleetDeploymentsWithHttpInfoAsync(ListFleetDeploymentsOptionalParameters parameters) {
+  public CompletableFuture<ApiResponse<FleetInstrumentedPodsResponse>>
+      listFleetInstrumentedPodsWithHttpInfoAsync(String clusterName) {
     // Check if unstable operation is enabled
-    String operationId = "listFleetDeployments";
+    String operationId = "listFleetInstrumentedPods";
     if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
       apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
     } else {
-      CompletableFuture<ApiResponse<FleetDeploymentsResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<FleetInstrumentedPodsResponse>> result =
+          new CompletableFuture<>();
       result.completeExceptionally(
           new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
       return result;
     }
     Object localVarPostBody = null;
-    Long pageSize = parameters.pageSize;
-    Long pageOffset = parameters.pageOffset;
+
+    // verify the required parameter 'clusterName' is set
+    if (clusterName == null) {
+      CompletableFuture<ApiResponse<FleetInstrumentedPodsResponse>> result =
+          new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(
+              400,
+              "Missing the required parameter 'clusterName' when calling"
+                  + " listFleetInstrumentedPods"));
+      return result;
+    }
     // create path and map variables
-    String localVarPath = "/api/unstable/fleet/deployments";
+    String localVarPath =
+        "/api/unstable/fleet/clusters/{cluster_name}/instrumented_pods"
+            .replaceAll(
+                "\\{" + "cluster_name" + "\\}", apiClient.escapeString(clusterName.toString()));
 
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
     Map<String, String> localVarHeaderParams = new HashMap<String, String>();
 
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_offset", pageOffset));
-
     Invocation.Builder builder;
     try {
       builder =
           apiClient.createBuilder(
-              "v2.FleetAutomationApi.listFleetDeployments",
+              "v2.FleetAutomationApi.listFleetInstrumentedPods",
               localVarPath,
-              localVarQueryParams,
+              new ArrayList<Pair>(),
               localVarHeaderParams,
               new HashMap<String, String>(),
               new String[] {"application/json"},
               new String[] {"apiKeyAuth", "appKeyAuth"});
     } catch (ApiException ex) {
-      CompletableFuture<ApiResponse<FleetDeploymentsResponse>> result = new CompletableFuture<>();
+      CompletableFuture<ApiResponse<FleetInstrumentedPodsResponse>> result =
+          new CompletableFuture<>();
       result.completeExceptionally(ex);
       return result;
     }
@@ -2034,7 +2749,7 @@ public ApiResponse<FleetDeploymentsResponse> listFleetDeploymentsWithHttpInfo(
         localVarPostBody,
         new HashMap<String, Object>(),
         false,
-        new GenericType<FleetDeploymentsResponse>() {});
+        new GenericType<FleetInstrumentedPodsResponse>() {});
   }
 
   /**
@@ -2169,6 +2884,265 @@ public ApiResponse<FleetSchedulesResponse> listFleetSchedulesWithHttpInfo() thro
         new GenericType<FleetSchedulesResponse>() {});
   }
 
+  /** Manage optional parameters to listFleetTracers. */
+  public static class ListFleetTracersOptionalParameters {
+    private Long pageNumber;
+    private Long pageSize;
+    private String sortAttribute;
+    private Boolean sortDescending;
+    private String filter;
+
+    /**
+     * Set pageNumber.
+     *
+     * @param pageNumber Page number for pagination (starts at 0). (optional, default to 0)
+     * @return ListFleetTracersOptionalParameters
+     */
+    public ListFleetTracersOptionalParameters pageNumber(Long pageNumber) {
+      this.pageNumber = pageNumber;
+      return this;
+    }
+
+    /**
+     * Set pageSize.
+     *
+     * @param pageSize Number of results per page (must be greater than 0 and less than or equal to
+     *     100). (optional, default to 10)
+     * @return ListFleetTracersOptionalParameters
+     */
+    public ListFleetTracersOptionalParameters pageSize(Long pageSize) {
+      this.pageSize = pageSize;
+      return this;
+    }
+
+    /**
+     * Set sortAttribute.
+     *
+     * @param sortAttribute Attribute to sort by. (optional)
+     * @return ListFleetTracersOptionalParameters
+     */
+    public ListFleetTracersOptionalParameters sortAttribute(String sortAttribute) {
+      this.sortAttribute = sortAttribute;
+      return this;
+    }
+
+    /**
+     * Set sortDescending.
+     *
+     * @param sortDescending Sort order (true for descending, false for ascending). (optional,
+     *     default to true)
+     * @return ListFleetTracersOptionalParameters
+     */
+    public ListFleetTracersOptionalParameters sortDescending(Boolean sortDescending) {
+      this.sortDescending = sortDescending;
+      return this;
+    }
+
+    /**
+     * Set filter.
+     *
+     * @param filter Filter string for narrowing down tracer results. (optional)
+     * @return ListFleetTracersOptionalParameters
+     */
+    public ListFleetTracersOptionalParameters filter(String filter) {
+      this.filter = filter;
+      return this;
+    }
+  }
+
+  /**
+   * List all fleet tracers.
+   *
+   * <p>See {@link #listFleetTracersWithHttpInfo}.
+   *
+   * @return FleetTracersResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetTracersResponse listFleetTracers() throws ApiException {
+    return listFleetTracersWithHttpInfo(new ListFleetTracersOptionalParameters()).getData();
+  }
+
+  /**
+   * List all fleet tracers.
+   *
+   * <p>See {@link #listFleetTracersWithHttpInfoAsync}.
+   *
+   * @return CompletableFuture&lt;FleetTracersResponse&gt;
+   */
+  public CompletableFuture<FleetTracersResponse> listFleetTracersAsync() {
+    return listFleetTracersWithHttpInfoAsync(new ListFleetTracersOptionalParameters())
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * List all fleet tracers.
+   *
+   * <p>See {@link #listFleetTracersWithHttpInfo}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return FleetTracersResponse
+   * @throws ApiException if fails to make API call
+   */
+  public FleetTracersResponse listFleetTracers(ListFleetTracersOptionalParameters parameters)
+      throws ApiException {
+    return listFleetTracersWithHttpInfo(parameters).getData();
+  }
+
+  /**
+   * List all fleet tracers.
+   *
+   * <p>See {@link #listFleetTracersWithHttpInfoAsync}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;FleetTracersResponse&gt;
+   */
+  public CompletableFuture<FleetTracersResponse> listFleetTracersAsync(
+      ListFleetTracersOptionalParameters parameters) {
+    return listFleetTracersWithHttpInfoAsync(parameters)
+        .thenApply(
+            response -> {
+              return response.getData();
+            });
+  }
+
+  /**
+   * Retrieve a paginated list of all fleet tracers.
+   *
+   * <p>This endpoint returns telemetry-derived service names from the SDK telemetry pipeline. These
+   * names may differ from span-derived names in APM and are useful for querying service library
+   * configurations. Use the <code>page_number</code> and <code>page_size</code> query parameters to
+   * paginate through results.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return ApiResponse&lt;FleetTracersResponse&gt;
+   * @throws ApiException if fails to make API call
+   * @http.response.details
+   *     <table border="1">
+   *    <caption>Response details</caption>
+   *       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
+   *       <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
+   *       <tr><td> 400 </td><td> Bad Request </td><td>  -  </td></tr>
+   *       <tr><td> 401 </td><td> Unauthorized </td><td>  -  </td></tr>
+   *       <tr><td> 403 </td><td> Forbidden </td><td>  -  </td></tr>
+   *       <tr><td> 404 </td><td> Not Found </td><td>  -  </td></tr>
+   *       <tr><td> 429 </td><td> Too many requests </td><td>  -  </td></tr>
+   *     </table>
+   */
+  public ApiResponse<FleetTracersResponse> listFleetTracersWithHttpInfo(
+      ListFleetTracersOptionalParameters parameters) throws ApiException {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetTracers";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      throw new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId));
+    }
+    Object localVarPostBody = null;
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    String filter = parameters.filter;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/tracers";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter", filter));
+
+    Invocation.Builder builder =
+        apiClient.createBuilder(
+            "v2.FleetAutomationApi.listFleetTracers",
+            localVarPath,
+            localVarQueryParams,
+            localVarHeaderParams,
+            new HashMap<String, String>(),
+            new String[] {"application/json"},
+            new String[] {"apiKeyAuth", "appKeyAuth"});
+    return apiClient.invokeAPI(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetTracersResponse>() {});
+  }
+
+  /**
+   * List all fleet tracers.
+   *
+   * <p>See {@link #listFleetTracersWithHttpInfo}.
+   *
+   * @param parameters Optional parameters for the request.
+   * @return CompletableFuture&lt;ApiResponse&lt;FleetTracersResponse&gt;&gt;
+   */
+  public CompletableFuture<ApiResponse<FleetTracersResponse>> listFleetTracersWithHttpInfoAsync(
+      ListFleetTracersOptionalParameters parameters) {
+    // Check if unstable operation is enabled
+    String operationId = "listFleetTracers";
+    if (apiClient.isUnstableOperationEnabled("v2." + operationId)) {
+      apiClient.getLogger().warning(String.format("Using unstable operation '%s'", operationId));
+    } else {
+      CompletableFuture<ApiResponse<FleetTracersResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(
+          new ApiException(0, String.format("Unstable operation '%s' is disabled", operationId)));
+      return result;
+    }
+    Object localVarPostBody = null;
+    Long pageNumber = parameters.pageNumber;
+    Long pageSize = parameters.pageSize;
+    String sortAttribute = parameters.sortAttribute;
+    Boolean sortDescending = parameters.sortDescending;
+    String filter = parameters.filter;
+    // create path and map variables
+    String localVarPath = "/api/unstable/fleet/tracers";
+
+    List<Pair> localVarQueryParams = new ArrayList<Pair>();
+    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
+
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_number", pageNumber));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "page_size", pageSize));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_attribute", sortAttribute));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "sort_descending", sortDescending));
+    localVarQueryParams.addAll(apiClient.parameterToPairs("", "filter", filter));
+
+    Invocation.Builder builder;
+    try {
+      builder =
+          apiClient.createBuilder(
+              "v2.FleetAutomationApi.listFleetTracers",
+              localVarPath,
+              localVarQueryParams,
+              localVarHeaderParams,
+              new HashMap<String, String>(),
+              new String[] {"application/json"},
+              new String[] {"apiKeyAuth", "appKeyAuth"});
+    } catch (ApiException ex) {
+      CompletableFuture<ApiResponse<FleetTracersResponse>> result = new CompletableFuture<>();
+      result.completeExceptionally(ex);
+      return result;
+    }
+    return apiClient.invokeAPIAsync(
+        "GET",
+        builder,
+        localVarHeaderParams,
+        new String[] {},
+        localVarPostBody,
+        new HashMap<String, Object>(),
+        false,
+        new GenericType<FleetTracersResponse>() {});
+  }
+
   /**
    * Trigger a schedule deployment.
    *
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetClusterAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetClusterAttributes.java
new file mode 100644
index 00000000000..f02a291553a
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetClusterAttributes.java
@@ -0,0 +1,701 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of a Kubernetes cluster in the fleet. */
+@JsonPropertyOrder({
+  FleetClusterAttributes.JSON_PROPERTY_AGENT_VERSIONS,
+  FleetClusterAttributes.JSON_PROPERTY_API_KEY_NAMES,
+  FleetClusterAttributes.JSON_PROPERTY_API_KEY_UUIDS,
+  FleetClusterAttributes.JSON_PROPERTY_CLOUD_PROVIDERS,
+  FleetClusterAttributes.JSON_PROPERTY_CLUSTER_NAME,
+  FleetClusterAttributes.JSON_PROPERTY_ENABLED_PRODUCTS,
+  FleetClusterAttributes.JSON_PROPERTY_ENVS,
+  FleetClusterAttributes.JSON_PROPERTY_FIRST_SEEN_AT,
+  FleetClusterAttributes.JSON_PROPERTY_INSTALL_METHOD_TOOL,
+  FleetClusterAttributes.JSON_PROPERTY_NODE_COUNT,
+  FleetClusterAttributes.JSON_PROPERTY_NODE_COUNT_BY_STATUS,
+  FleetClusterAttributes.JSON_PROPERTY_OPERATING_SYSTEMS,
+  FleetClusterAttributes.JSON_PROPERTY_OTEL_COLLECTOR_DISTRIBUTIONS,
+  FleetClusterAttributes.JSON_PROPERTY_OTEL_COLLECTOR_VERSIONS,
+  FleetClusterAttributes.JSON_PROPERTY_POD_COUNT_BY_STATE,
+  FleetClusterAttributes.JSON_PROPERTY_SERVICES,
+  FleetClusterAttributes.JSON_PROPERTY_TEAMS
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetClusterAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_AGENT_VERSIONS = "agent_versions";
+  private List<String> agentVersions = null;
+
+  public static final String JSON_PROPERTY_API_KEY_NAMES = "api_key_names";
+  private List<String> apiKeyNames = null;
+
+  public static final String JSON_PROPERTY_API_KEY_UUIDS = "api_key_uuids";
+  private List<String> apiKeyUuids = null;
+
+  public static final String JSON_PROPERTY_CLOUD_PROVIDERS = "cloud_providers";
+  private List<String> cloudProviders = null;
+
+  public static final String JSON_PROPERTY_CLUSTER_NAME = "cluster_name";
+  private String clusterName;
+
+  public static final String JSON_PROPERTY_ENABLED_PRODUCTS = "enabled_products";
+  private List<String> enabledProducts = null;
+
+  public static final String JSON_PROPERTY_ENVS = "envs";
+  private List<String> envs = null;
+
+  public static final String JSON_PROPERTY_FIRST_SEEN_AT = "first_seen_at";
+  private Long firstSeenAt;
+
+  public static final String JSON_PROPERTY_INSTALL_METHOD_TOOL = "install_method_tool";
+  private String installMethodTool;
+
+  public static final String JSON_PROPERTY_NODE_COUNT = "node_count";
+  private Long nodeCount;
+
+  public static final String JSON_PROPERTY_NODE_COUNT_BY_STATUS = "node_count_by_status";
+  private Map<String, Long> nodeCountByStatus = null;
+
+  public static final String JSON_PROPERTY_OPERATING_SYSTEMS = "operating_systems";
+  private List<String> operatingSystems = null;
+
+  public static final String JSON_PROPERTY_OTEL_COLLECTOR_DISTRIBUTIONS =
+      "otel_collector_distributions";
+  private List<String> otelCollectorDistributions = null;
+
+  public static final String JSON_PROPERTY_OTEL_COLLECTOR_VERSIONS = "otel_collector_versions";
+  private List<String> otelCollectorVersions = null;
+
+  public static final String JSON_PROPERTY_POD_COUNT_BY_STATE = "pod_count_by_state";
+  private Map<String, Long> podCountByState = null;
+
+  public static final String JSON_PROPERTY_SERVICES = "services";
+  private List<String> services = null;
+
+  public static final String JSON_PROPERTY_TEAMS = "teams";
+  private List<String> teams = null;
+
+  public FleetClusterAttributes agentVersions(List<String> agentVersions) {
+    this.agentVersions = agentVersions;
+    return this;
+  }
+
+  public FleetClusterAttributes addAgentVersionsItem(String agentVersionsItem) {
+    if (this.agentVersions == null) {
+      this.agentVersions = new ArrayList<>();
+    }
+    this.agentVersions.add(agentVersionsItem);
+    return this;
+  }
+
+  /**
+   * Datadog Agent versions running in the cluster.
+   *
+   * @return agentVersions
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_AGENT_VERSIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getAgentVersions() {
+    return agentVersions;
+  }
+
+  public void setAgentVersions(List<String> agentVersions) {
+    this.agentVersions = agentVersions;
+  }
+
+  public FleetClusterAttributes apiKeyNames(List<String> apiKeyNames) {
+    this.apiKeyNames = apiKeyNames;
+    return this;
+  }
+
+  public FleetClusterAttributes addApiKeyNamesItem(String apiKeyNamesItem) {
+    if (this.apiKeyNames == null) {
+      this.apiKeyNames = new ArrayList<>();
+    }
+    this.apiKeyNames.add(apiKeyNamesItem);
+    return this;
+  }
+
+  /**
+   * API key names used by agents in the cluster.
+   *
+   * @return apiKeyNames
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_API_KEY_NAMES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getApiKeyNames() {
+    return apiKeyNames;
+  }
+
+  public void setApiKeyNames(List<String> apiKeyNames) {
+    this.apiKeyNames = apiKeyNames;
+  }
+
+  public FleetClusterAttributes apiKeyUuids(List<String> apiKeyUuids) {
+    this.apiKeyUuids = apiKeyUuids;
+    return this;
+  }
+
+  public FleetClusterAttributes addApiKeyUuidsItem(String apiKeyUuidsItem) {
+    if (this.apiKeyUuids == null) {
+      this.apiKeyUuids = new ArrayList<>();
+    }
+    this.apiKeyUuids.add(apiKeyUuidsItem);
+    return this;
+  }
+
+  /**
+   * API key UUIDs used by agents in the cluster.
+   *
+   * @return apiKeyUuids
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_API_KEY_UUIDS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getApiKeyUuids() {
+    return apiKeyUuids;
+  }
+
+  public void setApiKeyUuids(List<String> apiKeyUuids) {
+    this.apiKeyUuids = apiKeyUuids;
+  }
+
+  public FleetClusterAttributes cloudProviders(List<String> cloudProviders) {
+    this.cloudProviders = cloudProviders;
+    return this;
+  }
+
+  public FleetClusterAttributes addCloudProvidersItem(String cloudProvidersItem) {
+    if (this.cloudProviders == null) {
+      this.cloudProviders = new ArrayList<>();
+    }
+    this.cloudProviders.add(cloudProvidersItem);
+    return this;
+  }
+
+  /**
+   * Cloud providers hosting the cluster.
+   *
+   * @return cloudProviders
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CLOUD_PROVIDERS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getCloudProviders() {
+    return cloudProviders;
+  }
+
+  public void setCloudProviders(List<String> cloudProviders) {
+    this.cloudProviders = cloudProviders;
+  }
+
+  public FleetClusterAttributes clusterName(String clusterName) {
+    this.clusterName = clusterName;
+    return this;
+  }
+
+  /**
+   * The name of the Kubernetes cluster.
+   *
+   * @return clusterName
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CLUSTER_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getClusterName() {
+    return clusterName;
+  }
+
+  public void setClusterName(String clusterName) {
+    this.clusterName = clusterName;
+  }
+
+  public FleetClusterAttributes enabledProducts(List<String> enabledProducts) {
+    this.enabledProducts = enabledProducts;
+    return this;
+  }
+
+  public FleetClusterAttributes addEnabledProductsItem(String enabledProductsItem) {
+    if (this.enabledProducts == null) {
+      this.enabledProducts = new ArrayList<>();
+    }
+    this.enabledProducts.add(enabledProductsItem);
+    return this;
+  }
+
+  /**
+   * Datadog products enabled in the cluster.
+   *
+   * @return enabledProducts
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENABLED_PRODUCTS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getEnabledProducts() {
+    return enabledProducts;
+  }
+
+  public void setEnabledProducts(List<String> enabledProducts) {
+    this.enabledProducts = enabledProducts;
+  }
+
+  public FleetClusterAttributes envs(List<String> envs) {
+    this.envs = envs;
+    return this;
+  }
+
+  public FleetClusterAttributes addEnvsItem(String envsItem) {
+    if (this.envs == null) {
+      this.envs = new ArrayList<>();
+    }
+    this.envs.add(envsItem);
+    return this;
+  }
+
+  /**
+   * Environments associated with the cluster.
+   *
+   * @return envs
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENVS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getEnvs() {
+    return envs;
+  }
+
+  public void setEnvs(List<String> envs) {
+    this.envs = envs;
+  }
+
+  public FleetClusterAttributes firstSeenAt(Long firstSeenAt) {
+    this.firstSeenAt = firstSeenAt;
+    return this;
+  }
+
+  /**
+   * Timestamp when the cluster was first seen.
+   *
+   * @return firstSeenAt
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_FIRST_SEEN_AT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getFirstSeenAt() {
+    return firstSeenAt;
+  }
+
+  public void setFirstSeenAt(Long firstSeenAt) {
+    this.firstSeenAt = firstSeenAt;
+  }
+
+  public FleetClusterAttributes installMethodTool(String installMethodTool) {
+    this.installMethodTool = installMethodTool;
+    return this;
+  }
+
+  /**
+   * The tool used to install agents in the cluster.
+   *
+   * @return installMethodTool
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INSTALL_METHOD_TOOL)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getInstallMethodTool() {
+    return installMethodTool;
+  }
+
+  public void setInstallMethodTool(String installMethodTool) {
+    this.installMethodTool = installMethodTool;
+  }
+
+  public FleetClusterAttributes nodeCount(Long nodeCount) {
+    this.nodeCount = nodeCount;
+    return this;
+  }
+
+  /**
+   * Total number of nodes in the cluster.
+   *
+   * @return nodeCount
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_NODE_COUNT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getNodeCount() {
+    return nodeCount;
+  }
+
+  public void setNodeCount(Long nodeCount) {
+    this.nodeCount = nodeCount;
+  }
+
+  public FleetClusterAttributes nodeCountByStatus(Map<String, Long> nodeCountByStatus) {
+    this.nodeCountByStatus = nodeCountByStatus;
+    return this;
+  }
+
+  public FleetClusterAttributes putNodeCountByStatusItem(String key, Long nodeCountByStatusItem) {
+    if (this.nodeCountByStatus == null) {
+      this.nodeCountByStatus = new HashMap<>();
+    }
+    this.nodeCountByStatus.put(key, nodeCountByStatusItem);
+    return this;
+  }
+
+  /**
+   * Node counts grouped by status.
+   *
+   * @return nodeCountByStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_NODE_COUNT_BY_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, Long> getNodeCountByStatus() {
+    return nodeCountByStatus;
+  }
+
+  public void setNodeCountByStatus(Map<String, Long> nodeCountByStatus) {
+    this.nodeCountByStatus = nodeCountByStatus;
+  }
+
+  public FleetClusterAttributes operatingSystems(List<String> operatingSystems) {
+    this.operatingSystems = operatingSystems;
+    return this;
+  }
+
+  public FleetClusterAttributes addOperatingSystemsItem(String operatingSystemsItem) {
+    if (this.operatingSystems == null) {
+      this.operatingSystems = new ArrayList<>();
+    }
+    this.operatingSystems.add(operatingSystemsItem);
+    return this;
+  }
+
+  /**
+   * Operating systems of nodes in the cluster.
+   *
+   * @return operatingSystems
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_OPERATING_SYSTEMS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getOperatingSystems() {
+    return operatingSystems;
+  }
+
+  public void setOperatingSystems(List<String> operatingSystems) {
+    this.operatingSystems = operatingSystems;
+  }
+
+  public FleetClusterAttributes otelCollectorDistributions(
+      List<String> otelCollectorDistributions) {
+    this.otelCollectorDistributions = otelCollectorDistributions;
+    return this;
+  }
+
+  public FleetClusterAttributes addOtelCollectorDistributionsItem(
+      String otelCollectorDistributionsItem) {
+    if (this.otelCollectorDistributions == null) {
+      this.otelCollectorDistributions = new ArrayList<>();
+    }
+    this.otelCollectorDistributions.add(otelCollectorDistributionsItem);
+    return this;
+  }
+
+  /**
+   * OpenTelemetry collector distributions in the cluster.
+   *
+   * @return otelCollectorDistributions
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_OTEL_COLLECTOR_DISTRIBUTIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getOtelCollectorDistributions() {
+    return otelCollectorDistributions;
+  }
+
+  public void setOtelCollectorDistributions(List<String> otelCollectorDistributions) {
+    this.otelCollectorDistributions = otelCollectorDistributions;
+  }
+
+  public FleetClusterAttributes otelCollectorVersions(List<String> otelCollectorVersions) {
+    this.otelCollectorVersions = otelCollectorVersions;
+    return this;
+  }
+
+  public FleetClusterAttributes addOtelCollectorVersionsItem(String otelCollectorVersionsItem) {
+    if (this.otelCollectorVersions == null) {
+      this.otelCollectorVersions = new ArrayList<>();
+    }
+    this.otelCollectorVersions.add(otelCollectorVersionsItem);
+    return this;
+  }
+
+  /**
+   * OpenTelemetry collector versions in the cluster.
+   *
+   * @return otelCollectorVersions
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_OTEL_COLLECTOR_VERSIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getOtelCollectorVersions() {
+    return otelCollectorVersions;
+  }
+
+  public void setOtelCollectorVersions(List<String> otelCollectorVersions) {
+    this.otelCollectorVersions = otelCollectorVersions;
+  }
+
+  public FleetClusterAttributes podCountByState(Map<String, Long> podCountByState) {
+    this.podCountByState = podCountByState;
+    return this;
+  }
+
+  public FleetClusterAttributes putPodCountByStateItem(String key, Long podCountByStateItem) {
+    if (this.podCountByState == null) {
+      this.podCountByState = new HashMap<>();
+    }
+    this.podCountByState.put(key, podCountByStateItem);
+    return this;
+  }
+
+  /**
+   * Pod counts grouped by state.
+   *
+   * @return podCountByState
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_POD_COUNT_BY_STATE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, Long> getPodCountByState() {
+    return podCountByState;
+  }
+
+  public void setPodCountByState(Map<String, Long> podCountByState) {
+    this.podCountByState = podCountByState;
+  }
+
+  public FleetClusterAttributes services(List<String> services) {
+    this.services = services;
+    return this;
+  }
+
+  public FleetClusterAttributes addServicesItem(String servicesItem) {
+    if (this.services == null) {
+      this.services = new ArrayList<>();
+    }
+    this.services.add(servicesItem);
+    return this;
+  }
+
+  /**
+   * Services running in the cluster.
+   *
+   * @return services
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_SERVICES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getServices() {
+    return services;
+  }
+
+  public void setServices(List<String> services) {
+    this.services = services;
+  }
+
+  public FleetClusterAttributes teams(List<String> teams) {
+    this.teams = teams;
+    return this;
+  }
+
+  public FleetClusterAttributes addTeamsItem(String teamsItem) {
+    if (this.teams == null) {
+      this.teams = new ArrayList<>();
+    }
+    this.teams.add(teamsItem);
+    return this;
+  }
+
+  /**
+   * Teams associated with the cluster.
+   *
+   * @return teams
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TEAMS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getTeams() {
+    return teams;
+  }
+
+  public void setTeams(List<String> teams) {
+    this.teams = teams;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetClusterAttributes
+   */
+  @JsonAnySetter
+  public FleetClusterAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetClusterAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetClusterAttributes fleetClusterAttributes = (FleetClusterAttributes) o;
+    return Objects.equals(this.agentVersions, fleetClusterAttributes.agentVersions)
+        && Objects.equals(this.apiKeyNames, fleetClusterAttributes.apiKeyNames)
+        && Objects.equals(this.apiKeyUuids, fleetClusterAttributes.apiKeyUuids)
+        && Objects.equals(this.cloudProviders, fleetClusterAttributes.cloudProviders)
+        && Objects.equals(this.clusterName, fleetClusterAttributes.clusterName)
+        && Objects.equals(this.enabledProducts, fleetClusterAttributes.enabledProducts)
+        && Objects.equals(this.envs, fleetClusterAttributes.envs)
+        && Objects.equals(this.firstSeenAt, fleetClusterAttributes.firstSeenAt)
+        && Objects.equals(this.installMethodTool, fleetClusterAttributes.installMethodTool)
+        && Objects.equals(this.nodeCount, fleetClusterAttributes.nodeCount)
+        && Objects.equals(this.nodeCountByStatus, fleetClusterAttributes.nodeCountByStatus)
+        && Objects.equals(this.operatingSystems, fleetClusterAttributes.operatingSystems)
+        && Objects.equals(
+            this.otelCollectorDistributions, fleetClusterAttributes.otelCollectorDistributions)
+        && Objects.equals(this.otelCollectorVersions, fleetClusterAttributes.otelCollectorVersions)
+        && Objects.equals(this.podCountByState, fleetClusterAttributes.podCountByState)
+        && Objects.equals(this.services, fleetClusterAttributes.services)
+        && Objects.equals(this.teams, fleetClusterAttributes.teams)
+        && Objects.equals(this.additionalProperties, fleetClusterAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        agentVersions,
+        apiKeyNames,
+        apiKeyUuids,
+        cloudProviders,
+        clusterName,
+        enabledProducts,
+        envs,
+        firstSeenAt,
+        installMethodTool,
+        nodeCount,
+        nodeCountByStatus,
+        operatingSystems,
+        otelCollectorDistributions,
+        otelCollectorVersions,
+        podCountByState,
+        services,
+        teams,
+        additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetClusterAttributes {\n");
+    sb.append("    agentVersions: ").append(toIndentedString(agentVersions)).append("\n");
+    sb.append("    apiKeyNames: ").append(toIndentedString(apiKeyNames)).append("\n");
+    sb.append("    apiKeyUuids: ").append(toIndentedString(apiKeyUuids)).append("\n");
+    sb.append("    cloudProviders: ").append(toIndentedString(cloudProviders)).append("\n");
+    sb.append("    clusterName: ").append(toIndentedString(clusterName)).append("\n");
+    sb.append("    enabledProducts: ").append(toIndentedString(enabledProducts)).append("\n");
+    sb.append("    envs: ").append(toIndentedString(envs)).append("\n");
+    sb.append("    firstSeenAt: ").append(toIndentedString(firstSeenAt)).append("\n");
+    sb.append("    installMethodTool: ").append(toIndentedString(installMethodTool)).append("\n");
+    sb.append("    nodeCount: ").append(toIndentedString(nodeCount)).append("\n");
+    sb.append("    nodeCountByStatus: ").append(toIndentedString(nodeCountByStatus)).append("\n");
+    sb.append("    operatingSystems: ").append(toIndentedString(operatingSystems)).append("\n");
+    sb.append("    otelCollectorDistributions: ")
+        .append(toIndentedString(otelCollectorDistributions))
+        .append("\n");
+    sb.append("    otelCollectorVersions: ")
+        .append(toIndentedString(otelCollectorVersions))
+        .append("\n");
+    sb.append("    podCountByState: ").append(toIndentedString(podCountByState)).append("\n");
+    sb.append("    services: ").append(toIndentedString(services)).append("\n");
+    sb.append("    teams: ").append(toIndentedString(teams)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponse.java b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponse.java
new file mode 100644
index 00000000000..0d7d7929f34
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponse.java
@@ -0,0 +1,175 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Response containing a paginated list of fleet clusters. */
+@JsonPropertyOrder({
+  FleetClustersResponse.JSON_PROPERTY_DATA,
+  FleetClustersResponse.JSON_PROPERTY_META
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetClustersResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private FleetClustersResponseData data;
+
+  public static final String JSON_PROPERTY_META = "meta";
+  private FleetClustersResponseMeta meta;
+
+  public FleetClustersResponse() {}
+
+  @JsonCreator
+  public FleetClustersResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) FleetClustersResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public FleetClustersResponse data(FleetClustersResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * The response data containing status and clusters array.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetClustersResponseData getData() {
+    return data;
+  }
+
+  public void setData(FleetClustersResponseData data) {
+    this.data = data;
+  }
+
+  public FleetClustersResponse meta(FleetClustersResponseMeta meta) {
+    this.meta = meta;
+    this.unparsed |= meta.unparsed;
+    return this;
+  }
+
+  /**
+   * Metadata for the list of clusters response.
+   *
+   * @return meta
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_META)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public FleetClustersResponseMeta getMeta() {
+    return meta;
+  }
+
+  public void setMeta(FleetClustersResponseMeta meta) {
+    this.meta = meta;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetClustersResponse
+   */
+  @JsonAnySetter
+  public FleetClustersResponse putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetClustersResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetClustersResponse fleetClustersResponse = (FleetClustersResponse) o;
+    return Objects.equals(this.data, fleetClustersResponse.data)
+        && Objects.equals(this.meta, fleetClustersResponse.meta)
+        && Objects.equals(this.additionalProperties, fleetClustersResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, meta, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetClustersResponse {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    meta: ").append(toIndentedString(meta)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseData.java b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseData.java
new file mode 100644
index 00000000000..c30b86cc1eb
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseData.java
@@ -0,0 +1,205 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** The response data containing status and clusters array. */
+@JsonPropertyOrder({
+  FleetClustersResponseData.JSON_PROPERTY_ATTRIBUTES,
+  FleetClustersResponseData.JSON_PROPERTY_ID,
+  FleetClustersResponseData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetClustersResponseData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private FleetClustersResponseDataAttributes attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private String type;
+
+  public FleetClustersResponseData() {}
+
+  @JsonCreator
+  public FleetClustersResponseData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          FleetClustersResponseDataAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) String type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+  }
+
+  public FleetClustersResponseData attributes(FleetClustersResponseDataAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes of the fleet clusters response containing the list of clusters.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetClustersResponseDataAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(FleetClustersResponseDataAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public FleetClustersResponseData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Status identifier.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public FleetClustersResponseData type(String type) {
+    this.type = type;
+    return this;
+  }
+
+  /**
+   * Resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetClustersResponseData
+   */
+  @JsonAnySetter
+  public FleetClustersResponseData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetClustersResponseData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetClustersResponseData fleetClustersResponseData = (FleetClustersResponseData) o;
+    return Objects.equals(this.attributes, fleetClustersResponseData.attributes)
+        && Objects.equals(this.id, fleetClustersResponseData.id)
+        && Objects.equals(this.type, fleetClustersResponseData.type)
+        && Objects.equals(
+            this.additionalProperties, fleetClustersResponseData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetClustersResponseData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseDataAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseDataAttributes.java
new file mode 100644
index 00000000000..2e87eccbb5a
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseDataAttributes.java
@@ -0,0 +1,151 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of the fleet clusters response containing the list of clusters. */
+@JsonPropertyOrder({FleetClustersResponseDataAttributes.JSON_PROPERTY_CLUSTERS})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetClustersResponseDataAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_CLUSTERS = "clusters";
+  private List<FleetClusterAttributes> clusters = null;
+
+  public FleetClustersResponseDataAttributes clusters(List<FleetClusterAttributes> clusters) {
+    this.clusters = clusters;
+    for (FleetClusterAttributes item : clusters) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public FleetClustersResponseDataAttributes addClustersItem(FleetClusterAttributes clustersItem) {
+    if (this.clusters == null) {
+      this.clusters = new ArrayList<>();
+    }
+    this.clusters.add(clustersItem);
+    this.unparsed |= clustersItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Array of clusters matching the query criteria.
+   *
+   * @return clusters
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CLUSTERS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<FleetClusterAttributes> getClusters() {
+    return clusters;
+  }
+
+  public void setClusters(List<FleetClusterAttributes> clusters) {
+    this.clusters = clusters;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetClustersResponseDataAttributes
+   */
+  @JsonAnySetter
+  public FleetClustersResponseDataAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetClustersResponseDataAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetClustersResponseDataAttributes fleetClustersResponseDataAttributes =
+        (FleetClustersResponseDataAttributes) o;
+    return Objects.equals(this.clusters, fleetClustersResponseDataAttributes.clusters)
+        && Objects.equals(
+            this.additionalProperties, fleetClustersResponseDataAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(clusters, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetClustersResponseDataAttributes {\n");
+    sb.append("    clusters: ").append(toIndentedString(clusters)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseMeta.java b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseMeta.java
new file mode 100644
index 00000000000..de5e2abbba6
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetClustersResponseMeta.java
@@ -0,0 +1,136 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Metadata for the list of clusters response. */
+@JsonPropertyOrder({FleetClustersResponseMeta.JSON_PROPERTY_TOTAL_FILTERED_COUNT})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetClustersResponseMeta {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_TOTAL_FILTERED_COUNT = "total_filtered_count";
+  private Long totalFilteredCount;
+
+  public FleetClustersResponseMeta totalFilteredCount(Long totalFilteredCount) {
+    this.totalFilteredCount = totalFilteredCount;
+    return this;
+  }
+
+  /**
+   * Total number of clusters matching the filter criteria across all pages.
+   *
+   * @return totalFilteredCount
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TOTAL_FILTERED_COUNT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getTotalFilteredCount() {
+    return totalFilteredCount;
+  }
+
+  public void setTotalFilteredCount(Long totalFilteredCount) {
+    this.totalFilteredCount = totalFilteredCount;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetClustersResponseMeta
+   */
+  @JsonAnySetter
+  public FleetClustersResponseMeta putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetClustersResponseMeta object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetClustersResponseMeta fleetClustersResponseMeta = (FleetClustersResponseMeta) o;
+    return Objects.equals(this.totalFilteredCount, fleetClustersResponseMeta.totalFilteredCount)
+        && Objects.equals(
+            this.additionalProperties, fleetClustersResponseMeta.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(totalFilteredCount, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetClustersResponseMeta {\n");
+    sb.append("    totalFilteredCount: ").append(toIndentedString(totalFilteredCount)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodGroupAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodGroupAttributes.java
new file mode 100644
index 00000000000..d60635b7568
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodGroupAttributes.java
@@ -0,0 +1,445 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of a group of instrumented pods targeted for SSI injection. */
+@JsonPropertyOrder({
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_APPLIED_TARGET,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_APPLIED_TARGET_NAME,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_INJECTED_TAGS,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_KUBE_OWNERREF_KIND,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_KUBE_OWNERREF_NAME,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_LIB_INJECTION_ANNOTATIONS,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_NAMESPACE,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_POD_COUNT,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_POD_NAMES,
+  FleetInstrumentedPodGroupAttributes.JSON_PROPERTY_TAGS
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetInstrumentedPodGroupAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_APPLIED_TARGET = "applied_target";
+  private Map<String, Object> appliedTarget = null;
+
+  public static final String JSON_PROPERTY_APPLIED_TARGET_NAME = "applied_target_name";
+  private String appliedTargetName;
+
+  public static final String JSON_PROPERTY_INJECTED_TAGS = "injected_tags";
+  private List<String> injectedTags = null;
+
+  public static final String JSON_PROPERTY_KUBE_OWNERREF_KIND = "kube_ownerref_kind";
+  private String kubeOwnerrefKind;
+
+  public static final String JSON_PROPERTY_KUBE_OWNERREF_NAME = "kube_ownerref_name";
+  private String kubeOwnerrefName;
+
+  public static final String JSON_PROPERTY_LIB_INJECTION_ANNOTATIONS = "lib_injection_annotations";
+  private List<String> libInjectionAnnotations = null;
+
+  public static final String JSON_PROPERTY_NAMESPACE = "namespace";
+  private String namespace;
+
+  public static final String JSON_PROPERTY_POD_COUNT = "pod_count";
+  private Long podCount;
+
+  public static final String JSON_PROPERTY_POD_NAMES = "pod_names";
+  private List<String> podNames = null;
+
+  public static final String JSON_PROPERTY_TAGS = "tags";
+  private Map<String, String> tags = null;
+
+  public FleetInstrumentedPodGroupAttributes appliedTarget(Map<String, Object> appliedTarget) {
+    this.appliedTarget = appliedTarget;
+    return this;
+  }
+
+  public FleetInstrumentedPodGroupAttributes putAppliedTargetItem(
+      String key, Object appliedTargetItem) {
+    if (this.appliedTarget == null) {
+      this.appliedTarget = new HashMap<>();
+    }
+    this.appliedTarget.put(key, appliedTargetItem);
+    return this;
+  }
+
+  /**
+   * The SSI injection target configuration applied to the pod group.
+   *
+   * @return appliedTarget
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_APPLIED_TARGET)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, Object> getAppliedTarget() {
+    return appliedTarget;
+  }
+
+  public void setAppliedTarget(Map<String, Object> appliedTarget) {
+    this.appliedTarget = appliedTarget;
+  }
+
+  public FleetInstrumentedPodGroupAttributes appliedTargetName(String appliedTargetName) {
+    this.appliedTargetName = appliedTargetName;
+    return this;
+  }
+
+  /**
+   * The name of the applied SSI injection target.
+   *
+   * @return appliedTargetName
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_APPLIED_TARGET_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getAppliedTargetName() {
+    return appliedTargetName;
+  }
+
+  public void setAppliedTargetName(String appliedTargetName) {
+    this.appliedTargetName = appliedTargetName;
+  }
+
+  public FleetInstrumentedPodGroupAttributes injectedTags(List<String> injectedTags) {
+    this.injectedTags = injectedTags;
+    return this;
+  }
+
+  public FleetInstrumentedPodGroupAttributes addInjectedTagsItem(String injectedTagsItem) {
+    if (this.injectedTags == null) {
+      this.injectedTags = new ArrayList<>();
+    }
+    this.injectedTags.add(injectedTagsItem);
+    return this;
+  }
+
+  /**
+   * Tags injected into the pods by the Admission Controller.
+   *
+   * @return injectedTags
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INJECTED_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getInjectedTags() {
+    return injectedTags;
+  }
+
+  public void setInjectedTags(List<String> injectedTags) {
+    this.injectedTags = injectedTags;
+  }
+
+  public FleetInstrumentedPodGroupAttributes kubeOwnerrefKind(String kubeOwnerrefKind) {
+    this.kubeOwnerrefKind = kubeOwnerrefKind;
+    return this;
+  }
+
+  /**
+   * The kind of the Kubernetes owner reference.
+   *
+   * @return kubeOwnerrefKind
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_KUBE_OWNERREF_KIND)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getKubeOwnerrefKind() {
+    return kubeOwnerrefKind;
+  }
+
+  public void setKubeOwnerrefKind(String kubeOwnerrefKind) {
+    this.kubeOwnerrefKind = kubeOwnerrefKind;
+  }
+
+  public FleetInstrumentedPodGroupAttributes kubeOwnerrefName(String kubeOwnerrefName) {
+    this.kubeOwnerrefName = kubeOwnerrefName;
+    return this;
+  }
+
+  /**
+   * The name of the Kubernetes owner reference (deployment, statefulset, etc.).
+   *
+   * @return kubeOwnerrefName
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_KUBE_OWNERREF_NAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getKubeOwnerrefName() {
+    return kubeOwnerrefName;
+  }
+
+  public void setKubeOwnerrefName(String kubeOwnerrefName) {
+    this.kubeOwnerrefName = kubeOwnerrefName;
+  }
+
+  public FleetInstrumentedPodGroupAttributes libInjectionAnnotations(
+      List<String> libInjectionAnnotations) {
+    this.libInjectionAnnotations = libInjectionAnnotations;
+    return this;
+  }
+
+  public FleetInstrumentedPodGroupAttributes addLibInjectionAnnotationsItem(
+      String libInjectionAnnotationsItem) {
+    if (this.libInjectionAnnotations == null) {
+      this.libInjectionAnnotations = new ArrayList<>();
+    }
+    this.libInjectionAnnotations.add(libInjectionAnnotationsItem);
+    return this;
+  }
+
+  /**
+   * Library injection annotations on the pod group.
+   *
+   * @return libInjectionAnnotations
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_LIB_INJECTION_ANNOTATIONS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getLibInjectionAnnotations() {
+    return libInjectionAnnotations;
+  }
+
+  public void setLibInjectionAnnotations(List<String> libInjectionAnnotations) {
+    this.libInjectionAnnotations = libInjectionAnnotations;
+  }
+
+  public FleetInstrumentedPodGroupAttributes namespace(String namespace) {
+    this.namespace = namespace;
+    return this;
+  }
+
+  /**
+   * The Kubernetes namespace of the pod group.
+   *
+   * @return namespace
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_NAMESPACE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getNamespace() {
+    return namespace;
+  }
+
+  public void setNamespace(String namespace) {
+    this.namespace = namespace;
+  }
+
+  public FleetInstrumentedPodGroupAttributes podCount(Long podCount) {
+    this.podCount = podCount;
+    return this;
+  }
+
+  /**
+   * Total number of pods in the group.
+   *
+   * @return podCount
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_POD_COUNT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getPodCount() {
+    return podCount;
+  }
+
+  public void setPodCount(Long podCount) {
+    this.podCount = podCount;
+  }
+
+  public FleetInstrumentedPodGroupAttributes podNames(List<String> podNames) {
+    this.podNames = podNames;
+    return this;
+  }
+
+  public FleetInstrumentedPodGroupAttributes addPodNamesItem(String podNamesItem) {
+    if (this.podNames == null) {
+      this.podNames = new ArrayList<>();
+    }
+    this.podNames.add(podNamesItem);
+    return this;
+  }
+
+  /**
+   * Names of the individual pods in the group.
+   *
+   * @return podNames
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_POD_NAMES)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getPodNames() {
+    return podNames;
+  }
+
+  public void setPodNames(List<String> podNames) {
+    this.podNames = podNames;
+  }
+
+  public FleetInstrumentedPodGroupAttributes tags(Map<String, String> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public FleetInstrumentedPodGroupAttributes putTagsItem(String key, String tagsItem) {
+    if (this.tags == null) {
+      this.tags = new HashMap<>();
+    }
+    this.tags.put(key, tagsItem);
+    return this;
+  }
+
+  /**
+   * Additional tags associated with the pod group.
+   *
+   * @return tags
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TAGS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, String> getTags() {
+    return tags;
+  }
+
+  public void setTags(Map<String, String> tags) {
+    this.tags = tags;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetInstrumentedPodGroupAttributes
+   */
+  @JsonAnySetter
+  public FleetInstrumentedPodGroupAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetInstrumentedPodGroupAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetInstrumentedPodGroupAttributes fleetInstrumentedPodGroupAttributes =
+        (FleetInstrumentedPodGroupAttributes) o;
+    return Objects.equals(this.appliedTarget, fleetInstrumentedPodGroupAttributes.appliedTarget)
+        && Objects.equals(
+            this.appliedTargetName, fleetInstrumentedPodGroupAttributes.appliedTargetName)
+        && Objects.equals(this.injectedTags, fleetInstrumentedPodGroupAttributes.injectedTags)
+        && Objects.equals(
+            this.kubeOwnerrefKind, fleetInstrumentedPodGroupAttributes.kubeOwnerrefKind)
+        && Objects.equals(
+            this.kubeOwnerrefName, fleetInstrumentedPodGroupAttributes.kubeOwnerrefName)
+        && Objects.equals(
+            this.libInjectionAnnotations,
+            fleetInstrumentedPodGroupAttributes.libInjectionAnnotations)
+        && Objects.equals(this.namespace, fleetInstrumentedPodGroupAttributes.namespace)
+        && Objects.equals(this.podCount, fleetInstrumentedPodGroupAttributes.podCount)
+        && Objects.equals(this.podNames, fleetInstrumentedPodGroupAttributes.podNames)
+        && Objects.equals(this.tags, fleetInstrumentedPodGroupAttributes.tags)
+        && Objects.equals(
+            this.additionalProperties, fleetInstrumentedPodGroupAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        appliedTarget,
+        appliedTargetName,
+        injectedTags,
+        kubeOwnerrefKind,
+        kubeOwnerrefName,
+        libInjectionAnnotations,
+        namespace,
+        podCount,
+        podNames,
+        tags,
+        additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetInstrumentedPodGroupAttributes {\n");
+    sb.append("    appliedTarget: ").append(toIndentedString(appliedTarget)).append("\n");
+    sb.append("    appliedTargetName: ").append(toIndentedString(appliedTargetName)).append("\n");
+    sb.append("    injectedTags: ").append(toIndentedString(injectedTags)).append("\n");
+    sb.append("    kubeOwnerrefKind: ").append(toIndentedString(kubeOwnerrefKind)).append("\n");
+    sb.append("    kubeOwnerrefName: ").append(toIndentedString(kubeOwnerrefName)).append("\n");
+    sb.append("    libInjectionAnnotations: ")
+        .append(toIndentedString(libInjectionAnnotations))
+        .append("\n");
+    sb.append("    namespace: ").append(toIndentedString(namespace)).append("\n");
+    sb.append("    podCount: ").append(toIndentedString(podCount)).append("\n");
+    sb.append("    podNames: ").append(toIndentedString(podNames)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponse.java b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponse.java
new file mode 100644
index 00000000000..1991e4bcd53
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponse.java
@@ -0,0 +1,147 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Response containing instrumented pods for a Kubernetes cluster. */
+@JsonPropertyOrder({FleetInstrumentedPodsResponse.JSON_PROPERTY_DATA})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetInstrumentedPodsResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private FleetInstrumentedPodsResponseData data;
+
+  public FleetInstrumentedPodsResponse() {}
+
+  @JsonCreator
+  public FleetInstrumentedPodsResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA)
+          FleetInstrumentedPodsResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public FleetInstrumentedPodsResponse data(FleetInstrumentedPodsResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * The response data containing the cluster name and instrumented pod groups.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetInstrumentedPodsResponseData getData() {
+    return data;
+  }
+
+  public void setData(FleetInstrumentedPodsResponseData data) {
+    this.data = data;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetInstrumentedPodsResponse
+   */
+  @JsonAnySetter
+  public FleetInstrumentedPodsResponse putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetInstrumentedPodsResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetInstrumentedPodsResponse fleetInstrumentedPodsResponse = (FleetInstrumentedPodsResponse) o;
+    return Objects.equals(this.data, fleetInstrumentedPodsResponse.data)
+        && Objects.equals(
+            this.additionalProperties, fleetInstrumentedPodsResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetInstrumentedPodsResponse {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseData.java b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseData.java
new file mode 100644
index 00000000000..76d6d9300b6
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseData.java
@@ -0,0 +1,207 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** The response data containing the cluster name and instrumented pod groups. */
+@JsonPropertyOrder({
+  FleetInstrumentedPodsResponseData.JSON_PROPERTY_ATTRIBUTES,
+  FleetInstrumentedPodsResponseData.JSON_PROPERTY_ID,
+  FleetInstrumentedPodsResponseData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetInstrumentedPodsResponseData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private FleetInstrumentedPodsResponseDataAttributes attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private String type;
+
+  public FleetInstrumentedPodsResponseData() {}
+
+  @JsonCreator
+  public FleetInstrumentedPodsResponseData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          FleetInstrumentedPodsResponseDataAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) String type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+  }
+
+  public FleetInstrumentedPodsResponseData attributes(
+      FleetInstrumentedPodsResponseDataAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes of the instrumented pods response containing the list of pod groups.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetInstrumentedPodsResponseDataAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(FleetInstrumentedPodsResponseDataAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public FleetInstrumentedPodsResponseData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * The cluster name identifier.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public FleetInstrumentedPodsResponseData type(String type) {
+    this.type = type;
+    return this;
+  }
+
+  /**
+   * Resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetInstrumentedPodsResponseData
+   */
+  @JsonAnySetter
+  public FleetInstrumentedPodsResponseData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetInstrumentedPodsResponseData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetInstrumentedPodsResponseData fleetInstrumentedPodsResponseData =
+        (FleetInstrumentedPodsResponseData) o;
+    return Objects.equals(this.attributes, fleetInstrumentedPodsResponseData.attributes)
+        && Objects.equals(this.id, fleetInstrumentedPodsResponseData.id)
+        && Objects.equals(this.type, fleetInstrumentedPodsResponseData.type)
+        && Objects.equals(
+            this.additionalProperties, fleetInstrumentedPodsResponseData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetInstrumentedPodsResponseData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseDataAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseDataAttributes.java
new file mode 100644
index 00000000000..e43732f041d
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetInstrumentedPodsResponseDataAttributes.java
@@ -0,0 +1,155 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of the instrumented pods response containing the list of pod groups. */
+@JsonPropertyOrder({FleetInstrumentedPodsResponseDataAttributes.JSON_PROPERTY_GROUPS})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetInstrumentedPodsResponseDataAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_GROUPS = "groups";
+  private List<FleetInstrumentedPodGroupAttributes> groups = null;
+
+  public FleetInstrumentedPodsResponseDataAttributes groups(
+      List<FleetInstrumentedPodGroupAttributes> groups) {
+    this.groups = groups;
+    for (FleetInstrumentedPodGroupAttributes item : groups) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public FleetInstrumentedPodsResponseDataAttributes addGroupsItem(
+      FleetInstrumentedPodGroupAttributes groupsItem) {
+    if (this.groups == null) {
+      this.groups = new ArrayList<>();
+    }
+    this.groups.add(groupsItem);
+    this.unparsed |= groupsItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Array of instrumented pod groups in the cluster.
+   *
+   * @return groups
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_GROUPS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<FleetInstrumentedPodGroupAttributes> getGroups() {
+    return groups;
+  }
+
+  public void setGroups(List<FleetInstrumentedPodGroupAttributes> groups) {
+    this.groups = groups;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetInstrumentedPodsResponseDataAttributes
+   */
+  @JsonAnySetter
+  public FleetInstrumentedPodsResponseDataAttributes putAdditionalProperty(
+      String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetInstrumentedPodsResponseDataAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetInstrumentedPodsResponseDataAttributes fleetInstrumentedPodsResponseDataAttributes =
+        (FleetInstrumentedPodsResponseDataAttributes) o;
+    return Objects.equals(this.groups, fleetInstrumentedPodsResponseDataAttributes.groups)
+        && Objects.equals(
+            this.additionalProperties,
+            fleetInstrumentedPodsResponseDataAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(groups, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetInstrumentedPodsResponseDataAttributes {\n");
+    sb.append("    groups: ").append(toIndentedString(groups)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetTracerAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetTracerAttributes.java
new file mode 100644
index 00000000000..b3151bba816
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetTracerAttributes.java
@@ -0,0 +1,401 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of a fleet tracer representing a service instance reporting telemetry. */
+@JsonPropertyOrder({
+  FleetTracerAttributes.JSON_PROPERTY_ENV,
+  FleetTracerAttributes.JSON_PROPERTY_HOSTNAME,
+  FleetTracerAttributes.JSON_PROPERTY_LANGUAGE,
+  FleetTracerAttributes.JSON_PROPERTY_LANGUAGE_VERSION,
+  FleetTracerAttributes.JSON_PROPERTY_REMOTE_CONFIG_STATUS,
+  FleetTracerAttributes.JSON_PROPERTY_RUNTIME_IDS,
+  FleetTracerAttributes.JSON_PROPERTY_SERVICE,
+  FleetTracerAttributes.JSON_PROPERTY_SERVICE_HOSTNAME,
+  FleetTracerAttributes.JSON_PROPERTY_SERVICE_VERSION,
+  FleetTracerAttributes.JSON_PROPERTY_TRACER_VERSION
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetTracerAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ENV = "env";
+  private String env;
+
+  public static final String JSON_PROPERTY_HOSTNAME = "hostname";
+  private String hostname;
+
+  public static final String JSON_PROPERTY_LANGUAGE = "language";
+  private String language;
+
+  public static final String JSON_PROPERTY_LANGUAGE_VERSION = "language_version";
+  private String languageVersion;
+
+  public static final String JSON_PROPERTY_REMOTE_CONFIG_STATUS = "remote_config_status";
+  private String remoteConfigStatus;
+
+  public static final String JSON_PROPERTY_RUNTIME_IDS = "runtime_ids";
+  private List<String> runtimeIds = null;
+
+  public static final String JSON_PROPERTY_SERVICE = "service";
+  private String service;
+
+  public static final String JSON_PROPERTY_SERVICE_HOSTNAME = "service_hostname";
+  private String serviceHostname;
+
+  public static final String JSON_PROPERTY_SERVICE_VERSION = "service_version";
+  private String serviceVersion;
+
+  public static final String JSON_PROPERTY_TRACER_VERSION = "tracer_version";
+  private String tracerVersion;
+
+  public FleetTracerAttributes env(String env) {
+    this.env = env;
+    return this;
+  }
+
+  /**
+   * The environment the tracer is reporting from.
+   *
+   * @return env
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENV)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getEnv() {
+    return env;
+  }
+
+  public void setEnv(String env) {
+    this.env = env;
+  }
+
+  public FleetTracerAttributes hostname(String hostname) {
+    this.hostname = hostname;
+    return this;
+  }
+
+  /**
+   * The hostname where the tracer is running.
+   *
+   * @return hostname
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_HOSTNAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getHostname() {
+    return hostname;
+  }
+
+  public void setHostname(String hostname) {
+    this.hostname = hostname;
+  }
+
+  public FleetTracerAttributes language(String language) {
+    this.language = language;
+    return this;
+  }
+
+  /**
+   * The programming language of the traced application.
+   *
+   * @return language
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_LANGUAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getLanguage() {
+    return language;
+  }
+
+  public void setLanguage(String language) {
+    this.language = language;
+  }
+
+  public FleetTracerAttributes languageVersion(String languageVersion) {
+    this.languageVersion = languageVersion;
+    return this;
+  }
+
+  /**
+   * The version of the programming language runtime.
+   *
+   * @return languageVersion
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_LANGUAGE_VERSION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getLanguageVersion() {
+    return languageVersion;
+  }
+
+  public void setLanguageVersion(String languageVersion) {
+    this.languageVersion = languageVersion;
+  }
+
+  public FleetTracerAttributes remoteConfigStatus(String remoteConfigStatus) {
+    this.remoteConfigStatus = remoteConfigStatus;
+    return this;
+  }
+
+  /**
+   * The remote configuration status of the tracer.
+   *
+   * @return remoteConfigStatus
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REMOTE_CONFIG_STATUS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getRemoteConfigStatus() {
+    return remoteConfigStatus;
+  }
+
+  public void setRemoteConfigStatus(String remoteConfigStatus) {
+    this.remoteConfigStatus = remoteConfigStatus;
+  }
+
+  public FleetTracerAttributes runtimeIds(List<String> runtimeIds) {
+    this.runtimeIds = runtimeIds;
+    return this;
+  }
+
+  public FleetTracerAttributes addRuntimeIdsItem(String runtimeIdsItem) {
+    if (this.runtimeIds == null) {
+      this.runtimeIds = new ArrayList<>();
+    }
+    this.runtimeIds.add(runtimeIdsItem);
+    return this;
+  }
+
+  /**
+   * Runtime identifiers for the tracer instances.
+   *
+   * @return runtimeIds
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_RUNTIME_IDS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<String> getRuntimeIds() {
+    return runtimeIds;
+  }
+
+  public void setRuntimeIds(List<String> runtimeIds) {
+    this.runtimeIds = runtimeIds;
+  }
+
+  public FleetTracerAttributes service(String service) {
+    this.service = service;
+    return this;
+  }
+
+  /**
+   * The telemetry-derived service name reported by the tracer.
+   *
+   * @return service
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_SERVICE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getService() {
+    return service;
+  }
+
+  public void setService(String service) {
+    this.service = service;
+  }
+
+  public FleetTracerAttributes serviceHostname(String serviceHostname) {
+    this.serviceHostname = serviceHostname;
+    return this;
+  }
+
+  /**
+   * The service hostname reported by the tracer.
+   *
+   * @return serviceHostname
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_SERVICE_HOSTNAME)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getServiceHostname() {
+    return serviceHostname;
+  }
+
+  public void setServiceHostname(String serviceHostname) {
+    this.serviceHostname = serviceHostname;
+  }
+
+  public FleetTracerAttributes serviceVersion(String serviceVersion) {
+    this.serviceVersion = serviceVersion;
+    return this;
+  }
+
+  /**
+   * The version of the traced service.
+   *
+   * @return serviceVersion
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_SERVICE_VERSION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getServiceVersion() {
+    return serviceVersion;
+  }
+
+  public void setServiceVersion(String serviceVersion) {
+    this.serviceVersion = serviceVersion;
+  }
+
+  public FleetTracerAttributes tracerVersion(String tracerVersion) {
+    this.tracerVersion = tracerVersion;
+    return this;
+  }
+
+  /**
+   * The version of the Datadog tracer library.
+   *
+   * @return tracerVersion
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TRACER_VERSION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getTracerVersion() {
+    return tracerVersion;
+  }
+
+  public void setTracerVersion(String tracerVersion) {
+    this.tracerVersion = tracerVersion;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetTracerAttributes
+   */
+  @JsonAnySetter
+  public FleetTracerAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetTracerAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetTracerAttributes fleetTracerAttributes = (FleetTracerAttributes) o;
+    return Objects.equals(this.env, fleetTracerAttributes.env)
+        && Objects.equals(this.hostname, fleetTracerAttributes.hostname)
+        && Objects.equals(this.language, fleetTracerAttributes.language)
+        && Objects.equals(this.languageVersion, fleetTracerAttributes.languageVersion)
+        && Objects.equals(this.remoteConfigStatus, fleetTracerAttributes.remoteConfigStatus)
+        && Objects.equals(this.runtimeIds, fleetTracerAttributes.runtimeIds)
+        && Objects.equals(this.service, fleetTracerAttributes.service)
+        && Objects.equals(this.serviceHostname, fleetTracerAttributes.serviceHostname)
+        && Objects.equals(this.serviceVersion, fleetTracerAttributes.serviceVersion)
+        && Objects.equals(this.tracerVersion, fleetTracerAttributes.tracerVersion)
+        && Objects.equals(this.additionalProperties, fleetTracerAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        env,
+        hostname,
+        language,
+        languageVersion,
+        remoteConfigStatus,
+        runtimeIds,
+        service,
+        serviceHostname,
+        serviceVersion,
+        tracerVersion,
+        additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetTracerAttributes {\n");
+    sb.append("    env: ").append(toIndentedString(env)).append("\n");
+    sb.append("    hostname: ").append(toIndentedString(hostname)).append("\n");
+    sb.append("    language: ").append(toIndentedString(language)).append("\n");
+    sb.append("    languageVersion: ").append(toIndentedString(languageVersion)).append("\n");
+    sb.append("    remoteConfigStatus: ").append(toIndentedString(remoteConfigStatus)).append("\n");
+    sb.append("    runtimeIds: ").append(toIndentedString(runtimeIds)).append("\n");
+    sb.append("    service: ").append(toIndentedString(service)).append("\n");
+    sb.append("    serviceHostname: ").append(toIndentedString(serviceHostname)).append("\n");
+    sb.append("    serviceVersion: ").append(toIndentedString(serviceVersion)).append("\n");
+    sb.append("    tracerVersion: ").append(toIndentedString(tracerVersion)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponse.java b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponse.java
new file mode 100644
index 00000000000..b0f49f21aef
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponse.java
@@ -0,0 +1,175 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Response containing a paginated list of fleet tracers. */
+@JsonPropertyOrder({
+  FleetTracersResponse.JSON_PROPERTY_DATA,
+  FleetTracersResponse.JSON_PROPERTY_META
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetTracersResponse {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_DATA = "data";
+  private FleetTracersResponseData data;
+
+  public static final String JSON_PROPERTY_META = "meta";
+  private FleetTracersResponseMeta meta;
+
+  public FleetTracersResponse() {}
+
+  @JsonCreator
+  public FleetTracersResponse(
+      @JsonProperty(required = true, value = JSON_PROPERTY_DATA) FleetTracersResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+  }
+
+  public FleetTracersResponse data(FleetTracersResponseData data) {
+    this.data = data;
+    this.unparsed |= data.unparsed;
+    return this;
+  }
+
+  /**
+   * The response data containing status and tracers array.
+   *
+   * @return data
+   */
+  @JsonProperty(JSON_PROPERTY_DATA)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetTracersResponseData getData() {
+    return data;
+  }
+
+  public void setData(FleetTracersResponseData data) {
+    this.data = data;
+  }
+
+  public FleetTracersResponse meta(FleetTracersResponseMeta meta) {
+    this.meta = meta;
+    this.unparsed |= meta.unparsed;
+    return this;
+  }
+
+  /**
+   * Metadata for the list of tracers response.
+   *
+   * @return meta
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_META)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public FleetTracersResponseMeta getMeta() {
+    return meta;
+  }
+
+  public void setMeta(FleetTracersResponseMeta meta) {
+    this.meta = meta;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetTracersResponse
+   */
+  @JsonAnySetter
+  public FleetTracersResponse putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetTracersResponse object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetTracersResponse fleetTracersResponse = (FleetTracersResponse) o;
+    return Objects.equals(this.data, fleetTracersResponse.data)
+        && Objects.equals(this.meta, fleetTracersResponse.meta)
+        && Objects.equals(this.additionalProperties, fleetTracersResponse.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(data, meta, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetTracersResponse {\n");
+    sb.append("    data: ").append(toIndentedString(data)).append("\n");
+    sb.append("    meta: ").append(toIndentedString(meta)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseData.java b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseData.java
new file mode 100644
index 00000000000..22696136468
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseData.java
@@ -0,0 +1,204 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** The response data containing status and tracers array. */
+@JsonPropertyOrder({
+  FleetTracersResponseData.JSON_PROPERTY_ATTRIBUTES,
+  FleetTracersResponseData.JSON_PROPERTY_ID,
+  FleetTracersResponseData.JSON_PROPERTY_TYPE
+})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetTracersResponseData {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private FleetTracersResponseDataAttributes attributes;
+
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
+
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private String type;
+
+  public FleetTracersResponseData() {}
+
+  @JsonCreator
+  public FleetTracersResponseData(
+      @JsonProperty(required = true, value = JSON_PROPERTY_ATTRIBUTES)
+          FleetTracersResponseDataAttributes attributes,
+      @JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
+      @JsonProperty(required = true, value = JSON_PROPERTY_TYPE) String type) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    this.id = id;
+    this.type = type;
+  }
+
+  public FleetTracersResponseData attributes(FleetTracersResponseDataAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
+    return this;
+  }
+
+  /**
+   * Attributes of the fleet tracers response containing the list of tracers.
+   *
+   * @return attributes
+   */
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public FleetTracersResponseDataAttributes getAttributes() {
+    return attributes;
+  }
+
+  public void setAttributes(FleetTracersResponseDataAttributes attributes) {
+    this.attributes = attributes;
+  }
+
+  public FleetTracersResponseData id(String id) {
+    this.id = id;
+    return this;
+  }
+
+  /**
+   * Status identifier.
+   *
+   * @return id
+   */
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public FleetTracersResponseData type(String type) {
+    this.type = type;
+    return this;
+  }
+
+  /**
+   * Resource type.
+   *
+   * @return type
+   */
+  @JsonProperty(JSON_PROPERTY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetTracersResponseData
+   */
+  @JsonAnySetter
+  public FleetTracersResponseData putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetTracersResponseData object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetTracersResponseData fleetTracersResponseData = (FleetTracersResponseData) o;
+    return Objects.equals(this.attributes, fleetTracersResponseData.attributes)
+        && Objects.equals(this.id, fleetTracersResponseData.id)
+        && Objects.equals(this.type, fleetTracersResponseData.type)
+        && Objects.equals(this.additionalProperties, fleetTracersResponseData.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributes, id, type, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetTracersResponseData {\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseDataAttributes.java b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseDataAttributes.java
new file mode 100644
index 00000000000..0e6745cdbca
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseDataAttributes.java
@@ -0,0 +1,151 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** Attributes of the fleet tracers response containing the list of tracers. */
+@JsonPropertyOrder({FleetTracersResponseDataAttributes.JSON_PROPERTY_TRACERS})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetTracersResponseDataAttributes {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_TRACERS = "tracers";
+  private List<FleetTracerAttributes> tracers = null;
+
+  public FleetTracersResponseDataAttributes tracers(List<FleetTracerAttributes> tracers) {
+    this.tracers = tracers;
+    for (FleetTracerAttributes item : tracers) {
+      this.unparsed |= item.unparsed;
+    }
+    return this;
+  }
+
+  public FleetTracersResponseDataAttributes addTracersItem(FleetTracerAttributes tracersItem) {
+    if (this.tracers == null) {
+      this.tracers = new ArrayList<>();
+    }
+    this.tracers.add(tracersItem);
+    this.unparsed |= tracersItem.unparsed;
+    return this;
+  }
+
+  /**
+   * Array of tracers matching the query criteria.
+   *
+   * @return tracers
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TRACERS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public List<FleetTracerAttributes> getTracers() {
+    return tracers;
+  }
+
+  public void setTracers(List<FleetTracerAttributes> tracers) {
+    this.tracers = tracers;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetTracersResponseDataAttributes
+   */
+  @JsonAnySetter
+  public FleetTracersResponseDataAttributes putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetTracersResponseDataAttributes object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetTracersResponseDataAttributes fleetTracersResponseDataAttributes =
+        (FleetTracersResponseDataAttributes) o;
+    return Objects.equals(this.tracers, fleetTracersResponseDataAttributes.tracers)
+        && Objects.equals(
+            this.additionalProperties, fleetTracersResponseDataAttributes.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tracers, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetTracersResponseDataAttributes {\n");
+    sb.append("    tracers: ").append(toIndentedString(tracers)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseMeta.java b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseMeta.java
new file mode 100644
index 00000000000..005a643f9bc
--- /dev/null
+++ b/src/main/java/com/datadog/api/client/v2/model/FleetTracersResponseMeta.java
@@ -0,0 +1,135 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Metadata for the list of tracers response. */
+@JsonPropertyOrder({FleetTracersResponseMeta.JSON_PROPERTY_TOTAL_FILTERED_COUNT})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class FleetTracersResponseMeta {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_TOTAL_FILTERED_COUNT = "total_filtered_count";
+  private Long totalFilteredCount;
+
+  public FleetTracersResponseMeta totalFilteredCount(Long totalFilteredCount) {
+    this.totalFilteredCount = totalFilteredCount;
+    return this;
+  }
+
+  /**
+   * Total number of tracers matching the filter criteria across all pages.
+   *
+   * @return totalFilteredCount
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_TOTAL_FILTERED_COUNT)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getTotalFilteredCount() {
+    return totalFilteredCount;
+  }
+
+  public void setTotalFilteredCount(Long totalFilteredCount) {
+    this.totalFilteredCount = totalFilteredCount;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return FleetTracersResponseMeta
+   */
+  @JsonAnySetter
+  public FleetTracersResponseMeta putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this FleetTracersResponseMeta object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FleetTracersResponseMeta fleetTracersResponseMeta = (FleetTracersResponseMeta) o;
+    return Objects.equals(this.totalFilteredCount, fleetTracersResponseMeta.totalFilteredCount)
+        && Objects.equals(this.additionalProperties, fleetTracersResponseMeta.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(totalFilteredCount, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FleetTracersResponseMeta {\n");
+    sb.append("    totalFilteredCount: ").append(toIndentedString(totalFilteredCount)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
index b676df880e6..42def371a51 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0188"
+    "id": "af617072-2860-ba27-e045-b00c8baf0187"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
index e5b3fe6bcf6..5a17eb5f03a 100644
--- a/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
+++ b/src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "af617072-2860-ba27-e045-b00c8baf0187"
+    "id": "af617072-2860-ba27-e045-b00c8baf0188"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
index dbf89c929d7..0b1cdf6a6a8 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
index e94edfb7099..91c8275f382 100644
--- a/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
@@ -28,6 +28,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
+    "id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
index bb3f69aef75..d603e22c7bf 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
index c82b6c27f29..a42ef29bfae 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
index 0d38d7d0a6a..20187b03f7f 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
index 7c4ece93315..490992cbf88 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
index efb480e06b4..a0731b5ad4a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
index f2248371931..70fc4d3589b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
index 6352d5f0102..87cb96a7640 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
index 55368f4ae1c..7e5c7b1234d 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
index 7711ea26b7b..994e56ed9eb 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
index e05cab1201f..266b281e690 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
index 994e56ed9eb..7711ea26b7b 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
+    "id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
index 1080a831ec7..0b391d3aa3a 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
index a1e750ca5ae..77aa5204b9c 100644
--- a/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
+    "id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
index 47cc972674a..2be18c73072 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
index 772f35c2d34..adda0ec49d5 100644
--- a/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
index 7b688758eac..4323550909c 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
index 2831c66a09c..c791186e6fd 100644
--- a/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
index b8c9cddb379..d39fee8a337 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_delete_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
index 95cd953a629..834de428629 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
index 05a3826cfbf..b7e39e620cf 100644
--- a/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Bulk_write_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d34"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
index 0b99dd1bd72..94ffd01c024 100644
--- a/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Cancels_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
index 1eaa8cc3077..9b1a448d846 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fe"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
index 58c1764cc21..43ce65998fe 100644
--- a/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Comment_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ee"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
index 5ba8e36023e..7e70b6729df 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_AWS_CCM_Config_object_response.json
@@ -18,7 +18,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2bcb392-2d71-be89-5578-460535c541b0"
+    "id": "b2bcb392-2d71-be89-5578-460535c541af"
   },
   {
     "httpRequest": {
@@ -48,7 +48,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
index a885ab105be..563401356dc 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_CCM_config_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f847921f"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
   },
   {
     "httpRequest": {
@@ -57,6 +57,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479220"
+    "id": "58d1c8d5-bb10-59b9-aa85-8871f8479221"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
index ac76e0bad7e..a4926516be0 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "22e692ec-0118-56ae-6a7b-e829dfef8419"
+    "id": "22e692ec-0118-56ae-6a7b-e829dfef841a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
index ea94cd9866e..91451dfea49 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
index fb2bbc86068..76a4e155ad0 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f70"
+    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f71"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Conflict_response.json
index a8a5126d14c..42fd2567c77 100644
--- a/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_AWS_scan_options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f65bb980-57f2-5b92-482f-54c273127343"
+    "id": "f65bb980-57f2-5b92-482f-54c273127342"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
index d78d4e863c8..ef26cd89a47 100644
--- a/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
index 82770941cf9..cd295ed246c 100644
--- a/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_GCP_scan_options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95bf"
+    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95be"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
index c6e2a2c6b52..09c3eea3a79 100644
--- a/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
index 5f01c6d4bb3..d6ef2b55a53 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
index 0b345fdd95d..02cf1734a56 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e79"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9e"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
index 542b97bd388..1fec75541c7 100644
--- a/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_Scanning_Rule_with_should_save_match_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa2"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
index 3af6b797aec..33f84691420 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
index 09067379e94..5b2bdee0951 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c76"
   },
   {
     "httpRequest": {
@@ -53,6 +53,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3f"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
index 75586923584..f98e1c3550d 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_dataset_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcc"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
index 992baa6ee80..2cb19c254b0 100644
--- a/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
index 83646ddb287..4e7150c70a8 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_account_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "bf073e02-7e0b-dc8b-b075-82932236e50a"
+    "id": "bf073e02-7e0b-dc8b-b075-82932236e50b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
index c7a019ef829..18ed773dab0 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_AWS_integration_returns_Conflict_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
   },
   {
     "httpRequest": {
@@ -57,7 +57,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "bf073e02-7e0b-dc8b-b075-82932236e50b"
+    "id": "bf073e02-7e0b-dc8b-b075-82932236e50a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
index 8cc48703039..5fdb5139b99 100644
--- a/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_an_incident_type_returns_CREATED_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
index e7858392bb2..2afada8e889 100644
--- a/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_custom_attribute_config_for_a_case_type_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
index 210fa549f1e..91af4088c4a 100644
--- a/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_incident_notification_template_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
index 226202c4126..cf1765920e9 100644
--- a/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Create_role_with_a_permission_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
index 626d104be82..8155c3aeded 100644
--- a/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Creates_a_data_deletion_request_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
index c32805bcdb2..efa9967a0e4 100644
--- a/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_AWS_CCM_config_returns_No_Content_response.json
@@ -18,6 +18,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2bcb392-2d71-be89-5578-460535c541af"
+    "id": "b2bcb392-2d71-be89-5578-460535c541b0"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
index ac61cefff94..0c91755cb44 100644
--- a/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
index d25a5b61b2c..17f6987468c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Multiple_Apps_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
index 6a1865e363e..bb02652c1ea 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Org_Connection_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
index 66fdaada60b..bc7e7c252fa 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Group_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
index e14419e8d86..0a4283ae5ae 100644
--- a/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
index d14b87aa29b..e17e659929e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
index 423beb9380f..1511b4f762f 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_NotContent_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
index d44f28ca671..7919b99b4ff 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6462"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6461"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
index ab18e4a92c4..0f7523c96c6 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c73"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
index 76d59841326..92c10c6b507 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_dataset_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
index 48b483cd7a4..aeb041f1a43 100644
--- a/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
index a42ef29bfae..c82b6c27f29 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_AWS_integration_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a8"
+    "id": "73fd406e-d686-10bd-50ee-83f2c499e8a9"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
index e5279316af5..ee9ff41cc5e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_an_incident_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
index a9b1b0a59f2..7808c1e347b 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
index 3c7a22d087a..fcf4a2bf172 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
index f09a21c5347..f1c8d39365e 100644
--- a/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_case_comment_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
index 763ae62b2fb..075a7f9db40 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f4"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
index c64f841650a..7c90bfe4fab 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attribute_from_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
index e6d802099c3..ed84911497c 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6464"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
index 8d1ac6d8c33..149174ae6d9 100644
--- a/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_custom_attributes_config_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6463"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
index cbdb9ebea90..a1c5ecbb403 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_item_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
index ccc4c95513a..3ffceed3185 100644
--- a/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d33"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
index edd6a6da9bf..621a6a2a79d 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_rule_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd3"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
index e668325311c..23e7a36d764 100644
--- a/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Delete_incident_notification_template_returns_No_Content_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
index 75a40d06c1c..f868434d6ac 100644
--- a/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Edit_a_dataset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addc9"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcf"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
index 75b451b6900..c2491988476 100644
--- a/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Generate_a_new_external_ID_returns_AWS_External_ID_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
+    "id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cc"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
index fe4cf251d57..6b2882ea815 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_On_Demand_task_by_id_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
index 6b2882ea815..fe4cf251d57 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4fd99083-06ab-185c-0a48-d579a5f192c2"
+    "id": "4fd99083-06ab-185c-0a48-d579a5f192c1"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_AWS_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_AWS_scan_options_returns_OK_response.json
index bc09886e60a..60bf7212494 100644
--- a/src/test/resources/cassettes/features/v2/Get_AWS_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_AWS_scan_options_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "2cb6ecfe-386c-3349-2689-26da480a6b5e"
+    "id": "2cb6ecfe-386c-3349-2689-26da480a6b5d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
index f2e8ebc7ed1..d0faeb9a172 100644
--- a/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_App_returns_Gone_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
index eccc4031f16..0baec6032c5 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
index f414d99275e..958f238638a 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c74"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c75"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
index 108cf352bd9..b3366690d8d 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_given_APM_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
index f19f9fbffe4..f6628e0a51d 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51861"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
index a3aed5c194a..462a7eb38f0 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_single_dataset_by_ID_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addcd"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
index ea476aa37df..40f41bf5c71 100644
--- a/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_a_specific_pipeline_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
index 15a3142e28a..758e4fb66ad 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_custom_attributes_config_of_case_type_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6465"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6466"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
index f6443799769..7b4fa0f864b 100644
--- a/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_all_datasets_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "32c558cf-4a2e-f914-f443-ab94000addca"
+    "id": "32c558cf-4a2e-f914-f443-ab94000addcb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
index 83cf7035f14..9933d6258ad 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce1"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
index 87cb96a7640..6352d5f0102 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Bad_Request_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
+    "id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
index 7e5c7b1234d..55368f4ae1c 100644
--- a/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_an_AWS_integration_by_config_ID_returns_Not_Found_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
+    "id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
index eda1a71080b..f392f13fc4c 100644
--- a/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d31"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
index cb29d3d82c6..00f0e4bc8fd 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd1"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bdc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
index 41eb6547e3c..273c818221c 100644
--- a/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
index f469a5cda1f..e05cab1201f 100644
--- a/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_list_of_AWS_log_ready_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7b"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
index 1034787e31d..9aabde754b9 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_a_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f3"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
index cc6c1703e9a..e9ddbf352f7 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fe9"
+    "id": "16438026-1168-3bfa-3763-949697b01fea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
index c0406058bb1..6b6dc7ffeef 100644
--- a/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Get_the_details_of_an_error_tracking_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "16438026-1168-3bfa-3763-949697b01fea"
+    "id": "16438026-1168-3bfa-3763-949697b01fe9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
index 6ab71e5cb0b..1eccad92176 100644
--- a/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Gets_a_list_of_data_deletion_requests_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "516e2b97-25f6-b08c-4d4a-1da22948b330"
+    "id": "516e2b97-25f6-b08c-4d4a-1da22948b32f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_AWS_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_AWS_scan_options_returns_OK_response.json
index 33fc1c5e1e7..4c0f531592f 100644
--- a/src/test/resources/cassettes/features/v2/List_AWS_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_AWS_scan_options_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "2cb6ecfe-386c-3349-2689-26da480a6b5d"
+    "id": "2cb6ecfe-386c-3349-2689-26da480a6b5e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
index 04b3928ec59..b59f7c51711 100644
--- a/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_Scanning_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7e"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e82"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa1"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa5"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7f"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e83"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
index 46c301ec1c4..ab1e1d16101 100644
--- a/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_all_APM_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
index 0251f9fdc84..ca6902dd772 100644
--- a/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_datastore_items_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2d"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
index 496fbb6e65d..03072b1897d 100644
--- a/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_historical_jobs_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4c138fa0-d834-5972-8bd7-894a659525ad"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525ac"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
index 6bdfa4f2dd4..26f01926eeb 100644
--- a/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_incident_notification_rules_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd5"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd4"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
index 266b281e690..f469a5cda1f 100644
--- a/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
+++ b/src/test/resources/cassettes/features/v2/List_log_services_returns_AWS_Logs_Services_List_object_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d7a"
+    "id": "03c3c0d9-a62f-5ac6-398b-e22a05d14d79"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
index e881ea5c75f..ca2387782fd 100644
--- a/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_permissions_returns_OK_response.json
@@ -23,6 +23,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892173"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
index be0c8e1fc69..17a313d3d48 100644
--- a/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_pipelines_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7d"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
index 88ddad7a3ae..b3459ffd0fc 100644
--- a/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/List_roles_for_a_restriction_query_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51860"
+    "id": "eb3b308b-3d56-9ef8-4096-dd7718f51862"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
index c48e77cce48..2ebfbdcfa75 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
index 0a176ee003e..974c53ce63d 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
index dd398a6ce01..f5b653cadfe 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
index 974c53ce63d..1b2ef6880a2 100644
--- a/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_AWS_Scan_Options_returns_OK_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9456"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
index fee9f74e00a..d4bcf1ca8ac 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Not_Found_response.json
index a7baf1534a7..0d180071156 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0a6c2650-313c-cd4a-4230-f1a883526456"
+    "id": "0a6c2650-313c-cd4a-4230-f1a883526455"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
index 46d1bbda4f0..15c0687ec0c 100644
--- a/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Patch_GCP_Scan_Options_returns_OK_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b0e82961-e316-45f9-b544-8011dda3dd98"
+    "id": "b0e82961-e316-45f9-b544-8011dda3dd99"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
index 858d36f9769..ead796b159c 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Agentless_scan_options_enabled_successfully_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
index 76a4e155ad0..fb2bbc86068 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f71"
+    "id": "e2891484-5e4d-166a-c2fe-dce7aead5f70"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Conflict_response.json
index 42fd2567c77..a8a5126d14c 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f65bb980-57f2-5b92-482f-54c273127342"
+    "id": "f65bb980-57f2-5b92-482f-54c273127343"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
index 08f556111f9..199c7919faf 100644
--- a/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_AWS_Scan_Options_returns_OK_response.json
@@ -52,6 +52,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02054"
+    "id": "49ae287a-8cc5-118a-4b1c-2dbceae02055"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
index cd295ed246c..82770941cf9 100644
--- a/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_GCP_Scan_Options_returns_Conflict_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95be"
+    "id": "e60f404e-4f1f-e719-af9d-8d61a2bd95bf"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
index c6ff6086445..8b4791c29ca 100644
--- a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_AWS_on_demand_task_created_successfully_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "22e692ec-0118-56ae-6a7b-e829dfef841a"
+    "id": "22e692ec-0118-56ae-6a7b-e829dfef8419"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
index 91451dfea49..ea94cd9866e 100644
--- a/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Post_an_AWS_on_demand_task_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2f"
+    "id": "ddc95453-e78c-c1f7-f3a9-441d29765f2e"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
index 122367ac740..458c0a50fce 100644
--- a/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
+++ b/src/test/resources/cassettes/features/v2/Publish_App_returns_Created_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c511"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c512"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
index 082683417bd..9232671467e 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
index e4f6980d6a5..f301ca6f3ce 100644
--- a/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Reorder_Groups_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7a"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e80"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9f"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa4"
   },
   {
     "httpRequest": {
@@ -79,7 +79,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
index e6d62878f58..d59c27e003b 100644
--- a/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Revoke_permission_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892174"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json b/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
index b0ab0c61ed8..20ea8f51018 100644
--- a/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
+++ b/src/test/resources/cassettes/features/v2/Run_a_threat_hunting_job_returns_Status_created_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "4c138fa0-d834-5972-8bd7-894a659525ac"
+    "id": "4c138fa0-d834-5972-8bd7-894a659525ad"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
index b38e668955e..5f10e5a84ba 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f7"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
index e3575156ede..2cf2f5e7036 100644
--- a/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unarchive_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
index 75b686bdbbe..cd0f546067e 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
index 88b95ace082..25c50b5140f 100644
--- a/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unassign_case_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f1"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145fb"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
index d2d1f94bb66..5aa2107af10 100644
--- a/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Unpublish_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
index 2ebfbdcfa75..c48e77cce48 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Bad_Request_response_2.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb77"
+    "id": "c6af96d1-87d1-3cd6-0d2d-71631b85bb78"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
index 1b2ef6880a2..0a176ee003e 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_No_Content_response.json
@@ -22,6 +22,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0f485c8a-a29e-ebed-3836-545f90bc9458"
+    "id": "0f485c8a-a29e-ebed-3836-545f90bc9457"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
index f5b653cadfe..dd398a6ce01 100644
--- a/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_AWS_scan_options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b2"
+    "id": "5b9334b2-8fb1-87b5-4ca9-1a0b54abb8b3"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
index babadb18733..b2d72b87ba2 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c50f"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c514"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
index 561057ced5c..385920ba074 100644
--- a/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_App_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c513"
+    "id": "c782b1f3-1b03-d50f-8fcd-12e51226c510"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
index bd889c4d7e5..e0d488678ae 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Bad_Request_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "c2c329a8-5875-126a-1858-e7c00b5af113"
+    "id": "c2c329a8-5875-126a-1858-e7c00b5af114"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Not_Found_response.json
index 0d180071156..a7baf1534a7 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_Not_Found_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "0a6c2650-313c-cd4a-4230-f1a883526455"
+    "id": "0a6c2650-313c-cd4a-4230-f1a883526456"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
index 15c0687ec0c..46d1bbda4f0 100644
--- a/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_GCP_scan_options_returns_OK_response.json
@@ -27,6 +27,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b0e82961-e316-45f9-b544-8011dda3dd99"
+    "id": "b0e82961-e316-45f9-b544-8011dda3dd98"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
index 9dfb29fa6ae..970a0b596df 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae46"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae47"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
index 2d30452fcb9..33523d241e1 100644
--- a/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Org_Connection_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae43"
+    "id": "76efebf6-d204-c8e8-5a8c-bd11c0a4ae45"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
index fa37ebb9c8e..949fd15a46e 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Group_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e78"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238a9d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
index 21771204ba7..bc71ccd8654 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_Bad_Request_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e81"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e84"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa3"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
index fe18d92a837..7a985fbb55d 100644
--- a/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_Scanning_Rule_returns_OK_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "01611a93-5e74-0630-3c51-f707c3b51e85"
+    "id": "01611a93-5e74-0630-3c51-f707c3b51e7b"
   },
   {
     "httpRequest": {
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa7"
+    "id": "e6af4a2f-dfda-8f06-6f3a-f5528b238aa0"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
index 36d9e528f82..c7a6553a4f2 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9442"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
index 7b5287a216a..72e65a80efe 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_Custom_Rule_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9441"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
index 402e0d483a0..370567a4e26 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9442"
+    "id": "337b2f05-cc5f-2fb5-c7be-e2e0e5bf9443"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
index b94fa5271d5..2d88a0bc75b 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_WAF_exclusion_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
index 6b10b1f99cb..3f634cdfdc4 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_critical_asset_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e5"
+    "id": "6ffb5b4d-a3b7-6fa1-1d1c-e0464f43c9e6"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
index cf8ae047cfb..4144e776050 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_custom_framework_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "13fe9685-b072-5fe0-c841-4499a9e71c72"
+    "id": "13fe9685-b072-5fe0-c841-4499a9e71c71"
   },
   {
     "httpRequest": {
@@ -83,6 +83,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3b"
+    "id": "e535722a-99e3-30cf-49f7-2d093bd78b3a"
   }
 ]
\ No newline at end of file
diff --git a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
index c3918bef3d9..84230fa914c 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_legacy_WAF_exclusion_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e9"
+    "id": "f87651cf-cb9d-db71-c4de-1be9e301b3e8"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
index 5c938dd3d90..3f6cb5725eb 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_pipeline_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c7f"
+    "id": "1c5790bf-1fdc-930d-ee1e-046e57b87c80"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
index c669844b54b..dff3c5435d1 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0697"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
index a69a6922bcb..cd4b267d68f 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069d"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0699"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
index 08f30297131..22477665035 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filter_with_trace_rate_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069b"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
index 87c7ca222ab..f7ba5a0c135 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069c"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
index 4f3f459c693..4dbd4d81382 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_retention_filters_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff0698"
+    "id": "b2404278-8cc9-cba4-e3eb-03a7fdff069a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
index a75c509829f..73305cd59ef 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Bad_Request_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
index 10ca3fd4408..811fe023421 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_Not_found_response.json
@@ -23,7 +23,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb89216d"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892172"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
index a6258c72557..b402a04ba55 100644
--- a/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_a_role_returns_OK_response.json
@@ -53,7 +53,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ab2c08c1-60c7-9278-3246-d650bb892171"
+    "id": "ab2c08c1-60c7-9278-3246-d650bb892170"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
index 6b99e4ee8e2..c0415eb8a2f 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_AWS_integration_returns_AWS_Account_object_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce6"
+    "id": "479ab602-1a6a-ff9c-cfae-4a71849b3ce5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
index ed23fbee9f5..3fff6d70d3c 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Bad_request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
index be6cf1cbadf..0f470acf82f 100644
--- a/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_an_existing_Workflow_returns_Successfully_updated_a_workflow_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21e"
+    "id": "ef58c8e5-8d44-f741-5735-0d8c01ffa21c"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
index 3f87e60b27c..aa33727ca2c 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_attributes_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fa"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ff"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
index c69aaf87654..876ad2e41fe 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af6469"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
index 8630f955ca7..a9ce37fb461 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_Not_Found_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145eb"
+    "id": "79babc38-7a70-5347-c8a6-73b0e7014600"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
index 86bac26ee06..3e0850132da 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_custom_attribute_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "dc45fc73-0f09-c12d-941b-eaf799af6468"
+    "id": "dc45fc73-0f09-c12d-941b-eaf799af646a"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
index bdbc4ea0c87..31556059bfd 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_description_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ec"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
index 1ef3a7d5fe9..88b2bb14ac5 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fc"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f5"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
index 8ea7f2b88b7..8acf5728617 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_priority_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145fd"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
index 43e74722652..60921358de9 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145f6"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
index 09ff145d4be..b4040b956bc 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_status_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ef"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f9"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
index b7f4230cf66..c06b8597bd4 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145ed"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145ea"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
index 23e97a25f8a..1a052a0e510 100644
--- a/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_case_title_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "79babc38-7a70-5347-c8a6-73b0e70145e9"
+    "id": "79babc38-7a70-5347-c8a6-73b0e70145f2"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
index 817c27a7388..3300bd74e78 100644
--- a/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_datastore_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d32"
+    "id": "6574cf7e-1c55-24e1-45d2-b92f9fa74d2f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
index 0da099d66fe..b9bf77f1d8f 100644
--- a/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_incident_notification_template_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bd7"
+    "id": "7bcfec66-5300-9891-51e5-e4d7e0833bda"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
index e642f719a20..4a27cd1e9d6 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_Bad_Request_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
index 0c4d5613d6a..6078cbf29e3 100644
--- a/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
+++ b/src/test/resources/cassettes/features/v2/Update_the_state_of_an_issue_returns_OK_response.json
@@ -27,7 +27,7 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35f"
+    "id": "a2c05b3b-bab5-013b-200d-7dc622c1b35e"
   },
   {
     "httpRequest": {
diff --git a/src/test/resources/com/datadog/api/client/v2/api/fleet_automation.feature b/src/test/resources/com/datadog/api/client/v2/api/fleet_automation.feature
index b21fe22c60f..3cc13c4aca3 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/fleet_automation.feature
+++ b/src/test/resources/com/datadog/api/client/v2/api/fleet_automation.feature
@@ -232,6 +232,48 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet clusters returns "Bad Request" response
+    Given operation "ListFleetClusters" enabled
+    And new "ListFleetClusters" request
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet clusters returns "Not Found" response
+    Given operation "ListFleetClusters" enabled
+    And new "ListFleetClusters" request
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet clusters returns "OK" response
+    Given operation "ListFleetClusters" enabled
+    And new "ListFleetClusters" request
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet tracers returns "Bad Request" response
+    Given operation "ListFleetTracers" enabled
+    And new "ListFleetTracers" request
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet tracers returns "Not Found" response
+    Given operation "ListFleetTracers" enabled
+    And new "ListFleetTracers" request
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List all fleet tracers returns "OK" response
+    Given operation "ListFleetTracers" enabled
+    And new "ListFleetTracers" request
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/fleet-automation
   Scenario: List all schedules returns "Bad Request" response
     Given operation "ListFleetSchedules" enabled
@@ -246,6 +288,54 @@ Feature: Fleet Automation
     When the request is sent
     Then the response status is 200 OK
 
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List instrumented pods for a cluster returns "Bad Request" response
+    Given operation "ListFleetInstrumentedPods" enabled
+    And new "ListFleetInstrumentedPods" request
+    And request contains "cluster_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List instrumented pods for a cluster returns "Not Found" response
+    Given operation "ListFleetInstrumentedPods" enabled
+    And new "ListFleetInstrumentedPods" request
+    And request contains "cluster_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List instrumented pods for a cluster returns "OK" response
+    Given operation "ListFleetInstrumentedPods" enabled
+    And new "ListFleetInstrumentedPods" request
+    And request contains "cluster_name" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List tracers for a specific agent returns "Bad Request" response
+    Given operation "ListFleetAgentTracers" enabled
+    And new "ListFleetAgentTracers" request
+    And request contains "agent_key" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List tracers for a specific agent returns "Not Found" response
+    Given operation "ListFleetAgentTracers" enabled
+    And new "ListFleetAgentTracers" request
+    And request contains "agent_key" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/fleet-automation
+  Scenario: List tracers for a specific agent returns "OK" response
+    Given operation "ListFleetAgentTracers" enabled
+    And new "ListFleetAgentTracers" request
+    And request contains "agent_key" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 200 OK
+
   @generated @skip @team:DataDog/fleet-automation
   Scenario: Trigger a schedule deployment returns "Bad Request" response
     Given operation "TriggerFleetSchedule" enabled
diff --git a/src/test/resources/com/datadog/api/client/v2/api/undo.json b/src/test/resources/com/datadog/api/client/v2/api/undo.json
index 078ced2bd84..40988de9965 100644
--- a/src/test/resources/com/datadog/api/client/v2/api/undo.json
+++ b/src/test/resources/com/datadog/api/client/v2/api/undo.json
@@ -17,6 +17,24 @@
       "type": "safe"
     }
   },
+  "ListFleetAgentTracers": {
+    "tag": "Fleet Automation",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "ListFleetClusters": {
+    "tag": "Fleet Automation",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "ListFleetInstrumentedPods": {
+    "tag": "Fleet Automation",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListFleetDeployments": {
     "tag": "Fleet Automation",
     "undo": {
@@ -111,6 +129,12 @@
       "type": "unsafe"
     }
   },
+  "ListFleetTracers": {
+    "tag": "Fleet Automation",
+    "undo": {
+      "type": "safe"
+    }
+  },
   "ListDatastores": {
     "tag": "Actions Datastores",
     "undo": {