From 3b3118c2705ecbaf7c0a64837609c4394e8e349c Mon Sep 17 00:00:00 2001
From: David Tapiador <david.tapiadordeldujo@datadoghq.com>
Date: Wed, 19 Aug 2026 16:09:20 +0200
Subject: [PATCH 1/3] ci: run formatters during generation

---
 .pre-commit-config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a216e493085a..9a5a48370771 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,7 @@ repos:
     language: system
     entry: bash -c "./generate.sh"
     files: '^(\.generator/.*|\.pre-commit-config\.yaml|Makefile|\features/.*|lib/.*)'
+    stages: [manual]
     pass_filenames: false
   - id: format-examples
     name: Format generated examples

From 16bc46a10e6f8bb3f4ef7eb86d44b78c789e9d04 Mon Sep 17 00:00:00 2001
From: David Tapiador <david.tapiadordeldujo@datadoghq.com>
Date: Thu, 20 Aug 2026 13:56:57 +0200
Subject: [PATCH 2/3] ci: use generated BDD test runner

---
 .github/workflows/reusable-integration-test.yml | 3 ++-
 .github/workflows/reusable-ruby-test.yml        | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-integration-test.yml b/.github/workflows/reusable-integration-test.yml
index 33abfa194518..c8ae00b75bdf 100644
--- a/.github/workflows/reusable-integration-test.yml
+++ b/.github/workflows/reusable-integration-test.yml
@@ -123,6 +123,7 @@ jobs:
         shell: bash
         env:
           CI: "true"
+          DD_USE_GENERATED_TESTS: "true"
           DD_AGENT_HOST: localhost
           DD_ENV: prod
           DD_SERVICE: datadog-api-client-ruby
@@ -147,4 +148,4 @@ jobs:
           github-token: ${{ steps.get_token.outputs.token }}
           repo: ${{ inputs.target-repo || 'datadog-api-spec' }}
           status: success
-          context: ${{ inputs.status-context || 'integration' }}
\ No newline at end of file
+          context: ${{ inputs.status-context || 'integration' }}
diff --git a/.github/workflows/reusable-ruby-test.yml b/.github/workflows/reusable-ruby-test.yml
index be95f5eb0b47..0cda874c88b6 100644
--- a/.github/workflows/reusable-ruby-test.yml
+++ b/.github/workflows/reusable-ruby-test.yml
@@ -59,3 +59,5 @@ jobs:
       - name: Test
         run: ${{ inputs.test-script }}
         shell: bash
+        env:
+          DD_USE_GENERATED_TESTS: "true"

From 7001b6761528cf41ebc4babdb669e0c0bb803709 Mon Sep 17 00:00:00 2001
From: "ci.datadog-api-spec" <packages@datadoghq.com>
Date: Fri, 21 Aug 2026 13:43:53 +0000
Subject: [PATCH 3/3] Regenerate client from commit 7f4d0bf of spec repo

---
 .generator/schemas/v1/openapi.yaml            |   56 +-
 .generator/schemas/v2/openapi.yaml            | 1159 +++++++++++------
 .../AggregateLLMObsExperimentation.rb         |    4 +-
 .../BatchUpdateLLMObsDataset.rb               |    4 +-
 .../CloneLLMObsDataset.rb                     |    4 +-
 .../CreateLLMObsAnnotationQueue.rb            |    4 +-
 ...CreateLLMObsAnnotationQueueInteractions.rb |    2 +-
 ...sAnnotationQueueInteractions_2021594537.rb |    2 +-
 .../CreateLLMObsDataset.rb                    |    4 +-
 .../CreateLLMObsDatasetRecords.rb             |    4 +-
 .../CreateLLMObsExperiment.rb                 |    4 +-
 .../CreateLLMObsExperimentEvents.rb           |    4 +-
 .../CreateLLMObsIntegrationInference.rb       |    2 +-
 .../CreateLLMObsProject.rb                    |    4 +-
 .../agent-observability/CreateLLMObsPrompt.rb |   22 +
 .../CreateLLMObsPromptVersion.rb              |   21 +
 .../DeleteLLMObsAnnotationQueue.rb            |    4 +-
 ...DeleteLLMObsAnnotationQueueInteractions.rb |    2 +-
 .../DeleteLLMObsAnnotations.rb                |    2 +-
 .../DeleteLLMObsCustomEvalConfig.rb           |    2 +-
 .../DeleteLLMObsDatasetRecords.rb             |    4 +-
 .../DeleteLLMObsDatasets.rb                   |    4 +-
 .../DeleteLLMObsExperiments.rb                |    4 +-
 .../DeleteLLMObsPatternsConfig.rb             |    2 +-
 .../DeleteLLMObsProjects.rb                   |    4 +-
 .../agent-observability/DeleteLLMObsPrompt.rb |    8 +
 .../ExportLLMObsDataset.rb                    |    4 +-
 .../GetLLMObsAnnotatedInteractions.rb         |    2 +-
 ...etLLMObsAnnotatedInteractionsByTraceIDs.rb |    2 +-
 .../GetLLMObsAnnotationQueueLabelSchema.rb    |    2 +-
 .../GetLLMObsCustomEvalConfig.rb              |    2 +-
 .../GetLLMObsDatasetDraftState.rb             |    4 +-
 .../GetLLMObsPatternsConfig.rb                |    2 +-
 .../GetLLMObsPatternsRunStatus.rb             |    2 +-
 .../v2/agent-observability/GetLLMObsPrompt.rb |    8 +
 .../GetLLMObsPromptVersion.rb                 |    8 +
 .../ListLLMObsAnnotationQueues.rb             |    4 +-
 .../ListLLMObsCustomEvalConfigs.rb            |    2 +-
 .../ListLLMObsDatasetRecords.rb               |    4 +-
 .../ListLLMObsDatasetVersions.rb              |    4 +-
 .../ListLLMObsDatasets.rb                     |    4 +-
 .../ListLLMObsExperimentEvents.rb             |    4 +-
 .../ListLLMObsExperimentEventsV1.rb           |    4 +-
 .../ListLLMObsExperimentEventsV2.rb           |    4 +-
 .../ListLLMObsExperiments.rb                  |    4 +-
 .../ListLLMObsIntegrationAccounts.rb          |    2 +-
 .../ListLLMObsIntegrationModels.rb            |    2 +-
 .../ListLLMObsPatternsClusteredPoints.rb      |    2 +-
 .../ListLLMObsPatternsConfigs.rb              |    2 +-
 .../ListLLMObsPatternsRuns.rb                 |    2 +-
 .../ListLLMObsPatternsTopics.rb               |    2 +-
 ...LLMObsPatternsTopicsWithClusteredPoints.rb |    2 +-
 .../ListLLMObsProjects.rb                     |    4 +-
 .../ListLLMObsPromptVersions.rb               |    8 +
 .../agent-observability/ListLLMObsPrompts.rb  |    8 +
 .../ListLLMObsSpans.rb                        |    4 +-
 .../LockLLMObsDatasetDraftState.rb            |    4 +-
 .../RestoreLLMObsDatasetVersion.rb            |    4 +-
 .../SearchLLMObsExperimentation.rb            |    6 +-
 .../SearchLLMObsSpans.rb                      |    4 +-
 .../SimpleSearchLLMObsExperimentation.rb      |    2 +-
 .../TriggerLLMObsPatterns.rb                  |    2 +-
 .../UnlockLLMObsDatasetDraftState.rb          |    4 +-
 .../UpdateLLMObsAnnotationQueue.rb            |    4 +-
 .../UpdateLLMObsAnnotationQueueLabelSchema.rb |    2 +-
 .../UpdateLLMObsCustomEvalConfig.rb           |    2 +-
 .../UpdateLLMObsDataset.rb                    |    4 +-
 .../UpdateLLMObsDatasetRecords.rb             |    4 +-
 .../UpdateLLMObsExperiment.rb                 |    4 +-
 .../UpdateLLMObsProject.rb                    |    4 +-
 .../UpdateLLMObsPrompt.rb                     |   13 +-
 .../UpdateLLMObsPromptVersion.rb              |   20 +
 .../UploadLLMObsDatasetRecordsFile.rb         |    4 +-
 .../UpsertLLMObsAnnotations.rb                |    2 +-
 .../UpsertLLMObsPatternsConfig.rb             |    2 +-
 .../llm-observability/CreateLLMObsPrompt.rb   |   28 -
 .../CreateLLMObsPromptVersion.rb              |   29 -
 .../llm-observability/DeleteLLMObsPrompt.rb   |   11 -
 .../v2/llm-observability/GetLLMObsPrompt.rb   |   11 -
 .../GetLLMObsPromptVersion.rb                 |   14 -
 .../ListLLMObsPromptVersions.rb               |   11 -
 .../v2/llm-observability/ListLLMObsPrompts.rb |   14 -
 .../UpdateLLMObsPromptVersion.rb              |   23 -
 .../DeleteRumQuotaConfig.rb                   |    5 +
 .../rum-retention-quota/GetRumQuotaConfig.rb  |    5 +
 .../UpsertRumQuotaConfig.rb                   |   25 +
 features/scenarios_model_mapping.rb           |   13 +
 ...ty.feature => agent_observability.feature} |  428 +++---
 features/v2/given.json                        |    4 +-
 features/v2/rum_retention_quota.feature       |  100 ++
 features/v2/synthetics.feature                |    2 +-
 features/v2/undo.json                         |  162 ++-
 generated-test/test-runner-data/manifest.json |  266 ++--
 ...n-policy-returns-bad-request-response.json |   40 +
 ...ution-policy-returns-created-response.json |   40 +
 ...-and-targets-returns-created-response.json |   59 +
 ...n-policy-returns-no-content-response.json} |   18 +-
 ...on-policy-returns-not-found-response.json} |   16 +-
 ...on-policy-returns-not-found-response.json} |   16 +-
 ...execution-policy-returns-ok-response.json} |   16 +-
 ...policies-returns-bad-request-response.json |   35 +
 ...xecution-policies-returns-ok-response.json |   18 +
 ...-query-parameters-returns-ok-response.json |  182 +++
 ...n-policy-returns-bad-request-response.json |   58 +
 ...ion-policy-returns-not-found-response.json |   58 +
 ...-execution-policy-returns-ok-response.json |   58 +
 ...-version-returns-bad-request-response.json |   50 -
 ...pt-version-returns-not-found-response.json |   57 -
 ...ty-prompt-version-returns-ok-response.json |   59 -
 ...y-prompt-returns-bad-request-response.json |   34 -
 ...lity-prompt-returns-conflict-response.json |   41 -
 ...ervability-prompt-returns-ok-response.json |   44 -
 ...pt-version-returns-not-found-response.json |   51 -
 ...ty-prompt-version-returns-ok-response.json |   51 -
 ...rvability-prompts-returns-ok-response.json |   35 -
 ...ervability-prompt-returns-ok-response.json |   35 -
 ...pt-version-returns-not-found-response.json |   67 -
 ...ty-prompt-version-returns-ok-response.json |   66 -
 ...y-prompt-returns-bad-request-response.json |   48 -
 ...ity-prompt-returns-not-found-response.json |   50 -
 ...ervability-prompt-returns-ok-response.json |   50 -
 ...d-the-severity-modifier-rule-response.json |   45 +
 ...ns-rule-successfully-deleted-response.json |   35 +
 ...d-the-severity-modifier-rule-response.json |   35 +
 ...t-of-severity-modifier-rules-response.json |   18 +
 ...-the-severity-modifier-rules-response.json |   33 +
 ...d-the-severity-modifier-rule-response.json |   62 +
 .../v2/llm-observability.json                 |  390 +++---
 .../v2/security-monitoring.json               |  562 ++++++++
 lib/datadog_api_client/inflector.rb           |   16 +-
 .../v1/api/aws_logs_integration_api.rb        |   20 +-
 .../monthly_usage_attribution_values.rb       |    4 +-
 .../v1/models/usage_summary_date.rb           |   12 +-
 .../v1/models/usage_summary_date_org.rb       |   12 +-
 .../v1/models/usage_summary_response.rb       |   12 +-
 ...lity_api.rb => agent_observability_api.rb} |  888 ++++++-------
 .../v2/api/authn_mappings_api.rb              |    2 +-
 .../v2/api/case_management_api.rb             |    2 +-
 lib/datadog_api_client/v2/api/events_api.rb   |    2 +-
 .../v2/api/identity_providers_api.rb          |    2 +-
 .../v2/api/incidents_api.rb                   |    4 +-
 .../v2/api/key_management_api.rb              |    8 +-
 lib/datadog_api_client/v2/api/logs_api.rb     |    4 +-
 .../v2/api/logs_restriction_queries_api.rb    |    4 +-
 .../v2/api/observability_pipelines_api.rb     |    2 +-
 .../v2/api/org_authorized_clients_api.rb      |    4 +-
 lib/datadog_api_client/v2/api/roles_api.rb    |    4 +-
 .../v2/api/rum_retention_quota_api.rb         |  259 ++++
 .../v2/api/scorecards_api.rb                  |    4 +-
 .../v2/api/security_monitoring_api.rb         |    8 +-
 .../v2/api/service_accounts_api.rb            |    4 +-
 .../v2/api/service_definition_api.rb          |    2 +-
 lib/datadog_api_client/v2/api/teams_api.rb    |   10 +-
 .../v2/api/user_authorized_clients_api.rb     |    2 +-
 lib/datadog_api_client/v2/api/users_api.rb    |    2 +-
 .../v2/api/workflow_automation_api.rb         |    2 +-
 .../v2/models/input_schema.rb                 |    2 +-
 ...nnotation_queue_data_attributes_request.rb |    2 +-
 ...notation_queue_data_attributes_response.rb |    2 +-
 .../llm_obs_annotation_queue_data_request.rb  |    6 +-
 .../llm_obs_annotation_queue_data_response.rb |    6 +-
 ...s_annotation_queue_interactions_request.rb |    2 +-
 ..._obs_annotation_queue_label_schema_data.rb |    2 +-
 ...notation_queue_label_schema_update_data.rb |    2 +-
 .../llm_obs_annotation_queue_request.rb       |    4 +-
 .../llm_obs_annotation_queue_response.rb      |    4 +-
 .../models/llm_obs_annotation_queue_type.rb   |    2 +-
 ...on_queue_update_data_attributes_request.rb |    2 +-
 ...bs_annotation_queue_update_data_request.rb |    6 +-
 ...llm_obs_annotation_queue_update_request.rb |    4 +-
 .../llm_obs_annotation_queues_response.rb     |    2 +-
 .../llm_obs_annotations_data_request.rb       |    2 +-
 .../llm_obs_annotations_data_response.rb      |    2 +-
 .../v2/models/llm_obs_annotations_type.rb     |    2 +-
 .../v2/models/llm_obs_create_prompt_data.rb   |    6 +-
 .../llm_obs_create_prompt_data_attributes.rb  |    2 +-
 .../models/llm_obs_create_prompt_request.rb   |    4 +-
 .../llm_obs_create_prompt_version_data.rb     |    6 +-
 ...s_create_prompt_version_data_attributes.rb |    2 +-
 .../llm_obs_create_prompt_version_request.rb  |    4 +-
 .../llm_obs_custom_eval_config_attributes.rb  |    2 +-
 .../models/llm_obs_custom_eval_config_data.rb |    6 +-
 ...lm_obs_custom_eval_config_list_response.rb |    2 +-
 .../llm_obs_custom_eval_config_response.rb    |    4 +-
 .../models/llm_obs_custom_eval_config_type.rb |    2 +-
 ...bs_custom_eval_config_update_attributes.rb |    2 +-
 .../llm_obs_custom_eval_config_update_data.rb |    6 +-
 ...m_obs_custom_eval_config_update_request.rb |    4 +-
 ...et_batch_update_data_attributes_request.rb |    2 +-
 ...m_obs_dataset_batch_update_data_request.rb |    6 +-
 ..._obs_dataset_batch_update_insert_record.rb |    2 +-
 .../llm_obs_dataset_batch_update_request.rb   |    4 +-
 ..._obs_dataset_batch_update_update_record.rb |    2 +-
 ...s_dataset_clone_data_attributes_request.rb |    2 +-
 .../llm_obs_dataset_clone_data_request.rb     |    6 +-
 .../models/llm_obs_dataset_clone_request.rb   |    4 +-
 ...llm_obs_dataset_data_attributes_request.rb |    2 +-
 ...lm_obs_dataset_data_attributes_response.rb |    2 +-
 .../v2/models/llm_obs_dataset_data_request.rb |    6 +-
 .../models/llm_obs_dataset_data_response.rb   |    6 +-
 .../llm_obs_dataset_draft_state_data.rb       |    6 +-
 ...obs_dataset_draft_state_data_attributes.rb |    2 +-
 .../llm_obs_dataset_draft_state_response.rb   |    4 +-
 .../llm_obs_dataset_draft_state_type.rb       |    2 +-
 .../models/llm_obs_dataset_export_format.rb   |    2 +-
 .../llm_obs_dataset_record_data_response.rb   |    2 +-
 .../v2/models/llm_obs_dataset_record_item.rb  |    2 +-
 .../llm_obs_dataset_record_update_item.rb     |    2 +-
 ...dataset_records_data_attributes_request.rb |    2 +-
 .../llm_obs_dataset_records_data_request.rb   |    6 +-
 .../llm_obs_dataset_records_list_response.rb  |    2 +-
 .../models/llm_obs_dataset_records_request.rb |    4 +-
 ..._records_update_data_attributes_request.rb |    2 +-
 ...obs_dataset_records_update_data_request.rb |    6 +-
 .../llm_obs_dataset_records_update_request.rb |    4 +-
 .../v2/models/llm_obs_dataset_request.rb      |    4 +-
 .../v2/models/llm_obs_dataset_response.rb     |    4 +-
 ...restore_version_data_attributes_request.rb |    2 +-
 ...bs_dataset_restore_version_data_request.rb |    6 +-
 ...llm_obs_dataset_restore_version_request.rb |    4 +-
 .../v2/models/llm_obs_dataset_type.rb         |    2 +-
 ..._dataset_update_data_attributes_request.rb |    2 +-
 .../llm_obs_dataset_update_data_request.rb    |    6 +-
 .../models/llm_obs_dataset_update_request.rb  |    4 +-
 .../v2/models/llm_obs_dataset_version_data.rb |    6 +-
 ...llm_obs_dataset_version_data_attributes.rb |    2 +-
 .../v2/models/llm_obs_dataset_version_type.rb |    2 +-
 .../llm_obs_dataset_versions_response.rb      |    2 +-
 .../v2/models/llm_obs_datasets_response.rb    |    2 +-
 ...e_annotation_queue_interactions_request.rb |    2 +-
 ...llm_obs_delete_annotations_data_request.rb |    2 +-
 ...lm_obs_delete_annotations_data_response.rb |    2 +-
 ...dataset_records_data_attributes_request.rb |    2 +-
 ...obs_delete_dataset_records_data_request.rb |    6 +-
 .../llm_obs_delete_dataset_records_request.rb |    4 +-
 ...delete_datasets_data_attributes_request.rb |    2 +-
 .../llm_obs_delete_datasets_data_request.rb   |    6 +-
 .../models/llm_obs_delete_datasets_request.rb |    4 +-
 ...ete_experiments_data_attributes_request.rb |    2 +-
 ...llm_obs_delete_experiments_data_request.rb |    6 +-
 .../llm_obs_delete_experiments_request.rb     |    4 +-
 ...delete_projects_data_attributes_request.rb |    2 +-
 .../llm_obs_delete_projects_data_request.rb   |    6 +-
 .../models/llm_obs_delete_projects_request.rb |    4 +-
 .../v2/models/llm_obs_deleted_prompt_data.rb  |    6 +-
 .../llm_obs_deleted_prompt_data_attributes.rb |    2 +-
 .../models/llm_obs_deleted_prompt_response.rb |    4 +-
 .../v2/models/llm_obs_event_type.rb           |    2 +-
 ..._obs_experiment_data_attributes_request.rb |    2 +-
 ...obs_experiment_data_attributes_response.rb |    4 +-
 .../models/llm_obs_experiment_data_request.rb |    6 +-
 .../llm_obs_experiment_data_response.rb       |    6 +-
 .../llm_obs_experiment_eval_metric_event.rb   |    4 +-
 .../llm_obs_experiment_events_data_request.rb |    2 +-
 .../llm_obs_experiment_events_request.rb      |    2 +-
 .../v2/models/llm_obs_experiment_metric.rb    |    6 +-
 .../v2/models/llm_obs_experiment_request.rb   |    4 +-
 .../v2/models/llm_obs_experiment_response.rb  |    4 +-
 .../llm_obs_experiment_run_data_response.rb   |    2 +-
 .../v2/models/llm_obs_experiment_span.rb      |    2 +-
 .../v2/models/llm_obs_experiment_status.rb    |    2 +-
 .../v2/models/llm_obs_experiment_type.rb      |    2 +-
 ...periment_update_data_attributes_request.rb |    4 +-
 .../llm_obs_experiment_update_data_request.rb |    6 +-
 .../llm_obs_experiment_update_request.rb      |    4 +-
 ...m_obs_experimentation_analytics_request.rb |    2 +-
 .../llm_obs_experimentation_search_request.rb |    2 +-
 ...s_experimentation_simple_search_request.rb |    2 +-
 .../v2/models/llm_obs_experiments_response.rb |    2 +-
 .../v2/models/llm_obs_metric_assessment.rb    |    2 +-
 .../v2/models/llm_obs_metric_score_type.rb    |    2 +-
 ..._obs_patterns_clustered_points_response.rb |    4 +-
 ...ns_clustered_points_response_attributes.rb |    2 +-
 ...patterns_clustered_points_response_data.rb |    6 +-
 .../llm_obs_patterns_clustered_points_type.rb |    2 +-
 .../llm_obs_patterns_config_attributes.rb     |    2 +-
 .../v2/models/llm_obs_patterns_config_item.rb |    2 +-
 .../llm_obs_patterns_config_response.rb       |    4 +-
 .../llm_obs_patterns_config_response_data.rb  |    6 +-
 .../v2/models/llm_obs_patterns_config_type.rb |    2 +-
 .../llm_obs_patterns_config_upsert_request.rb |    4 +-
 ...tterns_config_upsert_request_attributes.rb |    2 +-
 ...obs_patterns_config_upsert_request_data.rb |    6 +-
 .../llm_obs_patterns_configs_list_type.rb     |    2 +-
 .../llm_obs_patterns_configs_response.rb      |    4 +-
 ...bs_patterns_configs_response_attributes.rb |    2 +-
 .../llm_obs_patterns_configs_response_data.rb |    6 +-
 .../models/llm_obs_patterns_request_type.rb   |    2 +-
 .../llm_obs_patterns_run_status_response.rb   |    4 +-
 ...patterns_run_status_response_attributes.rb |    2 +-
 ...m_obs_patterns_run_status_response_data.rb |    6 +-
 .../llm_obs_patterns_run_status_type.rb       |    2 +-
 .../v2/models/llm_obs_patterns_run_summary.rb |    2 +-
 .../models/llm_obs_patterns_runs_list_type.rb |    2 +-
 .../models/llm_obs_patterns_runs_response.rb  |    4 +-
 ...m_obs_patterns_runs_response_attributes.rb |    2 +-
 .../llm_obs_patterns_runs_response_data.rb    |    6 +-
 .../v2/models/llm_obs_patterns_topic.rb       |    2 +-
 ...bs_patterns_topic_with_clustered_points.rb |    2 +-
 .../llm_obs_patterns_topics_response.rb       |    4 +-
 ...obs_patterns_topics_response_attributes.rb |    2 +-
 .../llm_obs_patterns_topics_response_data.rb  |    6 +-
 .../v2/models/llm_obs_patterns_topics_type.rb |    2 +-
 ...s_topics_with_clustered_points_response.rb |    4 +-
 ...th_clustered_points_response_attributes.rb |    2 +-
 ...ics_with_clustered_points_response_data.rb |    6 +-
 ...terns_topics_with_clustered_points_type.rb |    2 +-
 .../llm_obs_patterns_trigger_request.rb       |    4 +-
 ...obs_patterns_trigger_request_attributes.rb |    2 +-
 .../llm_obs_patterns_trigger_request_data.rb  |    6 +-
 .../llm_obs_patterns_trigger_response.rb      |    4 +-
 ...bs_patterns_trigger_response_attributes.rb |    2 +-
 .../llm_obs_patterns_trigger_response_data.rb |    6 +-
 .../llm_obs_patterns_trigger_response_type.rb |    2 +-
 ...llm_obs_project_data_attributes_request.rb |    2 +-
 ...lm_obs_project_data_attributes_response.rb |    2 +-
 .../v2/models/llm_obs_project_data_request.rb |    6 +-
 .../models/llm_obs_project_data_response.rb   |    6 +-
 .../v2/models/llm_obs_project_request.rb      |    4 +-
 .../v2/models/llm_obs_project_response.rb     |    4 +-
 .../v2/models/llm_obs_project_type.rb         |    2 +-
 ..._project_update_data_attributes_request.rb |    2 +-
 .../llm_obs_project_update_data_request.rb    |    6 +-
 .../models/llm_obs_project_update_request.rb  |    4 +-
 .../v2/models/llm_obs_projects_response.rb    |    2 +-
 .../v2/models/llm_obs_prompt_data.rb          |    6 +-
 .../models/llm_obs_prompt_data_attributes.rb  |    2 +-
 .../v2/models/llm_obs_prompt_response.rb      |    4 +-
 .../v2/models/llm_obs_prompt_sdk_data.rb      |    4 +-
 .../v2/models/llm_obs_prompt_sdk_response.rb  |    4 +-
 .../v2/models/llm_obs_prompt_type.rb          |    2 +-
 .../v2/models/llm_obs_prompt_version_data.rb  |    6 +-
 .../llm_obs_prompt_version_data_attributes.rb |    2 +-
 .../v2/models/llm_obs_prompt_version_label.rb |    2 +-
 .../llm_obs_prompt_version_list_data.rb       |    2 +-
 .../models/llm_obs_prompt_version_response.rb |    4 +-
 .../v2/models/llm_obs_prompt_version_type.rb  |    2 +-
 .../llm_obs_prompt_versions_response.rb       |    2 +-
 .../v2/models/llm_obs_prompts_response.rb     |    4 +-
 .../v2/models/llm_obs_record_type.rb          |    2 +-
 .../v2/models/llm_obs_search_spans_request.rb |    4 +-
 ...llm_obs_search_spans_request_attributes.rb |    4 +-
 .../llm_obs_search_spans_request_data.rb      |    6 +-
 .../llm_obs_search_spans_request_type.rb      |    2 +-
 .../v2/models/llm_obs_span_attributes.rb      |    6 +-
 .../v2/models/llm_obs_span_data.rb            |    6 +-
 .../models/llm_obs_span_evaluation_metric.rb  |    2 +-
 .../v2/models/llm_obs_span_filter.rb          |    4 +-
 .../v2/models/llm_obs_span_io.rb              |    2 +-
 .../v2/models/llm_obs_span_type.rb            |    2 +-
 .../v2/models/llm_obs_spans_response.rb       |    2 +-
 .../v2/models/llm_obs_update_prompt_data.rb   |    6 +-
 .../llm_obs_update_prompt_data_attributes.rb  |    2 +-
 .../models/llm_obs_update_prompt_request.rb   |    4 +-
 .../llm_obs_update_prompt_version_data.rb     |    6 +-
 ...s_update_prompt_version_data_attributes.rb |    2 +-
 .../llm_obs_update_prompt_version_request.rb  |    4 +-
 .../rum_retention_quota_adaptive_config.rb    |  131 ++
 .../rum_retention_quota_config_attributes.rb  |  185 +++
 .../models/rum_retention_quota_config_data.rb |  165 +++
 .../rum_retention_quota_config_response.rb    |  123 ++
 .../models/rum_retention_quota_config_type.rb |   26 +
 ...etention_quota_config_update_attributes.rb |  144 ++
 .../rum_retention_quota_config_update_data.rb |  166 +++
 ...m_retention_quota_config_update_request.rb |  123 ++
 .../rum_retention_quota_custom_config.rb      |  223 ++++
 .../v2/models/rum_retention_quota_mode.rb     |   28 +
 .../rum_retention_quota_reached_action.rb     |   27 +
 .../models/rum_retention_quota_scope_type.rb  |   26 +
 .../models/rum_retention_quota_window_type.rb |   26 +
 lib/datadog_api_client/v2/models/spec.rb      |    2 +-
 371 files changed, 5696 insertions(+), 2898 deletions(-)
 rename examples/v2/{llm-observability => agent-observability}/AggregateLLMObsExperimentation.rb (91%)
 rename examples/v2/{llm-observability => agent-observability}/BatchUpdateLLMObsDataset.rb (91%)
 rename examples/v2/{llm-observability => agent-observability}/CloneLLMObsDataset.rb (84%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsAnnotationQueue.rb (90%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsAnnotationQueueInteractions.rb (93%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsAnnotationQueueInteractions_2021594537.rb (94%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsDataset.rb (80%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsDatasetRecords.rb (83%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsExperiment.rb (84%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsExperimentEvents.rb (93%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsIntegrationInference.rb (98%)
 rename examples/v2/{llm-observability => agent-observability}/CreateLLMObsProject.rb (79%)
 create mode 100644 examples/v2/agent-observability/CreateLLMObsPrompt.rb
 create mode 100644 examples/v2/agent-observability/CreateLLMObsPromptVersion.rb
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsAnnotationQueue.rb (59%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsAnnotationQueueInteractions.rb (92%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsAnnotations.rb (92%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsCustomEvalConfig.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsDatasetRecords.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsDatasets.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsExperiments.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsPatternsConfig.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/DeleteLLMObsProjects.rb (81%)
 create mode 100644 examples/v2/agent-observability/DeleteLLMObsPrompt.rb
 rename examples/v2/{llm-observability => agent-observability}/ExportLLMObsDataset.rb (62%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsAnnotatedInteractions.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsAnnotatedInteractionsByTraceIDs.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsAnnotationQueueLabelSchema.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsCustomEvalConfig.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsDatasetDraftState.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsPatternsConfig.rb (79%)
 rename examples/v2/{llm-observability => agent-observability}/GetLLMObsPatternsRunStatus.rb (80%)
 create mode 100644 examples/v2/agent-observability/GetLLMObsPrompt.rb
 create mode 100644 examples/v2/agent-observability/GetLLMObsPromptVersion.rb
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsAnnotationQueues.rb (60%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsCustomEvalConfigs.rb (80%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsDatasetRecords.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsDatasetVersions.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsDatasets.rb (61%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsExperimentEvents.rb (61%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsExperimentEventsV1.rb (62%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsExperimentEventsV2.rb (62%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsExperiments.rb (60%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsIntegrationAccounts.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsIntegrationModels.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsPatternsClusteredPoints.rb (81%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsPatternsConfigs.rb (80%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsPatternsRuns.rb (79%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsPatternsTopics.rb (80%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsPatternsTopicsWithClusteredPoints.rb (83%)
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsProjects.rb (60%)
 create mode 100644 examples/v2/agent-observability/ListLLMObsPromptVersions.rb
 create mode 100644 examples/v2/agent-observability/ListLLMObsPrompts.rb
 rename examples/v2/{llm-observability => agent-observability}/ListLLMObsSpans.rb (60%)
 rename examples/v2/{llm-observability => agent-observability}/LockLLMObsDatasetDraftState.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/RestoreLLMObsDatasetVersion.rb (82%)
 rename examples/v2/{llm-observability => agent-observability}/SearchLLMObsExperimentation.rb (83%)
 rename examples/v2/{llm-observability => agent-observability}/SearchLLMObsSpans.rb (90%)
 rename examples/v2/{llm-observability => agent-observability}/SimpleSearchLLMObsExperimentation.rb (95%)
 rename examples/v2/{llm-observability => agent-observability}/TriggerLLMObsPatterns.rb (90%)
 rename examples/v2/{llm-observability => agent-observability}/UnlockLLMObsDatasetDraftState.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsAnnotationQueue.rb (90%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsAnnotationQueueLabelSchema.rb (95%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsCustomEvalConfig.rb (98%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsDataset.rb (80%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsDatasetRecords.rb (85%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsExperiment.rb (83%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsProject.rb (79%)
 rename examples/v2/{llm-observability => agent-observability}/UpdateLLMObsPrompt.rb (51%)
 create mode 100644 examples/v2/agent-observability/UpdateLLMObsPromptVersion.rb
 rename examples/v2/{llm-observability => agent-observability}/UploadLLMObsDatasetRecordsFile.rb (63%)
 rename examples/v2/{llm-observability => agent-observability}/UpsertLLMObsAnnotations.rb (94%)
 rename examples/v2/{llm-observability => agent-observability}/UpsertLLMObsPatternsConfig.rb (93%)
 delete mode 100644 examples/v2/llm-observability/CreateLLMObsPrompt.rb
 delete mode 100644 examples/v2/llm-observability/CreateLLMObsPromptVersion.rb
 delete mode 100644 examples/v2/llm-observability/DeleteLLMObsPrompt.rb
 delete mode 100644 examples/v2/llm-observability/GetLLMObsPrompt.rb
 delete mode 100644 examples/v2/llm-observability/GetLLMObsPromptVersion.rb
 delete mode 100644 examples/v2/llm-observability/ListLLMObsPromptVersions.rb
 delete mode 100644 examples/v2/llm-observability/ListLLMObsPrompts.rb
 delete mode 100644 examples/v2/llm-observability/UpdateLLMObsPromptVersion.rb
 create mode 100644 examples/v2/rum-retention-quota/DeleteRumQuotaConfig.rb
 create mode 100644 examples/v2/rum-retention-quota/GetRumQuotaConfig.rb
 create mode 100644 examples/v2/rum-retention-quota/UpsertRumQuotaConfig.rb
 rename features/v2/{llm_observability.feature => agent_observability.feature} (86%)
 create mode 100644 features/v2/rum_retention_quota.feature
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-bad-request-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-created-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-with-scope-and-targets-returns-created-response.json
 rename generated-test/test-runner-data/v2/{llm-observability/delete-an-llm-observability-prompt-returns-ok-response.json => execution-policy/delete-an-execution-policy-returns-no-content-response.json} (53%)
 rename generated-test/test-runner-data/v2/{llm-observability/delete-an-llm-observability-prompt-returns-not-found-response.json => execution-policy/delete-an-execution-policy-returns-not-found-response.json} (54%)
 rename generated-test/test-runner-data/v2/{llm-observability/get-an-llm-observability-prompt-returns-not-found-response.json => execution-policy/get-an-execution-policy-returns-not-found-response.json} (54%)
 rename generated-test/test-runner-data/v2/{llm-observability/get-an-llm-observability-prompt-returns-ok-response.json => execution-policy/get-an-execution-policy-returns-ok-response.json} (54%)
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-bad-request-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-ok-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/list-execution-policies-with-query-parameters-returns-ok-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-bad-request-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-not-found-response.json
 create mode 100644 generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-bad-request-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-not-found-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-bad-request-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-conflict-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-not-found-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/list-llm-observability-prompts-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/list-versions-of-an-llm-observability-prompt-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-not-found-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-ok-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-bad-request-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-not-found-response.json
 delete mode 100644 generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-ok-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/create-a-severity-modifier-rule-returns-successfully-created-the-severity-modifier-rule-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/delete-a-severity-modifier-rule-returns-rule-successfully-deleted-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/get-a-severity-modifier-rule-returns-successfully-retrieved-the-severity-modifier-rule-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/get-all-severity-modifier-rules-returns-successfully-retrieved-the-list-of-severity-modifier-rules-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/reorder-severity-modifier-rules-returns-successfully-reordered-the-severity-modifier-rules-response.json
 create mode 100644 generated-test/test-runner-data/v2/security-monitoring/update-a-severity-modifier-rule-returns-successfully-updated-the-severity-modifier-rule-response.json
 rename lib/datadog_api_client/v2/api/{llm_observability_api.rb => agent_observability_api.rb} (84%)
 create mode 100644 lib/datadog_api_client/v2/api/rum_retention_quota_api.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_adaptive_config.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_attributes.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_data.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_response.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_type.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_update_attributes.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_update_data.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_config_update_request.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_custom_config.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_mode.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_reached_action.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_scope_type.rb
 create mode 100644 lib/datadog_api_client/v2/models/rum_retention_quota_window_type.rb

diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index 3013d46b7cb4..3d7f50c714c3 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -11007,11 +11007,11 @@ components:
           format: double
           type: number
         llm_observability_percentage:
-          description: The percentage of LLM Observability usage by tag(s).
+          description: The percentage of Agent Observability usage by tag(s).
           format: double
           type: number
         llm_observability_usage:
-          description: The LLM Observability usage by tag(s).
+          description: The Agent Observability usage by tag(s).
           format: double
           type: number
         llm_spans_percentage:
@@ -24297,27 +24297,27 @@ components:
           format: int64
           type: integer
         llm_observability_15day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 15-day retention spans over all hours in the current date for all organizations.
+          description: Shows the sum of all Agent Observability 15-day retention spans over all hours in the current date for all organizations.
           format: int64
           type: integer
         llm_observability_30day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 30-day retention spans over all hours in the current date for all organizations.
+          description: Shows the sum of all Agent Observability 30-day retention spans over all hours in the current date for all organizations.
           format: int64
           type: integer
         llm_observability_60day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 60-day retention spans over all hours in the current date for all organizations.
+          description: Shows the sum of all Agent Observability 60-day retention spans over all hours in the current date for all organizations.
           format: int64
           type: integer
         llm_observability_90day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 90-day retention spans over all hours in the current date for all organizations.
+          description: Shows the sum of all Agent Observability 90-day retention spans over all hours in the current date for all organizations.
           format: int64
           type: integer
         llm_observability_min_spend_sum:
-          description: Sum of all LLM observability minimum spend over all hours in the current date for all organizations.
+          description: Sum of all Agent observability minimum spend over all hours in the current date for all organizations.
           format: int64
           type: integer
         llm_observability_sum:
-          description: Sum of all LLM observability sessions over all hours in the current date for all organizations.
+          description: Sum of all Agent observability sessions over all hours in the current date for all organizations.
           format: int64
           type: integer
         logs_archive_search_gb_scanned_sum:
@@ -25542,27 +25542,27 @@ components:
           format: int64
           type: integer
         llm_observability_15day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 15-day retention spans over all hours in the current date for the given org.
+          description: Shows the sum of all Agent Observability 15-day retention spans over all hours in the current date for the given org.
           format: int64
           type: integer
         llm_observability_30day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 30-day retention spans over all hours in the current date for the given org.
+          description: Shows the sum of all Agent Observability 30-day retention spans over all hours in the current date for the given org.
           format: int64
           type: integer
         llm_observability_60day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 60-day retention spans over all hours in the current date for the given org.
+          description: Shows the sum of all Agent Observability 60-day retention spans over all hours in the current date for the given org.
           format: int64
           type: integer
         llm_observability_90day_retention_spans_sum:
-          description: Shows the sum of all LLM Observability 90-day retention spans over all hours in the current date for the given org.
+          description: Shows the sum of all Agent Observability 90-day retention spans over all hours in the current date for the given org.
           format: int64
           type: integer
         llm_observability_min_spend_sum:
-          description: Shows the sum of all LLM Observability minimum spend over all hours in the current date for the given org.
+          description: Shows the sum of all Agent Observability minimum spend over all hours in the current date for the given org.
           format: int64
           type: integer
         llm_observability_sum:
-          description: Shows the sum of all LLM observability sessions over all hours in the current date for the given org.
+          description: Shows the sum of all Agent observability sessions over all hours in the current date for the given org.
           format: int64
           type: integer
         logs_archive_search_gb_scanned_sum:
@@ -26804,27 +26804,27 @@ components:
           format: int64
           type: integer
         llm_observability_15day_retention_spans_agg_sum:
-          description: Shows the sum of all LLM Observability 15-day retention spans over all hours in the current month for all organizations.
+          description: Shows the sum of all Agent Observability 15-day retention spans over all hours in the current month for all organizations.
           format: int64
           type: integer
         llm_observability_30day_retention_spans_agg_sum:
-          description: Shows the sum of all LLM Observability 30-day retention spans over all hours in the current month for all organizations.
+          description: Shows the sum of all Agent Observability 30-day retention spans over all hours in the current month for all organizations.
           format: int64
           type: integer
         llm_observability_60day_retention_spans_agg_sum:
-          description: Shows the sum of all LLM Observability 60-day retention spans over all hours in the current month for all organizations.
+          description: Shows the sum of all Agent Observability 60-day retention spans over all hours in the current month for all organizations.
           format: int64
           type: integer
         llm_observability_90day_retention_spans_agg_sum:
-          description: Shows the sum of all LLM Observability 90-day retention spans over all hours in the current month for all organizations.
+          description: Shows the sum of all Agent Observability 90-day retention spans over all hours in the current month for all organizations.
           format: int64
           type: integer
         llm_observability_agg_sum:
-          description: Sum of all LLM observability sessions for all hours in the current month for all organizations.
+          description: Sum of all Agent observability sessions for all hours in the current month for all organizations.
           format: int64
           type: integer
         llm_observability_min_spend_agg_sum:
-          description: Minimum spend for LLM observability sessions for all hours in the current month for all organizations.
+          description: Minimum spend for Agent observability sessions for all hours in the current month for all organizations.
           format: int64
           type: integer
         logs_archive_search_gb_scanned_agg_sum:
@@ -32856,8 +32856,9 @@ paths:
           - aws_configuration_edit
   /api/v1/integration/aws/logs:
     delete:
+      deprecated: true
       description: >-
-        Delete a Datadog-AWS logs configuration by removing the specific Lambda ARN associated with a given AWS account.
+        **This endpoint is deprecated.** Delete a Datadog-AWS logs configuration by removing the specific Lambda ARN associated with a given AWS account.
       operationId: DeleteAWSLambdaARN
       requestBody:
         content:
@@ -32903,6 +32904,7 @@ paths:
         operator: OR
         permissions:
           - aws_configuration_edit
+      x-sunset: "2027-02-20"
     get:
       deprecated: true
       description: >-
@@ -32952,8 +32954,9 @@ paths:
         permissions:
           - aws_configuration_read
     post:
+      deprecated: true
       description: >-
-        Attach the Lambda ARN of the Lambda created for the Datadog-AWS log collection to your AWS account ID to enable log collection.
+        **This endpoint is deprecated.** Attach the Lambda ARN of the Lambda created for the Datadog-AWS log collection to your AWS account ID to enable log collection.
       operationId: CreateAWSLambdaARN
       requestBody:
         content:
@@ -32999,10 +33002,12 @@ paths:
         operator: OR
         permissions:
           - aws_configuration_edit
+      x-sunset: "2027-02-20"
   /api/v1/integration/aws/logs/check_async:
     post:
+      deprecated: true
       description: |-
-        Test if permissions are present to add a log-forwarding triggers for the given services and AWS account. The input
+        **This endpoint is deprecated.** Test if permissions are present to add a log-forwarding triggers for the given services and AWS account. The input
         is the same as for Enable an AWS service log collection. Subsequent requests will always repeat the above, so this
         endpoint can be polled intermittently instead of blocking.
 
@@ -33057,6 +33062,7 @@ paths:
         operator: OR
         permissions:
           - aws_configuration_read
+      x-sunset: "2027-02-20"
   /api/v1/integration/aws/logs/services:
     get:
       deprecated: true
@@ -33152,8 +33158,9 @@ paths:
           - aws_configuration_edit
   /api/v1/integration/aws/logs/services_async:
     post:
+      deprecated: true
       description: |-
-        Test if permissions are present to add log-forwarding triggers for the
+        **This endpoint is deprecated.** Test if permissions are present to add log-forwarding triggers for the
         given services and AWS account. Input is the same as for `EnableAWSLogServices`.
         Done async, so can be repeatedly polled in a non-blocking fashion until
         the async request completes.
@@ -33216,6 +33223,7 @@ paths:
         operator: OR
         permissions:
           - aws_configuration_read
+      x-sunset: "2027-02-20"
   /api/v1/integration/azure:
     delete:
       description: |-
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 60e827af74bf..569064e98f04 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -974,7 +974,7 @@ components:
       schema:
         type: string
     LLMObsAnnotationQueueIDPathParameter:
-      description: The ID of the LLM Observability annotation queue.
+      description: The ID of the Agent Observability annotation queue.
       example: "00000000-0000-0000-0000-000000000001"
       in: path
       name: queue_id
@@ -982,7 +982,7 @@ components:
       schema:
         type: string
     LLMObsDatasetIDPathParameter:
-      description: The ID of the LLM Observability dataset.
+      description: The ID of the Agent Observability dataset.
       example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
       in: path
       name: dataset_id
@@ -990,7 +990,7 @@ components:
       schema:
         type: string
     LLMObsEvalNamePathParameter:
-      description: The name of the custom LLM Observability evaluator configuration.
+      description: The name of the custom Agent Observability evaluator configuration.
       example: "my-custom-evaluator"
       in: path
       name: eval_name
@@ -998,7 +998,7 @@ components:
       schema:
         type: string
     LLMObsExperimentIDPathParameter:
-      description: The ID of the LLM Observability experiment.
+      description: The ID of the Agent Observability experiment.
       example: "3fd6b5e0-8910-4b1c-a7d0-5b84de329012"
       in: path
       name: experiment_id
@@ -1066,7 +1066,7 @@ components:
       schema:
         type: string
     LLMObsProjectIDPathParameter:
-      description: The ID of the LLM Observability project.
+      description: The ID of the Agent Observability project.
       example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
       in: path
       name: project_id
@@ -1074,7 +1074,7 @@ components:
       schema:
         type: string
     LLMObsPromptIDPathParameter:
-      description: The customer-provided identifier of the LLM Observability prompt.
+      description: The customer-provided identifier of the Agent Observability prompt.
       example: "customer-support-assistant"
       in: path
       name: prompt_id
@@ -1090,7 +1090,7 @@ components:
       schema:
         type: string
     LLMObsPromptVersionPathParameter:
-      description: The version number of the LLM Observability prompt.
+      description: The version number of the Agent Observability prompt.
       example: 1
       in: path
       name: version
@@ -1460,7 +1460,7 @@ components:
         format: int64
         type: integer
     PageSize:
-      description: Size for a given page. The maximum allowed value is 100.
+      description: Number of items to return per page. The maximum allowed value is 100.
       in: query
       name: page[size]
       required: false
@@ -1788,6 +1788,23 @@ components:
       required: true
       schema:
         type: string
+    RumRetentionQuotaScopeIDParameter:
+      description: |-
+        The identifier of the scope the retention quota configuration applies to.
+        For the `application` scope, this is the RUM application ID.
+      in: path
+      name: scope_id
+      required: true
+      schema:
+        example: cd73a516-a481-4af5-8352-9b577465c77b
+        type: string
+    RumRetentionQuotaScopeTypeParameter:
+      description: The type of scope the retention quota configuration applies to.
+      in: path
+      name: scope_type
+      required: true
+      schema:
+        $ref: "#/components/schemas/RumRetentionQuotaScopeType"
     SAMLConfigurationUUIDPathParameter:
       description: The UUID of the SAML configuration.
       in: path
@@ -7734,7 +7751,7 @@ components:
       description: An arbitrary object value with additional properties.
       type: object
     AnyValueString:
-      description: A scalar string value.
+      description: A scalar value represented as a string.
       type: string
     ApiID:
       description: API identifier.
@@ -52583,7 +52600,7 @@ components:
         - INCIDENT
         - RELATION
     InputSchema:
-      description: "A list of input parameters for the workflow. These can be used as dynamic runtime values in your workflow."
+      description: "A list of input parameters for the workflow. Input parameters are available under the `Trigger` object and can be referenced in workflow steps using `{{ Trigger.<parameter_name> }}`."
       properties:
         parameters:
           description: The `InputSchema` `parameters`.
@@ -55597,7 +55614,7 @@ components:
         - $ref: "#/components/schemas/LLMObsAnnotationLabelValueStringArray"
         - $ref: "#/components/schemas/AnyValueBoolean"
     LLMObsAnnotationQueueDataAttributesRequest:
-      description: Attributes for creating an LLM Observability annotation queue.
+      description: Attributes for creating an Agent Observability annotation queue.
       properties:
         annotation_schema:
           $ref: "#/components/schemas/LLMObsAnnotationSchema"
@@ -55618,7 +55635,7 @@ components:
         - project_id
       type: object
     LLMObsAnnotationQueueDataAttributesResponse:
-      description: Attributes of an LLM Observability annotation queue.
+      description: Attributes of an Agent Observability annotation queue.
       properties:
         annotation_schema:
           $ref: "#/components/schemas/LLMObsAnnotationSchema"
@@ -55667,7 +55684,7 @@ components:
         - owned_by
       type: object
     LLMObsAnnotationQueueDataRequest:
-      description: Data object for creating an LLM Observability annotation queue.
+      description: Data object for creating an Agent Observability annotation queue.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsAnnotationQueueDataAttributesRequest"
@@ -55678,7 +55695,7 @@ components:
         - attributes
       type: object
     LLMObsAnnotationQueueDataResponse:
-      description: Data object for an LLM Observability annotation queue.
+      description: Data object for an Agent Observability annotation queue.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsAnnotationQueueDataAttributesResponse"
@@ -55762,7 +55779,7 @@ components:
         - attributes
       type: object
     LLMObsAnnotationQueueInteractionsRequest:
-      description: Request to add interactions to an LLM Observability annotation queue.
+      description: Request to add interactions to an Agent Observability annotation queue.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsAnnotationQueueInteractionsDataRequest"
@@ -55845,7 +55862,7 @@ components:
         - data
       type: object
     LLMObsAnnotationQueueRequest:
-      description: Request to create an LLM Observability annotation queue.
+      description: Request to create an Agent Observability annotation queue.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsAnnotationQueueDataRequest"
@@ -55853,7 +55870,7 @@ components:
         - data
       type: object
     LLMObsAnnotationQueueResponse:
-      description: Response containing a single LLM Observability annotation queue.
+      description: Response containing a single Agent Observability annotation queue.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsAnnotationQueueDataResponse"
@@ -55861,7 +55878,7 @@ components:
         - data
       type: object
     LLMObsAnnotationQueueType:
-      description: Resource type of an LLM Observability annotation queue.
+      description: Resource type of an Agent Observability annotation queue.
       enum:
         - queues
       example: queues
@@ -55869,7 +55886,7 @@ components:
       x-enum-varnames:
         - QUEUES
     LLMObsAnnotationQueueUpdateDataAttributesRequest:
-      description: Attributes for updating an LLM Observability annotation queue. All fields are optional.
+      description: Attributes for updating an Agent Observability annotation queue. All fields are optional.
       properties:
         annotation_schema:
           $ref: "#/components/schemas/LLMObsAnnotationSchema"
@@ -55883,7 +55900,7 @@ components:
           type: string
       type: object
     LLMObsAnnotationQueueUpdateDataRequest:
-      description: Data object for updating an LLM Observability annotation queue.
+      description: Data object for updating an Agent Observability annotation queue.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsAnnotationQueueUpdateDataAttributesRequest"
@@ -55894,7 +55911,7 @@ components:
         - attributes
       type: object
     LLMObsAnnotationQueueUpdateRequest:
-      description: Request to update an LLM Observability annotation queue.
+      description: Request to update an Agent Observability annotation queue.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsAnnotationQueueUpdateDataRequest"
@@ -55902,7 +55919,7 @@ components:
         - data
       type: object
     LLMObsAnnotationQueuesResponse:
-      description: Response containing a list of LLM Observability annotation queues.
+      description: Response containing a list of Agent Observability annotation queues.
       properties:
         data:
           description: List of annotation queues.
@@ -55995,7 +56012,7 @@ components:
         - data
       type: object
     LLMObsAnnotationsType:
-      description: Resource type for LLM Observability annotations.
+      description: Resource type for Agent Observability annotations.
       enum:
         - annotations
       example: annotations
@@ -56229,7 +56246,7 @@ components:
       minItems: 1
       type: array
     LLMObsCreatePromptData:
-      description: Data object for creating an LLM Observability prompt.
+      description: Data object for creating an Agent Observability prompt.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsCreatePromptDataAttributes"
@@ -56241,7 +56258,7 @@ components:
       type: object
     LLMObsCreatePromptDataAttributes:
       description: >-
-        Attributes for creating an LLM Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
+        Attributes for creating an Agent Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
       properties:
         description:
           description: Optional description of the prompt.
@@ -56277,7 +56294,7 @@ components:
         - template
       type: object
     LLMObsCreatePromptRequest:
-      description: Request to create an LLM Observability prompt.
+      description: Request to create an Agent Observability prompt.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsCreatePromptData"
@@ -56285,7 +56302,7 @@ components:
         - data
       type: object
     LLMObsCreatePromptVersionData:
-      description: Data object for creating an LLM Observability prompt version.
+      description: Data object for creating an Agent Observability prompt version.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsCreatePromptVersionDataAttributes"
@@ -56297,7 +56314,7 @@ components:
       type: object
     LLMObsCreatePromptVersionDataAttributes:
       description: >-
-        Attributes for creating a new version of an LLM Observability prompt. `template` is required; all other attributes are optional.
+        Attributes for creating a new version of an Agent Observability prompt. `template` is required; all other attributes are optional.
       properties:
         description:
           description: Optional description of this version.
@@ -56323,7 +56340,7 @@ components:
         - template
       type: object
     LLMObsCreatePromptVersionRequest:
-      description: Request to create a new version of an LLM Observability prompt.
+      description: Request to create a new version of an Agent Observability prompt.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsCreatePromptVersionData"
@@ -56370,7 +56387,7 @@ components:
           type: boolean
       type: object
     LLMObsCustomEvalConfigAttributes:
-      description: Attributes of a custom LLM Observability evaluator configuration.
+      description: Attributes of a custom Agent Observability evaluator configuration.
       properties:
         category:
           description: Category of the evaluator.
@@ -56418,7 +56435,7 @@ components:
           type: string
       type: object
     LLMObsCustomEvalConfigData:
-      description: Data object for a custom LLM Observability evaluator configuration.
+      description: Data object for a custom Agent Observability evaluator configuration.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsCustomEvalConfigAttributes"
@@ -56562,7 +56579,7 @@ components:
           $ref: "#/components/schemas/LLMObsCustomEvalConfigVertexAIOptions"
       type: object
     LLMObsCustomEvalConfigListResponse:
-      description: Response containing a list of custom LLM Observability evaluator configurations.
+      description: Response containing a list of custom Agent Observability evaluator configurations.
       properties:
         data:
           description: List of custom evaluator configuration data objects.
@@ -56669,7 +56686,7 @@ components:
           type: string
       type: object
     LLMObsCustomEvalConfigResponse:
-      description: Response containing a custom LLM Observability evaluator configuration.
+      description: Response containing a custom Agent Observability evaluator configuration.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsCustomEvalConfigData"
@@ -56718,7 +56735,7 @@ components:
         - enabled
       type: object
     LLMObsCustomEvalConfigType:
-      description: Type of the custom LLM Observability evaluator configuration resource.
+      description: Type of the custom Agent Observability evaluator configuration resource.
       enum:
         - evaluator_config
       example: "evaluator_config"
@@ -56726,7 +56743,7 @@ components:
       x-enum-varnames:
         - EVALUATOR_CONFIG
     LLMObsCustomEvalConfigUpdateAttributes:
-      description: Attributes for creating or updating a custom LLM Observability evaluator configuration.
+      description: Attributes for creating or updating a custom Agent Observability evaluator configuration.
       properties:
         category:
           description: Category of the evaluator.
@@ -56746,7 +56763,7 @@ components:
         - target
       type: object
     LLMObsCustomEvalConfigUpdateData:
-      description: Data object for creating or updating a custom LLM Observability evaluator configuration.
+      description: Data object for creating or updating a custom Agent Observability evaluator configuration.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsCustomEvalConfigUpdateAttributes"
@@ -56761,7 +56778,7 @@ components:
         - attributes
       type: object
     LLMObsCustomEvalConfigUpdateRequest:
-      description: Request to create or update a custom LLM Observability evaluator configuration.
+      description: Request to create or update a custom Agent Observability evaluator configuration.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsCustomEvalConfigUpdateData"
@@ -56789,7 +56806,7 @@ components:
           type: string
       type: object
     LLMObsDatasetBatchUpdateDataAttributesRequest:
-      description: Attributes for batch-updating records in an LLM Observability dataset.
+      description: Attributes for batch-updating records in an Agent Observability dataset.
       properties:
         create_new_version:
           description: Whether to create a new dataset version when applying the batch update. Defaults to `true`.
@@ -56805,7 +56822,7 @@ components:
           $ref: "#/components/schemas/LLMObsDatasetBatchUpdateUpdateRecords"
       type: object
     LLMObsDatasetBatchUpdateDataRequest:
-      description: Data object for batch-updating records in an LLM Observability dataset.
+      description: Data object for batch-updating records in an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetBatchUpdateDataAttributesRequest"
@@ -56827,7 +56844,7 @@ components:
         type: string
       type: array
     LLMObsDatasetBatchUpdateInsertRecord:
-      description: A record to insert as part of a batch update on an LLM Observability dataset.
+      description: A record to insert as part of a batch update on an Agent Observability dataset.
       properties:
         expected_output:
           $ref: "#/components/schemas/AnyValue"
@@ -56854,7 +56871,7 @@ components:
         $ref: "#/components/schemas/LLMObsDatasetBatchUpdateInsertRecord"
       type: array
     LLMObsDatasetBatchUpdateRequest:
-      description: Request to batch-insert, update, and delete records in an LLM Observability dataset.
+      description: Request to batch-insert, update, and delete records in an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetBatchUpdateDataRequest"
@@ -56862,7 +56879,7 @@ components:
         - data
       type: object
     LLMObsDatasetBatchUpdateUpdateRecord:
-      description: A record update payload as part of a batch update on an LLM Observability dataset.
+      description: A record update payload as part of a batch update on an Agent Observability dataset.
       properties:
         expected_output:
           $ref: "#/components/schemas/AnyValue"
@@ -56887,7 +56904,7 @@ components:
         $ref: "#/components/schemas/LLMObsDatasetBatchUpdateUpdateRecord"
       type: array
     LLMObsDatasetCloneDataAttributesRequest:
-      description: Attributes for cloning an LLM Observability dataset.
+      description: Attributes for cloning an Agent Observability dataset.
       properties:
         description:
           description: Description of the cloned dataset.
@@ -56901,7 +56918,7 @@ components:
         - name
       type: object
     LLMObsDatasetCloneDataRequest:
-      description: Data object for cloning an LLM Observability dataset.
+      description: Data object for cloning an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetCloneDataAttributesRequest"
@@ -56917,7 +56934,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetCloneRequest:
-      description: Request to clone an LLM Observability dataset.
+      description: Request to clone an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetCloneDataRequest"
@@ -56925,7 +56942,7 @@ components:
         - data
       type: object
     LLMObsDatasetDataAttributesRequest:
-      description: Attributes for creating an LLM Observability dataset.
+      description: Attributes for creating an Agent Observability dataset.
       properties:
         description:
           description: Description of the dataset.
@@ -56942,7 +56959,7 @@ components:
         - name
       type: object
     LLMObsDatasetDataAttributesResponse:
-      description: Attributes of an LLM Observability dataset.
+      description: Attributes of an Agent Observability dataset.
       properties:
         created_at:
           description: Timestamp when the dataset was created.
@@ -56982,7 +56999,7 @@ components:
         - updated_at
       type: object
     LLMObsDatasetDataRequest:
-      description: Data object for creating an LLM Observability dataset.
+      description: Data object for creating an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetDataAttributesRequest"
@@ -56993,7 +57010,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetDataResponse:
-      description: Data object for an LLM Observability dataset.
+      description: Data object for an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetDataAttributesResponse"
@@ -57009,7 +57026,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetDraftStateData:
-      description: Data object for an LLM Observability dataset draft state.
+      description: Data object for an Agent Observability dataset draft state.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetDraftStateDataAttributes"
@@ -57025,7 +57042,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetDraftStateDataAttributes:
-      description: Attributes of an LLM Observability dataset draft state.
+      description: Attributes of an Agent Observability dataset draft state.
       properties:
         drafting_since:
           description: Timestamp when the dataset draft session started.
@@ -57039,7 +57056,7 @@ components:
         - drafting_since
       type: object
     LLMObsDatasetDraftStateResponse:
-      description: Response containing the draft state of an LLM Observability dataset.
+      description: Response containing the draft state of an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetDraftStateData"
@@ -57047,7 +57064,7 @@ components:
         - data
       type: object
     LLMObsDatasetDraftStateType:
-      description: Resource type of an LLM Observability dataset draft state.
+      description: Resource type of an Agent Observability dataset draft state.
       enum:
         - draft_state_data
       example: draft_state_data
@@ -57082,7 +57099,7 @@ components:
       type: object
     LLMObsDatasetExportFormat:
       default: csv
-      description: Supported export format for an LLM Observability dataset.
+      description: Supported export format for an Agent Observability dataset.
       enum:
         - csv
       example: csv
@@ -57090,7 +57107,7 @@ components:
       x-enum-varnames:
         - CSV
     LLMObsDatasetRecordDataResponse:
-      description: A single LLM Observability dataset record.
+      description: A single Agent Observability dataset record.
       properties:
         created_at:
           description: Timestamp when the record was created.
@@ -57129,7 +57146,7 @@ components:
         - updated_at
       type: object
     LLMObsDatasetRecordItem:
-      description: A single record to append to an LLM Observability dataset.
+      description: A single record to append to an Agent Observability dataset.
       properties:
         expected_output:
           $ref: "#/components/schemas/AnyValue"
@@ -57159,7 +57176,7 @@ components:
         type: string
       type: array
     LLMObsDatasetRecordUpdateItem:
-      description: A record update payload for an LLM Observability dataset.
+      description: A record update payload for an Agent Observability dataset.
       properties:
         expected_output:
           $ref: "#/components/schemas/AnyValue"
@@ -57177,7 +57194,7 @@ components:
         - id
       type: object
     LLMObsDatasetRecordsDataAttributesRequest:
-      description: Attributes for appending records to an LLM Observability dataset.
+      description: Attributes for appending records to an Agent Observability dataset.
       properties:
         deduplicate:
           description: Whether to deduplicate records before appending. Defaults to `true`.
@@ -57191,7 +57208,7 @@ components:
         - records
       type: object
     LLMObsDatasetRecordsDataRequest:
-      description: Data object for appending records to an LLM Observability dataset.
+      description: Data object for appending records to an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetRecordsDataAttributesRequest"
@@ -57202,7 +57219,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetRecordsListResponse:
-      description: Response containing a paginated list of LLM Observability dataset records.
+      description: Response containing a paginated list of Agent Observability dataset records.
       properties:
         data:
           description: List of dataset records.
@@ -57237,7 +57254,7 @@ components:
         - data
       type: object
     LLMObsDatasetRecordsRequest:
-      description: Request to append records to an LLM Observability dataset.
+      description: Request to append records to an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetRecordsDataRequest"
@@ -57245,7 +57262,7 @@ components:
         - data
       type: object
     LLMObsDatasetRecordsUpdateDataAttributesRequest:
-      description: Attributes for updating records in an LLM Observability dataset.
+      description: Attributes for updating records in an Agent Observability dataset.
       properties:
         records:
           description: List of records to update.
@@ -57256,7 +57273,7 @@ components:
         - records
       type: object
     LLMObsDatasetRecordsUpdateDataRequest:
-      description: Data object for updating records in an LLM Observability dataset.
+      description: Data object for updating records in an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetRecordsUpdateDataAttributesRequest"
@@ -57267,7 +57284,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetRecordsUpdateRequest:
-      description: Request to update records in an LLM Observability dataset.
+      description: Request to update records in an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetRecordsUpdateDataRequest"
@@ -57283,7 +57300,7 @@ components:
           type: string
       type: object
     LLMObsDatasetRequest:
-      description: Request to create an LLM Observability dataset.
+      description: Request to create an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetDataRequest"
@@ -57291,7 +57308,7 @@ components:
         - data
       type: object
     LLMObsDatasetResponse:
-      description: Response containing a single LLM Observability dataset.
+      description: Response containing a single Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetDataResponse"
@@ -57299,7 +57316,7 @@ components:
         - data
       type: object
     LLMObsDatasetRestoreVersionDataAttributesRequest:
-      description: Attributes for restoring an LLM Observability dataset to a previous version.
+      description: Attributes for restoring an Agent Observability dataset to a previous version.
       properties:
         dataset_version:
           description: Version number of the dataset to restore. Must be between 0 and the current version of the dataset, inclusive.
@@ -57311,7 +57328,7 @@ components:
         - dataset_version
       type: object
     LLMObsDatasetRestoreVersionDataRequest:
-      description: Data object for restoring an LLM Observability dataset to a previous version.
+      description: Data object for restoring an Agent Observability dataset to a previous version.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetRestoreVersionDataAttributesRequest"
@@ -57327,7 +57344,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetRestoreVersionRequest:
-      description: Request to restore an LLM Observability dataset to a previous version.
+      description: Request to restore an Agent Observability dataset to a previous version.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetRestoreVersionDataRequest"
@@ -57335,7 +57352,7 @@ components:
         - data
       type: object
     LLMObsDatasetType:
-      description: Resource type of an LLM Observability dataset.
+      description: Resource type of an Agent Observability dataset.
       enum:
         - datasets
       example: datasets
@@ -57343,7 +57360,7 @@ components:
       x-enum-varnames:
         - DATASETS
     LLMObsDatasetUpdateDataAttributesRequest:
-      description: Attributes for updating an LLM Observability dataset.
+      description: Attributes for updating an Agent Observability dataset.
       properties:
         description:
           description: Updated description of the dataset.
@@ -57357,7 +57374,7 @@ components:
           type: string
       type: object
     LLMObsDatasetUpdateDataRequest:
-      description: Data object for updating an LLM Observability dataset.
+      description: Data object for updating an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetUpdateDataAttributesRequest"
@@ -57368,7 +57385,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetUpdateRequest:
-      description: Request to partially update an LLM Observability dataset.
+      description: Request to partially update an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetUpdateDataRequest"
@@ -57376,7 +57393,7 @@ components:
         - data
       type: object
     LLMObsDatasetVersionData:
-      description: Data object for an LLM Observability dataset version.
+      description: Data object for an Agent Observability dataset version.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDatasetVersionDataAttributes"
@@ -57392,7 +57409,7 @@ components:
         - attributes
       type: object
     LLMObsDatasetVersionDataAttributes:
-      description: Attributes of an LLM Observability dataset version.
+      description: Attributes of an Agent Observability dataset version.
       properties:
         dataset_id:
           description: Unique identifier of the dataset this version belongs to.
@@ -57416,7 +57433,7 @@ components:
         - last_used
       type: object
     LLMObsDatasetVersionType:
-      description: Resource type of an LLM Observability dataset version.
+      description: Resource type of an Agent Observability dataset version.
       enum:
         - dataset_version
       example: dataset_version
@@ -57424,7 +57441,7 @@ components:
       x-enum-varnames:
         - DATASET_VERSION
     LLMObsDatasetVersionsResponse:
-      description: Response containing the active versions of an LLM Observability dataset.
+      description: Response containing the active versions of an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDatasetVersionsResponseData"
@@ -57437,7 +57454,7 @@ components:
         $ref: "#/components/schemas/LLMObsDatasetVersionData"
       type: array
     LLMObsDatasetsResponse:
-      description: Response containing a list of LLM Observability datasets.
+      description: Response containing a list of Agent Observability datasets.
       properties:
         data:
           description: List of datasets.
@@ -57492,7 +57509,7 @@ components:
         - attributes
       type: object
     LLMObsDeleteAnnotationQueueInteractionsRequest:
-      description: Request to delete interactions from an LLM Observability annotation queue.
+      description: Request to delete interactions from an Agent Observability annotation queue.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDeleteAnnotationQueueInteractionsDataRequest"
@@ -57579,7 +57596,7 @@ components:
         - data
       type: object
     LLMObsDeleteDatasetRecordsDataAttributesRequest:
-      description: Attributes for deleting records from an LLM Observability dataset.
+      description: Attributes for deleting records from an Agent Observability dataset.
       properties:
         record_ids:
           description: List of record IDs to delete.
@@ -57593,7 +57610,7 @@ components:
         - record_ids
       type: object
     LLMObsDeleteDatasetRecordsDataRequest:
-      description: Data object for deleting records from an LLM Observability dataset.
+      description: Data object for deleting records from an Agent Observability dataset.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDeleteDatasetRecordsDataAttributesRequest"
@@ -57604,7 +57621,7 @@ components:
         - attributes
       type: object
     LLMObsDeleteDatasetRecordsRequest:
-      description: Request to delete records from an LLM Observability dataset.
+      description: Request to delete records from an Agent Observability dataset.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDeleteDatasetRecordsDataRequest"
@@ -57612,7 +57629,7 @@ components:
         - data
       type: object
     LLMObsDeleteDatasetsDataAttributesRequest:
-      description: Attributes for deleting LLM Observability datasets.
+      description: Attributes for deleting Agent Observability datasets.
       properties:
         dataset_ids:
           description: List of dataset IDs to delete.
@@ -57626,7 +57643,7 @@ components:
         - dataset_ids
       type: object
     LLMObsDeleteDatasetsDataRequest:
-      description: Data object for deleting LLM Observability datasets.
+      description: Data object for deleting Agent Observability datasets.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDeleteDatasetsDataAttributesRequest"
@@ -57637,7 +57654,7 @@ components:
         - attributes
       type: object
     LLMObsDeleteDatasetsRequest:
-      description: Request to delete one or more LLM Observability datasets.
+      description: Request to delete one or more Agent Observability datasets.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDeleteDatasetsDataRequest"
@@ -57645,7 +57662,7 @@ components:
         - data
       type: object
     LLMObsDeleteExperimentsDataAttributesRequest:
-      description: Attributes for deleting LLM Observability experiments.
+      description: Attributes for deleting Agent Observability experiments.
       properties:
         experiment_ids:
           description: List of experiment IDs to delete.
@@ -57659,7 +57676,7 @@ components:
         - experiment_ids
       type: object
     LLMObsDeleteExperimentsDataRequest:
-      description: Data object for deleting LLM Observability experiments.
+      description: Data object for deleting Agent Observability experiments.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDeleteExperimentsDataAttributesRequest"
@@ -57670,7 +57687,7 @@ components:
         - attributes
       type: object
     LLMObsDeleteExperimentsRequest:
-      description: Request to delete one or more LLM Observability experiments.
+      description: Request to delete one or more Agent Observability experiments.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDeleteExperimentsDataRequest"
@@ -57678,7 +57695,7 @@ components:
         - data
       type: object
     LLMObsDeleteProjectsDataAttributesRequest:
-      description: Attributes for deleting LLM Observability projects.
+      description: Attributes for deleting Agent Observability projects.
       properties:
         project_ids:
           description: List of project IDs to delete.
@@ -57692,7 +57709,7 @@ components:
         - project_ids
       type: object
     LLMObsDeleteProjectsDataRequest:
-      description: Data object for deleting LLM Observability projects.
+      description: Data object for deleting Agent Observability projects.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDeleteProjectsDataAttributesRequest"
@@ -57703,7 +57720,7 @@ components:
         - attributes
       type: object
     LLMObsDeleteProjectsRequest:
-      description: Request to delete one or more LLM Observability projects.
+      description: Request to delete one or more Agent Observability projects.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsDeleteProjectsDataRequest"
@@ -57711,7 +57728,7 @@ components:
         - data
       type: object
     LLMObsDeletedPromptData:
-      description: Data object confirming that an LLM Observability prompt was deleted.
+      description: Data object confirming that an Agent Observability prompt was deleted.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsDeletedPromptDataAttributes"
@@ -57727,7 +57744,7 @@ components:
         - attributes
       type: object
     LLMObsDeletedPromptDataAttributes:
-      description: Attributes confirming that an LLM Observability prompt was deleted.
+      description: Attributes confirming that an Agent Observability prompt was deleted.
       properties:
         deleted_at:
           description: Timestamp when the prompt was deleted.
@@ -57743,7 +57760,7 @@ components:
         - deleted_at
       type: object
     LLMObsDeletedPromptResponse:
-      description: Response confirming that an LLM Observability prompt was deleted.
+      description: Response confirming that an Agent Observability prompt was deleted.
       example:
         data:
           attributes:
@@ -57833,7 +57850,7 @@ components:
       x-enum-varnames:
         - DISPLAY_BLOCK
     LLMObsEventType:
-      description: Resource type for LLM Observability experiment events.
+      description: Resource type for Agent Observability experiment events.
       enum:
         - events
       example: events
@@ -57841,7 +57858,7 @@ components:
       x-enum-varnames:
         - EVENTS
     LLMObsExperimentDataAttributesRequest:
-      description: Attributes for creating an LLM Observability experiment.
+      description: Attributes for creating an Agent Observability experiment.
       properties:
         config:
           additionalProperties: {}
@@ -57887,7 +57904,7 @@ components:
         - name
       type: object
     LLMObsExperimentDataAttributesResponse:
-      description: Attributes of an LLM Observability experiment.
+      description: Attributes of an Agent Observability experiment.
       properties:
         aggregate_data:
           additionalProperties: {}
@@ -57980,7 +57997,7 @@ components:
         - updated_at
       type: object
     LLMObsExperimentDataRequest:
-      description: Data object for creating an LLM Observability experiment.
+      description: Data object for creating an Agent Observability experiment.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsExperimentDataAttributesRequest"
@@ -57991,7 +58008,7 @@ components:
         - attributes
       type: object
     LLMObsExperimentDataResponse:
-      description: Data object for an LLM Observability experiment.
+      description: Data object for an Agent Observability experiment.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsExperimentDataAttributesResponse"
@@ -58101,7 +58118,7 @@ components:
         - attributes
       type: object
     LLMObsExperimentEventsRequest:
-      description: Request to push spans and metrics for an LLM Observability experiment.
+      description: Request to push spans and metrics for an Agent Observability experiment.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentEventsDataRequest"
@@ -58160,7 +58177,7 @@ components:
         - data
       type: object
     LLMObsExperimentMetric:
-      description: A metric associated with an LLM Observability experiment span.
+      description: A metric associated with an Agent Observability experiment span.
       properties:
         assessment:
           $ref: "#/components/schemas/LLMObsMetricAssessment"
@@ -58222,7 +58239,7 @@ components:
           type: string
       type: object
     LLMObsExperimentRequest:
-      description: Request to create an LLM Observability experiment.
+      description: Request to create an Agent Observability experiment.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentDataRequest"
@@ -58230,7 +58247,7 @@ components:
         - data
       type: object
     LLMObsExperimentResponse:
-      description: Response containing a single LLM Observability experiment.
+      description: Response containing a single Agent Observability experiment.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentDataResponse"
@@ -58238,7 +58255,7 @@ components:
         - data
       type: object
     LLMObsExperimentRunDataResponse:
-      description: Data object for an LLM Observability experiment run.
+      description: Data object for an Agent Observability experiment run.
       properties:
         aggregate_data:
           additionalProperties: {}
@@ -58266,7 +58283,7 @@ components:
           type: integer
       type: object
     LLMObsExperimentSpan:
-      description: A span associated with an LLM Observability experiment.
+      description: A span associated with an Agent Observability experiment.
       properties:
         dataset_id:
           description: Dataset ID associated with this span.
@@ -58452,7 +58469,7 @@ components:
         - data
       type: object
     LLMObsExperimentStatus:
-      description: Execution status of an LLM Observability experiment.
+      description: Execution status of an Agent Observability experiment.
       enum:
         - running
         - completed
@@ -58466,7 +58483,7 @@ components:
         - FAILED
         - INTERRUPTED
     LLMObsExperimentType:
-      description: Resource type of an LLM Observability experiment.
+      description: Resource type of an Agent Observability experiment.
       enum:
         - experiments
       example: experiments
@@ -58474,7 +58491,7 @@ components:
       x-enum-varnames:
         - EXPERIMENTS
     LLMObsExperimentUpdateDataAttributesRequest:
-      description: Attributes for updating an LLM Observability experiment.
+      description: Attributes for updating an Agent Observability experiment.
       properties:
         dataset_id:
           description: Updated identifier of the dataset used in this experiment.
@@ -58497,7 +58514,7 @@ components:
           $ref: "#/components/schemas/LLMObsExperimentStatus"
       type: object
     LLMObsExperimentUpdateDataRequest:
-      description: Data object for updating an LLM Observability experiment.
+      description: Data object for updating an Agent Observability experiment.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsExperimentUpdateDataAttributesRequest"
@@ -58508,7 +58525,7 @@ components:
         - attributes
       type: object
     LLMObsExperimentUpdateRequest:
-      description: Request to partially update an LLM Observability experiment.
+      description: Request to partially update an Agent Observability experiment.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentUpdateDataRequest"
@@ -58656,7 +58673,7 @@ components:
         - field
       type: object
     LLMObsExperimentationAnalyticsRequest:
-      description: Request to run an analytics aggregation over LLM Observability experimentation data.
+      description: Request to run an analytics aggregation over Agent Observability experimentation data.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentationAnalyticsDataRequest"
@@ -58847,7 +58864,7 @@ components:
         - attributes
       type: object
     LLMObsExperimentationSearchRequest:
-      description: Request to search across LLM Observability experimentation entities using cursor-based pagination.
+      description: Request to search across Agent Observability experimentation entities using cursor-based pagination.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentationSearchDataRequest"
@@ -58979,7 +58996,7 @@ components:
           type: integer
       type: object
     LLMObsExperimentationSimpleSearchRequest:
-      description: Request to search across LLM Observability experimentation entities using offset-based pagination.
+      description: Request to search across Agent Observability experimentation entities using offset-based pagination.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsExperimentationSimpleSearchDataRequest"
@@ -59027,7 +59044,7 @@ components:
       x-enum-varnames:
         - EXPERIMENTATION
     LLMObsExperimentsResponse:
-      description: Response containing a list of LLM Observability experiments.
+      description: Response containing a list of Agent Observability experiments.
       properties:
         data:
           description: List of experiments.
@@ -59645,7 +59662,7 @@ components:
         - BOOLEAN
         - TEXT
     LLMObsMetricAssessment:
-      description: Assessment result for an LLM Observability experiment metric.
+      description: Assessment result for an Agent Observability experiment metric.
       enum:
         - pass
         - fail
@@ -59655,7 +59672,7 @@ components:
         - PASS
         - FAIL
     LLMObsMetricScoreType:
-      description: Type of metric recorded for an LLM Observability experiment.
+      description: Type of metric recorded for an Agent Observability experiment.
       enum:
         - score
         - categorical
@@ -59830,7 +59847,7 @@ components:
         $ref: "#/components/schemas/LLMObsPatternsClusteredPoint"
       type: array
     LLMObsPatternsClusteredPointsResponse:
-      description: Response containing the clustered points of an LLM Observability topic.
+      description: Response containing the clustered points of an Agent Observability topic.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsClusteredPointsResponseData"
@@ -59838,7 +59855,7 @@ components:
         - data
       type: object
     LLMObsPatternsClusteredPointsResponseAttributes:
-      description: Attributes of an LLM Observability patterns clustered points response.
+      description: Attributes of an Agent Observability patterns clustered points response.
       properties:
         next_page_token:
           description: Pagination token for the next page of points. Null if there are no more pages.
@@ -59857,7 +59874,7 @@ components:
         - points
       type: object
     LLMObsPatternsClusteredPointsResponseData:
-      description: Data object of an LLM Observability patterns clustered points response.
+      description: Data object of an Agent Observability patterns clustered points response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsClusteredPointsResponseAttributes"
@@ -59873,7 +59890,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsClusteredPointsType:
-      description: Resource type of an LLM Observability patterns clustered points response.
+      description: Resource type of an Agent Observability patterns clustered points response.
       enum:
         - clustered_points_response
       example: clustered_points_response
@@ -59881,7 +59898,7 @@ components:
       x-enum-varnames:
         - CLUSTERED_POINTS_RESPONSE
     LLMObsPatternsConfigAttributes:
-      description: Attributes of an LLM Observability patterns configuration.
+      description: Attributes of an Agent Observability patterns configuration.
       properties:
         account_id:
           description: Integration account ID for a bring-your-own-model configuration.
@@ -59953,7 +59970,7 @@ components:
         - updated_at
       type: object
     LLMObsPatternsConfigItem:
-      description: A single LLM Observability patterns configuration in a list response.
+      description: A single Agent Observability patterns configuration in a list response.
       properties:
         account_id:
           description: Integration account ID for a bring-your-own-model configuration.
@@ -60035,7 +60052,7 @@ components:
         $ref: "#/components/schemas/LLMObsPatternsConfigItem"
       type: array
     LLMObsPatternsConfigResponse:
-      description: Response containing a single LLM Observability patterns configuration.
+      description: Response containing a single Agent Observability patterns configuration.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsConfigResponseData"
@@ -60043,7 +60060,7 @@ components:
         - data
       type: object
     LLMObsPatternsConfigResponseData:
-      description: Data object of an LLM Observability patterns configuration.
+      description: Data object of an Agent Observability patterns configuration.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsConfigAttributes"
@@ -60096,7 +60113,7 @@ components:
           type: number
       type: object
     LLMObsPatternsConfigType:
-      description: Resource type of an LLM Observability patterns configuration.
+      description: Resource type of an Agent Observability patterns configuration.
       enum:
         - topic_discovery_configs
       example: topic_discovery_configs
@@ -60104,7 +60121,7 @@ components:
       x-enum-varnames:
         - TOPIC_DISCOVERY_CONFIGS
     LLMObsPatternsConfigUpsertRequest:
-      description: Request to create or update an LLM Observability patterns configuration.
+      description: Request to create or update an Agent Observability patterns configuration.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsConfigUpsertRequestData"
@@ -60112,7 +60129,7 @@ components:
         - data
       type: object
     LLMObsPatternsConfigUpsertRequestAttributes:
-      description: Attributes for creating or updating an LLM Observability patterns configuration.
+      description: Attributes for creating or updating an Agent Observability patterns configuration.
       properties:
         account_id:
           description: Integration account ID for a bring-your-own-model configuration.
@@ -60171,7 +60188,7 @@ components:
         - hierarchy_depth
       type: object
     LLMObsPatternsConfigUpsertRequestData:
-      description: Data object for creating or updating an LLM Observability patterns configuration.
+      description: Data object for creating or updating an Agent Observability patterns configuration.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsConfigUpsertRequestAttributes"
@@ -60182,7 +60199,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsConfigsListType:
-      description: Resource type of a list of LLM Observability patterns configurations.
+      description: Resource type of a list of Agent Observability patterns configurations.
       enum:
         - list_topic_discovery_configs_response
       example: list_topic_discovery_configs_response
@@ -60190,7 +60207,7 @@ components:
       x-enum-varnames:
         - LIST_TOPIC_DISCOVERY_CONFIGS_RESPONSE
     LLMObsPatternsConfigsResponse:
-      description: Response containing a list of LLM Observability patterns configurations.
+      description: Response containing a list of Agent Observability patterns configurations.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsConfigsResponseData"
@@ -60198,7 +60215,7 @@ components:
         - data
       type: object
     LLMObsPatternsConfigsResponseAttributes:
-      description: Attributes of a list of LLM Observability patterns configurations.
+      description: Attributes of a list of Agent Observability patterns configurations.
       properties:
         configs:
           $ref: "#/components/schemas/LLMObsPatternsConfigItemsList"
@@ -60206,7 +60223,7 @@ components:
         - configs
       type: object
     LLMObsPatternsConfigsResponseData:
-      description: Data object of a list of LLM Observability patterns configurations.
+      description: Data object of a list of Agent Observability patterns configurations.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsConfigsResponseAttributes"
@@ -60227,7 +60244,7 @@ components:
         $ref: "#/components/schemas/LLMObsPatternsActivityProgress"
       type: array
     LLMObsPatternsRequestType:
-      description: Resource type for triggering an LLM Observability patterns run.
+      description: Resource type for triggering an Agent Observability patterns run.
       enum:
         - topic_discovery
       example: topic_discovery
@@ -60235,7 +60252,7 @@ components:
       x-enum-varnames:
         - TOPIC_DISCOVERY
     LLMObsPatternsRunStatusResponse:
-      description: Response containing the status of an LLM Observability patterns run.
+      description: Response containing the status of an Agent Observability patterns run.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsRunStatusResponseData"
@@ -60243,7 +60260,7 @@ components:
         - data
       type: object
     LLMObsPatternsRunStatusResponseAttributes:
-      description: Attributes of an LLM Observability patterns run status.
+      description: Attributes of an Agent Observability patterns run status.
       properties:
         created_at:
           description: Timestamp when the run was created.
@@ -60267,7 +60284,7 @@ components:
         - progress
       type: object
     LLMObsPatternsRunStatusResponseData:
-      description: Data object of an LLM Observability patterns run status response.
+      description: Data object of an Agent Observability patterns run status response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsRunStatusResponseAttributes"
@@ -60283,7 +60300,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsRunStatusType:
-      description: Resource type of an LLM Observability patterns run status.
+      description: Resource type of an Agent Observability patterns run status.
       enum:
         - topic_discovery_run_status
       example: topic_discovery_run_status
@@ -60291,7 +60308,7 @@ components:
       x-enum-varnames:
         - TOPIC_DISCOVERY_RUN_STATUS
     LLMObsPatternsRunSummary:
-      description: Summary of an LLM Observability patterns run.
+      description: Summary of an Agent Observability patterns run.
       properties:
         completed_at:
           description: Timestamp when the run completed. Null if the run has not completed.
@@ -60325,7 +60342,7 @@ components:
         $ref: "#/components/schemas/LLMObsPatternsRunSummary"
       type: array
     LLMObsPatternsRunsListType:
-      description: Resource type of a list of LLM Observability patterns runs.
+      description: Resource type of a list of Agent Observability patterns runs.
       enum:
         - list_topic_discovery_runs_response
       example: list_topic_discovery_runs_response
@@ -60333,7 +60350,7 @@ components:
       x-enum-varnames:
         - LIST_TOPIC_DISCOVERY_RUNS_RESPONSE
     LLMObsPatternsRunsResponse:
-      description: Response containing the completed runs of an LLM Observability patterns configuration.
+      description: Response containing the completed runs of an Agent Observability patterns configuration.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsRunsResponseData"
@@ -60341,7 +60358,7 @@ components:
         - data
       type: object
     LLMObsPatternsRunsResponseAttributes:
-      description: Attributes of an LLM Observability patterns runs response.
+      description: Attributes of an Agent Observability patterns runs response.
       properties:
         runs:
           $ref: "#/components/schemas/LLMObsPatternsRunsList"
@@ -60349,7 +60366,7 @@ components:
         - runs
       type: object
     LLMObsPatternsRunsResponseData:
-      description: Data object of an LLM Observability patterns runs response.
+      description: Data object of an Agent Observability patterns runs response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsRunsResponseAttributes"
@@ -60365,7 +60382,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsTopic:
-      description: A topic discovered by an LLM Observability patterns run.
+      description: A topic discovered by an Agent Observability patterns run.
       properties:
         created_at:
           description: Timestamp when the topic was created.
@@ -60425,7 +60442,7 @@ components:
       type: object
     LLMObsPatternsTopicWithClusteredPoints:
       description: |-
-        A topic discovered by an LLM Observability patterns run, including the
+        A topic discovered by an Agent Observability patterns run, including the
         clustered points attached to leaf topics.
       properties:
         cluster_points:
@@ -60492,7 +60509,7 @@ components:
         $ref: "#/components/schemas/LLMObsPatternsTopic"
       type: array
     LLMObsPatternsTopicsResponse:
-      description: Response containing the topics discovered by an LLM Observability patterns run.
+      description: Response containing the topics discovered by an Agent Observability patterns run.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsTopicsResponseData"
@@ -60500,7 +60517,7 @@ components:
         - data
       type: object
     LLMObsPatternsTopicsResponseAttributes:
-      description: Attributes of an LLM Observability patterns topics response.
+      description: Attributes of an Agent Observability patterns topics response.
       properties:
         completed_at:
           description: Timestamp when the run completed. Null if the run has not completed.
@@ -60537,7 +60554,7 @@ components:
         - topics
       type: object
     LLMObsPatternsTopicsResponseData:
-      description: Data object of an LLM Observability patterns topics response.
+      description: Data object of an Agent Observability patterns topics response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsTopicsResponseAttributes"
@@ -60553,7 +60570,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsTopicsType:
-      description: Resource type of an LLM Observability patterns topics response.
+      description: Resource type of an Agent Observability patterns topics response.
       enum:
         - get_topics_response
       example: get_topics_response
@@ -60568,7 +60585,7 @@ components:
     LLMObsPatternsTopicsWithClusteredPointsResponse:
       description: |-
         Response containing the topics, and the clustered points of their leaf topics,
-        discovered by an LLM Observability patterns run.
+        discovered by an Agent Observability patterns run.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsTopicsWithClusteredPointsResponseData"
@@ -60576,7 +60593,7 @@ components:
         - data
       type: object
     LLMObsPatternsTopicsWithClusteredPointsResponseAttributes:
-      description: Attributes of an LLM Observability patterns topics-with-clustered-points response.
+      description: Attributes of an Agent Observability patterns topics-with-clustered-points response.
       properties:
         completed_at:
           description: Timestamp when the run completed. Null if the run has not completed.
@@ -60613,7 +60630,7 @@ components:
         - topics
       type: object
     LLMObsPatternsTopicsWithClusteredPointsResponseData:
-      description: Data object of an LLM Observability patterns topics-with-clustered-points response.
+      description: Data object of an Agent Observability patterns topics-with-clustered-points response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsTopicsWithClusteredPointsResponseAttributes"
@@ -60629,7 +60646,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsTopicsWithClusteredPointsType:
-      description: Resource type of an LLM Observability patterns topics-with-clustered-points response.
+      description: Resource type of an Agent Observability patterns topics-with-clustered-points response.
       enum:
         - get_topics_with_cluster_points_response
       example: get_topics_with_cluster_points_response
@@ -60637,7 +60654,7 @@ components:
       x-enum-varnames:
         - GET_TOPICS_WITH_CLUSTER_POINTS_RESPONSE
     LLMObsPatternsTriggerRequest:
-      description: Request to trigger an LLM Observability patterns run.
+      description: Request to trigger an Agent Observability patterns run.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsTriggerRequestData"
@@ -60645,7 +60662,7 @@ components:
         - data
       type: object
     LLMObsPatternsTriggerRequestAttributes:
-      description: Attributes for triggering an LLM Observability patterns run.
+      description: Attributes for triggering an Agent Observability patterns run.
       properties:
         config_id:
           description: The ID of the patterns configuration to run.
@@ -60655,7 +60672,7 @@ components:
         - config_id
       type: object
     LLMObsPatternsTriggerRequestData:
-      description: Data object for triggering an LLM Observability patterns run.
+      description: Data object for triggering an Agent Observability patterns run.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsTriggerRequestAttributes"
@@ -60666,7 +60683,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsTriggerResponse:
-      description: Response after triggering an LLM Observability patterns run.
+      description: Response after triggering an Agent Observability patterns run.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsPatternsTriggerResponseData"
@@ -60674,7 +60691,7 @@ components:
         - data
       type: object
     LLMObsPatternsTriggerResponseAttributes:
-      description: Attributes of an LLM Observability patterns trigger response.
+      description: Attributes of an Agent Observability patterns trigger response.
       properties:
         config_id:
           description: The ID of the patterns configuration that was run.
@@ -60694,7 +60711,7 @@ components:
         - status
       type: object
     LLMObsPatternsTriggerResponseData:
-      description: Data object of an LLM Observability patterns trigger response.
+      description: Data object of an Agent Observability patterns trigger response.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPatternsTriggerResponseAttributes"
@@ -60710,7 +60727,7 @@ components:
         - attributes
       type: object
     LLMObsPatternsTriggerResponseType:
-      description: Resource type of an LLM Observability patterns trigger response.
+      description: Resource type of an Agent Observability patterns trigger response.
       enum:
         - topic_discovery_run
       example: topic_discovery_run
@@ -60718,7 +60735,7 @@ components:
       x-enum-varnames:
         - TOPIC_DISCOVERY_RUN
     LLMObsProjectDataAttributesRequest:
-      description: Attributes for creating an LLM Observability project.
+      description: Attributes for creating an Agent Observability project.
       properties:
         description:
           description: Description of the project.
@@ -60731,7 +60748,7 @@ components:
         - name
       type: object
     LLMObsProjectDataAttributesResponse:
-      description: Attributes of an LLM Observability project.
+      description: Attributes of an Agent Observability project.
       properties:
         created_at:
           description: Timestamp when the project was created.
@@ -60759,7 +60776,7 @@ components:
         - updated_at
       type: object
     LLMObsProjectDataRequest:
-      description: Data object for creating an LLM Observability project.
+      description: Data object for creating an Agent Observability project.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsProjectDataAttributesRequest"
@@ -60770,7 +60787,7 @@ components:
         - attributes
       type: object
     LLMObsProjectDataResponse:
-      description: Data object for an LLM Observability project.
+      description: Data object for an Agent Observability project.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsProjectDataAttributesResponse"
@@ -60786,7 +60803,7 @@ components:
         - attributes
       type: object
     LLMObsProjectRequest:
-      description: Request to create an LLM Observability project.
+      description: Request to create an Agent Observability project.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsProjectDataRequest"
@@ -60794,7 +60811,7 @@ components:
         - data
       type: object
     LLMObsProjectResponse:
-      description: Response containing a single LLM Observability project.
+      description: Response containing a single Agent Observability project.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsProjectDataResponse"
@@ -60802,7 +60819,7 @@ components:
         - data
       type: object
     LLMObsProjectType:
-      description: Resource type of an LLM Observability project.
+      description: Resource type of an Agent Observability project.
       enum:
         - projects
       example: projects
@@ -60810,7 +60827,7 @@ components:
       x-enum-varnames:
         - PROJECTS
     LLMObsProjectUpdateDataAttributesRequest:
-      description: Attributes for updating an LLM Observability project.
+      description: Attributes for updating an Agent Observability project.
       properties:
         description:
           description: Updated description of the project.
@@ -60820,7 +60837,7 @@ components:
           type: string
       type: object
     LLMObsProjectUpdateDataRequest:
-      description: Data object for updating an LLM Observability project.
+      description: Data object for updating an Agent Observability project.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsProjectUpdateDataAttributesRequest"
@@ -60831,7 +60848,7 @@ components:
         - attributes
       type: object
     LLMObsProjectUpdateRequest:
-      description: Request to partially update an LLM Observability project.
+      description: Request to partially update an Agent Observability project.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsProjectUpdateDataRequest"
@@ -60839,7 +60856,7 @@ components:
         - data
       type: object
     LLMObsProjectsResponse:
-      description: Response containing a list of LLM Observability projects.
+      description: Response containing a list of Agent Observability projects.
       properties:
         data:
           description: List of projects.
@@ -60874,7 +60891,7 @@ components:
       type: array
       x-generate-alias-as-model: true
     LLMObsPromptData:
-      description: Data object for an LLM Observability prompt.
+      description: Data object for an Agent Observability prompt.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPromptDataAttributes"
@@ -60890,7 +60907,7 @@ components:
         - attributes
       type: object
     LLMObsPromptDataAttributes:
-      description: Attributes of an LLM Observability prompt registry entry.
+      description: Attributes of an Agent Observability prompt registry entry.
       properties:
         author:
           description: UUID of the user who authored the prompt.
@@ -60975,7 +60992,7 @@ components:
         - id
       type: object
     LLMObsPromptResponse:
-      description: Response containing a single LLM Observability prompt.
+      description: Response containing a single Agent Observability prompt.
       example:
         data:
           attributes:
@@ -61008,7 +61025,7 @@ components:
         - REGISTRY
         - CODE
     LLMObsPromptSDKData:
-      description: Data object for a flattened LLM Observability prompt version returned for SDK consumption.
+      description: Data object for a flattened Agent Observability prompt version returned for SDK consumption.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPromptSDKDataAttributes"
@@ -61057,7 +61074,7 @@ components:
           type: string
       type: object
     LLMObsPromptSDKResponse:
-      description: Response containing a flattened LLM Observability prompt version for SDK consumption.
+      description: Response containing a flattened Agent Observability prompt version for SDK consumption.
       example:
         data:
           attributes:
@@ -61089,7 +61106,7 @@ components:
       pattern: ".*\\S.*"
       type: string
     LLMObsPromptType:
-      description: Resource type of an LLM Observability prompt.
+      description: Resource type of an Agent Observability prompt.
       enum:
         - prompt-templates
       example: prompt-templates
@@ -61097,7 +61114,7 @@ components:
       x-enum-varnames:
         - PROMPT_TEMPLATES
     LLMObsPromptVersionData:
-      description: Data object for a specific version of an LLM Observability prompt.
+      description: Data object for a specific version of an Agent Observability prompt.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsPromptVersionDataAttributes"
@@ -61113,7 +61130,7 @@ components:
         - attributes
       type: object
     LLMObsPromptVersionDataAttributes:
-      description: Attributes of a specific version of an LLM Observability prompt.
+      description: Attributes of a specific version of an Agent Observability prompt.
       properties:
         author:
           description: UUID of the user who authored this version.
@@ -61183,7 +61200,7 @@ components:
         - version
       type: object
     LLMObsPromptVersionLabel:
-      description: A label attached to an LLM Observability prompt version.
+      description: A label attached to an Agent Observability prompt version.
       enum:
         - production
         - development
@@ -61275,7 +61292,7 @@ components:
         - version
       type: object
     LLMObsPromptVersionResponse:
-      description: Response containing a specific version of an LLM Observability prompt.
+      description: Response containing a specific version of an Agent Observability prompt.
       example:
         data:
           attributes:
@@ -61300,7 +61317,7 @@ components:
         - data
       type: object
     LLMObsPromptVersionType:
-      description: Resource type of an LLM Observability prompt version.
+      description: Resource type of an Agent Observability prompt version.
       enum:
         - prompt-template-versions
       example: prompt-template-versions
@@ -61308,7 +61325,7 @@ components:
       x-enum-varnames:
         - PROMPT_TEMPLATE_VERSIONS
     LLMObsPromptVersionsResponse:
-      description: Response containing the versions of an LLM Observability prompt.
+      description: Response containing the versions of an Agent Observability prompt.
       example:
         data:
           - attributes:
@@ -61341,7 +61358,7 @@ components:
         - data
       type: object
     LLMObsPromptsResponse:
-      description: Response containing a list of LLM Observability prompts.
+      description: Response containing a list of Agent Observability prompts.
       example:
         data:
           - attributes:
@@ -61359,7 +61376,7 @@ components:
             type: prompt-templates
       properties:
         data:
-          description: List of LLM Observability prompts.
+          description: List of Agent Observability prompts.
           items:
             $ref: "#/components/schemas/LLMObsPromptData"
           type: array
@@ -61367,7 +61384,7 @@ components:
         - data
       type: object
     LLMObsRecordType:
-      description: Resource type of LLM Observability dataset records.
+      description: Resource type of Agent Observability dataset records.
       enum:
         - records
       example: records
@@ -61375,7 +61392,7 @@ components:
       x-enum-varnames:
         - RECORDS
     LLMObsSearchSpansRequest:
-      description: Request body for searching LLM Observability spans.
+      description: Request body for searching Agent Observability spans.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsSearchSpansRequestData"
@@ -61383,7 +61400,7 @@ components:
         - data
       type: object
     LLMObsSearchSpansRequestAttributes:
-      description: Attributes of an LLM Observability spans search request.
+      description: Attributes of an Agent Observability spans search request.
       properties:
         filter:
           $ref: "#/components/schemas/LLMObsSpanFilter"
@@ -61397,7 +61414,7 @@ components:
           type: string
       type: object
     LLMObsSearchSpansRequestData:
-      description: Data object for an LLM Observability spans search request.
+      description: Data object for an Agent Observability spans search request.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsSearchSpansRequestAttributes"
@@ -61408,7 +61425,7 @@ components:
         - attributes
       type: object
     LLMObsSearchSpansRequestType:
-      description: Resource type for an LLM Observability spans search request.
+      description: Resource type for an Agent Observability spans search request.
       enum:
         - spans
       example: spans
@@ -61416,7 +61433,7 @@ components:
       x-enum-varnames:
         - SPANS
     LLMObsSpanAttributes:
-      description: Attributes of an LLM Observability span.
+      description: Attributes of an Agent Observability span.
       properties:
         duration:
           description: Duration of the span in nanoseconds.
@@ -61506,7 +61523,7 @@ components:
         - span_kind
       type: object
     LLMObsSpanData:
-      description: A single LLM Observability span.
+      description: A single Agent Observability span.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsSpanAttributes"
@@ -61522,7 +61539,7 @@ components:
         - attributes
       type: object
     LLMObsSpanEvaluationMetric:
-      description: An evaluation metric associated with an LLM Observability span.
+      description: An evaluation metric associated with an Agent Observability span.
       properties:
         assessment:
           description: Assessment result (e.g., pass or fail).
@@ -61547,7 +61564,7 @@ components:
           description: Value of the evaluation result.
       type: object
     LLMObsSpanFilter:
-      description: Filter criteria for an LLM Observability span search.
+      description: Filter criteria for an Agent Observability span search.
       properties:
         from:
           description: Start of the time range. Accepts ISO 8601 or relative format (e.g., `now-15m`). Defaults to `now-15m`.
@@ -61559,7 +61576,7 @@ components:
           type: string
         query:
           description: >-
-            Search query using LLM Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`span_id`, `trace_id`, etc.) are ignored.
+            Search query using Agent Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`span_id`, `trace_id`, etc.) are ignored.
           example: "@session_id:abc123def456"
           type: string
         span_id:
@@ -61589,7 +61606,7 @@ components:
           type: string
       type: object
     LLMObsSpanIO:
-      description: Input or output content of an LLM Observability span.
+      description: Input or output content of an Agent Observability span.
       properties:
         messages:
           description: List of messages in the input or output.
@@ -61700,7 +61717,7 @@ components:
           type: string
       type: object
     LLMObsSpanType:
-      description: Resource type for an LLM Observability span.
+      description: Resource type for an Agent Observability span.
       enum:
         - span
       example: span
@@ -61708,7 +61725,7 @@ components:
       x-enum-varnames:
         - SPAN
     LLMObsSpansResponse:
-      description: Response containing a list of LLM Observability spans.
+      description: Response containing a list of Agent Observability spans.
       properties:
         data:
           description: List of spans matching the query.
@@ -61860,7 +61877,7 @@ components:
         - EXPERIMENT_TRACE
         - SESSION
     LLMObsUpdatePromptData:
-      description: Data object for updating an LLM Observability prompt.
+      description: Data object for updating an Agent Observability prompt.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsUpdatePromptDataAttributes"
@@ -61873,7 +61890,7 @@ components:
     LLMObsUpdatePromptDataAttributes:
       additionalProperties: false
       description: >-
-        Attributes for updating an LLM Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
+        Attributes for updating an Agent Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
       minProperties: 1
       properties:
         description:
@@ -61884,7 +61901,7 @@ components:
           type: string
       type: object
     LLMObsUpdatePromptRequest:
-      description: Request to update an LLM Observability prompt's metadata.
+      description: Request to update an Agent Observability prompt's metadata.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsUpdatePromptData"
@@ -61892,7 +61909,7 @@ components:
         - data
       type: object
     LLMObsUpdatePromptVersionData:
-      description: Data object for updating an LLM Observability prompt version.
+      description: Data object for updating an Agent Observability prompt version.
       properties:
         attributes:
           $ref: "#/components/schemas/LLMObsUpdatePromptVersionDataAttributes"
@@ -61905,7 +61922,7 @@ components:
     LLMObsUpdatePromptVersionDataAttributes:
       additionalProperties: false
       description: >-
-        Attributes for updating an LLM Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
+        Attributes for updating an Agent Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
       minProperties: 1
       properties:
         description:
@@ -61925,7 +61942,7 @@ components:
           type: array
       type: object
     LLMObsUpdatePromptVersionRequest:
-      description: Request to update an LLM Observability prompt version's metadata or feature-flag environments.
+      description: Request to update an Agent Observability prompt version's metadata or feature-flag environments.
       properties:
         data:
           $ref: "#/components/schemas/LLMObsUpdatePromptVersionData"
@@ -90311,6 +90328,180 @@ components:
             $ref: "#/components/schemas/RumRetentionFilterData"
           type: array
       type: object
+    RumRetentionQuotaAdaptiveConfig:
+      description: The configuration used when `mode` is `adaptive`.
+      properties:
+        max_retention_rate:
+          description: The maximum fraction of sessions to retain, in the range `(0, 1]`.
+          example: 0.5
+          exclusiveMinimum: true
+          format: double
+          maximum: 1
+          minimum: 0
+          type: number
+      required:
+        - max_retention_rate
+      type: object
+    RumRetentionQuotaConfigAttributes:
+      description: The RUM retention quota configuration properties.
+      properties:
+        adaptive:
+          $ref: "#/components/schemas/RumRetentionQuotaAdaptiveConfig"
+        custom:
+          $ref: "#/components/schemas/RumRetentionQuotaCustomConfig"
+        mode:
+          $ref: "#/components/schemas/RumRetentionQuotaMode"
+        org_id:
+          description: The ID of the organization the retention quota configuration belongs to.
+          example: 2
+          format: int64
+          type: integer
+        updated_at:
+          description: The date the retention quota configuration was last updated.
+          example: "2026-03-04T15:37:54.951447Z"
+          format: date-time
+          type: string
+        updated_by:
+          description: The handle of the user who last updated the retention quota configuration.
+          example: test@example.com
+          type: string
+      required:
+        - mode
+        - org_id
+      type: object
+    RumRetentionQuotaConfigData:
+      description: The RUM retention quota configuration object.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigAttributes"
+        id:
+          description: The identifier of the scope the retention quota configuration applies to.
+          example: cd73a516-a481-4af5-8352-9b577465c77b
+          type: string
+        type:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigType"
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    RumRetentionQuotaConfigResponse:
+      description: The RUM retention quota configuration response.
+      properties:
+        data:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigData"
+      required:
+        - data
+      type: object
+    RumRetentionQuotaConfigType:
+      default: rum_quota_config
+      description: The type of the resource, always `rum_quota_config`.
+      enum:
+        - rum_quota_config
+      example: rum_quota_config
+      type: string
+      x-enum-varnames: ["RUM_QUOTA_CONFIG"]
+    RumRetentionQuotaConfigUpdateAttributes:
+      description: The RUM retention quota configuration properties to create or update.
+      properties:
+        adaptive:
+          $ref: "#/components/schemas/RumRetentionQuotaAdaptiveConfig"
+        custom:
+          $ref: "#/components/schemas/RumRetentionQuotaCustomConfig"
+        mode:
+          $ref: "#/components/schemas/RumRetentionQuotaMode"
+      required:
+        - mode
+      type: object
+    RumRetentionQuotaConfigUpdateData:
+      description: The RUM retention quota configuration to create or update.
+      properties:
+        attributes:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigUpdateAttributes"
+        id:
+          description: |-
+            The identifier of the scope the retention quota configuration applies to.
+            Must match `scope_id` in the path.
+          example: cd73a516-a481-4af5-8352-9b577465c77b
+          type: string
+        type:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigType"
+      required:
+        - id
+        - type
+        - attributes
+      type: object
+    RumRetentionQuotaConfigUpdateRequest:
+      description: The body of a request to create or update a RUM retention quota configuration.
+      properties:
+        data:
+          $ref: "#/components/schemas/RumRetentionQuotaConfigUpdateData"
+      required:
+        - data
+      type: object
+    RumRetentionQuotaCustomConfig:
+      description: The configuration used when `mode` is `custom`.
+      properties:
+        daily_reset_time:
+          description: The time of day when the daily quota resets, in `HH:MM` 24-hour format.
+          example: "08:00"
+          pattern: "^([01]\\d|2[0-3]):[0-5]\\d$"
+          type: string
+        daily_reset_timezone:
+          description: The timezone offset used for the daily reset time, in `±HH:MM` format.
+          example: "+09:00"
+          pattern: "^[+-](0\\d|1[0-4]):[0-5]\\d$"
+          type: string
+        quota_reached_action:
+          $ref: "#/components/schemas/RumRetentionQuotaReachedAction"
+        session_limit:
+          description: The maximum number of sessions allowed within the window. Must be at least `1000`.
+          example: 1000000
+          format: int64
+          minimum: 1000
+          type: integer
+        window_type:
+          $ref: "#/components/schemas/RumRetentionQuotaWindowType"
+      required:
+        - window_type
+        - session_limit
+        - daily_reset_time
+        - daily_reset_timezone
+        - quota_reached_action
+      type: object
+    RumRetentionQuotaMode:
+      description: |-
+        The retention quota mode. `custom` enforces a fixed session limit, while
+        `adaptive` dynamically adjusts retention.
+      enum:
+        - custom
+        - adaptive
+      example: custom
+      type: string
+      x-enum-varnames: ["CUSTOM", "ADAPTIVE"]
+    RumRetentionQuotaReachedAction:
+      description: The action to take when the session quota is reached.
+      enum:
+        - stop
+        - slowdown
+      example: stop
+      type: string
+      x-enum-varnames: ["STOP", "SLOWDOWN"]
+    RumRetentionQuotaScopeType:
+      default: application
+      description: The type of scope the retention quota configuration applies to.
+      enum:
+        - application
+      example: application
+      type: string
+      x-enum-varnames: ["APPLICATION"]
+    RumRetentionQuotaWindowType:
+      description: The window type over which the session limit is enforced.
+      enum:
+        - daily
+      example: daily
+      type: string
+      x-enum-varnames: ["DAILY"]
     RumSdkConfigAllowedTracingUrlList:
       description: A list of URL configurations for distributed tracing.
       items:
@@ -120316,6 +120507,7 @@ components:
             incident_write: Create, view, and manage incidents in Datadog.
             integrations_read: View configured integrations and their settings.
             logs_modify_indexes: Modify log indexes, filters, exclusion filters, and configurations.
+            logs_read_data: Read log data.
             logs_read_index_data: Read indexed log data.
             manage_integrations: Install, uninstall, and configure integrations.
             metrics_read: View custom metrics.
@@ -120924,7 +121116,7 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/unstable/llm-obs/config/evaluators/custom:
     get:
-      description: List all custom LLM Observability evaluator configurations for the organization.
+      description: List all custom Agent Observability evaluator configurations for the organization.
       operationId: ListLLMObsCustomEvalConfigs
       responses:
         "200":
@@ -120979,13 +121171,13 @@ paths:
           appKeyAuth: []
       summary: List custom evaluator configurations
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/unstable/llm-obs/config/evaluators/custom/{eval_name}:
     delete:
-      description: Delete a custom LLM Observability evaluator configuration by its name.
+      description: Delete a custom Agent Observability evaluator configuration by its name.
       operationId: DeleteLLMObsCustomEvalConfig
       parameters:
         - $ref: "#/components/parameters/LLMObsEvalNamePathParameter"
@@ -121023,12 +121215,12 @@ paths:
           appKeyAuth: []
       summary: Delete a custom evaluator configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     get:
-      description: Retrieve a custom LLM Observability evaluator configuration by its name.
+      description: Retrieve a custom Agent Observability evaluator configuration by its name.
       operationId: GetLLMObsCustomEvalConfig
       parameters:
         - $ref: "#/components/parameters/LLMObsEvalNamePathParameter"
@@ -121097,12 +121289,12 @@ paths:
           appKeyAuth: []
       summary: Get a custom evaluator configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     put:
-      description: Create or update a custom LLM Observability evaluator configuration by its name.
+      description: Create or update a custom Agent Observability evaluator configuration by its name.
       operationId: UpdateLLMObsCustomEvalConfig
       parameters:
         - $ref: "#/components/parameters/LLMObsEvalNamePathParameter"
@@ -121210,7 +121402,7 @@ paths:
           appKeyAuth: []
       summary: Create or update a custom evaluator configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -143386,6 +143578,11 @@ paths:
           $ref: "#/components/responses/NotAuthorizedResponse"
         "429":
           $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+        - AuthZ:
+            - events_read
       summary: Search events
       tags: ["Events"]
       x-codegen-request-body-name: body
@@ -159620,7 +159817,7 @@ paths:
           appKeyAuth: []
       summary: Get annotated interactions by content IDs
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -159689,9 +159886,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability annotation queues
+      summary: List Agent Observability annotation queues
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -159785,9 +159982,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create an LLM Observability annotation queue
+      summary: Create an Agent Observability annotation queue
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -159823,9 +160020,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete an LLM Observability annotation queue
+      summary: Delete an Agent Observability annotation queue
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -159901,9 +160098,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update an LLM Observability annotation queue
+      summary: Update an Agent Observability annotation queue
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -159963,7 +160160,7 @@ paths:
           appKeyAuth: []
       summary: Get annotated queue interactions
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160052,7 +160249,7 @@ paths:
           appKeyAuth: []
       summary: Create or update annotations
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160138,7 +160335,7 @@ paths:
           appKeyAuth: []
       summary: Delete annotations
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160257,7 +160454,7 @@ paths:
           appKeyAuth: []
       summary: Add annotation queue interactions
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160317,7 +160514,7 @@ paths:
           appKeyAuth: []
       summary: Delete annotation queue interactions
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160387,7 +160584,7 @@ paths:
           appKeyAuth: []
       summary: Get annotation queue label schema
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -160532,14 +160729,14 @@ paths:
           appKeyAuth: []
       summary: Update annotation queue label schema
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experimentation/analytics:
     post:
       description: |-
-        Execute an analytics aggregation over LLM Observability experimentation data.
+        Execute an analytics aggregation over Agent Observability experimentation data.
         Use this endpoint to compute metrics (for example average eval scores) grouped by fields such as `span_id` or `experiment_id`.
 
         At least one `compute` definition and one `index` must be provided.
@@ -160617,16 +160814,16 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Aggregate LLM Observability experimentation
+      summary: Aggregate Agent Observability experimentation
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experimentation/search:
     post:
       description: |-
-        Search across LLM Observability experimentation entities — projects, datasets, dataset records, experiments, and experiment runs — using cursor-based pagination.
+        Search across Agent Observability experimentation entities — projects, datasets, dataset records, experiments, and experiment runs — using cursor-based pagination.
 
         The `filter.scope` field controls which entity types are returned. At least one valid scope must be provided.
 
@@ -160727,16 +160924,16 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Search LLM Observability experimentation entities
+      summary: Search Agent Observability experimentation
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experimentation/simple-search:
     post:
       description: |-
-        Search across LLM Observability experimentation entities using offset-based (page-number) pagination.
+        Search across Agent Observability experimentation entities using offset-based (page-number) pagination.
         Use this endpoint when you need total page count or want to navigate to a specific page number.
 
         The `filter.scope` field controls which entity types are returned. At least one valid scope must be provided.
@@ -160822,13 +161019,13 @@ paths:
           appKeyAuth: []
       summary: Simple search experimentation entities
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experiments:
     get:
-      description: List all LLM Observability experiments sorted by creation date, newest first.
+      description: List all Agent Observability experiments sorted by creation date, newest first.
       operationId: ListLLMObsExperiments
       parameters:
         - description: Filter experiments by project ID. Required if `filter[dataset_id]` is not provided.
@@ -160945,14 +161142,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability experiments
+      summary: List Agent Observability experiments
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Create a new LLM Observability experiment.
+      description: Create a new Agent Observability experiment.
       operationId: CreateLLMObsExperiment
       requestBody:
         content:
@@ -161036,15 +161233,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create an LLM Observability experiment
+      summary: Create an Agent Observability experiment
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experiments/delete:
     post:
-      description: Delete one or more LLM Observability experiments.
+      description: Delete one or more Agent Observability experiments.
       operationId: DeleteLLMObsExperiments
       requestBody:
         content:
@@ -161087,15 +161284,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete LLM Observability experiments
+      summary: Delete Agent Observability experiments
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/experiments/{experiment_id}:
     patch:
-      description: Partially update an existing LLM Observability experiment.
+      description: Partially update an existing Agent Observability experiment.
       operationId: UpdateLLMObsExperiment
       parameters:
         - $ref: "#/components/parameters/LLMObsExperimentIDPathParameter"
@@ -161162,9 +161359,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update an LLM Observability experiment
+      summary: Update an Agent Observability experiment
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -161233,14 +161430,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability experiment spans (v1)
+      summary: List Agent Observability experiment spans (v1)
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Push spans and metrics for an LLM Observability experiment.
+      description: Push spans and metrics for an Agent Observability experiment.
       operationId: CreateLLMObsExperimentEvents
       parameters:
         - $ref: "#/components/parameters/LLMObsExperimentIDPathParameter"
@@ -161304,9 +161501,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Push events for an LLM Observability experiment
+      summary: Push events for an Agent Observability experiment
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -161358,7 +161555,7 @@ paths:
           appKeyAuth: []
       summary: List LLM integration accounts
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in Preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -161442,7 +161639,7 @@ paths:
           appKeyAuth: []
       summary: Run an LLM inference
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in Preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -161499,13 +161696,13 @@ paths:
           appKeyAuth: []
       summary: List LLM integration models
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in Preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/projects:
     get:
-      description: List all LLM Observability projects sorted by creation date, newest first.
+      description: List all Agent Observability projects sorted by creation date, newest first.
       operationId: ListLLMObsProjects
       parameters:
         - description: Filter projects by project ID.
@@ -161570,14 +161767,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability projects
+      summary: List Agent Observability projects
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Create a new LLM Observability project. Returns the existing project if a name conflict occurs.
+      description: Create a new Agent Observability project. Returns the existing project if a name conflict occurs.
       operationId: CreateLLMObsProject
       requestBody:
         content:
@@ -161651,15 +161848,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create an LLM Observability project
+      summary: Create an Agent Observability project
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/projects/delete:
     post:
-      description: Delete one or more LLM Observability projects.
+      description: Delete one or more Agent Observability projects.
       operationId: DeleteLLMObsProjects
       requestBody:
         content:
@@ -161702,15 +161899,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete LLM Observability projects
+      summary: Delete Agent Observability projects
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/projects/{project_id}:
     patch:
-      description: Partially update an existing LLM Observability project.
+      description: Partially update an existing Agent Observability project.
       operationId: UpdateLLMObsProject
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -161773,15 +161970,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update an LLM Observability project
+      summary: Update an Agent Observability project
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/prompts:
     get:
-      description: List all LLM Observability prompts in the prompt registry for the organization.
+      description: List all Agent Observability prompts in the prompt registry for the organization.
       operationId: ListLLMObsPrompts
       parameters:
         - description: Optional filter for prompts by prompt ID.
@@ -161831,9 +162028,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability prompts
+      summary: List Agent Observability prompts
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: OR
         permissions:
@@ -161842,7 +162039,7 @@ paths:
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Create a new prompt (and its first version) in the LLM Observability prompt registry.
+      description: Create a new prompt (and its first version) in the Agent Observability prompt registry.
       operationId: CreateLLMObsPrompt
       requestBody:
         content:
@@ -161918,9 +162115,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create an LLM Observability prompt
+      summary: Create an Agent Observability prompt
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: AND
         permissions:
@@ -161935,7 +162132,7 @@ paths:
   /api/v2/llm-obs/v1/prompts/{prompt_id}:
     delete:
       description: >-
-        Soft-delete an LLM Observability prompt. The prompt's version rows are retained, but they are no longer accessible through the public prompt registry endpoints.
+        Soft-delete an Agent Observability prompt. The prompt's version rows are retained, but they are no longer accessible through the public prompt registry endpoints.
       operationId: DeleteLLMObsPrompt
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -161978,9 +162175,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete an LLM Observability prompt
+      summary: Delete an Agent Observability prompt
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: AND
         permissions:
@@ -161993,7 +162190,7 @@ paths:
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     get:
-      description: Get the latest version of an LLM Observability prompt by prompt ID.
+      description: Get the latest version of an Agent Observability prompt by prompt ID.
       operationId: GetLLMObsPrompt
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162043,9 +162240,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get an LLM Observability prompt
+      summary: Get an Agent Observability prompt
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: OR
         permissions:
@@ -162054,7 +162251,7 @@ paths:
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     patch:
-      description: Update the title, the description, or both, for an LLM Observability prompt.
+      description: Update the title, the description, or both, for an Agent Observability prompt.
       operationId: UpdateLLMObsPrompt
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162126,9 +162323,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update an LLM Observability prompt
+      summary: Update an Agent Observability prompt
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: AND
         permissions:
@@ -162143,7 +162340,7 @@ paths:
   /api/v2/llm-obs/v1/prompts/{prompt_id}/versions:
     get:
       description: >-
-        List all versions of an LLM Observability prompt, ordered newest to oldest. If the prompt does not exist, is not registered, or is archived, the response contains an empty list.
+        List all versions of an Agent Observability prompt, ordered newest to oldest. If the prompt does not exist, is not registered, or is archived, the response contains an empty list.
       operationId: ListLLMObsPromptVersions
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162195,9 +162392,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List versions of an LLM Observability prompt
+      summary: List versions of an Agent Observability prompt
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: OR
         permissions:
@@ -162206,7 +162403,7 @@ paths:
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Create a new version of an existing LLM Observability prompt.
+      description: Create a new version of an existing Agent Observability prompt.
       operationId: CreateLLMObsPromptVersion
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162284,9 +162481,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create a new LLM Observability prompt version
+      summary: Create a new Agent Observability prompt version
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: AND
         permissions:
@@ -162300,7 +162497,7 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}:
     get:
-      description: Get the full template of a single, specific version of an LLM Observability prompt.
+      description: Get the full template of a single, specific version of an Agent Observability prompt.
       operationId: GetLLMObsPromptVersion
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162360,9 +162557,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get a specific LLM Observability prompt version
+      summary: Get a specific Agent Observability prompt version
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: OR
         permissions:
@@ -162372,7 +162569,7 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     patch:
       description: >-
-        Update the description, the feature-flag environments, or both, for a specific version of an LLM Observability prompt.
+        Update the description, the feature-flag environments, or both, for a specific version of an Agent Observability prompt.
       operationId: UpdateLLMObsPromptVersion
       parameters:
         - $ref: "#/components/parameters/LLMObsPromptIDPathParameter"
@@ -162446,9 +162643,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update a specific LLM Observability prompt version
+      summary: Update an Agent Observability prompt version
       tags:
-        - LLM Observability
+        - Agent Observability
       x-permission:
         operator: AND
         permissions:
@@ -162462,7 +162659,7 @@ paths:
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/spans/events:
     get:
-      description: List LLM Observability spans matching the specified filters.
+      description: List Agent Observability spans matching the specified filters.
       operationId: ListLLMObsSpans
       parameters:
         - description: Start of the time range. Accepts ISO 8601 or relative format (e.g., `now-15m`). Defaults to `now-15m`.
@@ -162478,7 +162675,7 @@ paths:
             example: "now"
             type: string
         - description: >-
-            Search query using LLM Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`filter[span_id]`, `filter[trace_id]`, etc.) are ignored.
+            Search query using Agent Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`filter[span_id]`, `filter[trace_id]`, etc.) are ignored.
           in: query
           name: filter[query]
           schema:
@@ -162605,15 +162802,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability spans
+      summary: List Agent Observability spans
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/spans/events/search:
     post:
-      description: Search LLM Observability spans using structured filters in the request body.
+      description: Search Agent Observability spans using structured filters in the request body.
       operationId: SearchLLMObsSpans
       requestBody:
         content:
@@ -162704,9 +162901,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Search LLM Observability spans
+      summary: Search Agent Observability spans
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -162782,7 +162979,7 @@ paths:
           appKeyAuth: []
       summary: List patterns clustered points
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -162845,7 +163042,7 @@ paths:
           appKeyAuth: []
       summary: List patterns configurations
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -162929,7 +163126,7 @@ paths:
           appKeyAuth: []
       summary: Create or update a patterns configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -162996,7 +163193,7 @@ paths:
           appKeyAuth: []
       summary: Get a patterns configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163046,7 +163243,7 @@ paths:
           appKeyAuth: []
       summary: Delete a patterns configuration
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163112,7 +163309,7 @@ paths:
           appKeyAuth: []
       summary: List patterns runs
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163187,7 +163384,7 @@ paths:
           appKeyAuth: []
       summary: Trigger a patterns run
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163260,7 +163457,7 @@ paths:
           appKeyAuth: []
       summary: Get patterns run status
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163340,7 +163537,7 @@ paths:
           appKeyAuth: []
       summary: List patterns topics
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163432,13 +163629,13 @@ paths:
           appKeyAuth: []
       summary: List patterns topics with clustered points
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets:
     get:
-      description: List all LLM Observability datasets for a project, sorted by creation date, newest first.
+      description: List all Agent Observability datasets for a project, sorted by creation date, newest first.
       operationId: ListLLMObsDatasets
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -163512,14 +163709,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability datasets
+      summary: List Agent Observability datasets
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Create a new LLM Observability dataset within the specified project.
+      description: Create a new Agent Observability dataset within the specified project.
       operationId: CreateLLMObsDataset
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -163605,15 +163802,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Create an LLM Observability dataset
+      summary: Create an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/delete:
     post:
-      description: Delete one or more LLM Observability datasets within the specified project.
+      description: Delete one or more Agent Observability datasets within the specified project.
       operationId: DeleteLLMObsDatasets
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -163664,15 +163861,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete LLM Observability datasets
+      summary: Delete Agent Observability datasets
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}:
     patch:
-      description: Partially update an existing LLM Observability dataset within the specified project.
+      description: Partially update an existing Agent Observability dataset within the specified project.
       operationId: UpdateLLMObsDataset
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -163738,9 +163935,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update an LLM Observability dataset
+      summary: Update an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163749,14 +163946,14 @@ paths:
       description: Insert, update, and delete records in a single dataset operation. By default, a new dataset version is created when the batch is applied.
       operationId: BatchUpdateLLMObsDataset
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -163853,9 +164050,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Batch update LLM Observability dataset records
+      summary: Batch update Agent Observability dataset records
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163864,14 +164061,14 @@ paths:
       description: Clone a dataset, copying its current records into a new dataset within the same project.
       operationId: CloneLLMObsDataset
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the source LLM Observability dataset to clone.
+        - description: The ID of the source Agent Observability dataset to clone.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -163949,9 +164146,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Clone an LLM Observability dataset
+      summary: Clone an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -163960,14 +164157,14 @@ paths:
       description: Retrieve the draft state of a dataset, including whether it is currently locked for editing and which user holds the lock.
       operationId: GetLLMObsDatasetDraftState
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164029,9 +164226,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Get LLM Observability dataset draft state
+      summary: Get Agent Observability dataset draft state
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164040,14 +164237,14 @@ paths:
       description: Acquire the draft lock on a dataset for the calling user. The lock prevents other users from concurrently editing the dataset draft.
       operationId: LockLLMObsDatasetDraftState
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164109,9 +164306,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Lock LLM Observability dataset draft state
+      summary: Lock Agent Observability dataset draft state
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164120,14 +164317,14 @@ paths:
       description: Release the draft lock on a dataset held by the calling user, allowing other users to edit the dataset draft.
       operationId: UnlockLLMObsDatasetDraftState
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164172,9 +164369,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Unlock LLM Observability dataset draft state
+      summary: Unlock Agent Observability dataset draft state
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164183,14 +164380,14 @@ paths:
       description: Download the contents of a dataset as a CSV file. The download is streamed and includes one row per dataset record.
       operationId: ExportLLMObsDataset
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164254,15 +164451,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Export an LLM Observability dataset
+      summary: Export an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records:
     get:
-      description: List all records in an LLM Observability dataset, sorted by creation date, newest first.
+      description: List all records in an Agent Observability dataset, sorted by creation date, newest first.
       operationId: ListLLMObsDatasetRecords
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -164333,14 +164530,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability dataset records
+      summary: List Agent Observability dataset records
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     patch:
-      description: Update one or more existing records in an LLM Observability dataset.
+      description: Update one or more existing records in an Agent Observability dataset.
       operationId: UpdateLLMObsDatasetRecords
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -164410,14 +164607,14 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Update LLM Observability dataset records
+      summary: Update Agent Observability dataset records
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
     post:
-      description: Append one or more records to an LLM Observability dataset.
+      description: Append one or more records to an Agent Observability dataset.
       operationId: CreateLLMObsDatasetRecords
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -164504,15 +164701,15 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Append records to an LLM Observability dataset
+      summary: Append records to an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
   /api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records/delete:
     post:
-      description: Delete one or more records from an LLM Observability dataset.
+      description: Delete one or more records from an Agent Observability dataset.
       operationId: DeleteLLMObsDatasetRecords
       parameters:
         - $ref: "#/components/parameters/LLMObsProjectIDPathParameter"
@@ -164564,9 +164761,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Delete LLM Observability dataset records
+      summary: Delete Agent Observability dataset records
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164575,14 +164772,14 @@ paths:
       description: Restore a dataset to a previous version. The dataset's current version is bumped, and its records are replaced with the records from the specified prior version.
       operationId: RestoreLLMObsDatasetVersion
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164642,9 +164839,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Restore an LLM Observability dataset version
+      summary: Restore an Agent Observability dataset version
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164653,14 +164850,14 @@ paths:
       description: List the active versions of a dataset. A version is created each time a dataset is referenced by an experiment run.
       operationId: ListLLMObsDatasetVersions
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164725,9 +164922,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability dataset versions
+      summary: List Agent Observability dataset versions
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164799,9 +164996,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List LLM Observability experiment events (v2)
+      summary: List Agent Observability experiment events (v2)
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164817,14 +165014,14 @@ paths:
           - `error`: terminal event with a JSON body containing an error `message`.
       operationId: UploadLLMObsDatasetRecordsFile
       parameters:
-        - description: The ID of the LLM Observability project.
+        - description: The ID of the Agent Observability project.
           example: "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"
           in: path
           name: project_id
           required: true
           schema:
             type: string
-        - description: The ID of the LLM Observability dataset.
+        - description: The ID of the Agent Observability dataset.
           example: "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d"
           in: path
           name: dataset_id
@@ -164904,9 +165101,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: Upload records to an LLM Observability dataset
+      summary: Upload records to an Agent Observability dataset
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -164990,9 +165187,9 @@ paths:
       security:
         - apiKeyAuth: []
           appKeyAuth: []
-      summary: List events for an LLM Observability experiment
+      summary: List events for an Agent Observability experiment
       tags:
-        - LLM Observability
+        - Agent Observability
       x-unstable: |-
         **Note**: This endpoint is in preview and is subject to change.
         If you have any feedback, contact [Datadog support](https://docs.datadoghq.com/help/).
@@ -165332,6 +165529,11 @@ paths:
           $ref: "#/components/responses/NotAuthorizedResponse"
         "429":
           $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+        - AuthZ:
+            - logs_read_data
       summary: Aggregate events
       tags: ["Logs"]
       x-codegen-request-body-name: body
@@ -167214,6 +167416,11 @@ paths:
           $ref: "#/components/responses/NotAuthorizedResponse"
         "429":
           $ref: "#/components/responses/TooManyRequestsResponse"
+      security:
+        - apiKeyAuth: []
+          appKeyAuth: []
+        - AuthZ:
+            - logs_read_data
       summary: Search logs (POST)
       tags: ["Logs"]
       x-codegen-request-body-name: body
@@ -184287,6 +184494,199 @@ paths:
       tags:
         - Rum Metrics
       x-codegen-request-body-name: body
+  /api/v2/rum/config/retention-quota/{scope_type}/{scope_id}:
+    delete:
+      description: Delete the RUM retention quota configuration for a given scope.
+      operationId: DeleteRumQuotaConfig
+      parameters:
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeTypeParameter"
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeIDParameter"
+      responses:
+        "204":
+          description: No Content
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      summary: Delete a RUM retention quota configuration
+      tags:
+        - RUM Retention Quota
+      x-permission:
+        operator: OR
+        permissions:
+          - rum_retention_filters_write
+    get:
+      description: Get the RUM retention quota configuration for a given scope.
+      operationId: GetRumQuotaConfig
+      parameters:
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeTypeParameter"
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeIDParameter"
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      attributes:
+                        custom:
+                          daily_reset_time: "08:00"
+                          daily_reset_timezone: "+09:00"
+                          quota_reached_action: stop
+                          session_limit: 1000000
+                          window_type: daily
+                        mode: custom
+                        org_id: 2
+                        updated_at: "2026-03-04T15:37:54.951447Z"
+                        updated_by: test@example.com
+                      id: cd73a516-a481-4af5-8352-9b577465c77b
+                      type: rum_quota_config
+              schema:
+                $ref: "#/components/schemas/RumRetentionQuotaConfigResponse"
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      summary: Get a RUM retention quota configuration
+      tags:
+        - RUM Retention Quota
+      x-permission:
+        operator: OR
+        permissions:
+          - rum_retention_filters_read
+    put:
+      description: |-
+        Create or update the RUM retention quota configuration for a given scope.
+        Returns the retention quota configuration object when the request is successful.
+      operationId: UpsertRumQuotaConfig
+      parameters:
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeTypeParameter"
+        - $ref: "#/components/parameters/RumRetentionQuotaScopeIDParameter"
+      requestBody:
+        content:
+          application/json:
+            examples:
+              default:
+                value:
+                  data:
+                    attributes:
+                      custom:
+                        daily_reset_time: "08:00"
+                        daily_reset_timezone: "+09:00"
+                        quota_reached_action: stop
+                        session_limit: 1000000
+                        window_type: daily
+                      mode: custom
+                    id: cd73a516-a481-4af5-8352-9b577465c77b
+                    type: rum_quota_config
+            schema:
+              $ref: "#/components/schemas/RumRetentionQuotaConfigUpdateRequest"
+        description: The definition of the RUM retention quota configuration to create or update.
+        required: true
+      responses:
+        "200":
+          content:
+            application/json:
+              examples:
+                default:
+                  value:
+                    data:
+                      attributes:
+                        custom:
+                          daily_reset_time: "08:00"
+                          daily_reset_timezone: "+09:00"
+                          quota_reached_action: stop
+                          session_limit: 1000000
+                          window_type: daily
+                        mode: custom
+                        org_id: 2
+                        updated_at: "2026-03-04T21:52:53.526022Z"
+                        updated_by: test@example.com
+                      id: cd73a516-a481-4af5-8352-9b577465c77b
+                      type: rum_quota_config
+              schema:
+                $ref: "#/components/schemas/RumRetentionQuotaConfigResponse"
+          description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/JSONAPIErrorResponse"
+          description: Not Found
+        "429":
+          $ref: "#/components/responses/TooManyRequestsResponse"
+      summary: Create or update a RUM retention quota config
+      tags:
+        - RUM Retention Quota
+      x-codegen-request-body-name: body
+      x-permission:
+        operator: OR
+        permissions:
+          - rum_retention_filters_write
   /api/v2/rum/events:
     get:
       description: |-
@@ -214727,6 +215127,9 @@ tags:
     externalDocs:
       url: https://docs.datadoghq.com/actions/datastore
     name: Actions Datastores
+  - description: >-
+      Manage Agent Observability spans, data, projects, datasets, dataset records, experiments, prompts, and annotations.
+    name: Agent Observability
   - description: |-
       Datadog Agentless Scanning provides visibility into risks and vulnerabilities
       within your hosts, running containers, and serverless functions—all without
@@ -215009,9 +215412,6 @@ tags:
       description: Find out more at
       url: "https://docs.datadoghq.com/account_management/api-app-keys/"
     name: Key Management
-  - description: >-
-      Manage LLM Observability spans, data, projects, datasets, dataset records, experiments, prompts, and annotations.
-    name: LLM Observability
   - description: |-
       Search your logs and send them to your Datadog platform over HTTP. See the [Log Management page](https://docs.datadoghq.com/logs/) for more information.
     name: Logs
@@ -215198,6 +215598,9 @@ tags:
       description: Find out more at
       url: https://docs.datadoghq.com/real_user_monitoring/
     name: RUM Remote Config
+  - description: |-
+      Manage RUM retention quota configurations for your organization's RUM applications.
+    name: RUM Retention Quota
   - description: View and manage Reference Tables in your organization.
     name: Reference Tables
   - description: |-
diff --git a/examples/v2/llm-observability/AggregateLLMObsExperimentation.rb b/examples/v2/agent-observability/AggregateLLMObsExperimentation.rb
similarity index 91%
rename from examples/v2/llm-observability/AggregateLLMObsExperimentation.rb
rename to examples/v2/agent-observability/AggregateLLMObsExperimentation.rb
index 2dfba37bc76a..b7695f4cfcc9 100644
--- a/examples/v2/llm-observability/AggregateLLMObsExperimentation.rb
+++ b/examples/v2/agent-observability/AggregateLLMObsExperimentation.rb
@@ -1,10 +1,10 @@
-# Aggregate LLM Observability experimentation returns "OK" response
+# Aggregate Agent Observability experimentation returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.aggregate_llm_obs_experimentation".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentationAnalyticsRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentationAnalyticsDataRequest.new({
diff --git a/examples/v2/llm-observability/BatchUpdateLLMObsDataset.rb b/examples/v2/agent-observability/BatchUpdateLLMObsDataset.rb
similarity index 91%
rename from examples/v2/llm-observability/BatchUpdateLLMObsDataset.rb
rename to examples/v2/agent-observability/BatchUpdateLLMObsDataset.rb
index d892f110fddd..477fba539990 100644
--- a/examples/v2/llm-observability/BatchUpdateLLMObsDataset.rb
+++ b/examples/v2/agent-observability/BatchUpdateLLMObsDataset.rb
@@ -1,10 +1,10 @@
-# Batch update LLM Observability dataset records returns "OK" response
+# Batch update Agent Observability dataset records returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.batch_update_llm_obs_dataset".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetBatchUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetBatchUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/CloneLLMObsDataset.rb b/examples/v2/agent-observability/CloneLLMObsDataset.rb
similarity index 84%
rename from examples/v2/llm-observability/CloneLLMObsDataset.rb
rename to examples/v2/agent-observability/CloneLLMObsDataset.rb
index b425735a79b0..23842128d8fa 100644
--- a/examples/v2/llm-observability/CloneLLMObsDataset.rb
+++ b/examples/v2/agent-observability/CloneLLMObsDataset.rb
@@ -1,10 +1,10 @@
-# Clone an LLM Observability dataset returns "OK" response
+# Clone an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.clone_llm_obs_dataset".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetCloneRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetCloneDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsAnnotationQueue.rb b/examples/v2/agent-observability/CreateLLMObsAnnotationQueue.rb
similarity index 90%
rename from examples/v2/llm-observability/CreateLLMObsAnnotationQueue.rb
rename to examples/v2/agent-observability/CreateLLMObsAnnotationQueue.rb
index 4b1e26855d85..e7b3bf9dfa2f 100644
--- a/examples/v2/llm-observability/CreateLLMObsAnnotationQueue.rb
+++ b/examples/v2/agent-observability/CreateLLMObsAnnotationQueue.rb
@@ -1,10 +1,10 @@
-# Create an LLM Observability annotation queue returns "Created" response
+# Create an Agent Observability annotation queue returns "Created" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_annotation_queue".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationQueueRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationQueueDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions.rb b/examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions.rb
similarity index 93%
rename from examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions.rb
rename to examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions.rb
index ba908f873220..8df5b7a2af7c 100644
--- a/examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions.rb
+++ b/examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_annotation_queue_interactions".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationQueueInteractionsRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationQueueInteractionsDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb b/examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb
similarity index 94%
rename from examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb
rename to examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb
index 5591e81d6e04..0041ca13f373 100644
--- a/examples/v2/llm-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb
+++ b/examples/v2/agent-observability/CreateLLMObsAnnotationQueueInteractions_2021594537.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_annotation_queue_interactions".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationQueueInteractionsRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationQueueInteractionsDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsDataset.rb b/examples/v2/agent-observability/CreateLLMObsDataset.rb
similarity index 80%
rename from examples/v2/llm-observability/CreateLLMObsDataset.rb
rename to examples/v2/agent-observability/CreateLLMObsDataset.rb
index 05eb5ca0d654..b313ddbca1c0 100644
--- a/examples/v2/llm-observability/CreateLLMObsDataset.rb
+++ b/examples/v2/agent-observability/CreateLLMObsDataset.rb
@@ -1,10 +1,10 @@
-# Create an LLM Observability dataset returns "OK" response
+# Create an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_dataset".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsDatasetRecords.rb b/examples/v2/agent-observability/CreateLLMObsDatasetRecords.rb
similarity index 83%
rename from examples/v2/llm-observability/CreateLLMObsDatasetRecords.rb
rename to examples/v2/agent-observability/CreateLLMObsDatasetRecords.rb
index 86b45932d6e5..6dc4b63734fd 100644
--- a/examples/v2/llm-observability/CreateLLMObsDatasetRecords.rb
+++ b/examples/v2/agent-observability/CreateLLMObsDatasetRecords.rb
@@ -1,10 +1,10 @@
-# Append records to an LLM Observability dataset returns "OK" response
+# Append records to an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_dataset_records".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetRecordsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetRecordsDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsExperiment.rb b/examples/v2/agent-observability/CreateLLMObsExperiment.rb
similarity index 84%
rename from examples/v2/llm-observability/CreateLLMObsExperiment.rb
rename to examples/v2/agent-observability/CreateLLMObsExperiment.rb
index 49e7eab5a6fa..4a8d602013fd 100644
--- a/examples/v2/llm-observability/CreateLLMObsExperiment.rb
+++ b/examples/v2/agent-observability/CreateLLMObsExperiment.rb
@@ -1,10 +1,10 @@
-# Create an LLM Observability experiment returns "OK" response
+# Create an Agent Observability experiment returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_experiment".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsExperimentEvents.rb b/examples/v2/agent-observability/CreateLLMObsExperimentEvents.rb
similarity index 93%
rename from examples/v2/llm-observability/CreateLLMObsExperimentEvents.rb
rename to examples/v2/agent-observability/CreateLLMObsExperimentEvents.rb
index 85cdb02d98ae..49d0d6d11ebc 100644
--- a/examples/v2/llm-observability/CreateLLMObsExperimentEvents.rb
+++ b/examples/v2/agent-observability/CreateLLMObsExperimentEvents.rb
@@ -1,10 +1,10 @@
-# Push events for an LLM Observability experiment returns "Accepted" response
+# Push events for an Agent Observability experiment returns "Accepted" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_experiment_events".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentEventsRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentEventsDataRequest.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsIntegrationInference.rb b/examples/v2/agent-observability/CreateLLMObsIntegrationInference.rb
similarity index 98%
rename from examples/v2/llm-observability/CreateLLMObsIntegrationInference.rb
rename to examples/v2/agent-observability/CreateLLMObsIntegrationInference.rb
index 7a85d0c223e5..f7489b0fc618 100644
--- a/examples/v2/llm-observability/CreateLLMObsIntegrationInference.rb
+++ b/examples/v2/agent-observability/CreateLLMObsIntegrationInference.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_integration_inference".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsIntegrationInferenceRequest.new({
   anthropic_metadata: DatadogAPIClient::V2::LLMObsAnthropicMetadata.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsProject.rb b/examples/v2/agent-observability/CreateLLMObsProject.rb
similarity index 79%
rename from examples/v2/llm-observability/CreateLLMObsProject.rb
rename to examples/v2/agent-observability/CreateLLMObsProject.rb
index 0d78a5425d02..34f523182d99 100644
--- a/examples/v2/llm-observability/CreateLLMObsProject.rb
+++ b/examples/v2/agent-observability/CreateLLMObsProject.rb
@@ -1,10 +1,10 @@
-# Create an LLM Observability project returns "OK" response
+# Create an Agent Observability project returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.create_llm_obs_project".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsProjectRequest.new({
   data: DatadogAPIClient::V2::LLMObsProjectDataRequest.new({
diff --git a/examples/v2/agent-observability/CreateLLMObsPrompt.rb b/examples/v2/agent-observability/CreateLLMObsPrompt.rb
new file mode 100644
index 000000000000..e615769b32a4
--- /dev/null
+++ b/examples/v2/agent-observability/CreateLLMObsPrompt.rb
@@ -0,0 +1,22 @@
+# Create an Agent Observability prompt returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.create_llm_obs_prompt".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+
+body = DatadogAPIClient::V2::LLMObsCreatePromptRequest.new({
+  data: DatadogAPIClient::V2::LLMObsCreatePromptData.new({
+    attributes: DatadogAPIClient::V2::LLMObsCreatePromptDataAttributes.new({
+      env_ids: [],
+      labels: [
+        DatadogAPIClient::V2::LLMObsPromptVersionLabel::PRODUCTION,
+      ],
+      prompt_id: "customer-support-assistant",
+      template: "You are a helpful assistant for .",
+    }),
+    type: DatadogAPIClient::V2::LLMObsPromptType::PROMPT_TEMPLATES,
+  }),
+})
+p api_instance.create_llm_obs_prompt(body)
diff --git a/examples/v2/agent-observability/CreateLLMObsPromptVersion.rb b/examples/v2/agent-observability/CreateLLMObsPromptVersion.rb
new file mode 100644
index 000000000000..e85db0d3e9bc
--- /dev/null
+++ b/examples/v2/agent-observability/CreateLLMObsPromptVersion.rb
@@ -0,0 +1,21 @@
+# Create a new Agent Observability prompt version returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.create_llm_obs_prompt_version".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+
+body = DatadogAPIClient::V2::LLMObsCreatePromptVersionRequest.new({
+  data: DatadogAPIClient::V2::LLMObsCreatePromptVersionData.new({
+    attributes: DatadogAPIClient::V2::LLMObsCreatePromptVersionDataAttributes.new({
+      env_ids: [],
+      labels: [
+        DatadogAPIClient::V2::LLMObsPromptVersionLabel::PRODUCTION,
+      ],
+      template: "You are a helpful assistant for .",
+    }),
+    type: DatadogAPIClient::V2::LLMObsPromptVersionType::PROMPT_TEMPLATE_VERSIONS,
+  }),
+})
+p api_instance.create_llm_obs_prompt_version("prompt_id", body)
diff --git a/examples/v2/llm-observability/DeleteLLMObsAnnotationQueue.rb b/examples/v2/agent-observability/DeleteLLMObsAnnotationQueue.rb
similarity index 59%
rename from examples/v2/llm-observability/DeleteLLMObsAnnotationQueue.rb
rename to examples/v2/agent-observability/DeleteLLMObsAnnotationQueue.rb
index bbb558a6c1c5..210f530780cd 100644
--- a/examples/v2/llm-observability/DeleteLLMObsAnnotationQueue.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsAnnotationQueue.rb
@@ -1,8 +1,8 @@
-# Delete an LLM Observability annotation queue returns "No Content" response
+# Delete an Agent Observability annotation queue returns "No Content" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_annotation_queue".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 api_instance.delete_llm_obs_annotation_queue("queue_id")
diff --git a/examples/v2/llm-observability/DeleteLLMObsAnnotationQueueInteractions.rb b/examples/v2/agent-observability/DeleteLLMObsAnnotationQueueInteractions.rb
similarity index 92%
rename from examples/v2/llm-observability/DeleteLLMObsAnnotationQueueInteractions.rb
rename to examples/v2/agent-observability/DeleteLLMObsAnnotationQueueInteractions.rb
index 34603d2f0bb9..232599ae0f39 100644
--- a/examples/v2/llm-observability/DeleteLLMObsAnnotationQueueInteractions.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsAnnotationQueueInteractions.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_annotation_queue_interactions".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteAnnotationQueueInteractionsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteAnnotationQueueInteractionsDataRequest.new({
diff --git a/examples/v2/llm-observability/DeleteLLMObsAnnotations.rb b/examples/v2/agent-observability/DeleteLLMObsAnnotations.rb
similarity index 92%
rename from examples/v2/llm-observability/DeleteLLMObsAnnotations.rb
rename to examples/v2/agent-observability/DeleteLLMObsAnnotations.rb
index e1e7acf1b6b6..00f45c0ad4e9 100644
--- a/examples/v2/llm-observability/DeleteLLMObsAnnotations.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsAnnotations.rb
@@ -5,7 +5,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_annotations".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteAnnotationsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteAnnotationsDataRequest.new({
diff --git a/examples/v2/llm-observability/DeleteLLMObsCustomEvalConfig.rb b/examples/v2/agent-observability/DeleteLLMObsCustomEvalConfig.rb
similarity index 82%
rename from examples/v2/llm-observability/DeleteLLMObsCustomEvalConfig.rb
rename to examples/v2/agent-observability/DeleteLLMObsCustomEvalConfig.rb
index 2823d59aeb4f..b470e505d8eb 100644
--- a/examples/v2/llm-observability/DeleteLLMObsCustomEvalConfig.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsCustomEvalConfig.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_custom_eval_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 api_instance.delete_llm_obs_custom_eval_config("eval_name")
diff --git a/examples/v2/llm-observability/DeleteLLMObsDatasetRecords.rb b/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.rb
similarity index 81%
rename from examples/v2/llm-observability/DeleteLLMObsDatasetRecords.rb
rename to examples/v2/agent-observability/DeleteLLMObsDatasetRecords.rb
index 5a03c41bc199..d2cd54e15fd5 100644
--- a/examples/v2/llm-observability/DeleteLLMObsDatasetRecords.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsDatasetRecords.rb
@@ -1,10 +1,10 @@
-# Delete LLM Observability dataset records returns "No Content" response
+# Delete Agent Observability dataset records returns "No Content" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_dataset_records".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteDatasetRecordsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteDatasetRecordsDataRequest.new({
diff --git a/examples/v2/llm-observability/DeleteLLMObsDatasets.rb b/examples/v2/agent-observability/DeleteLLMObsDatasets.rb
similarity index 81%
rename from examples/v2/llm-observability/DeleteLLMObsDatasets.rb
rename to examples/v2/agent-observability/DeleteLLMObsDatasets.rb
index ee7a4828ccf7..18c9b23d5240 100644
--- a/examples/v2/llm-observability/DeleteLLMObsDatasets.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsDatasets.rb
@@ -1,10 +1,10 @@
-# Delete LLM Observability datasets returns "No Content" response
+# Delete Agent Observability datasets returns "No Content" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_datasets".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteDatasetsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteDatasetsDataRequest.new({
diff --git a/examples/v2/llm-observability/DeleteLLMObsExperiments.rb b/examples/v2/agent-observability/DeleteLLMObsExperiments.rb
similarity index 81%
rename from examples/v2/llm-observability/DeleteLLMObsExperiments.rb
rename to examples/v2/agent-observability/DeleteLLMObsExperiments.rb
index 6bd5483ab942..50aefeb9529a 100644
--- a/examples/v2/llm-observability/DeleteLLMObsExperiments.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsExperiments.rb
@@ -1,10 +1,10 @@
-# Delete LLM Observability experiments returns "No Content" response
+# Delete Agent Observability experiments returns "No Content" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_experiments".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteExperimentsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteExperimentsDataRequest.new({
diff --git a/examples/v2/llm-observability/DeleteLLMObsPatternsConfig.rb b/examples/v2/agent-observability/DeleteLLMObsPatternsConfig.rb
similarity index 81%
rename from examples/v2/llm-observability/DeleteLLMObsPatternsConfig.rb
rename to examples/v2/agent-observability/DeleteLLMObsPatternsConfig.rb
index 1cfbfb9261e3..194617b14402 100644
--- a/examples/v2/llm-observability/DeleteLLMObsPatternsConfig.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsPatternsConfig.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_patterns_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 api_instance.delete_llm_obs_patterns_config("config_id")
diff --git a/examples/v2/llm-observability/DeleteLLMObsProjects.rb b/examples/v2/agent-observability/DeleteLLMObsProjects.rb
similarity index 81%
rename from examples/v2/llm-observability/DeleteLLMObsProjects.rb
rename to examples/v2/agent-observability/DeleteLLMObsProjects.rb
index 2bb95b7d6e54..4804bb06ce1b 100644
--- a/examples/v2/llm-observability/DeleteLLMObsProjects.rb
+++ b/examples/v2/agent-observability/DeleteLLMObsProjects.rb
@@ -1,10 +1,10 @@
-# Delete LLM Observability projects returns "No Content" response
+# Delete Agent Observability projects returns "No Content" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.delete_llm_obs_projects".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDeleteProjectsRequest.new({
   data: DatadogAPIClient::V2::LLMObsDeleteProjectsDataRequest.new({
diff --git a/examples/v2/agent-observability/DeleteLLMObsPrompt.rb b/examples/v2/agent-observability/DeleteLLMObsPrompt.rb
new file mode 100644
index 000000000000..94fef5ba2009
--- /dev/null
+++ b/examples/v2/agent-observability/DeleteLLMObsPrompt.rb
@@ -0,0 +1,8 @@
+# Delete an Agent Observability prompt returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.delete_llm_obs_prompt".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+p api_instance.delete_llm_obs_prompt("prompt_id")
diff --git a/examples/v2/llm-observability/ExportLLMObsDataset.rb b/examples/v2/agent-observability/ExportLLMObsDataset.rb
similarity index 62%
rename from examples/v2/llm-observability/ExportLLMObsDataset.rb
rename to examples/v2/agent-observability/ExportLLMObsDataset.rb
index ef1cfac8fa6b..be3b9a3e9c70 100644
--- a/examples/v2/llm-observability/ExportLLMObsDataset.rb
+++ b/examples/v2/agent-observability/ExportLLMObsDataset.rb
@@ -1,8 +1,8 @@
-# Export an LLM Observability dataset returns "OK" response
+# Export an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.export_llm_obs_dataset".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.export_llm_obs_dataset("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/GetLLMObsAnnotatedInteractions.rb b/examples/v2/agent-observability/GetLLMObsAnnotatedInteractions.rb
similarity index 81%
rename from examples/v2/llm-observability/GetLLMObsAnnotatedInteractions.rb
rename to examples/v2/agent-observability/GetLLMObsAnnotatedInteractions.rb
index 71222a8efcbb..cc5781aa825c 100644
--- a/examples/v2/llm-observability/GetLLMObsAnnotatedInteractions.rb
+++ b/examples/v2/agent-observability/GetLLMObsAnnotatedInteractions.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_annotated_interactions".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_annotated_interactions("queue_id")
diff --git a/examples/v2/llm-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb b/examples/v2/agent-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb
similarity index 82%
rename from examples/v2/llm-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb
rename to examples/v2/agent-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb
index 8ff665639e97..8c37ab433042 100644
--- a/examples/v2/llm-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb
+++ b/examples/v2/agent-observability/GetLLMObsAnnotatedInteractionsByTraceIDs.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_annotated_interactions_by_trace_i_ds".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_annotated_interactions_by_trace_i_ds([])
diff --git a/examples/v2/llm-observability/GetLLMObsAnnotationQueueLabelSchema.rb b/examples/v2/agent-observability/GetLLMObsAnnotationQueueLabelSchema.rb
similarity index 82%
rename from examples/v2/llm-observability/GetLLMObsAnnotationQueueLabelSchema.rb
rename to examples/v2/agent-observability/GetLLMObsAnnotationQueueLabelSchema.rb
index fe6366c37ede..a534e7ccf2f5 100644
--- a/examples/v2/llm-observability/GetLLMObsAnnotationQueueLabelSchema.rb
+++ b/examples/v2/agent-observability/GetLLMObsAnnotationQueueLabelSchema.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_annotation_queue_label_schema".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_annotation_queue_label_schema("queue_id")
diff --git a/examples/v2/llm-observability/GetLLMObsCustomEvalConfig.rb b/examples/v2/agent-observability/GetLLMObsCustomEvalConfig.rb
similarity index 81%
rename from examples/v2/llm-observability/GetLLMObsCustomEvalConfig.rb
rename to examples/v2/agent-observability/GetLLMObsCustomEvalConfig.rb
index f6b1c38a688a..e74bfbc5bf59 100644
--- a/examples/v2/llm-observability/GetLLMObsCustomEvalConfig.rb
+++ b/examples/v2/agent-observability/GetLLMObsCustomEvalConfig.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_custom_eval_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_custom_eval_config("eval_name")
diff --git a/examples/v2/llm-observability/GetLLMObsDatasetDraftState.rb b/examples/v2/agent-observability/GetLLMObsDatasetDraftState.rb
similarity index 63%
rename from examples/v2/llm-observability/GetLLMObsDatasetDraftState.rb
rename to examples/v2/agent-observability/GetLLMObsDatasetDraftState.rb
index d29bf89eab35..295e37e0f160 100644
--- a/examples/v2/llm-observability/GetLLMObsDatasetDraftState.rb
+++ b/examples/v2/agent-observability/GetLLMObsDatasetDraftState.rb
@@ -1,8 +1,8 @@
-# Get LLM Observability dataset draft state returns "OK" response
+# Get Agent Observability dataset draft state returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_dataset_draft_state".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_dataset_draft_state("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/GetLLMObsPatternsConfig.rb b/examples/v2/agent-observability/GetLLMObsPatternsConfig.rb
similarity index 79%
rename from examples/v2/llm-observability/GetLLMObsPatternsConfig.rb
rename to examples/v2/agent-observability/GetLLMObsPatternsConfig.rb
index c48bbb87c38e..8e9c88f455d0 100644
--- a/examples/v2/llm-observability/GetLLMObsPatternsConfig.rb
+++ b/examples/v2/agent-observability/GetLLMObsPatternsConfig.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_patterns_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_patterns_config()
diff --git a/examples/v2/llm-observability/GetLLMObsPatternsRunStatus.rb b/examples/v2/agent-observability/GetLLMObsPatternsRunStatus.rb
similarity index 80%
rename from examples/v2/llm-observability/GetLLMObsPatternsRunStatus.rb
rename to examples/v2/agent-observability/GetLLMObsPatternsRunStatus.rb
index 5da584d5608f..6ad737c7c98c 100644
--- a/examples/v2/llm-observability/GetLLMObsPatternsRunStatus.rb
+++ b/examples/v2/agent-observability/GetLLMObsPatternsRunStatus.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.get_llm_obs_patterns_run_status".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.get_llm_obs_patterns_run_status("config_id")
diff --git a/examples/v2/agent-observability/GetLLMObsPrompt.rb b/examples/v2/agent-observability/GetLLMObsPrompt.rb
new file mode 100644
index 000000000000..efe42e63ecd6
--- /dev/null
+++ b/examples/v2/agent-observability/GetLLMObsPrompt.rb
@@ -0,0 +1,8 @@
+# Get an Agent Observability prompt returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.get_llm_obs_prompt".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+p api_instance.get_llm_obs_prompt("prompt_id")
diff --git a/examples/v2/agent-observability/GetLLMObsPromptVersion.rb b/examples/v2/agent-observability/GetLLMObsPromptVersion.rb
new file mode 100644
index 000000000000..0695a58f210a
--- /dev/null
+++ b/examples/v2/agent-observability/GetLLMObsPromptVersion.rb
@@ -0,0 +1,8 @@
+# Get a specific Agent Observability prompt version returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.get_llm_obs_prompt_version".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+p api_instance.get_llm_obs_prompt_version("prompt_id", 9223372036854775807)
diff --git a/examples/v2/llm-observability/ListLLMObsAnnotationQueues.rb b/examples/v2/agent-observability/ListLLMObsAnnotationQueues.rb
similarity index 60%
rename from examples/v2/llm-observability/ListLLMObsAnnotationQueues.rb
rename to examples/v2/agent-observability/ListLLMObsAnnotationQueues.rb
index 2fbc61f2dcfb..0496c2646b51 100644
--- a/examples/v2/llm-observability/ListLLMObsAnnotationQueues.rb
+++ b/examples/v2/agent-observability/ListLLMObsAnnotationQueues.rb
@@ -1,8 +1,8 @@
-# List LLM Observability annotation queues returns "OK" response
+# List Agent Observability annotation queues returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_annotation_queues".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_annotation_queues()
diff --git a/examples/v2/llm-observability/ListLLMObsCustomEvalConfigs.rb b/examples/v2/agent-observability/ListLLMObsCustomEvalConfigs.rb
similarity index 80%
rename from examples/v2/llm-observability/ListLLMObsCustomEvalConfigs.rb
rename to examples/v2/agent-observability/ListLLMObsCustomEvalConfigs.rb
index 8d603011f886..10b458f5fa3d 100644
--- a/examples/v2/llm-observability/ListLLMObsCustomEvalConfigs.rb
+++ b/examples/v2/agent-observability/ListLLMObsCustomEvalConfigs.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_custom_eval_configs".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_custom_eval_configs()
diff --git a/examples/v2/llm-observability/ListLLMObsDatasetRecords.rb b/examples/v2/agent-observability/ListLLMObsDatasetRecords.rb
similarity index 63%
rename from examples/v2/llm-observability/ListLLMObsDatasetRecords.rb
rename to examples/v2/agent-observability/ListLLMObsDatasetRecords.rb
index 3a4648053b02..40d20f9abfff 100644
--- a/examples/v2/llm-observability/ListLLMObsDatasetRecords.rb
+++ b/examples/v2/agent-observability/ListLLMObsDatasetRecords.rb
@@ -1,8 +1,8 @@
-# List LLM Observability dataset records returns "OK" response
+# List Agent Observability dataset records returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_dataset_records".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_dataset_records("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/ListLLMObsDatasetVersions.rb b/examples/v2/agent-observability/ListLLMObsDatasetVersions.rb
similarity index 63%
rename from examples/v2/llm-observability/ListLLMObsDatasetVersions.rb
rename to examples/v2/agent-observability/ListLLMObsDatasetVersions.rb
index dd608de96e4a..73378048a12d 100644
--- a/examples/v2/llm-observability/ListLLMObsDatasetVersions.rb
+++ b/examples/v2/agent-observability/ListLLMObsDatasetVersions.rb
@@ -1,8 +1,8 @@
-# List LLM Observability dataset versions returns "OK" response
+# List Agent Observability dataset versions returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_dataset_versions".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_dataset_versions("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/ListLLMObsDatasets.rb b/examples/v2/agent-observability/ListLLMObsDatasets.rb
similarity index 61%
rename from examples/v2/llm-observability/ListLLMObsDatasets.rb
rename to examples/v2/agent-observability/ListLLMObsDatasets.rb
index 1edf75eb9531..1640cd3f375a 100644
--- a/examples/v2/llm-observability/ListLLMObsDatasets.rb
+++ b/examples/v2/agent-observability/ListLLMObsDatasets.rb
@@ -1,8 +1,8 @@
-# List LLM Observability datasets returns "OK" response
+# List Agent Observability datasets returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_datasets".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_datasets("project_id")
diff --git a/examples/v2/llm-observability/ListLLMObsExperimentEvents.rb b/examples/v2/agent-observability/ListLLMObsExperimentEvents.rb
similarity index 61%
rename from examples/v2/llm-observability/ListLLMObsExperimentEvents.rb
rename to examples/v2/agent-observability/ListLLMObsExperimentEvents.rb
index 5c8f78774b04..91ccd5f1d030 100644
--- a/examples/v2/llm-observability/ListLLMObsExperimentEvents.rb
+++ b/examples/v2/agent-observability/ListLLMObsExperimentEvents.rb
@@ -1,8 +1,8 @@
-# List events for an LLM Observability experiment returns "OK" response
+# List events for an Agent Observability experiment returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_experiment_events".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_experiment_events("experiment_id")
diff --git a/examples/v2/llm-observability/ListLLMObsExperimentEventsV1.rb b/examples/v2/agent-observability/ListLLMObsExperimentEventsV1.rb
similarity index 62%
rename from examples/v2/llm-observability/ListLLMObsExperimentEventsV1.rb
rename to examples/v2/agent-observability/ListLLMObsExperimentEventsV1.rb
index 879b89f02735..c4c9364df854 100644
--- a/examples/v2/llm-observability/ListLLMObsExperimentEventsV1.rb
+++ b/examples/v2/agent-observability/ListLLMObsExperimentEventsV1.rb
@@ -1,8 +1,8 @@
-# List LLM Observability experiment spans (v1) returns "OK" response
+# List Agent Observability experiment spans (v1) returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_experiment_events_v1".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_experiment_events_v1("experiment_id")
diff --git a/examples/v2/llm-observability/ListLLMObsExperimentEventsV2.rb b/examples/v2/agent-observability/ListLLMObsExperimentEventsV2.rb
similarity index 62%
rename from examples/v2/llm-observability/ListLLMObsExperimentEventsV2.rb
rename to examples/v2/agent-observability/ListLLMObsExperimentEventsV2.rb
index 025e23853b7d..2f831b7e157f 100644
--- a/examples/v2/llm-observability/ListLLMObsExperimentEventsV2.rb
+++ b/examples/v2/agent-observability/ListLLMObsExperimentEventsV2.rb
@@ -1,8 +1,8 @@
-# List LLM Observability experiment events (v2) returns "OK" response
+# List Agent Observability experiment events (v2) returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_experiment_events_v2".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_experiment_events_v2("experiment_id")
diff --git a/examples/v2/llm-observability/ListLLMObsExperiments.rb b/examples/v2/agent-observability/ListLLMObsExperiments.rb
similarity index 60%
rename from examples/v2/llm-observability/ListLLMObsExperiments.rb
rename to examples/v2/agent-observability/ListLLMObsExperiments.rb
index eb85b9043a9f..8ddcd06a7d52 100644
--- a/examples/v2/llm-observability/ListLLMObsExperiments.rb
+++ b/examples/v2/agent-observability/ListLLMObsExperiments.rb
@@ -1,8 +1,8 @@
-# List LLM Observability experiments returns "OK" response
+# List Agent Observability experiments returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_experiments".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_experiments()
diff --git a/examples/v2/llm-observability/ListLLMObsIntegrationAccounts.rb b/examples/v2/agent-observability/ListLLMObsIntegrationAccounts.rb
similarity index 82%
rename from examples/v2/llm-observability/ListLLMObsIntegrationAccounts.rb
rename to examples/v2/agent-observability/ListLLMObsIntegrationAccounts.rb
index 25ac7de60822..a840a39c1f5b 100644
--- a/examples/v2/llm-observability/ListLLMObsIntegrationAccounts.rb
+++ b/examples/v2/agent-observability/ListLLMObsIntegrationAccounts.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_integration_accounts".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_integration_accounts(LLMObsIntegrationName::OPENAI)
diff --git a/examples/v2/llm-observability/ListLLMObsIntegrationModels.rb b/examples/v2/agent-observability/ListLLMObsIntegrationModels.rb
similarity index 82%
rename from examples/v2/llm-observability/ListLLMObsIntegrationModels.rb
rename to examples/v2/agent-observability/ListLLMObsIntegrationModels.rb
index bd25b614f861..6ba085fd92a7 100644
--- a/examples/v2/llm-observability/ListLLMObsIntegrationModels.rb
+++ b/examples/v2/agent-observability/ListLLMObsIntegrationModels.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_integration_models".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_integration_models(LLMObsIntegrationName::OPENAI, "account_id")
diff --git a/examples/v2/llm-observability/ListLLMObsPatternsClusteredPoints.rb b/examples/v2/agent-observability/ListLLMObsPatternsClusteredPoints.rb
similarity index 81%
rename from examples/v2/llm-observability/ListLLMObsPatternsClusteredPoints.rb
rename to examples/v2/agent-observability/ListLLMObsPatternsClusteredPoints.rb
index d881b5189b2d..dda4f11156da 100644
--- a/examples/v2/llm-observability/ListLLMObsPatternsClusteredPoints.rb
+++ b/examples/v2/agent-observability/ListLLMObsPatternsClusteredPoints.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_patterns_clustered_points".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_patterns_clustered_points("topic_id")
diff --git a/examples/v2/llm-observability/ListLLMObsPatternsConfigs.rb b/examples/v2/agent-observability/ListLLMObsPatternsConfigs.rb
similarity index 80%
rename from examples/v2/llm-observability/ListLLMObsPatternsConfigs.rb
rename to examples/v2/agent-observability/ListLLMObsPatternsConfigs.rb
index cc4ebea9ab53..84279109f02e 100644
--- a/examples/v2/llm-observability/ListLLMObsPatternsConfigs.rb
+++ b/examples/v2/agent-observability/ListLLMObsPatternsConfigs.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_patterns_configs".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_patterns_configs()
diff --git a/examples/v2/llm-observability/ListLLMObsPatternsRuns.rb b/examples/v2/agent-observability/ListLLMObsPatternsRuns.rb
similarity index 79%
rename from examples/v2/llm-observability/ListLLMObsPatternsRuns.rb
rename to examples/v2/agent-observability/ListLLMObsPatternsRuns.rb
index e2922d3ea648..1ecbec6644d3 100644
--- a/examples/v2/llm-observability/ListLLMObsPatternsRuns.rb
+++ b/examples/v2/agent-observability/ListLLMObsPatternsRuns.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_patterns_runs".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_patterns_runs("config_id")
diff --git a/examples/v2/llm-observability/ListLLMObsPatternsTopics.rb b/examples/v2/agent-observability/ListLLMObsPatternsTopics.rb
similarity index 80%
rename from examples/v2/llm-observability/ListLLMObsPatternsTopics.rb
rename to examples/v2/agent-observability/ListLLMObsPatternsTopics.rb
index 086d5f4ba9dc..0e2f155b58c6 100644
--- a/examples/v2/llm-observability/ListLLMObsPatternsTopics.rb
+++ b/examples/v2/agent-observability/ListLLMObsPatternsTopics.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_patterns_topics".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_patterns_topics("config_id")
diff --git a/examples/v2/llm-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb b/examples/v2/agent-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb
similarity index 83%
rename from examples/v2/llm-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb
rename to examples/v2/agent-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb
index f4cbe3c64366..11677100a2ec 100644
--- a/examples/v2/llm-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb
+++ b/examples/v2/agent-observability/ListLLMObsPatternsTopicsWithClusteredPoints.rb
@@ -4,5 +4,5 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_patterns_topics_with_clustered_points".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_patterns_topics_with_clustered_points("config_id")
diff --git a/examples/v2/llm-observability/ListLLMObsProjects.rb b/examples/v2/agent-observability/ListLLMObsProjects.rb
similarity index 60%
rename from examples/v2/llm-observability/ListLLMObsProjects.rb
rename to examples/v2/agent-observability/ListLLMObsProjects.rb
index 4e40a79d9296..99c609d6878b 100644
--- a/examples/v2/llm-observability/ListLLMObsProjects.rb
+++ b/examples/v2/agent-observability/ListLLMObsProjects.rb
@@ -1,8 +1,8 @@
-# List LLM Observability projects returns "OK" response
+# List Agent Observability projects returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_projects".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_projects()
diff --git a/examples/v2/agent-observability/ListLLMObsPromptVersions.rb b/examples/v2/agent-observability/ListLLMObsPromptVersions.rb
new file mode 100644
index 000000000000..e8881a317895
--- /dev/null
+++ b/examples/v2/agent-observability/ListLLMObsPromptVersions.rb
@@ -0,0 +1,8 @@
+# List versions of an Agent Observability prompt returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.list_llm_obs_prompt_versions".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+p api_instance.list_llm_obs_prompt_versions("prompt_id")
diff --git a/examples/v2/agent-observability/ListLLMObsPrompts.rb b/examples/v2/agent-observability/ListLLMObsPrompts.rb
new file mode 100644
index 000000000000..bd6c480fa123
--- /dev/null
+++ b/examples/v2/agent-observability/ListLLMObsPrompts.rb
@@ -0,0 +1,8 @@
+# List Agent Observability prompts returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.list_llm_obs_prompts".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+p api_instance.list_llm_obs_prompts()
diff --git a/examples/v2/llm-observability/ListLLMObsSpans.rb b/examples/v2/agent-observability/ListLLMObsSpans.rb
similarity index 60%
rename from examples/v2/llm-observability/ListLLMObsSpans.rb
rename to examples/v2/agent-observability/ListLLMObsSpans.rb
index bcdeaaf4a89c..608d7c5ea609 100644
--- a/examples/v2/llm-observability/ListLLMObsSpans.rb
+++ b/examples/v2/agent-observability/ListLLMObsSpans.rb
@@ -1,8 +1,8 @@
-# List LLM Observability spans returns "OK" response
+# List Agent Observability spans returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.list_llm_obs_spans".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.list_llm_obs_spans()
diff --git a/examples/v2/llm-observability/LockLLMObsDatasetDraftState.rb b/examples/v2/agent-observability/LockLLMObsDatasetDraftState.rb
similarity index 63%
rename from examples/v2/llm-observability/LockLLMObsDatasetDraftState.rb
rename to examples/v2/agent-observability/LockLLMObsDatasetDraftState.rb
index 2857210dce43..f486db0cfd9e 100644
--- a/examples/v2/llm-observability/LockLLMObsDatasetDraftState.rb
+++ b/examples/v2/agent-observability/LockLLMObsDatasetDraftState.rb
@@ -1,8 +1,8 @@
-# Lock LLM Observability dataset draft state returns "OK" response
+# Lock Agent Observability dataset draft state returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.lock_llm_obs_dataset_draft_state".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.lock_llm_obs_dataset_draft_state("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/RestoreLLMObsDatasetVersion.rb b/examples/v2/agent-observability/RestoreLLMObsDatasetVersion.rb
similarity index 82%
rename from examples/v2/llm-observability/RestoreLLMObsDatasetVersion.rb
rename to examples/v2/agent-observability/RestoreLLMObsDatasetVersion.rb
index d9c702378916..6657fbd139d9 100644
--- a/examples/v2/llm-observability/RestoreLLMObsDatasetVersion.rb
+++ b/examples/v2/agent-observability/RestoreLLMObsDatasetVersion.rb
@@ -1,10 +1,10 @@
-# Restore an LLM Observability dataset version returns "OK" response
+# Restore an Agent Observability dataset version returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.restore_llm_obs_dataset_version".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetRestoreVersionRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetRestoreVersionDataRequest.new({
diff --git a/examples/v2/llm-observability/SearchLLMObsExperimentation.rb b/examples/v2/agent-observability/SearchLLMObsExperimentation.rb
similarity index 83%
rename from examples/v2/llm-observability/SearchLLMObsExperimentation.rb
rename to examples/v2/agent-observability/SearchLLMObsExperimentation.rb
index 180dafb61d8e..93367f6eed8b 100644
--- a/examples/v2/llm-observability/SearchLLMObsExperimentation.rb
+++ b/examples/v2/agent-observability/SearchLLMObsExperimentation.rb
@@ -1,11 +1,11 @@
-# Search LLM Observability experimentation entities returns "Partial Content — more results are available. Use
-# `meta.after` as the next `page.cursor`." response
+# Search Agent Observability experimentation returns "Partial Content — more results are available. Use `meta.after` as
+# the next `page.cursor`." response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.search_llm_obs_experimentation".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentationSearchRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentationSearchDataRequest.new({
diff --git a/examples/v2/llm-observability/SearchLLMObsSpans.rb b/examples/v2/agent-observability/SearchLLMObsSpans.rb
similarity index 90%
rename from examples/v2/llm-observability/SearchLLMObsSpans.rb
rename to examples/v2/agent-observability/SearchLLMObsSpans.rb
index 194de4be8a62..a92f70fafd0a 100644
--- a/examples/v2/llm-observability/SearchLLMObsSpans.rb
+++ b/examples/v2/agent-observability/SearchLLMObsSpans.rb
@@ -1,10 +1,10 @@
-# Search LLM Observability spans returns "OK" response
+# Search Agent Observability spans returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.search_llm_obs_spans".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsSearchSpansRequest.new({
   data: DatadogAPIClient::V2::LLMObsSearchSpansRequestData.new({
diff --git a/examples/v2/llm-observability/SimpleSearchLLMObsExperimentation.rb b/examples/v2/agent-observability/SimpleSearchLLMObsExperimentation.rb
similarity index 95%
rename from examples/v2/llm-observability/SimpleSearchLLMObsExperimentation.rb
rename to examples/v2/agent-observability/SimpleSearchLLMObsExperimentation.rb
index bd9ca69ca71a..91d6ec6ff5c7 100644
--- a/examples/v2/llm-observability/SimpleSearchLLMObsExperimentation.rb
+++ b/examples/v2/agent-observability/SimpleSearchLLMObsExperimentation.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.simple_search_llm_obs_experimentation".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentationSimpleSearchRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentationSimpleSearchDataRequest.new({
diff --git a/examples/v2/llm-observability/TriggerLLMObsPatterns.rb b/examples/v2/agent-observability/TriggerLLMObsPatterns.rb
similarity index 90%
rename from examples/v2/llm-observability/TriggerLLMObsPatterns.rb
rename to examples/v2/agent-observability/TriggerLLMObsPatterns.rb
index 4a0ecec3c49d..646cec691c7a 100644
--- a/examples/v2/llm-observability/TriggerLLMObsPatterns.rb
+++ b/examples/v2/agent-observability/TriggerLLMObsPatterns.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.trigger_llm_obs_patterns".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsPatternsTriggerRequest.new({
   data: DatadogAPIClient::V2::LLMObsPatternsTriggerRequestData.new({
diff --git a/examples/v2/llm-observability/UnlockLLMObsDatasetDraftState.rb b/examples/v2/agent-observability/UnlockLLMObsDatasetDraftState.rb
similarity index 63%
rename from examples/v2/llm-observability/UnlockLLMObsDatasetDraftState.rb
rename to examples/v2/agent-observability/UnlockLLMObsDatasetDraftState.rb
index 20e0c6f44b32..c769c488825c 100644
--- a/examples/v2/llm-observability/UnlockLLMObsDatasetDraftState.rb
+++ b/examples/v2/agent-observability/UnlockLLMObsDatasetDraftState.rb
@@ -1,8 +1,8 @@
-# Unlock LLM Observability dataset draft state returns "OK" response
+# Unlock Agent Observability dataset draft state returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.unlock_llm_obs_dataset_draft_state".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.unlock_llm_obs_dataset_draft_state("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/UpdateLLMObsAnnotationQueue.rb b/examples/v2/agent-observability/UpdateLLMObsAnnotationQueue.rb
similarity index 90%
rename from examples/v2/llm-observability/UpdateLLMObsAnnotationQueue.rb
rename to examples/v2/agent-observability/UpdateLLMObsAnnotationQueue.rb
index a10defef52e1..6c381b039877 100644
--- a/examples/v2/llm-observability/UpdateLLMObsAnnotationQueue.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsAnnotationQueue.rb
@@ -1,10 +1,10 @@
-# Update an LLM Observability annotation queue returns "OK" response
+# Update an Agent Observability annotation queue returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_annotation_queue".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationQueueUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationQueueUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb b/examples/v2/agent-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb
similarity index 95%
rename from examples/v2/llm-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb
rename to examples/v2/agent-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb
index d616138b49ef..102dcd34741b 100644
--- a/examples/v2/llm-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsAnnotationQueueLabelSchema.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_annotation_queue_label_schema".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationQueueLabelSchemaUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationQueueLabelSchemaUpdateData.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsCustomEvalConfig.rb b/examples/v2/agent-observability/UpdateLLMObsCustomEvalConfig.rb
similarity index 98%
rename from examples/v2/llm-observability/UpdateLLMObsCustomEvalConfig.rb
rename to examples/v2/agent-observability/UpdateLLMObsCustomEvalConfig.rb
index 2a23fbad0870..43fd6c17ebcb 100644
--- a/examples/v2/llm-observability/UpdateLLMObsCustomEvalConfig.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsCustomEvalConfig.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_custom_eval_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsCustomEvalConfigUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsCustomEvalConfigUpdateData.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsDataset.rb b/examples/v2/agent-observability/UpdateLLMObsDataset.rb
similarity index 80%
rename from examples/v2/llm-observability/UpdateLLMObsDataset.rb
rename to examples/v2/agent-observability/UpdateLLMObsDataset.rb
index e765c0d1e2c6..bf328007ec8f 100644
--- a/examples/v2/llm-observability/UpdateLLMObsDataset.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsDataset.rb
@@ -1,10 +1,10 @@
-# Update an LLM Observability dataset returns "OK" response
+# Update an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_dataset".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsDatasetRecords.rb b/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.rb
similarity index 85%
rename from examples/v2/llm-observability/UpdateLLMObsDatasetRecords.rb
rename to examples/v2/agent-observability/UpdateLLMObsDatasetRecords.rb
index 3573605e2bf7..9c3816d5f5e3 100644
--- a/examples/v2/llm-observability/UpdateLLMObsDatasetRecords.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsDatasetRecords.rb
@@ -1,10 +1,10 @@
-# Update LLM Observability dataset records returns "OK" response
+# Update Agent Observability dataset records returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_dataset_records".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsDatasetRecordsUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsDatasetRecordsUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsExperiment.rb b/examples/v2/agent-observability/UpdateLLMObsExperiment.rb
similarity index 83%
rename from examples/v2/llm-observability/UpdateLLMObsExperiment.rb
rename to examples/v2/agent-observability/UpdateLLMObsExperiment.rb
index 6ca2de0640ae..511c62f61e9e 100644
--- a/examples/v2/llm-observability/UpdateLLMObsExperiment.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsExperiment.rb
@@ -1,10 +1,10 @@
-# Update an LLM Observability experiment returns "OK" response
+# Update an Agent Observability experiment returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_experiment".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsExperimentUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsExperimentUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsProject.rb b/examples/v2/agent-observability/UpdateLLMObsProject.rb
similarity index 79%
rename from examples/v2/llm-observability/UpdateLLMObsProject.rb
rename to examples/v2/agent-observability/UpdateLLMObsProject.rb
index a8905835bb04..a7393c37a3d3 100644
--- a/examples/v2/llm-observability/UpdateLLMObsProject.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsProject.rb
@@ -1,10 +1,10 @@
-# Update an LLM Observability project returns "OK" response
+# Update an Agent Observability project returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_project".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsProjectUpdateRequest.new({
   data: DatadogAPIClient::V2::LLMObsProjectUpdateDataRequest.new({
diff --git a/examples/v2/llm-observability/UpdateLLMObsPrompt.rb b/examples/v2/agent-observability/UpdateLLMObsPrompt.rb
similarity index 51%
rename from examples/v2/llm-observability/UpdateLLMObsPrompt.rb
rename to examples/v2/agent-observability/UpdateLLMObsPrompt.rb
index 84f8c1c9a3d7..8407aa55f5e3 100644
--- a/examples/v2/llm-observability/UpdateLLMObsPrompt.rb
+++ b/examples/v2/agent-observability/UpdateLLMObsPrompt.rb
@@ -1,20 +1,15 @@
-# Update an LLM Observability prompt returns "OK" response
+# Update an Agent Observability prompt returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.update_llm_obs_prompt".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsUpdatePromptRequest.new({
   data: DatadogAPIClient::V2::LLMObsUpdatePromptData.new({
-    attributes: DatadogAPIClient::V2::LLMObsUpdatePromptDataAttributes.new({
-      title: "Customer Support Assistant",
-    }),
+    attributes: DatadogAPIClient::V2::LLMObsUpdatePromptDataAttributes.new({}),
     type: DatadogAPIClient::V2::LLMObsPromptType::PROMPT_TEMPLATES,
   }),
 })
-p api_instance.update_llm_obs_prompt(PROMPT_DATA_ATTRIBUTES_PROMPT_ID, body)
+p api_instance.update_llm_obs_prompt("prompt_id", body)
diff --git a/examples/v2/agent-observability/UpdateLLMObsPromptVersion.rb b/examples/v2/agent-observability/UpdateLLMObsPromptVersion.rb
new file mode 100644
index 000000000000..7b08a72745ee
--- /dev/null
+++ b/examples/v2/agent-observability/UpdateLLMObsPromptVersion.rb
@@ -0,0 +1,20 @@
+# Update an Agent Observability prompt version returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.update_llm_obs_prompt_version".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
+
+body = DatadogAPIClient::V2::LLMObsUpdatePromptVersionRequest.new({
+  data: DatadogAPIClient::V2::LLMObsUpdatePromptVersionData.new({
+    attributes: DatadogAPIClient::V2::LLMObsUpdatePromptVersionDataAttributes.new({
+      env_ids: [],
+      labels: [
+        DatadogAPIClient::V2::LLMObsPromptVersionLabel::PRODUCTION,
+      ],
+    }),
+    type: DatadogAPIClient::V2::LLMObsPromptVersionType::PROMPT_TEMPLATE_VERSIONS,
+  }),
+})
+p api_instance.update_llm_obs_prompt_version("prompt_id", 9223372036854775807, body)
diff --git a/examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.rb b/examples/v2/agent-observability/UploadLLMObsDatasetRecordsFile.rb
similarity index 63%
rename from examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.rb
rename to examples/v2/agent-observability/UploadLLMObsDatasetRecordsFile.rb
index 9701f51caa04..e77657f7bab1 100644
--- a/examples/v2/llm-observability/UploadLLMObsDatasetRecordsFile.rb
+++ b/examples/v2/agent-observability/UploadLLMObsDatasetRecordsFile.rb
@@ -1,8 +1,8 @@
-# Upload records to an LLM Observability dataset returns "OK" response
+# Upload records to an Agent Observability dataset returns "OK" response
 
 require "datadog_api_client"
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.upload_llm_obs_dataset_records_file".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 p api_instance.upload_llm_obs_dataset_records_file("project_id", "dataset_id")
diff --git a/examples/v2/llm-observability/UpsertLLMObsAnnotations.rb b/examples/v2/agent-observability/UpsertLLMObsAnnotations.rb
similarity index 94%
rename from examples/v2/llm-observability/UpsertLLMObsAnnotations.rb
rename to examples/v2/agent-observability/UpsertLLMObsAnnotations.rb
index 464c9e65a666..febf34d059a8 100644
--- a/examples/v2/llm-observability/UpsertLLMObsAnnotations.rb
+++ b/examples/v2/agent-observability/UpsertLLMObsAnnotations.rb
@@ -5,7 +5,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.upsert_llm_obs_annotations".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsAnnotationsRequest.new({
   data: DatadogAPIClient::V2::LLMObsAnnotationsDataRequest.new({
diff --git a/examples/v2/llm-observability/UpsertLLMObsPatternsConfig.rb b/examples/v2/agent-observability/UpsertLLMObsPatternsConfig.rb
similarity index 93%
rename from examples/v2/llm-observability/UpsertLLMObsPatternsConfig.rb
rename to examples/v2/agent-observability/UpsertLLMObsPatternsConfig.rb
index 8b67ddf66d93..30cfb680f441 100644
--- a/examples/v2/llm-observability/UpsertLLMObsPatternsConfig.rb
+++ b/examples/v2/agent-observability/UpsertLLMObsPatternsConfig.rb
@@ -4,7 +4,7 @@
 DatadogAPIClient.configure do |config|
   config.unstable_operations["v2.upsert_llm_obs_patterns_config".to_sym] = true
 end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
+api_instance = DatadogAPIClient::V2::AgentObservabilityAPI.new
 
 body = DatadogAPIClient::V2::LLMObsPatternsConfigUpsertRequest.new({
   data: DatadogAPIClient::V2::LLMObsPatternsConfigUpsertRequestData.new({
diff --git a/examples/v2/llm-observability/CreateLLMObsPrompt.rb b/examples/v2/llm-observability/CreateLLMObsPrompt.rb
deleted file mode 100644
index 442ce98e1d7f..000000000000
--- a/examples/v2/llm-observability/CreateLLMObsPrompt.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Create an LLM Observability prompt returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.create_llm_obs_prompt".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-body = DatadogAPIClient::V2::LLMObsCreatePromptRequest.new({
-  data: DatadogAPIClient::V2::LLMObsCreatePromptData.new({
-    attributes: DatadogAPIClient::V2::LLMObsCreatePromptDataAttributes.new({
-      prompt_id: "Example-LLM-Observability",
-      title: "Customer Support Assistant",
-      template: [
-        DatadogAPIClient::V2::LLMObsPromptChatMessage.new({
-          content: "You are a helpful customer support assistant for {{company_name}}.",
-          role: "system",
-        }),
-        DatadogAPIClient::V2::LLMObsPromptChatMessage.new({
-          content: "Help {{customer_name}} with this question: {{question}}",
-          role: "user",
-        }),
-      ],
-    }),
-    type: DatadogAPIClient::V2::LLMObsPromptType::PROMPT_TEMPLATES,
-  }),
-})
-p api_instance.create_llm_obs_prompt(body)
diff --git a/examples/v2/llm-observability/CreateLLMObsPromptVersion.rb b/examples/v2/llm-observability/CreateLLMObsPromptVersion.rb
deleted file mode 100644
index 184dd3635913..000000000000
--- a/examples/v2/llm-observability/CreateLLMObsPromptVersion.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Create a new LLM Observability prompt version returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.create_llm_obs_prompt_version".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-
-body = DatadogAPIClient::V2::LLMObsCreatePromptVersionRequest.new({
-  data: DatadogAPIClient::V2::LLMObsCreatePromptVersionData.new({
-    attributes: DatadogAPIClient::V2::LLMObsCreatePromptVersionDataAttributes.new({
-      template: [
-        DatadogAPIClient::V2::LLMObsPromptChatMessage.new({
-          content: "You are a concise customer support assistant for {{company_name}}.",
-          role: "system",
-        }),
-        DatadogAPIClient::V2::LLMObsPromptChatMessage.new({
-          content: "Answer {{customer_name}}'s question: {{question}}",
-          role: "user",
-        }),
-      ],
-    }),
-    type: DatadogAPIClient::V2::LLMObsPromptVersionType::PROMPT_TEMPLATE_VERSIONS,
-  }),
-})
-p api_instance.create_llm_obs_prompt_version(PROMPT_DATA_ATTRIBUTES_PROMPT_ID, body)
diff --git a/examples/v2/llm-observability/DeleteLLMObsPrompt.rb b/examples/v2/llm-observability/DeleteLLMObsPrompt.rb
deleted file mode 100644
index 8ba90975c9d1..000000000000
--- a/examples/v2/llm-observability/DeleteLLMObsPrompt.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Delete an LLM Observability prompt returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.delete_llm_obs_prompt".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-p api_instance.delete_llm_obs_prompt(PROMPT_DATA_ATTRIBUTES_PROMPT_ID)
diff --git a/examples/v2/llm-observability/GetLLMObsPrompt.rb b/examples/v2/llm-observability/GetLLMObsPrompt.rb
deleted file mode 100644
index 1f8210d495c9..000000000000
--- a/examples/v2/llm-observability/GetLLMObsPrompt.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# Get an LLM Observability prompt returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.get_llm_obs_prompt".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-p api_instance.get_llm_obs_prompt(PROMPT_DATA_ATTRIBUTES_PROMPT_ID)
diff --git a/examples/v2/llm-observability/GetLLMObsPromptVersion.rb b/examples/v2/llm-observability/GetLLMObsPromptVersion.rb
deleted file mode 100644
index 197021c8478a..000000000000
--- a/examples/v2/llm-observability/GetLLMObsPromptVersion.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# Get a specific LLM Observability prompt version returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.get_llm_obs_prompt_version".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-
-# there is a valid "prompt_version" in the system
-PROMPT_VERSION_DATA_ATTRIBUTES_VERSION = ENV["PROMPT_VERSION_DATA_ATTRIBUTES_VERSION"]
-p api_instance.get_llm_obs_prompt_version(PROMPT_DATA_ATTRIBUTES_PROMPT_ID, PROMPT_VERSION_DATA_ATTRIBUTES_VERSION.to_i)
diff --git a/examples/v2/llm-observability/ListLLMObsPromptVersions.rb b/examples/v2/llm-observability/ListLLMObsPromptVersions.rb
deleted file mode 100644
index 5eccc2346653..000000000000
--- a/examples/v2/llm-observability/ListLLMObsPromptVersions.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# List versions of an LLM Observability prompt returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.list_llm_obs_prompt_versions".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-p api_instance.list_llm_obs_prompt_versions(PROMPT_DATA_ATTRIBUTES_PROMPT_ID)
diff --git a/examples/v2/llm-observability/ListLLMObsPrompts.rb b/examples/v2/llm-observability/ListLLMObsPrompts.rb
deleted file mode 100644
index c6619561514a..000000000000
--- a/examples/v2/llm-observability/ListLLMObsPrompts.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# List LLM Observability prompts returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.list_llm_obs_prompts".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-opts = {
-  filter_prompt_id: PROMPT_DATA_ATTRIBUTES_PROMPT_ID,
-}
-p api_instance.list_llm_obs_prompts(opts)
diff --git a/examples/v2/llm-observability/UpdateLLMObsPromptVersion.rb b/examples/v2/llm-observability/UpdateLLMObsPromptVersion.rb
deleted file mode 100644
index 35a99fb79d52..000000000000
--- a/examples/v2/llm-observability/UpdateLLMObsPromptVersion.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# Update a specific LLM Observability prompt version returns "OK" response
-
-require "datadog_api_client"
-DatadogAPIClient.configure do |config|
-  config.unstable_operations["v2.update_llm_obs_prompt_version".to_sym] = true
-end
-api_instance = DatadogAPIClient::V2::LLMObservabilityAPI.new
-
-# there is a valid "prompt" in the system
-PROMPT_DATA_ATTRIBUTES_PROMPT_ID = ENV["PROMPT_DATA_ATTRIBUTES_PROMPT_ID"]
-
-# there is a valid "prompt_version" in the system
-PROMPT_VERSION_DATA_ATTRIBUTES_VERSION = ENV["PROMPT_VERSION_DATA_ATTRIBUTES_VERSION"]
-
-body = DatadogAPIClient::V2::LLMObsUpdatePromptVersionRequest.new({
-  data: DatadogAPIClient::V2::LLMObsUpdatePromptVersionData.new({
-    attributes: DatadogAPIClient::V2::LLMObsUpdatePromptVersionDataAttributes.new({
-      description: "Give concise answers and cite relevant help-center articles.",
-    }),
-    type: DatadogAPIClient::V2::LLMObsPromptVersionType::PROMPT_TEMPLATE_VERSIONS,
-  }),
-})
-p api_instance.update_llm_obs_prompt_version(PROMPT_DATA_ATTRIBUTES_PROMPT_ID, PROMPT_VERSION_DATA_ATTRIBUTES_VERSION.to_i, body)
diff --git a/examples/v2/rum-retention-quota/DeleteRumQuotaConfig.rb b/examples/v2/rum-retention-quota/DeleteRumQuotaConfig.rb
new file mode 100644
index 000000000000..65026eebcde4
--- /dev/null
+++ b/examples/v2/rum-retention-quota/DeleteRumQuotaConfig.rb
@@ -0,0 +1,5 @@
+# Delete a RUM retention quota configuration returns "No Content" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::RUMRetentionQuotaAPI.new
+api_instance.delete_rum_quota_config(RumRetentionQuotaScopeType::APPLICATION, "ced16651-97b6-4e67-8590-8caec3af0695")
diff --git a/examples/v2/rum-retention-quota/GetRumQuotaConfig.rb b/examples/v2/rum-retention-quota/GetRumQuotaConfig.rb
new file mode 100644
index 000000000000..bdf61f624abb
--- /dev/null
+++ b/examples/v2/rum-retention-quota/GetRumQuotaConfig.rb
@@ -0,0 +1,5 @@
+# Get a RUM retention quota configuration returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::RUMRetentionQuotaAPI.new
+p api_instance.get_rum_quota_config(RumRetentionQuotaScopeType::APPLICATION, "ced16651-97b6-4e67-8590-8caec3af0695")
diff --git a/examples/v2/rum-retention-quota/UpsertRumQuotaConfig.rb b/examples/v2/rum-retention-quota/UpsertRumQuotaConfig.rb
new file mode 100644
index 000000000000..2e99cf3b4011
--- /dev/null
+++ b/examples/v2/rum-retention-quota/UpsertRumQuotaConfig.rb
@@ -0,0 +1,25 @@
+# Create or update a RUM retention quota config returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::RUMRetentionQuotaAPI.new
+
+body = DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateRequest.new({
+  data: DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateData.new({
+    attributes: DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateAttributes.new({
+      adaptive: DatadogAPIClient::V2::RumRetentionQuotaAdaptiveConfig.new({
+        max_retention_rate: 0.5,
+      }),
+      custom: DatadogAPIClient::V2::RumRetentionQuotaCustomConfig.new({
+        daily_reset_time: "08:00",
+        daily_reset_timezone: "+09:00",
+        quota_reached_action: DatadogAPIClient::V2::RumRetentionQuotaReachedAction::STOP,
+        session_limit: 1000000,
+        window_type: DatadogAPIClient::V2::RumRetentionQuotaWindowType::DAILY,
+      }),
+      mode: DatadogAPIClient::V2::RumRetentionQuotaMode::CUSTOM,
+    }),
+    id: "ced16651-97b6-4e67-8590-8caec3af0695",
+    type: DatadogAPIClient::V2::RumRetentionQuotaConfigType::RUM_QUOTA_CONFIG,
+  }),
+})
+p api_instance.upsert_rum_quota_config(RumRetentionQuotaScopeType::APPLICATION, "ced16651-97b6-4e67-8590-8caec3af0695", body)
diff --git a/features/scenarios_model_mapping.rb b/features/scenarios_model_mapping.rb
index 066d5a8d18c7..6dd185830a99 100644
--- a/features/scenarios_model_mapping.rb
+++ b/features/scenarios_model_mapping.rb
@@ -5461,6 +5461,19 @@
             "metric_id" => "String",
             "body" => "RumMetricUpdateRequest",
     },
+    "v2.DeleteRumQuotaConfig" => {
+            "scope_type" => "RumRetentionQuotaScopeType",
+            "scope_id" => "String",
+    },
+    "v2.GetRumQuotaConfig" => {
+            "scope_type" => "RumRetentionQuotaScopeType",
+            "scope_id" => "String",
+    },
+    "v2.UpsertRumQuotaConfig" => {
+            "scope_type" => "RumRetentionQuotaScopeType",
+            "scope_id" => "String",
+            "body" => "RumRetentionQuotaConfigUpdateRequest",
+    },
     "v2.CreateRUMOperation" => {
             "body" => "RUMOperationCreateRequest",
     },
diff --git a/features/v2/llm_observability.feature b/features/v2/agent_observability.feature
similarity index 86%
rename from features/v2/llm_observability.feature
rename to features/v2/agent_observability.feature
index 8cb53cdc5a9d..0b036ba38eab 100644
--- a/features/v2/llm_observability.feature
+++ b/features/v2/agent_observability.feature
@@ -1,12 +1,12 @@
-@endpoint(llm-observability) @endpoint(llm-observability-v2)
-Feature: LLM Observability
-  Manage LLM Observability spans, data, projects, datasets, dataset records,
-  experiments, prompts, and annotations.
+@endpoint(agent-observability) @endpoint(agent-observability-v2)
+Feature: Agent Observability
+  Manage Agent Observability spans, data, projects, datasets, dataset
+  records, experiments, prompts, and annotations.
 
   Background:
     Given a valid "apiKeyAuth" key in the system
-    And an instance of "LLMObservability" API
     And a valid "appKeyAuth" key in the system
+    And an instance of "AgentObservability" API
 
   @skip @team:DataDog/ml-observability
   Scenario: Add a display_block interaction returns "Created" response
@@ -54,7 +54,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Aggregate LLM Observability experimentation returns "Bad Request" response
+  Scenario: Aggregate Agent Observability experimentation returns "Bad Request" response
     Given operation "AggregateLLMObsExperimentation" enabled
     And new "AggregateLLMObsExperimentation" request
     And body with value {"data": {"attributes": {"aggregate": {"compute": [{"metric": "score_value", "name": "avg_faithfulness"}], "dataset_version": null, "group_by": [{"field": "span_id"}], "indexes": ["experiment-evals"], "limit": 1000, "search": {"query": "@experiment_id:3fd6b5e0-8910-4b1c-a7d0-5b84de329012"}, "time": {"from": 1705312200000, "to": 1705315800000}}}, "type": "experimentation"}}
@@ -62,7 +62,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Aggregate LLM Observability experimentation returns "OK" response
+  Scenario: Aggregate Agent Observability experimentation returns "OK" response
     Given operation "AggregateLLMObsExperimentation" enabled
     And new "AggregateLLMObsExperimentation" request
     And body with value {"data": {"attributes": {"aggregate": {"compute": [{"metric": "score_value", "name": "avg_faithfulness"}], "dataset_version": null, "group_by": [{"field": "span_id"}], "indexes": ["experiment-evals"], "limit": 1000, "search": {"query": "@experiment_id:3fd6b5e0-8910-4b1c-a7d0-5b84de329012"}, "time": {"from": 1705312200000, "to": 1705315800000}}}, "type": "experimentation"}}
@@ -70,7 +70,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Append records to an LLM Observability dataset returns "Bad Request" response
+  Scenario: Append records to an Agent Observability dataset returns "Bad Request" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -80,7 +80,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Append records to an LLM Observability dataset returns "Created" response
+  Scenario: Append records to an Agent Observability dataset returns "Created" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -90,7 +90,7 @@ Feature: LLM Observability
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Append records to an LLM Observability dataset returns "Not Found" response
+  Scenario: Append records to an Agent Observability dataset returns "Not Found" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -100,7 +100,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Append records to an LLM Observability dataset returns "OK" response
+  Scenario: Append records to an Agent Observability dataset returns "OK" response
     Given operation "CreateLLMObsDatasetRecords" enabled
     And new "CreateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -110,7 +110,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Batch update LLM Observability dataset records returns "Bad Request" response
+  Scenario: Batch update Agent Observability dataset records returns "Bad Request" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -120,7 +120,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Batch update LLM Observability dataset records returns "Not Found" response
+  Scenario: Batch update Agent Observability dataset records returns "Not Found" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -130,7 +130,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Batch update LLM Observability dataset records returns "OK" response
+  Scenario: Batch update Agent Observability dataset records returns "OK" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -140,7 +140,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Batch update LLM Observability dataset records returns "Payload Too Large" response
+  Scenario: Batch update Agent Observability dataset records returns "Payload Too Large" response
     Given operation "BatchUpdateLLMObsDataset" enabled
     And new "BatchUpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -150,7 +150,7 @@ Feature: LLM Observability
     Then the response status is 413 Payload Too Large
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Clone an LLM Observability dataset returns "Bad Request" response
+  Scenario: Clone an Agent Observability dataset returns "Bad Request" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -160,7 +160,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Clone an LLM Observability dataset returns "Not Found" response
+  Scenario: Clone an Agent Observability dataset returns "Not Found" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -170,7 +170,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Clone an LLM Observability dataset returns "OK" response
+  Scenario: Clone an Agent Observability dataset returns "OK" response
     Given operation "CloneLLMObsDataset" enabled
     And new "CloneLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -179,37 +179,35 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: Create a new LLM Observability prompt version returns "Bad Request" response
-    Given there is a valid "prompt" in the system
-    And operation "CreateLLMObsPromptVersion" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create a new Agent Observability prompt version returns "Bad Request" response
+    Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
-    And body with value {"data": {"attributes": {"template": " "}, "type": "prompt-template-versions"}}
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-template-versions"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ml-observability
-  Scenario: Create a new LLM Observability prompt version returns "Not Found" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create a new Agent Observability prompt version returns "Not Found" response
     Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
-    And body with value {"data": {"attributes": {"env_ids": [], "labels": [], "template": [{"content": "Hello v2", "role": "user"}]}, "type": "prompt-template-versions"}}
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-template-versions"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Create a new LLM Observability prompt version returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "CreateLLMObsPromptVersion" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create a new Agent Observability prompt version returns "OK" response
+    Given operation "CreateLLMObsPromptVersion" enabled
     And new "CreateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
-    And body with value {"data": {"attributes": {"template": [{"content": "You are a concise customer support assistant for {{ '{{company_name}}' }}.", "role": "system"}, {"content": "Answer {{ '{{customer_name}}' }}'s question: {{ '{{question}}' }}", "role": "user"}]}, "type": "prompt-template-versions"}}
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-template-versions"}}
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability annotation queue returns "Bad Request" response
+  Scenario: Create an Agent Observability annotation queue returns "Bad Request" response
     Given operation "CreateLLMObsAnnotationQueue" enabled
     And new "CreateLLMObsAnnotationQueue" request
     And body with value {"data": {"attributes": {"annotation_schema": {"label_schemas": [{"description": "Rating of the response quality.", "has_assessment": false, "has_reasoning": false, "id": "abc-123", "is_assessment": false, "is_integer": false, "is_required": true, "max": 5.0, "min": 0.0, "name": "quality", "type": "score", "values": ["good", "bad", "neutral"]}]}, "description": "Queue for annotating customer support traces", "name": "My annotation queue", "project_id": "00000000-0000-0000-0000-000000000002"}, "type": "queues"}}
@@ -217,7 +215,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability annotation queue returns "Created" response
+  Scenario: Create an Agent Observability annotation queue returns "Created" response
     Given operation "CreateLLMObsAnnotationQueue" enabled
     And new "CreateLLMObsAnnotationQueue" request
     And body with value {"data": {"attributes": {"annotation_schema": {"label_schemas": [{"description": "Rating of the response quality.", "has_assessment": false, "has_reasoning": false, "id": "abc-123", "is_assessment": false, "is_integer": false, "is_required": true, "max": 5.0, "min": 0.0, "name": "quality", "type": "score", "values": ["good", "bad", "neutral"]}]}, "description": "Queue for annotating customer support traces", "name": "My annotation queue", "project_id": "00000000-0000-0000-0000-000000000002"}, "type": "queues"}}
@@ -225,7 +223,7 @@ Feature: LLM Observability
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability dataset returns "Bad Request" response
+  Scenario: Create an Agent Observability dataset returns "Bad Request" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -234,7 +232,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability dataset returns "Created" response
+  Scenario: Create an Agent Observability dataset returns "Created" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -243,7 +241,7 @@ Feature: LLM Observability
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability dataset returns "Not Found" response
+  Scenario: Create an Agent Observability dataset returns "Not Found" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -252,7 +250,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability dataset returns "OK" response
+  Scenario: Create an Agent Observability dataset returns "OK" response
     Given operation "CreateLLMObsDataset" enabled
     And new "CreateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -261,7 +259,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability experiment returns "Bad Request" response
+  Scenario: Create an Agent Observability experiment returns "Bad Request" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
     And body with value {"data": {"attributes": {"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "name": "My Experiment v1", "parent_experiment_id": "3fd6b5e0-8910-4b1c-a7d0-5b84de329012", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"}, "type": "experiments"}}
@@ -269,7 +267,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability experiment returns "Created" response
+  Scenario: Create an Agent Observability experiment returns "Created" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
     And body with value {"data": {"attributes": {"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "name": "My Experiment v1", "parent_experiment_id": "3fd6b5e0-8910-4b1c-a7d0-5b84de329012", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"}, "type": "experiments"}}
@@ -277,7 +275,7 @@ Feature: LLM Observability
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability experiment returns "OK" response
+  Scenario: Create an Agent Observability experiment returns "OK" response
     Given operation "CreateLLMObsExperiment" enabled
     And new "CreateLLMObsExperiment" request
     And body with value {"data": {"attributes": {"dataset_id": "9f64e5c7-dc5a-45c8-a17c-1b85f0bec97d", "name": "My Experiment v1", "parent_experiment_id": "3fd6b5e0-8910-4b1c-a7d0-5b84de329012", "project_id": "a33671aa-24fd-4dcd-9b33-a8ec7dde7751"}, "type": "experiments"}}
@@ -285,7 +283,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability project returns "Bad Request" response
+  Scenario: Create an Agent Observability project returns "Bad Request" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
     And body with value {"data": {"attributes": {"name": "My LLM Project"}, "type": "projects"}}
@@ -293,7 +291,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability project returns "Created" response
+  Scenario: Create an Agent Observability project returns "Created" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
     And body with value {"data": {"attributes": {"name": "My LLM Project"}, "type": "projects"}}
@@ -301,35 +299,34 @@ Feature: LLM Observability
     Then the response status is 201 Created
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability project returns "OK" response
+  Scenario: Create an Agent Observability project returns "OK" response
     Given operation "CreateLLMObsProject" enabled
     And new "CreateLLMObsProject" request
     And body with value {"data": {"attributes": {"name": "My LLM Project"}, "type": "projects"}}
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability prompt returns "Bad Request" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create an Agent Observability prompt returns "Bad Request" response
     Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
-    And body with value {"data": {"attributes": {"prompt_id": "{{ unique }}", "template": " "}, "type": "prompt-templates"}}
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "prompt_id": "customer-support-assistant", "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-templates"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability prompt returns "Conflict" response
-    Given there is a valid "prompt" in the system
-    And operation "CreateLLMObsPrompt" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create an Agent Observability prompt returns "Conflict" response
+    Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
-    And body with value {"data": {"attributes": {"env_ids": [], "labels": [], "prompt_id": "{{ prompt.data.attributes.prompt_id }}", "template": [{"content": "Hello", "role": "user"}]}, "type": "prompt-templates"}}
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "prompt_id": "customer-support-assistant", "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-templates"}}
     When the request is sent
     Then the response status is 409 Conflict
 
-  @team:DataDog/ml-observability
-  Scenario: Create an LLM Observability prompt returns "OK" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Create an Agent Observability prompt returns "OK" response
     Given operation "CreateLLMObsPrompt" enabled
     And new "CreateLLMObsPrompt" request
-    And body with value {"data": {"attributes": {"prompt_id": "{{ unique }}", "title": "Customer Support Assistant", "template": [{"content": "You are a helpful customer support assistant for {{ '{{company_name}}' }}.", "role": "system"}, {"content": "Help {{ '{{customer_name}}' }} with this question: {{ '{{question}}' }}", "role": "user"}]}, "type": "prompt-templates"}}
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"], "prompt_id": "customer-support-assistant", "template": "You are a helpful assistant for {{audience}}."}, "type": "prompt-templates"}}
     When the request is sent
     Then the response status is 200 OK
 
@@ -421,7 +418,7 @@ Feature: LLM Observability
     Then the response status is 200 OK — annotations created or updated. Per-item errors are listed in `errors`.
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability dataset records returns "Bad Request" response
+  Scenario: Delete Agent Observability dataset records returns "Bad Request" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -431,7 +428,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability dataset records returns "No Content" response
+  Scenario: Delete Agent Observability dataset records returns "No Content" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -441,7 +438,7 @@ Feature: LLM Observability
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability dataset records returns "Not Found" response
+  Scenario: Delete Agent Observability dataset records returns "Not Found" response
     Given operation "DeleteLLMObsDatasetRecords" enabled
     And new "DeleteLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -451,7 +448,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability datasets returns "Bad Request" response
+  Scenario: Delete Agent Observability datasets returns "Bad Request" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -460,7 +457,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability datasets returns "No Content" response
+  Scenario: Delete Agent Observability datasets returns "No Content" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -469,7 +466,7 @@ Feature: LLM Observability
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability datasets returns "Not Found" response
+  Scenario: Delete Agent Observability datasets returns "Not Found" response
     Given operation "DeleteLLMObsDatasets" enabled
     And new "DeleteLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -478,7 +475,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability experiments returns "Bad Request" response
+  Scenario: Delete Agent Observability experiments returns "Bad Request" response
     Given operation "DeleteLLMObsExperiments" enabled
     And new "DeleteLLMObsExperiments" request
     And body with value {"data": {"attributes": {"experiment_ids": ["3fd6b5e0-8910-4b1c-a7d0-5b84de329012"]}, "type": "experiments"}}
@@ -486,7 +483,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability experiments returns "No Content" response
+  Scenario: Delete Agent Observability experiments returns "No Content" response
     Given operation "DeleteLLMObsExperiments" enabled
     And new "DeleteLLMObsExperiments" request
     And body with value {"data": {"attributes": {"experiment_ids": ["3fd6b5e0-8910-4b1c-a7d0-5b84de329012"]}, "type": "experiments"}}
@@ -494,7 +491,7 @@ Feature: LLM Observability
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability projects returns "Bad Request" response
+  Scenario: Delete Agent Observability projects returns "Bad Request" response
     Given operation "DeleteLLMObsProjects" enabled
     And new "DeleteLLMObsProjects" request
     And body with value {"data": {"attributes": {"project_ids": ["a33671aa-24fd-4dcd-9b33-a8ec7dde7751"]}, "type": "projects"}}
@@ -502,7 +499,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete LLM Observability projects returns "No Content" response
+  Scenario: Delete Agent Observability projects returns "No Content" response
     Given operation "DeleteLLMObsProjects" enabled
     And new "DeleteLLMObsProjects" request
     And body with value {"data": {"attributes": {"project_ids": ["a33671aa-24fd-4dcd-9b33-a8ec7dde7751"]}, "type": "projects"}}
@@ -558,7 +555,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete an LLM Observability annotation queue returns "No Content" response
+  Scenario: Delete an Agent Observability annotation queue returns "No Content" response
     Given operation "DeleteLLMObsAnnotationQueue" enabled
     And new "DeleteLLMObsAnnotationQueue" request
     And request contains "queue_id" parameter from "REPLACE.ME"
@@ -566,27 +563,26 @@ Feature: LLM Observability
     Then the response status is 204 No Content
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Delete an LLM Observability annotation queue returns "Not Found" response
+  Scenario: Delete an Agent Observability annotation queue returns "Not Found" response
     Given operation "DeleteLLMObsAnnotationQueue" enabled
     And new "DeleteLLMObsAnnotationQueue" request
     And request contains "queue_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Delete an LLM Observability prompt returns "Not Found" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Delete an Agent Observability prompt returns "Not Found" response
     Given operation "DeleteLLMObsPrompt" enabled
     And new "DeleteLLMObsPrompt" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Delete an LLM Observability prompt returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "DeleteLLMObsPrompt" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Delete an Agent Observability prompt returns "OK" response
+    Given operation "DeleteLLMObsPrompt" enabled
     And new "DeleteLLMObsPrompt" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
@@ -645,7 +641,7 @@ Feature: LLM Observability
     Then the response status is 200 OK — annotations deleted. Errors for annotations that could not be deleted are listed in `errors`.
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Export an LLM Observability dataset returns "Bad Request" response
+  Scenario: Export an Agent Observability dataset returns "Bad Request" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -654,7 +650,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Export an LLM Observability dataset returns "Not Found" response
+  Scenario: Export an Agent Observability dataset returns "Not Found" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -663,7 +659,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Export an LLM Observability dataset returns "OK" response
+  Scenario: Export an Agent Observability dataset returns "OK" response
     Given operation "ExportLLMObsDataset" enabled
     And new "ExportLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -672,7 +668,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Get LLM Observability dataset draft state returns "Bad Request" response
+  Scenario: Get Agent Observability dataset draft state returns "Bad Request" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -681,7 +677,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Get LLM Observability dataset draft state returns "Not Found" response
+  Scenario: Get Agent Observability dataset draft state returns "Not Found" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -690,7 +686,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Get LLM Observability dataset draft state returns "OK" response
+  Scenario: Get Agent Observability dataset draft state returns "OK" response
     Given operation "GetLLMObsDatasetDraftState" enabled
     And new "GetLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -744,7 +740,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Get a specific LLM Observability prompt version returns "Bad Request" response
+  Scenario: Get a specific Agent Observability prompt version returns "Bad Request" response
     Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
     And request contains "prompt_id" parameter from "REPLACE.ME"
@@ -752,40 +748,37 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ml-observability
-  Scenario: Get a specific LLM Observability prompt version returns "Not Found" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Get a specific Agent Observability prompt version returns "Not Found" response
     Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
-    And request contains "version" parameter with value 1
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And request contains "version" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Get a specific LLM Observability prompt version returns "OK" response
-    Given there is a valid "prompt" in the system
-    And there is a valid "prompt_version" in the system
-    And operation "GetLLMObsPromptVersion" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Get a specific Agent Observability prompt version returns "OK" response
+    Given operation "GetLLMObsPromptVersion" enabled
     And new "GetLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
-    And request contains "version" parameter from "prompt_version.data.attributes.version"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And request contains "version" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: Get an LLM Observability prompt returns "Not Found" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Get an Agent Observability prompt returns "Not Found" response
     Given operation "GetLLMObsPrompt" enabled
     And new "GetLLMObsPrompt" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Get an LLM Observability prompt returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "GetLLMObsPrompt" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Get an Agent Observability prompt returns "OK" response
+    Given operation "GetLLMObsPrompt" enabled
     And new "GetLLMObsPrompt" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
@@ -870,21 +863,21 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability annotation queues returns "Bad Request" response
+  Scenario: List Agent Observability annotation queues returns "Bad Request" response
     Given operation "ListLLMObsAnnotationQueues" enabled
     And new "ListLLMObsAnnotationQueues" request
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability annotation queues returns "OK" response
+  Scenario: List Agent Observability annotation queues returns "OK" response
     Given operation "ListLLMObsAnnotationQueues" enabled
     And new "ListLLMObsAnnotationQueues" request
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset records returns "Bad Request" response
+  Scenario: List Agent Observability dataset records returns "Bad Request" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -893,7 +886,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset records returns "Not Found" response
+  Scenario: List Agent Observability dataset records returns "Not Found" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -902,7 +895,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset records returns "OK" response
+  Scenario: List Agent Observability dataset records returns "OK" response
     Given operation "ListLLMObsDatasetRecords" enabled
     And new "ListLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -911,7 +904,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset versions returns "Bad Request" response
+  Scenario: List Agent Observability dataset versions returns "Bad Request" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -920,7 +913,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset versions returns "Not Found" response
+  Scenario: List Agent Observability dataset versions returns "Not Found" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -929,7 +922,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability dataset versions returns "OK" response
+  Scenario: List Agent Observability dataset versions returns "OK" response
     Given operation "ListLLMObsDatasetVersions" enabled
     And new "ListLLMObsDatasetVersions" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -938,7 +931,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability datasets returns "Bad Request" response
+  Scenario: List Agent Observability datasets returns "Bad Request" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -946,7 +939,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability datasets returns "Not Found" response
+  Scenario: List Agent Observability datasets returns "Not Found" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -954,7 +947,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability datasets returns "OK" response
+  Scenario: List Agent Observability datasets returns "OK" response
     Given operation "ListLLMObsDatasets" enabled
     And new "ListLLMObsDatasets" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -962,7 +955,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment events (v2) returns "Bad Request" response
+  Scenario: List Agent Observability experiment events (v2) returns "Bad Request" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -970,7 +963,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment events (v2) returns "Not Found" response
+  Scenario: List Agent Observability experiment events (v2) returns "Not Found" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -978,7 +971,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment events (v2) returns "OK" response
+  Scenario: List Agent Observability experiment events (v2) returns "OK" response
     Given operation "ListLLMObsExperimentEventsV2" enabled
     And new "ListLLMObsExperimentEventsV2" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -986,7 +979,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment spans (v1) returns "Bad Request" response
+  Scenario: List Agent Observability experiment spans (v1) returns "Bad Request" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -994,7 +987,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment spans (v1) returns "Not Found" response
+  Scenario: List Agent Observability experiment spans (v1) returns "Not Found" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1002,7 +995,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiment spans (v1) returns "OK" response
+  Scenario: List Agent Observability experiment spans (v1) returns "OK" response
     Given operation "ListLLMObsExperimentEventsV1" enabled
     And new "ListLLMObsExperimentEventsV1" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1010,51 +1003,49 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiments returns "Bad Request" response
+  Scenario: List Agent Observability experiments returns "Bad Request" response
     Given operation "ListLLMObsExperiments" enabled
     And new "ListLLMObsExperiments" request
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability experiments returns "OK" response
+  Scenario: List Agent Observability experiments returns "OK" response
     Given operation "ListLLMObsExperiments" enabled
     And new "ListLLMObsExperiments" request
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability projects returns "Bad Request" response
+  Scenario: List Agent Observability projects returns "Bad Request" response
     Given operation "ListLLMObsProjects" enabled
     And new "ListLLMObsProjects" request
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability projects returns "OK" response
+  Scenario: List Agent Observability projects returns "OK" response
     Given operation "ListLLMObsProjects" enabled
     And new "ListLLMObsProjects" request
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: List LLM Observability prompts returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "ListLLMObsPrompts" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: List Agent Observability prompts returns "OK" response
+    Given operation "ListLLMObsPrompts" enabled
     And new "ListLLMObsPrompts" request
-    And request contains "filter[prompt_id]" parameter from "prompt.data.attributes.prompt_id"
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability spans returns "Bad Request" response
+  Scenario: List Agent Observability spans returns "Bad Request" response
     Given operation "ListLLMObsSpans" enabled
     And new "ListLLMObsSpans" request
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List LLM Observability spans returns "OK" response
+  Scenario: List Agent Observability spans returns "OK" response
     Given operation "ListLLMObsSpans" enabled
     And new "ListLLMObsSpans" request
     When the request is sent
@@ -1102,7 +1093,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List events for an LLM Observability experiment returns "Bad Request" response
+  Scenario: List events for an Agent Observability experiment returns "Bad Request" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1110,7 +1101,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List events for an LLM Observability experiment returns "Not Found" response
+  Scenario: List events for an Agent Observability experiment returns "Not Found" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1118,7 +1109,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: List events for an LLM Observability experiment returns "OK" response
+  Scenario: List events for an Agent Observability experiment returns "OK" response
     Given operation "ListLLMObsExperimentEvents" enabled
     And new "ListLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1235,17 +1226,16 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: List versions of an LLM Observability prompt returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "ListLLMObsPromptVersions" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: List versions of an Agent Observability prompt returns "OK" response
+    Given operation "ListLLMObsPromptVersions" enabled
     And new "ListLLMObsPromptVersions" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Lock LLM Observability dataset draft state returns "Bad Request" response
+  Scenario: Lock Agent Observability dataset draft state returns "Bad Request" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1254,7 +1244,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Lock LLM Observability dataset draft state returns "Not Found" response
+  Scenario: Lock Agent Observability dataset draft state returns "Not Found" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1263,7 +1253,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Lock LLM Observability dataset draft state returns "OK" response
+  Scenario: Lock Agent Observability dataset draft state returns "OK" response
     Given operation "LockLLMObsDatasetDraftState" enabled
     And new "LockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1272,7 +1262,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Push events for an LLM Observability experiment returns "Accepted" response
+  Scenario: Push events for an Agent Observability experiment returns "Accepted" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1281,7 +1271,7 @@ Feature: LLM Observability
     Then the response status is 202 Accepted
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Push events for an LLM Observability experiment returns "Bad Request" response
+  Scenario: Push events for an Agent Observability experiment returns "Bad Request" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1290,7 +1280,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Push events for an LLM Observability experiment returns "Not Found" response
+  Scenario: Push events for an Agent Observability experiment returns "Not Found" response
     Given operation "CreateLLMObsExperimentEvents" enabled
     And new "CreateLLMObsExperimentEvents" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1299,7 +1289,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Restore an LLM Observability dataset version returns "Bad Request" response
+  Scenario: Restore an Agent Observability dataset version returns "Bad Request" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1309,7 +1299,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Restore an LLM Observability dataset version returns "Not Found" response
+  Scenario: Restore an Agent Observability dataset version returns "Not Found" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1319,7 +1309,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Restore an LLM Observability dataset version returns "OK" response
+  Scenario: Restore an Agent Observability dataset version returns "OK" response
     Given operation "RestoreLLMObsDatasetVersion" enabled
     And new "RestoreLLMObsDatasetVersion" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1349,7 +1339,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Search LLM Observability experimentation entities returns "Bad Request" response
+  Scenario: Search Agent Observability experimentation returns "Bad Request" response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
     And body with value {"data": {"attributes": {"content_preview": {"limit": 500}, "filter": {"include_deleted": false, "is_deleted": false, "query": "my experiment", "scope": ["experiments"], "version": null}, "include": {"user_data": false}, "page": {"limit": 100}}, "type": "experimentation"}}
@@ -1357,7 +1347,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Search LLM Observability experimentation entities returns "OK — all results returned in a single page." response
+  Scenario: Search Agent Observability experimentation returns "OK — all results returned in a single page." response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
     And body with value {"data": {"attributes": {"content_preview": {"limit": 500}, "filter": {"include_deleted": false, "is_deleted": false, "query": "my experiment", "scope": ["experiments"], "version": null}, "include": {"user_data": false}, "page": {"limit": 100}}, "type": "experimentation"}}
@@ -1365,7 +1355,7 @@ Feature: LLM Observability
     Then the response status is 200 OK — all results returned in a single page.
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Search LLM Observability experimentation entities returns "Partial Content — more results are available. Use `meta.after` as the next `page.cursor`." response
+  Scenario: Search Agent Observability experimentation returns "Partial Content — more results are available. Use `meta.after` as the next `page.cursor`." response
     Given operation "SearchLLMObsExperimentation" enabled
     And new "SearchLLMObsExperimentation" request
     And body with value {"data": {"attributes": {"content_preview": {"limit": 500}, "filter": {"include_deleted": false, "is_deleted": false, "query": "my experiment", "scope": ["experiments"], "version": null}, "include": {"user_data": false}, "page": {"limit": 100}}, "type": "experimentation"}}
@@ -1373,7 +1363,7 @@ Feature: LLM Observability
     Then the response status is 206 Partial Content — more results are available. Use `meta.after` as the next `page.cursor`.
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Search LLM Observability spans returns "Bad Request" response
+  Scenario: Search Agent Observability spans returns "Bad Request" response
     Given operation "SearchLLMObsSpans" enabled
     And new "SearchLLMObsSpans" request
     And body with value {"data": {"attributes": {"filter": {"from": "now-900s", "ml_app": "my-llm-app", "query": "@session_id:abc123def456", "span_id": "abc123def456", "span_kind": "llm", "span_name": "llm_call", "to": "now", "trace_id": "trace-9a8b7c6d5e4f"}, "options": {"include_attachments": true, "time_offset": 0}, "page": {"cursor": "eyJzdGFydCI6MTAwfQ==", "limit": 10}, "sort": "-start_ns"}, "type": "spans"}}
@@ -1381,7 +1371,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Search LLM Observability spans returns "OK" response
+  Scenario: Search Agent Observability spans returns "OK" response
     Given operation "SearchLLMObsSpans" enabled
     And new "SearchLLMObsSpans" request
     And body with value {"data": {"attributes": {"filter": {"from": "now-900s", "ml_app": "my-llm-app", "query": "@session_id:abc123def456", "span_id": "abc123def456", "span_kind": "llm", "span_name": "llm_call", "to": "now", "trace_id": "trace-9a8b7c6d5e4f"}, "options": {"include_attachments": true, "time_offset": 0}, "page": {"cursor": "eyJzdGFydCI6MTAwfQ==", "limit": 10}, "sort": "-start_ns"}, "type": "spans"}}
@@ -1429,7 +1419,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Unlock LLM Observability dataset draft state returns "Bad Request" response
+  Scenario: Unlock Agent Observability dataset draft state returns "Bad Request" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1438,7 +1428,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Unlock LLM Observability dataset draft state returns "Not Found" response
+  Scenario: Unlock Agent Observability dataset draft state returns "Not Found" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1447,7 +1437,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Unlock LLM Observability dataset draft state returns "OK" response
+  Scenario: Unlock Agent Observability dataset draft state returns "OK" response
     Given operation "UnlockLLMObsDatasetDraftState" enabled
     And new "UnlockLLMObsDatasetDraftState" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1456,7 +1446,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update LLM Observability dataset records returns "Bad Request" response
+  Scenario: Update Agent Observability dataset records returns "Bad Request" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1466,7 +1456,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update LLM Observability dataset records returns "Not Found" response
+  Scenario: Update Agent Observability dataset records returns "Not Found" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1476,7 +1466,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update LLM Observability dataset records returns "OK" response
+  Scenario: Update Agent Observability dataset records returns "OK" response
     Given operation "UpdateLLMObsDatasetRecords" enabled
     And new "UpdateLLMObsDatasetRecords" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1486,39 +1476,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update a specific LLM Observability prompt version returns "Bad Request" response
-    Given operation "UpdateLLMObsPromptVersion" enabled
-    And new "UpdateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter from "REPLACE.ME"
-    And request contains "version" parameter from "REPLACE.ME"
-    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"]}, "type": "prompt-template-versions"}}
-    When the request is sent
-    Then the response status is 400 Bad Request
-
-  @team:DataDog/ml-observability
-  Scenario: Update a specific LLM Observability prompt version returns "Not Found" response
-    Given operation "UpdateLLMObsPromptVersion" enabled
-    And new "UpdateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
-    And request contains "version" parameter with value 1
-    And body with value {"data": {"attributes": {"env_ids": [], "labels": []}, "type": "prompt-template-versions"}}
-    When the request is sent
-    Then the response status is 404 Not Found
-
-  @team:DataDog/ml-observability
-  Scenario: Update a specific LLM Observability prompt version returns "OK" response
-    Given there is a valid "prompt" in the system
-    And there is a valid "prompt_version" in the system
-    And operation "UpdateLLMObsPromptVersion" enabled
-    And new "UpdateLLMObsPromptVersion" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
-    And request contains "version" parameter from "prompt_version.data.attributes.version"
-    And body with value {"data": {"attributes": {"description": "Give concise answers and cite relevant help-center articles."}, "type": "prompt-template-versions"}}
-    When the request is sent
-    Then the response status is 200 OK
-
-  @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability annotation queue returns "Bad Request" response
+  Scenario: Update an Agent Observability annotation queue returns "Bad Request" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
     And request contains "queue_id" parameter from "REPLACE.ME"
@@ -1527,7 +1485,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability annotation queue returns "Not Found" response
+  Scenario: Update an Agent Observability annotation queue returns "Not Found" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
     And request contains "queue_id" parameter from "REPLACE.ME"
@@ -1536,7 +1494,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability annotation queue returns "OK" response
+  Scenario: Update an Agent Observability annotation queue returns "OK" response
     Given operation "UpdateLLMObsAnnotationQueue" enabled
     And new "UpdateLLMObsAnnotationQueue" request
     And request contains "queue_id" parameter from "REPLACE.ME"
@@ -1545,7 +1503,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability dataset returns "Bad Request" response
+  Scenario: Update an Agent Observability dataset returns "Bad Request" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1555,7 +1513,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability dataset returns "Not Found" response
+  Scenario: Update an Agent Observability dataset returns "Not Found" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1565,7 +1523,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability dataset returns "OK" response
+  Scenario: Update an Agent Observability dataset returns "OK" response
     Given operation "UpdateLLMObsDataset" enabled
     And new "UpdateLLMObsDataset" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1575,7 +1533,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability experiment returns "Bad Request" response
+  Scenario: Update an Agent Observability experiment returns "Bad Request" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1584,7 +1542,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability experiment returns "Not Found" response
+  Scenario: Update an Agent Observability experiment returns "Not Found" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1593,7 +1551,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability experiment returns "OK" response
+  Scenario: Update an Agent Observability experiment returns "OK" response
     Given operation "UpdateLLMObsExperiment" enabled
     And new "UpdateLLMObsExperiment" request
     And request contains "experiment_id" parameter from "REPLACE.ME"
@@ -1602,7 +1560,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability project returns "Bad Request" response
+  Scenario: Update an Agent Observability project returns "Bad Request" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1611,7 +1569,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability project returns "Not Found" response
+  Scenario: Update an Agent Observability project returns "Not Found" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1620,7 +1578,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability project returns "OK" response
+  Scenario: Update an Agent Observability project returns "OK" response
     Given operation "UpdateLLMObsProject" enabled
     And new "UpdateLLMObsProject" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1628,32 +1586,60 @@ Feature: LLM Observability
     When the request is sent
     Then the response status is 200 OK
 
-  @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability prompt returns "Bad Request" response
-    Given there is a valid "prompt" in the system
-    And operation "UpdateLLMObsPrompt" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt returns "Bad Request" response
+    Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
+    And request contains "prompt_id" parameter from "REPLACE.ME"
     And body with value {"data": {"attributes": {}, "type": "prompt-templates"}}
     When the request is sent
     Then the response status is 400 Bad Request
 
-  @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability prompt returns "Not Found" response
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt returns "Not Found" response
     Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
-    And request contains "prompt_id" parameter with value "nonexistent-prompt"
-    And body with value {"data": {"attributes": {"title": "New title"}, "type": "prompt-templates"}}
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {}, "type": "prompt-templates"}}
     When the request is sent
     Then the response status is 404 Not Found
 
-  @team:DataDog/ml-observability
-  Scenario: Update an LLM Observability prompt returns "OK" response
-    Given there is a valid "prompt" in the system
-    And operation "UpdateLLMObsPrompt" enabled
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt returns "OK" response
+    Given operation "UpdateLLMObsPrompt" enabled
     And new "UpdateLLMObsPrompt" request
-    And request contains "prompt_id" parameter from "prompt.data.attributes.prompt_id"
-    And body with value {"data": {"attributes": {"title": "Customer Support Assistant"}, "type": "prompt-templates"}}
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {}, "type": "prompt-templates"}}
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt version returns "Bad Request" response
+    Given operation "UpdateLLMObsPromptVersion" enabled
+    And new "UpdateLLMObsPromptVersion" request
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And request contains "version" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"]}, "type": "prompt-template-versions"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt version returns "Not Found" response
+    Given operation "UpdateLLMObsPromptVersion" enabled
+    And new "UpdateLLMObsPromptVersion" request
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And request contains "version" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"]}, "type": "prompt-template-versions"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/ml-observability
+  Scenario: Update an Agent Observability prompt version returns "OK" response
+    Given operation "UpdateLLMObsPromptVersion" enabled
+    And new "UpdateLLMObsPromptVersion" request
+    And request contains "prompt_id" parameter from "REPLACE.ME"
+    And request contains "version" parameter from "REPLACE.ME"
+    And body with value {"data": {"attributes": {"env_ids": [], "labels": ["production"]}, "type": "prompt-template-versions"}}
     When the request is sent
     Then the response status is 200 OK
 
@@ -1685,7 +1671,7 @@ Feature: LLM Observability
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Upload records to an LLM Observability dataset returns "Bad Request" response
+  Scenario: Upload records to an Agent Observability dataset returns "Bad Request" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1694,7 +1680,7 @@ Feature: LLM Observability
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Upload records to an LLM Observability dataset returns "Not Found" response
+  Scenario: Upload records to an Agent Observability dataset returns "Not Found" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
     And request contains "project_id" parameter from "REPLACE.ME"
@@ -1703,7 +1689,7 @@ Feature: LLM Observability
     Then the response status is 404 Not Found
 
   @generated @skip @team:DataDog/ml-observability
-  Scenario: Upload records to an LLM Observability dataset returns "OK" response
+  Scenario: Upload records to an Agent Observability dataset returns "OK" response
     Given operation "UploadLLMObsDatasetRecordsFile" enabled
     And new "UploadLLMObsDatasetRecordsFile" request
     And request contains "project_id" parameter from "REPLACE.ME"
diff --git a/features/v2/given.json b/features/v2/given.json
index 2e083a2fd1d0..25ee1fa4088c 100644
--- a/features/v2/given.json
+++ b/features/v2/given.json
@@ -879,7 +879,7 @@
     ],
     "step": "there is a valid \"prompt\" in the system",
     "key": "prompt",
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "operationId": "CreateLLMObsPrompt"
   },
   {
@@ -895,7 +895,7 @@
     ],
     "step": "there is a valid \"prompt_version\" in the system",
     "key": "prompt_version",
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "operationId": "CreateLLMObsPromptVersion"
   },
   {
diff --git a/features/v2/rum_retention_quota.feature b/features/v2/rum_retention_quota.feature
new file mode 100644
index 000000000000..527a1597d4d8
--- /dev/null
+++ b/features/v2/rum_retention_quota.feature
@@ -0,0 +1,100 @@
+@endpoint(rum-retention-quota) @endpoint(rum-retention-quota-v2)
+Feature: RUM Retention Quota
+  Manage RUM retention quota configurations for your organization's RUM
+  applications.
+
+  Background:
+    Given a valid "apiKeyAuth" key in the system
+    And a valid "appKeyAuth" key in the system
+    And an instance of "RUMRetentionQuota" API
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Create or update a RUM retention quota config returns "Bad Request" response
+    Given new "UpsertRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "invalid-scope-id"
+    And body with value {"data": {"attributes": {"adaptive": {"max_retention_rate": 0.5}, "custom": {"daily_reset_time": "08:00", "daily_reset_timezone": "+09:00", "quota_reached_action": "stop", "session_limit": 1000000, "window_type": "daily"}, "mode": "custom"}, "id": "cd73a516-a481-4af5-8352-9b577465c77b", "type": "rum_quota_config"}}
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Create or update a RUM retention quota config returns "Not Found" response
+    Given new "UpsertRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "{{ unique }}"
+    And body with value {"data": {"attributes": {"adaptive": {"max_retention_rate": 0.5}, "custom": {"daily_reset_time": "08:00", "daily_reset_timezone": "+09:00", "quota_reached_action": "stop", "session_limit": 1000000, "window_type": "daily"}, "mode": "custom"}, "id": "{{ unique }}", "type": "rum_quota_config"}}
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Create or update a RUM retention quota config returns "OK" response
+    Given new "UpsertRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "ced16651-97b6-4e67-8590-8caec3af0695"
+    And body with value {"data": {"attributes": {"adaptive": {"max_retention_rate": 0.5}, "custom": {"daily_reset_time": "08:00", "daily_reset_timezone": "+09:00", "quota_reached_action": "stop", "session_limit": 1000000, "window_type": "daily"}, "mode": "custom"}, "id": "ced16651-97b6-4e67-8590-8caec3af0695", "type": "rum_quota_config"}}
+    When the request is sent
+    Then the response status is 200 OK
+
+  @generated @skip @team:DataDog/rum-backend
+  Scenario: Delete a RUM retention quota configuration returns "Bad Request" response
+    Given new "DeleteRumQuotaConfig" request
+    And request contains "scope_type" parameter from "REPLACE.ME"
+    And request contains "scope_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Delete a RUM retention quota configuration returns "No Content" response
+    Given new "DeleteRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "ced16651-97b6-4e67-8590-8caec3af0695"
+    When the request is sent
+    Then the response status is 204 No Content
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Delete a RUM retention quota configuration returns "Not Found" response
+    Given new "DeleteRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "{{ unique }}"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Delete a RUM retention quota configuration returns "Not Found" response for an invalid scope_id
+    Given new "DeleteRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "invalid-scope-id"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @generated @skip @team:DataDog/rum-backend
+  Scenario: Get a RUM retention quota configuration returns "Bad Request" response
+    Given new "GetRumQuotaConfig" request
+    And request contains "scope_type" parameter from "REPLACE.ME"
+    And request contains "scope_id" parameter from "REPLACE.ME"
+    When the request is sent
+    Then the response status is 400 Bad Request
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Get a RUM retention quota configuration returns "Not Found" response
+    Given new "GetRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "1d4b9c34-7ac4-423a-91cf-9902d926e9b3"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Get a RUM retention quota configuration returns "Not Found" response for an invalid scope_id
+    Given new "GetRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "invalid-scope-id"
+    When the request is sent
+    Then the response status is 404 Not Found
+
+  @skip @team:DataDog/rum-backend
+  Scenario: Get a RUM retention quota configuration returns "OK" response
+    Given new "GetRumQuotaConfig" request
+    And request contains "scope_type" parameter with value "application"
+    And request contains "scope_id" parameter with value "ced16651-97b6-4e67-8590-8caec3af0695"
+    When the request is sent
+    Then the response status is 200 OK
diff --git a/features/v2/synthetics.feature b/features/v2/synthetics.feature
index f43e2e2c997e..b77a1189bdf8 100644
--- a/features/v2/synthetics.feature
+++ b/features/v2/synthetics.feature
@@ -108,7 +108,7 @@ Feature: Synthetics
     When the request is sent
     Then the response status is 400 API error response.
 
-  @team:DataDog/synthetics-orchestrating-managing
+  @team:DataDog/synthetics-api-and-network
   Scenario: Create a Network Path test returns "OK" response
     Given new "CreateSyntheticsNetworkTest" request
     And body with value {"data": {"attributes": {"config": {"assertions": [{"operator": "lessThan", "property": "avg", "target": 500, "type": "latency"}], "request": {"host": "example.com", "port": 443, "tcp_method": "prefer_sack", "max_ttl": 30, "e2e_queries": 50, "traceroute_queries": 3}}, "locations": ["aws:us-east-1", "agent:my-agent-name"], "message": "Network Path test notification", "name": "Example Network Path test", "options": {"tick_every": 60}, "status": "live", "subtype": "tcp", "tags": ["env:production"], "type": "network"}, "type": "network"}}
diff --git a/features/v2/undo.json b/features/v2/undo.json
index 981c19e60085..b0bc955911dd 100644
--- a/features/v2/undo.json
+++ b/features/v2/undo.json
@@ -50,13 +50,13 @@
     }
   },
   "ListLLMObsCustomEvalConfigs": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "DeleteLLMObsCustomEvalConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "UpdateLLMObsCustomEvalConfig",
       "parameters": [
@@ -69,13 +69,13 @@
     }
   },
   "GetLLMObsCustomEvalConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpdateLLMObsCustomEvalConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
@@ -4477,19 +4477,19 @@
     }
   },
   "GetLLMObsAnnotatedInteractionsByTraceIDs": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsAnnotationQueues": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsAnnotationQueue": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsAnnotationQueue",
       "parameters": [
@@ -4502,25 +4502,25 @@
     }
   },
   "DeleteLLMObsAnnotationQueue": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "UpdateLLMObsAnnotationQueue": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "GetLLMObsAnnotatedInteractions": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpsertLLMObsAnnotations": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsAnnotations",
       "parameters": [
@@ -4537,13 +4537,13 @@
     }
   },
   "DeleteLLMObsAnnotations": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "CreateLLMObsAnnotationQueueInteractions": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsAnnotationQueueInteractions",
       "parameters": [
@@ -4560,49 +4560,49 @@
     }
   },
   "DeleteLLMObsAnnotationQueueInteractions": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "GetLLMObsAnnotationQueueLabelSchema": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpdateLLMObsAnnotationQueueLabelSchema": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "AggregateLLMObsExperimentation": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "SearchLLMObsExperimentation": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "SimpleSearchLLMObsExperimentation": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsExperiments": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsExperiment": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsExperiments",
       "parameters": [
@@ -4615,57 +4615,57 @@
     }
   },
   "DeleteLLMObsExperiments": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "parameters": [],
       "type": "unsafe"
     }
   },
   "UpdateLLMObsExperiment": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsExperimentEventsV1": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsExperimentEvents": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "parameters": [],
       "type": "unsafe"
     }
   },
   "ListLLMObsIntegrationAccounts": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsIntegrationInference": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsIntegrationModels": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsProjects": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsProject": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4673,7 +4673,7 @@
     }
   },
   "DeleteLLMObsProjects": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4681,19 +4681,19 @@
     }
   },
   "UpdateLLMObsProject": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsPrompts": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsPrompt": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsPrompt",
       "parameters": [
@@ -4706,31 +4706,31 @@
     }
   },
   "DeleteLLMObsPrompt": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "GetLLMObsPrompt": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpdateLLMObsPrompt": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsPromptVersions": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsPromptVersion": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsPrompt",
       "parameters": [
@@ -4743,67 +4743,67 @@
     }
   },
   "GetLLMObsPromptVersion": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpdateLLMObsPromptVersion": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsSpans": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "SearchLLMObsSpans": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsPatternsClusteredPoints": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsPatternsConfigs": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpsertLLMObsPatternsConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "GetLLMObsPatternsConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "DeleteLLMObsPatternsConfig": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsPatternsRuns": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "TriggerLLMObsPatterns": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4811,31 +4811,31 @@
     }
   },
   "GetLLMObsPatternsRunStatus": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsPatternsTopics": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsPatternsTopicsWithClusteredPoints": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsDatasets": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "CreateLLMObsDataset": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4843,7 +4843,7 @@
     }
   },
   "DeleteLLMObsDatasets": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4851,19 +4851,19 @@
     }
   },
   "UpdateLLMObsDataset": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "BatchUpdateLLMObsDataset": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "CloneLLMObsDataset": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4871,43 +4871,43 @@
     }
   },
   "GetLLMObsDatasetDraftState": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "LockLLMObsDatasetDraftState": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "UnlockLLMObsDatasetDraftState": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ExportLLMObsDataset": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsDatasetRecords": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UpdateLLMObsDatasetRecords": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "CreateLLMObsDatasetRecords": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "DeleteLLMObsDatasetRecords",
       "parameters": [
@@ -4924,7 +4924,7 @@
     }
   },
   "DeleteLLMObsDatasetRecords": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "operationId": "TODO",
       "parameters": [],
@@ -4932,31 +4932,31 @@
     }
   },
   "RestoreLLMObsDatasetVersion": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsDatasetVersions": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "ListLLMObsExperimentEventsV2": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
   },
   "UploadLLMObsDatasetRecordsFile": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "idempotent"
     }
   },
   "ListLLMObsExperimentEvents": {
-    "tag": "LLM Observability",
+    "tag": "Agent Observability",
     "undo": {
       "type": "safe"
     }
@@ -7086,6 +7086,24 @@
       "type": "idempotent"
     }
   },
+  "DeleteRumQuotaConfig": {
+    "tag": "RUM Retention Quota",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
+  "GetRumQuotaConfig": {
+    "tag": "RUM Retention Quota",
+    "undo": {
+      "type": "safe"
+    }
+  },
+  "UpsertRumQuotaConfig": {
+    "tag": "RUM Retention Quota",
+    "undo": {
+      "type": "idempotent"
+    }
+  },
   "ListRUMEvents": {
     "tag": "RUM",
     "undo": {
diff --git a/generated-test/test-runner-data/manifest.json b/generated-test/test-runner-data/manifest.json
index c7083d4cfa82..a48a0197c9ea 100644
--- a/generated-test/test-runner-data/manifest.json
+++ b/generated-test/test-runner-data/manifest.json
@@ -5362,6 +5362,97 @@
       "scenario": "Search events returns \"OK\" response with pagination",
       "version": "v2"
     },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/create-an-execution-policy-returns-bad-request-response.json",
+      "scenario": "Create an execution policy returns \"Bad Request\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/create-an-execution-policy-returns-created-response.json",
+      "scenario": "Create an execution policy returns \"Created\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/create-an-execution-policy-with-scope-and-targets-returns-created-response.json",
+      "scenario": "Create an execution policy with scope and targets returns \"Created\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/delete-an-execution-policy-returns-no-content-response.json",
+      "scenario": "Delete an execution policy returns \"No Content\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/delete-an-execution-policy-returns-not-found-response.json",
+      "scenario": "Delete an execution policy returns \"Not Found\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/get-an-execution-policy-returns-not-found-response.json",
+      "scenario": "Get an execution policy returns \"Not Found\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/get-an-execution-policy-returns-ok-response.json",
+      "scenario": "Get an execution policy returns \"OK\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/list-execution-policies-returns-bad-request-response.json",
+      "scenario": "List execution policies returns \"Bad Request\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/list-execution-policies-returns-ok-response.json",
+      "scenario": "List execution policies returns \"OK\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/list-execution-policies-with-query-parameters-returns-ok-response.json",
+      "scenario": "List execution policies with query parameters returns \"OK\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/update-an-execution-policy-returns-bad-request-response.json",
+      "scenario": "Update an execution policy returns \"Bad Request\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/update-an-execution-policy-returns-not-found-response.json",
+      "scenario": "Update an execution policy returns \"Not Found\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "Execution Policy",
+      "feature_file": "../../features/v2/execution_policy.feature",
+      "file": "v2/execution-policy/update-an-execution-policy-returns-ok-response.json",
+      "scenario": "Update an execution policy returns \"OK\" response",
+      "version": "v2"
+    },
     {
       "feature": "Fastly Integration",
       "feature_file": "../../features/v2/fastly_integration.feature",
@@ -6216,139 +6307,6 @@
       "scenario": "Update a personal access token returns \"OK\" response",
       "version": "v2"
     },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-bad-request-response.json",
-      "scenario": "Create a new LLM Observability prompt version returns \"Bad Request\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-not-found-response.json",
-      "scenario": "Create a new LLM Observability prompt version returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-ok-response.json",
-      "scenario": "Create a new LLM Observability prompt version returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-an-llm-observability-prompt-returns-bad-request-response.json",
-      "scenario": "Create an LLM Observability prompt returns \"Bad Request\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-an-llm-observability-prompt-returns-conflict-response.json",
-      "scenario": "Create an LLM Observability prompt returns \"Conflict\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/create-an-llm-observability-prompt-returns-ok-response.json",
-      "scenario": "Create an LLM Observability prompt returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/delete-an-llm-observability-prompt-returns-not-found-response.json",
-      "scenario": "Delete an LLM Observability prompt returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/delete-an-llm-observability-prompt-returns-ok-response.json",
-      "scenario": "Delete an LLM Observability prompt returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-not-found-response.json",
-      "scenario": "Get a specific LLM Observability prompt version returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-ok-response.json",
-      "scenario": "Get a specific LLM Observability prompt version returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/get-an-llm-observability-prompt-returns-not-found-response.json",
-      "scenario": "Get an LLM Observability prompt returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/get-an-llm-observability-prompt-returns-ok-response.json",
-      "scenario": "Get an LLM Observability prompt returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/list-llm-observability-prompts-returns-ok-response.json",
-      "scenario": "List LLM Observability prompts returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/list-versions-of-an-llm-observability-prompt-returns-ok-response.json",
-      "scenario": "List versions of an LLM Observability prompt returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-not-found-response.json",
-      "scenario": "Update a specific LLM Observability prompt version returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-ok-response.json",
-      "scenario": "Update a specific LLM Observability prompt version returns \"OK\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/update-an-llm-observability-prompt-returns-bad-request-response.json",
-      "scenario": "Update an LLM Observability prompt returns \"Bad Request\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/update-an-llm-observability-prompt-returns-not-found-response.json",
-      "scenario": "Update an LLM Observability prompt returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "feature_file": "../../features/v2/llm_observability.feature",
-      "file": "v2/llm-observability/update-an-llm-observability-prompt-returns-ok-response.json",
-      "scenario": "Update an LLM Observability prompt returns \"OK\" response",
-      "version": "v2"
-    },
     {
       "feature": "Logs",
       "feature_file": "../../features/v2/logs.feature",
@@ -9457,6 +9415,13 @@
       "scenario": "Create a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/create-a-severity-modifier-rule-returns-successfully-created-the-severity-modifier-rule-response.json",
+      "scenario": "Create a severity modifier rule returns \"Successfully created the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
@@ -9576,6 +9541,13 @@
       "scenario": "Delete a security filter returns \"No Content\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/delete-a-severity-modifier-rule-returns-rule-successfully-deleted-response.json",
+      "scenario": "Delete a severity modifier rule returns \"Rule successfully deleted\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
@@ -9793,6 +9765,13 @@
       "scenario": "Get a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/get-a-severity-modifier-rule-returns-successfully-retrieved-the-severity-modifier-rule-response.json",
+      "scenario": "Get a severity modifier rule returns \"Successfully retrieved the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
@@ -9870,6 +9849,13 @@
       "scenario": "Get all security filters returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/get-all-severity-modifier-rules-returns-successfully-retrieved-the-list-of-severity-modifier-rules-response.json",
+      "scenario": "Get all severity modifier rules returns \"Successfully retrieved the list of severity modifier rules\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
@@ -10213,6 +10199,13 @@
       "scenario": "Reorder mute rules returns \"Successfully reordered the mute rules\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/reorder-severity-modifier-rules-returns-successfully-reordered-the-severity-modifier-rules-response.json",
+      "scenario": "Reorder severity modifier rules returns \"Successfully reordered the severity modifier rules\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
@@ -10374,6 +10367,13 @@
       "scenario": "Update a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "feature_file": "../../features/v2/security_monitoring.feature",
+      "file": "v2/security-monitoring/update-a-severity-modifier-rule-returns-successfully-updated-the-severity-modifier-rule-response.json",
+      "scenario": "Update a severity modifier rule returns \"Successfully updated the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "feature_file": "../../features/v2/security_monitoring.feature",
diff --git a/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-bad-request-response.json b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-bad-request-response.json
new file mode 100644
index 000000000000..307eaa2c4dbe
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-bad-request-response.json
@@ -0,0 +1,40 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 400,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Create an execution policy returns \"Bad Request\" response",
+  "operation_id": "CreateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyCreateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "invalid_effect",
+            "name": "Cassette Execution Policy"
+          },
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "POST",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "Create an execution policy returns \"Bad Request\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-created-response.json b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-created-response.json
new file mode 100644
index 000000000000..eed08c235283
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-returns-created-response.json
@@ -0,0 +1,40 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 201,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Create an execution policy returns \"Created\" response",
+  "operation_id": "CreateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyCreateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "allow",
+            "name": "Cassette Execution Policy {{ unique_lower_alnum }}"
+          },
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "POST",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "Create an execution policy returns \"Created\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-with-scope-and-targets-returns-created-response.json b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-with-scope-and-targets-returns-created-response.json
new file mode 100644
index 000000000000..c764349abf61
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/create-an-execution-policy-with-scope-and-targets-returns-created-response.json
@@ -0,0 +1,59 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 201,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Create an execution policy with scope and targets returns \"Created\" response",
+  "operation_id": "CreateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyCreateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "allow",
+            "name": "Cassette Execution Policy {{ unique_lower_alnum }}",
+            "scope": {
+              "scripts": {
+                "rules": [
+                  {
+                    "target_script_names": [
+                      "restart_service.sh"
+                    ]
+                  }
+                ]
+              }
+            },
+            "targets": [
+              {
+                "agent_tags": [
+                  "env:prod"
+                ],
+                "name": "Production hosts"
+              }
+            ]
+          },
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "POST",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "Create an execution policy with scope and targets returns \"Created\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-ok-response.json b/generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-no-content-response.json
similarity index 53%
rename from generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-ok-response.json
rename to generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-no-content-response.json
index 110b0d02fb4f..d632e75c73fc 100644
--- a/generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-ok-response.json
+++ b/generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-no-content-response.json
@@ -1,9 +1,9 @@
 {
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Delete an LLM Observability prompt returns \"OK\" response",
-  "operation_id": "DeleteLLMObsPrompt",
+  "api": "ExecutionPolicy",
+  "expected_status": 204,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Delete an execution policy returns \"No Content\" response",
+  "operation_id": "DeleteExecutionPolicy",
   "request": {
     "body": null,
     "content_type": null,
@@ -13,7 +13,7 @@
       {
         "explode": null,
         "in": "path",
-        "name": "prompt_id",
+        "name": "policy_id",
         "required": true,
         "schema": {
           "format": null,
@@ -21,15 +21,15 @@
           "type": "string"
         },
         "source": {
-          "path": "prompt.data.attributes.prompt_id",
+          "path": "execution_policy.data.id",
           "type": "fixture"
         },
         "style": null
       }
     ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
   },
-  "scenario": "Delete an LLM Observability prompt returns \"OK\" response",
+  "scenario": "Delete an execution policy returns \"No Content\" response",
   "schema_version": 1,
   "version": "v2"
 }
diff --git a/generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-not-found-response.json b/generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-not-found-response.json
similarity index 54%
rename from generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-not-found-response.json
rename to generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-not-found-response.json
index 743ed2335461..b58af8d63344 100644
--- a/generated-test/test-runner-data/v2/llm-observability/delete-an-llm-observability-prompt-returns-not-found-response.json
+++ b/generated-test/test-runner-data/v2/execution-policy/delete-an-execution-policy-returns-not-found-response.json
@@ -1,9 +1,9 @@
 {
-  "api": "LLMObservability",
+  "api": "ExecutionPolicy",
   "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Delete an LLM Observability prompt returns \"Not Found\" response",
-  "operation_id": "DeleteLLMObsPrompt",
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Delete an execution policy returns \"Not Found\" response",
+  "operation_id": "DeleteExecutionPolicy",
   "request": {
     "body": null,
     "content_type": null,
@@ -13,7 +13,7 @@
       {
         "explode": null,
         "in": "path",
-        "name": "prompt_id",
+        "name": "policy_id",
         "required": true,
         "schema": {
           "format": null,
@@ -22,14 +22,14 @@
         },
         "source": {
           "type": "literal",
-          "value": "nonexistent-prompt"
+          "value": "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
         },
         "style": null
       }
     ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
   },
-  "scenario": "Delete an LLM Observability prompt returns \"Not Found\" response",
+  "scenario": "Delete an execution policy returns \"Not Found\" response",
   "schema_version": 1,
   "version": "v2"
 }
diff --git a/generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-not-found-response.json b/generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-not-found-response.json
similarity index 54%
rename from generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-not-found-response.json
rename to generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-not-found-response.json
index c7cbbe4ad6bc..953b174a76e8 100644
--- a/generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-not-found-response.json
+++ b/generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-not-found-response.json
@@ -1,9 +1,9 @@
 {
-  "api": "LLMObservability",
+  "api": "ExecutionPolicy",
   "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Get an LLM Observability prompt returns \"Not Found\" response",
-  "operation_id": "GetLLMObsPrompt",
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Get an execution policy returns \"Not Found\" response",
+  "operation_id": "GetExecutionPolicy",
   "request": {
     "body": null,
     "content_type": null,
@@ -13,7 +13,7 @@
       {
         "explode": null,
         "in": "path",
-        "name": "prompt_id",
+        "name": "policy_id",
         "required": true,
         "schema": {
           "format": null,
@@ -22,14 +22,14 @@
         },
         "source": {
           "type": "literal",
-          "value": "nonexistent-prompt"
+          "value": "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
         },
         "style": null
       }
     ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
   },
-  "scenario": "Get an LLM Observability prompt returns \"Not Found\" response",
+  "scenario": "Get an execution policy returns \"Not Found\" response",
   "schema_version": 1,
   "version": "v2"
 }
diff --git a/generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-ok-response.json b/generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-ok-response.json
similarity index 54%
rename from generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-ok-response.json
rename to generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-ok-response.json
index 05b271965238..0ce29da01888 100644
--- a/generated-test/test-runner-data/v2/llm-observability/get-an-llm-observability-prompt-returns-ok-response.json
+++ b/generated-test/test-runner-data/v2/execution-policy/get-an-execution-policy-returns-ok-response.json
@@ -1,9 +1,9 @@
 {
-  "api": "LLMObservability",
+  "api": "ExecutionPolicy",
   "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Get an LLM Observability prompt returns \"OK\" response",
-  "operation_id": "GetLLMObsPrompt",
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Get an execution policy returns \"OK\" response",
+  "operation_id": "GetExecutionPolicy",
   "request": {
     "body": null,
     "content_type": null,
@@ -13,7 +13,7 @@
       {
         "explode": null,
         "in": "path",
-        "name": "prompt_id",
+        "name": "policy_id",
         "required": true,
         "schema": {
           "format": null,
@@ -21,15 +21,15 @@
           "type": "string"
         },
         "source": {
-          "path": "prompt.data.attributes.prompt_id",
+          "path": "execution_policy.data.id",
           "type": "fixture"
         },
         "style": null
       }
     ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
   },
-  "scenario": "Get an LLM Observability prompt returns \"OK\" response",
+  "scenario": "Get an execution policy returns \"OK\" response",
   "schema_version": 1,
   "version": "v2"
 }
diff --git a/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-bad-request-response.json b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-bad-request-response.json
new file mode 100644
index 000000000000..34e2f8f569eb
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-bad-request-response.json
@@ -0,0 +1,35 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 400,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/List execution policies returns \"Bad Request\" response",
+  "operation_id": "ListExecutionPolicies",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "GET",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "query",
+        "name": "page[size]",
+        "required": false,
+        "schema": {
+          "format": "int32",
+          "ref": null,
+          "type": "integer"
+        },
+        "source": {
+          "type": "literal",
+          "value": 0
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "List execution policies returns \"Bad Request\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-ok-response.json b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-ok-response.json
new file mode 100644
index 000000000000..8b02440a05b1
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-returns-ok-response.json
@@ -0,0 +1,18 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 200,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/List execution policies returns \"OK\" response",
+  "operation_id": "ListExecutionPolicies",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "GET",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "List execution policies returns \"OK\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-with-query-parameters-returns-ok-response.json b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-with-query-parameters-returns-ok-response.json
new file mode 100644
index 000000000000..70a06c95f69b
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/list-execution-policies-with-query-parameters-returns-ok-response.json
@@ -0,0 +1,182 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 200,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/List execution policies with query parameters returns \"OK\" response",
+  "operation_id": "ListExecutionPolicies",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "GET",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "query",
+        "name": "page[size]",
+        "required": false,
+        "schema": {
+          "format": "int32",
+          "ref": null,
+          "type": "integer"
+        },
+        "source": {
+          "type": "literal",
+          "value": 10
+        },
+        "style": null
+      },
+      {
+        "explode": null,
+        "in": "query",
+        "name": "page[number]",
+        "required": false,
+        "schema": {
+          "format": "int32",
+          "ref": null,
+          "type": "integer"
+        },
+        "source": {
+          "type": "literal",
+          "value": 0
+        },
+        "style": null
+      },
+      {
+        "explode": null,
+        "in": "query",
+        "name": "filter[name]",
+        "required": false,
+        "schema": {
+          "format": null,
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "execution_policy.data.attributes.name",
+          "type": "fixture"
+        },
+        "style": null
+      },
+      {
+        "explode": true,
+        "in": "query",
+        "name": "filter[ids]",
+        "required": false,
+        "schema": {
+          "format": null,
+          "items": {
+            "format": null,
+            "ref": null,
+            "type": "string"
+          },
+          "ref": null,
+          "type": "array"
+        },
+        "source": {
+          "type": "literal",
+          "value": [
+            "{{ execution_policy.data.id }}"
+          ]
+        },
+        "style": "form"
+      },
+      {
+        "explode": true,
+        "in": "query",
+        "name": "filter[integration]",
+        "required": false,
+        "schema": {
+          "format": null,
+          "items": {
+            "format": null,
+            "ref": "ExecutionPolicyIntegration",
+            "type": "string"
+          },
+          "ref": null,
+          "type": "array"
+        },
+        "source": {
+          "type": "literal",
+          "value": [
+            "INTEGRATION_SCRIPT"
+          ]
+        },
+        "style": "form"
+      },
+      {
+        "explode": true,
+        "in": "query",
+        "name": "filter[effects]",
+        "required": false,
+        "schema": {
+          "format": null,
+          "items": {
+            "format": null,
+            "ref": "ExecutionPolicyEffect",
+            "type": "string"
+          },
+          "ref": null,
+          "type": "array"
+        },
+        "source": {
+          "type": "literal",
+          "value": [
+            "allow"
+          ]
+        },
+        "style": "form"
+      },
+      {
+        "explode": true,
+        "in": "query",
+        "name": "filter[creator_ids]",
+        "required": false,
+        "schema": {
+          "format": null,
+          "items": {
+            "format": null,
+            "ref": null,
+            "type": "string"
+          },
+          "ref": null,
+          "type": "array"
+        },
+        "source": {
+          "type": "literal",
+          "value": [
+            "{{ execution_policy.data.attributes.created_by }}"
+          ]
+        },
+        "style": "form"
+      },
+      {
+        "explode": true,
+        "in": "query",
+        "name": "sort",
+        "required": false,
+        "schema": {
+          "format": null,
+          "items": {
+            "format": null,
+            "ref": null,
+            "type": "string"
+          },
+          "ref": null,
+          "type": "array"
+        },
+        "source": {
+          "type": "literal",
+          "value": [
+            "-created_at"
+          ]
+        },
+        "style": "form"
+      }
+    ],
+    "path": "/api/v2/actions/execution-policies"
+  },
+  "scenario": "List execution policies with query parameters returns \"OK\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-bad-request-response.json b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-bad-request-response.json
new file mode 100644
index 000000000000..1ac7275c1400
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-bad-request-response.json
@@ -0,0 +1,58 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 400,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Update an execution policy returns \"Bad Request\" response",
+  "operation_id": "UpdateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyUpdateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "invalid_effect",
+            "name": "Cassette Execution Policy Updated"
+          },
+          "id": "{{ execution_policy.data.id }}",
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "PUT",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "policy_id",
+        "required": true,
+        "schema": {
+          "format": null,
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "execution_policy.data.id",
+          "type": "fixture"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
+  },
+  "scenario": "Update an execution policy returns \"Bad Request\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-not-found-response.json b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-not-found-response.json
new file mode 100644
index 000000000000..8f596bf256f7
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-not-found-response.json
@@ -0,0 +1,58 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 404,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Update an execution policy returns \"Not Found\" response",
+  "operation_id": "UpdateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyUpdateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "allow",
+            "name": "Cassette Execution Policy Updated"
+          },
+          "id": "aaa11111-aa11-aa11-aaaa-aaaaaa111111",
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "PUT",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "policy_id",
+        "required": true,
+        "schema": {
+          "format": null,
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "type": "literal",
+          "value": "aaa11111-aa11-aa11-aaaa-aaaaaa111111"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
+  },
+  "scenario": "Update an execution policy returns \"Not Found\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-ok-response.json b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-ok-response.json
new file mode 100644
index 000000000000..327597eb735b
--- /dev/null
+++ b/generated-test/test-runner-data/v2/execution-policy/update-an-execution-policy-returns-ok-response.json
@@ -0,0 +1,58 @@
+{
+  "api": "ExecutionPolicy",
+  "expected_status": 200,
+  "feature": "Execution Policy",
+  "id": "v2/Execution Policy/Update an execution policy returns \"OK\" response",
+  "operation_id": "UpdateExecutionPolicy",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "ExecutionPolicyUpdateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action_pattern": {
+              "action_fqns": [
+                "com.datadoghq.script.*"
+              ],
+              "integration": "INTEGRATION_SCRIPT"
+            },
+            "effect": "allow",
+            "name": "Cassette Execution Policy Updated"
+          },
+          "id": "{{ execution_policy.data.id }}",
+          "type": "execution_policy"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "PUT",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "policy_id",
+        "required": true,
+        "schema": {
+          "format": null,
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "execution_policy.data.id",
+          "type": "fixture"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/actions/execution-policies/{policy_id}"
+  },
+  "scenario": "Update an execution policy returns \"OK\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-bad-request-response.json b/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-bad-request-response.json
deleted file mode 100644
index 65929251dd90..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-bad-request-response.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 400,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create a new LLM Observability prompt version returns \"Bad Request\" response",
-  "operation_id": "CreateLLMObsPromptVersion",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptVersionRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "template": " "
-          },
-          "type": "prompt-template-versions"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions"
-  },
-  "scenario": "Create a new LLM Observability prompt version returns \"Bad Request\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-not-found-response.json b/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-not-found-response.json
deleted file mode 100644
index ad4bf8d9f78f..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-not-found-response.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create a new LLM Observability prompt version returns \"Not Found\" response",
-  "operation_id": "CreateLLMObsPromptVersion",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptVersionRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "env_ids": [],
-            "labels": [],
-            "template": [
-              {
-                "content": "Hello v2",
-                "role": "user"
-              }
-            ]
-          },
-          "type": "prompt-template-versions"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "type": "literal",
-          "value": "nonexistent-prompt"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions"
-  },
-  "scenario": "Create a new LLM Observability prompt version returns \"Not Found\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-ok-response.json
deleted file mode 100644
index c6ef8f220099..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-a-new-llm-observability-prompt-version-returns-ok-response.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create a new LLM Observability prompt version returns \"OK\" response",
-  "operation_id": "CreateLLMObsPromptVersion",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptVersionRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "template": [
-              {
-                "content": "You are a concise customer support assistant for {{ '{{company_name}}' }}.",
-                "role": "system"
-              },
-              {
-                "content": "Answer {{ '{{customer_name}}' }}'s question: {{ '{{question}}' }}",
-                "role": "user"
-              }
-            ]
-          },
-          "type": "prompt-template-versions"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions"
-  },
-  "scenario": "Create a new LLM Observability prompt version returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-bad-request-response.json b/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-bad-request-response.json
deleted file mode 100644
index df5731e579d0..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-bad-request-response.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 400,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create an LLM Observability prompt returns \"Bad Request\" response",
-  "operation_id": "CreateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "prompt_id": "{{ unique }}",
-            "template": " "
-          },
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [],
-    "path": "/api/v2/llm-obs/v1/prompts"
-  },
-  "scenario": "Create an LLM Observability prompt returns \"Bad Request\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-conflict-response.json b/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-conflict-response.json
deleted file mode 100644
index b840eeafa59f..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-conflict-response.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 409,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create an LLM Observability prompt returns \"Conflict\" response",
-  "operation_id": "CreateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "env_ids": [],
-            "labels": [],
-            "prompt_id": "{{ prompt.data.attributes.prompt_id }}",
-            "template": [
-              {
-                "content": "Hello",
-                "role": "user"
-              }
-            ]
-          },
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [],
-    "path": "/api/v2/llm-obs/v1/prompts"
-  },
-  "scenario": "Create an LLM Observability prompt returns \"Conflict\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-ok-response.json
deleted file mode 100644
index c0b21409bdc2..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/create-an-llm-observability-prompt-returns-ok-response.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Create an LLM Observability prompt returns \"OK\" response",
-  "operation_id": "CreateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsCreatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "prompt_id": "{{ unique }}",
-            "template": [
-              {
-                "content": "You are a helpful customer support assistant for {{ '{{company_name}}' }}.",
-                "role": "system"
-              },
-              {
-                "content": "Help {{ '{{customer_name}}' }} with this question: {{ '{{question}}' }}",
-                "role": "user"
-              }
-            ],
-            "title": "Customer Support Assistant"
-          },
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "POST",
-    "pagination": false,
-    "parameters": [],
-    "path": "/api/v2/llm-obs/v1/prompts"
-  },
-  "scenario": "Create an LLM Observability prompt returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-not-found-response.json b/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-not-found-response.json
deleted file mode 100644
index 08da415a6c6b..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-not-found-response.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Get a specific LLM Observability prompt version returns \"Not Found\" response",
-  "operation_id": "GetLLMObsPromptVersion",
-  "request": {
-    "body": null,
-    "content_type": null,
-    "method": "GET",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "type": "literal",
-          "value": "nonexistent-prompt"
-        },
-        "style": null
-      },
-      {
-        "explode": null,
-        "in": "path",
-        "name": "version",
-        "required": true,
-        "schema": {
-          "format": "int64",
-          "ref": null,
-          "type": "integer"
-        },
-        "source": {
-          "type": "literal",
-          "value": 1
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}"
-  },
-  "scenario": "Get a specific LLM Observability prompt version returns \"Not Found\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-ok-response.json
deleted file mode 100644
index 87d861d12b69..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/get-a-specific-llm-observability-prompt-version-returns-ok-response.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Get a specific LLM Observability prompt version returns \"OK\" response",
-  "operation_id": "GetLLMObsPromptVersion",
-  "request": {
-    "body": null,
-    "content_type": null,
-    "method": "GET",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      },
-      {
-        "explode": null,
-        "in": "path",
-        "name": "version",
-        "required": true,
-        "schema": {
-          "format": "int64",
-          "ref": null,
-          "type": "integer"
-        },
-        "source": {
-          "path": "prompt_version.data.attributes.version",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}"
-  },
-  "scenario": "Get a specific LLM Observability prompt version returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/list-llm-observability-prompts-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/list-llm-observability-prompts-returns-ok-response.json
deleted file mode 100644
index 60268602b4e9..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/list-llm-observability-prompts-returns-ok-response.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/List LLM Observability prompts returns \"OK\" response",
-  "operation_id": "ListLLMObsPrompts",
-  "request": {
-    "body": null,
-    "content_type": null,
-    "method": "GET",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "query",
-        "name": "filter[prompt_id]",
-        "required": false,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts"
-  },
-  "scenario": "List LLM Observability prompts returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/list-versions-of-an-llm-observability-prompt-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/list-versions-of-an-llm-observability-prompt-returns-ok-response.json
deleted file mode 100644
index bc4fe3c62dbb..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/list-versions-of-an-llm-observability-prompt-returns-ok-response.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/List versions of an LLM Observability prompt returns \"OK\" response",
-  "operation_id": "ListLLMObsPromptVersions",
-  "request": {
-    "body": null,
-    "content_type": null,
-    "method": "GET",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions"
-  },
-  "scenario": "List versions of an LLM Observability prompt returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-not-found-response.json b/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-not-found-response.json
deleted file mode 100644
index 0fc3e751ba95..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-not-found-response.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Update a specific LLM Observability prompt version returns \"Not Found\" response",
-  "operation_id": "UpdateLLMObsPromptVersion",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsUpdatePromptVersionRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "env_ids": [],
-            "labels": []
-          },
-          "type": "prompt-template-versions"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "PATCH",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "type": "literal",
-          "value": "nonexistent-prompt"
-        },
-        "style": null
-      },
-      {
-        "explode": null,
-        "in": "path",
-        "name": "version",
-        "required": true,
-        "schema": {
-          "format": "int64",
-          "ref": null,
-          "type": "integer"
-        },
-        "source": {
-          "type": "literal",
-          "value": 1
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}"
-  },
-  "scenario": "Update a specific LLM Observability prompt version returns \"Not Found\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-ok-response.json
deleted file mode 100644
index 861e8da8a0ee..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/update-a-specific-llm-observability-prompt-version-returns-ok-response.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Update a specific LLM Observability prompt version returns \"OK\" response",
-  "operation_id": "UpdateLLMObsPromptVersion",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsUpdatePromptVersionRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "description": "Give concise answers and cite relevant help-center articles."
-          },
-          "type": "prompt-template-versions"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "PATCH",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      },
-      {
-        "explode": null,
-        "in": "path",
-        "name": "version",
-        "required": true,
-        "schema": {
-          "format": "int64",
-          "ref": null,
-          "type": "integer"
-        },
-        "source": {
-          "path": "prompt_version.data.attributes.version",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}"
-  },
-  "scenario": "Update a specific LLM Observability prompt version returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-bad-request-response.json b/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-bad-request-response.json
deleted file mode 100644
index 2299dae0e613..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-bad-request-response.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 400,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Update an LLM Observability prompt returns \"Bad Request\" response",
-  "operation_id": "UpdateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsUpdatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {},
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "PATCH",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
-  },
-  "scenario": "Update an LLM Observability prompt returns \"Bad Request\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-not-found-response.json b/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-not-found-response.json
deleted file mode 100644
index 5c63acb05818..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-not-found-response.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 404,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Update an LLM Observability prompt returns \"Not Found\" response",
-  "operation_id": "UpdateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsUpdatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "title": "New title"
-          },
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "PATCH",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "type": "literal",
-          "value": "nonexistent-prompt"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
-  },
-  "scenario": "Update an LLM Observability prompt returns \"Not Found\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-ok-response.json b/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-ok-response.json
deleted file mode 100644
index 43684364bae9..000000000000
--- a/generated-test/test-runner-data/v2/llm-observability/update-an-llm-observability-prompt-returns-ok-response.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "api": "LLMObservability",
-  "expected_status": 200,
-  "feature": "LLM Observability",
-  "id": "v2/LLM Observability/Update an LLM Observability prompt returns \"OK\" response",
-  "operation_id": "UpdateLLMObsPrompt",
-  "request": {
-    "body": {
-      "schema": {
-        "format": null,
-        "ref": "LLMObsUpdatePromptRequest",
-        "type": "object"
-      },
-      "source": "inline",
-      "value": {
-        "data": {
-          "attributes": {
-            "title": "Customer Support Assistant"
-          },
-          "type": "prompt-templates"
-        }
-      }
-    },
-    "content_type": "application/json",
-    "method": "PATCH",
-    "pagination": false,
-    "parameters": [
-      {
-        "explode": null,
-        "in": "path",
-        "name": "prompt_id",
-        "required": true,
-        "schema": {
-          "format": null,
-          "ref": null,
-          "type": "string"
-        },
-        "source": {
-          "path": "prompt.data.attributes.prompt_id",
-          "type": "fixture"
-        },
-        "style": null
-      }
-    ],
-    "path": "/api/v2/llm-obs/v1/prompts/{prompt_id}"
-  },
-  "scenario": "Update an LLM Observability prompt returns \"OK\" response",
-  "schema_version": 1,
-  "version": "v2"
-}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/create-a-severity-modifier-rule-returns-successfully-created-the-severity-modifier-rule-response.json b/generated-test/test-runner-data/v2/security-monitoring/create-a-severity-modifier-rule-returns-successfully-created-the-severity-modifier-rule-response.json
new file mode 100644
index 000000000000..f211fa9ad612
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/create-a-severity-modifier-rule-returns-successfully-created-the-severity-modifier-rule-response.json
@@ -0,0 +1,45 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 201,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Create a severity modifier rule returns \"Successfully created the severity modifier rule\" response",
+  "operation_id": "CreateSecurityFindingsAutomationSeverityModifierRule",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "SeverityModifierRuleCreateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action": {
+              "description": "Lower severity for dev environment noise",
+              "severity": "low",
+              "type": "set"
+            },
+            "enabled": true,
+            "name": "Downgrade misconfigurations in dev",
+            "rule": {
+              "finding_types": [
+                "misconfiguration"
+              ],
+              "query": "env:prod team:platform"
+            }
+          },
+          "type": "severity_modifier_rules"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "POST",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules"
+  },
+  "scenario": "Create a severity modifier rule returns \"Successfully created the severity modifier rule\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/delete-a-severity-modifier-rule-returns-rule-successfully-deleted-response.json b/generated-test/test-runner-data/v2/security-monitoring/delete-a-severity-modifier-rule-returns-rule-successfully-deleted-response.json
new file mode 100644
index 000000000000..d2c50566c40e
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/delete-a-severity-modifier-rule-returns-rule-successfully-deleted-response.json
@@ -0,0 +1,35 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 204,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Delete a severity modifier rule returns \"Rule successfully deleted\" response",
+  "operation_id": "DeleteSecurityFindingsAutomationSeverityModifierRule",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "DELETE",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "rule_id",
+        "required": true,
+        "schema": {
+          "format": "uuid",
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "valid_severity_modifier_rule.data.id",
+          "type": "fixture"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules/{rule_id}"
+  },
+  "scenario": "Delete a severity modifier rule returns \"Rule successfully deleted\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/get-a-severity-modifier-rule-returns-successfully-retrieved-the-severity-modifier-rule-response.json b/generated-test/test-runner-data/v2/security-monitoring/get-a-severity-modifier-rule-returns-successfully-retrieved-the-severity-modifier-rule-response.json
new file mode 100644
index 000000000000..9f92b6360151
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/get-a-severity-modifier-rule-returns-successfully-retrieved-the-severity-modifier-rule-response.json
@@ -0,0 +1,35 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 200,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Get a severity modifier rule returns \"Successfully retrieved the severity modifier rule\" response",
+  "operation_id": "GetSecurityFindingsAutomationSeverityModifierRule",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "GET",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "rule_id",
+        "required": true,
+        "schema": {
+          "format": "uuid",
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "valid_severity_modifier_rule.data.id",
+          "type": "fixture"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules/{rule_id}"
+  },
+  "scenario": "Get a severity modifier rule returns \"Successfully retrieved the severity modifier rule\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/get-all-severity-modifier-rules-returns-successfully-retrieved-the-list-of-severity-modifier-rules-response.json b/generated-test/test-runner-data/v2/security-monitoring/get-all-severity-modifier-rules-returns-successfully-retrieved-the-list-of-severity-modifier-rules-response.json
new file mode 100644
index 000000000000..dd490468e599
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/get-all-severity-modifier-rules-returns-successfully-retrieved-the-list-of-severity-modifier-rules-response.json
@@ -0,0 +1,18 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 200,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Get all severity modifier rules returns \"Successfully retrieved the list of severity modifier rules\" response",
+  "operation_id": "ListSecurityFindingsAutomationSeverityModifierRules",
+  "request": {
+    "body": null,
+    "content_type": null,
+    "method": "GET",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules"
+  },
+  "scenario": "Get all severity modifier rules returns \"Successfully retrieved the list of severity modifier rules\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/reorder-severity-modifier-rules-returns-successfully-reordered-the-severity-modifier-rules-response.json b/generated-test/test-runner-data/v2/security-monitoring/reorder-severity-modifier-rules-returns-successfully-reordered-the-severity-modifier-rules-response.json
new file mode 100644
index 000000000000..37b49884a03b
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/reorder-severity-modifier-rules-returns-successfully-reordered-the-severity-modifier-rules-response.json
@@ -0,0 +1,33 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 200,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Reorder severity modifier rules returns \"Successfully reordered the severity modifier rules\" response",
+  "operation_id": "ReorderSecurityFindingsAutomationSeverityModifierRules",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "SeverityModifierRuleReorderRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": [
+          {
+            "id": "{{ valid_severity_modifier_rule.data.id }}",
+            "type": "severity_modifier_rules"
+          }
+        ]
+      }
+    },
+    "content_type": "application/json",
+    "method": "POST",
+    "pagination": false,
+    "parameters": [],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules/reorder"
+  },
+  "scenario": "Reorder severity modifier rules returns \"Successfully reordered the severity modifier rules\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-runner-data/v2/security-monitoring/update-a-severity-modifier-rule-returns-successfully-updated-the-severity-modifier-rule-response.json b/generated-test/test-runner-data/v2/security-monitoring/update-a-severity-modifier-rule-returns-successfully-updated-the-severity-modifier-rule-response.json
new file mode 100644
index 000000000000..755f467322fa
--- /dev/null
+++ b/generated-test/test-runner-data/v2/security-monitoring/update-a-severity-modifier-rule-returns-successfully-updated-the-severity-modifier-rule-response.json
@@ -0,0 +1,62 @@
+{
+  "api": "SecurityMonitoring",
+  "expected_status": 200,
+  "feature": "Security Monitoring",
+  "id": "v2/Security Monitoring/Update a severity modifier rule returns \"Successfully updated the severity modifier rule\" response",
+  "operation_id": "UpdateSecurityFindingsAutomationSeverityModifierRule",
+  "request": {
+    "body": {
+      "schema": {
+        "format": null,
+        "ref": "SeverityModifierRuleUpdateRequest",
+        "type": "object"
+      },
+      "source": "inline",
+      "value": {
+        "data": {
+          "attributes": {
+            "action": {
+              "description": "Lower severity for dev environment noise",
+              "severity": "low",
+              "type": "set"
+            },
+            "enabled": true,
+            "name": "Downgrade misconfigurations in dev",
+            "rule": {
+              "finding_types": [
+                "misconfiguration"
+              ],
+              "query": "env:prod team:platform"
+            }
+          },
+          "type": "severity_modifier_rules"
+        }
+      }
+    },
+    "content_type": "application/json",
+    "method": "PUT",
+    "pagination": false,
+    "parameters": [
+      {
+        "explode": null,
+        "in": "path",
+        "name": "rule_id",
+        "required": true,
+        "schema": {
+          "format": "uuid",
+          "ref": null,
+          "type": "string"
+        },
+        "source": {
+          "path": "valid_severity_modifier_rule.data.id",
+          "type": "fixture"
+        },
+        "style": null
+      }
+    ],
+    "path": "/api/v2/security/findings/automation/severity_modifier_rules/{rule_id}"
+  },
+  "scenario": "Update a severity modifier rule returns \"Successfully updated the severity modifier rule\" response",
+  "schema_version": 1,
+  "version": "v2"
+}
diff --git a/generated-test/test-server-data/v2/llm-observability.json b/generated-test/test-server-data/v2/llm-observability.json
index a02a3db70e7f..e97396ce1458 100644
--- a/generated-test/test-server-data/v2/llm-observability.json
+++ b/generated-test/test-server-data/v2/llm-observability.json
@@ -12,7 +12,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Create_a_new_LLM_Observability_prompt_version_returns_Bad_Request_response-1784543283",
+                    "prompt_id": "Test-Create_a_new_Agent_Observability_prompt_version_returns_Bad_Request_response-1784543283",
                     "template": [
                       {
                         "content": "Hello",
@@ -32,7 +32,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"9c67c0e2-0806-589b-8e8c-83ab2e6f76e3\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T10:28:04.139526235Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T10:28:04.139526235Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_Bad_Request_response-1784543283\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"9c67c0e2-0806-589b-8e8c-83ab2e6f76e3\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T10:28:04.139526235Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T10:28:04.139526235Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_Bad_Request_response-1784543283\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -56,7 +56,7 @@
             },
             "content_type": "application/json",
             "method": "POST",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_LLM_Observability_prompt_version_returns_Bad_Request_response-1784543283/versions",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_Agent_Observability_prompt_version_returns_Bad_Request_response-1784543283/versions",
             "query": []
           },
           "response": {
@@ -79,13 +79,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_LLM_Observability_prompt_version_returns_Bad_Request_response-1784543283",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_Agent_Observability_prompt_version_returns_Bad_Request_response-1784543283",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"9c67c0e2-0806-589b-8e8c-83ab2e6f76e3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T10:28:05.328346Z\",\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_Bad_Request_response-1784543283\"}}}"
+              "value": "{\"data\":{\"id\":\"9c67c0e2-0806-589b-8e8c-83ab2e6f76e3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T10:28:05.328346Z\",\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_Bad_Request_response-1784543283\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -95,7 +95,7 @@
           }
         }
       ],
-      "scenario": "Create a new LLM Observability prompt version returns \"Bad Request\" response",
+      "scenario": "Create a new Agent Observability prompt version returns \"Bad Request\" response",
       "version": "v2"
     },
     {
@@ -140,7 +140,7 @@
           }
         }
       ],
-      "scenario": "Create a new LLM Observability prompt version returns \"Not Found\" response",
+      "scenario": "Create a new Agent Observability prompt version returns \"Not Found\" response",
       "version": "v2"
     },
     {
@@ -154,7 +154,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144",
+                    "prompt_id": "Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144",
                     "template": [
                       {
                         "content": "Hello",
@@ -174,7 +174,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:32:24.497241896Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-21T12:32:24.497241896Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:32:24.497241896Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-21T12:32:24.497241896Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -207,13 +207,13 @@
             },
             "content_type": "application/json",
             "method": "POST",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144/versions",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144/versions",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"a002055b-7e0f-501d-ba5b-45df41fbca73\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:32:25.272760959Z\",\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144\",\"prompt_uuid\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"template\":[{\"content\":\"You are a concise customer support assistant for {{company_name}}.\",\"role\":\"system\"},{\"content\":\"Answer {{customer_name}}'s question: {{question}}\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-21T12:32:25.272760959Z\"}}}"
+              "value": "{\"data\":{\"id\":\"a002055b-7e0f-501d-ba5b-45df41fbca73\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:32:25.272760959Z\",\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144\",\"prompt_uuid\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"template\":[{\"content\":\"You are a concise customer support assistant for {{company_name}}.\",\"role\":\"system\"},{\"content\":\"Answer {{customer_name}}'s question: {{question}}\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-21T12:32:25.272760959Z\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -230,13 +230,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:32:25.768356Z\",\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144\"}}}"
+              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:32:25.768356Z\",\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -253,13 +253,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:32:26.168974Z\",\"prompt_id\":\"Test-Create_a_new_LLM_Observability_prompt_version_returns_OK_response-1784637144\"}}}"
+              "value": "{\"data\":{\"id\":\"c0077820-d57d-54d6-be0c-b62e4e827e67\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:32:26.168974Z\",\"prompt_id\":\"Test-Create_a_new_Agent_Observability_prompt_version_returns_OK_response-1784637144\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -269,7 +269,7 @@
           }
         }
       ],
-      "scenario": "Create a new LLM Observability prompt version returns \"OK\" response",
+      "scenario": "Create a new Agent Observability prompt version returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -283,7 +283,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Create_an_LLM_Observability_prompt_returns_Bad_Request_response-1784543299",
+                    "prompt_id": "Test-Create_an_Agent_Observability_prompt_returns_Bad_Request_response-1784543299",
                     "template": " "
                   },
                   "type": "prompt-templates"
@@ -308,7 +308,7 @@
           }
         }
       ],
-      "scenario": "Create an LLM Observability prompt returns \"Bad Request\" response",
+      "scenario": "Create an Agent Observability prompt returns \"Bad Request\" response",
       "version": "v2"
     },
     {
@@ -322,7 +322,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Create_an_LLM_Observability_prompt_returns_Conflict_response-1784539199",
+                    "prompt_id": "Test-Create_an_Agent_Observability_prompt_returns_Conflict_response-1784539199",
                     "template": [
                       {
                         "content": "Hello",
@@ -342,7 +342,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"2fedf714-8445-571b-bad9-f7d4bb131524\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:00.140121332Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:00.140121332Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_an_LLM_Observability_prompt_returns_Conflict_response-1784539199\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"2fedf714-8445-571b-bad9-f7d4bb131524\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:00.140121332Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:00.140121332Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_an_Agent_Observability_prompt_returns_Conflict_response-1784539199\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -360,7 +360,7 @@
                   "attributes": {
                     "env_ids": [],
                     "labels": [],
-                    "prompt_id": "Test-Create_an_LLM_Observability_prompt_returns_Conflict_response-1784539199",
+                    "prompt_id": "Test-Create_an_Agent_Observability_prompt_returns_Conflict_response-1784539199",
                     "template": [
                       {
                         "content": "Hello",
@@ -397,13 +397,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_an_LLM_Observability_prompt_returns_Conflict_response-1784539199",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_an_Agent_Observability_prompt_returns_Conflict_response-1784539199",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"2fedf714-8445-571b-bad9-f7d4bb131524\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:01.051306Z\",\"prompt_id\":\"Test-Create_an_LLM_Observability_prompt_returns_Conflict_response-1784539199\"}}}"
+              "value": "{\"data\":{\"id\":\"2fedf714-8445-571b-bad9-f7d4bb131524\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:01.051306Z\",\"prompt_id\":\"Test-Create_an_Agent_Observability_prompt_returns_Conflict_response-1784539199\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -413,7 +413,7 @@
           }
         }
       ],
-      "scenario": "Create an LLM Observability prompt returns \"Conflict\" response",
+      "scenario": "Create an Agent Observability prompt returns \"Conflict\" response",
       "version": "v2"
     },
     {
@@ -427,7 +427,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Create_an_LLM_Observability_prompt_returns_OK_response-1784637113",
+                    "prompt_id": "Test-Create_an_Agent_Observability_prompt_returns_OK_response-1784637113",
                     "template": [
                       {
                         "content": "You are a helpful customer support assistant for {{company_name}}.",
@@ -452,7 +452,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"7d3137ab-7d6a-5358-b791-26ead4540e09\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:31:53.812929348Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-21T12:31:53.812929348Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_an_LLM_Observability_prompt_returns_OK_response-1784637113\",\"source\":\"registry\",\"title\":\"Customer Support Assistant\"}}}"
+              "value": "{\"data\":{\"id\":\"7d3137ab-7d6a-5358-b791-26ead4540e09\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-21T12:31:53.812929348Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-21T12:31:53.812929348Z\",\"num_versions\":1,\"prompt_id\":\"Test-Create_an_Agent_Observability_prompt_returns_OK_response-1784637113\",\"source\":\"registry\",\"title\":\"Customer Support Assistant\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -469,13 +469,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_an_LLM_Observability_prompt_returns_OK_response-1784637113",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Create_an_Agent_Observability_prompt_returns_OK_response-1784637113",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"7d3137ab-7d6a-5358-b791-26ead4540e09\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:31:55.799078Z\",\"prompt_id\":\"Test-Create_an_LLM_Observability_prompt_returns_OK_response-1784637113\"}}}"
+              "value": "{\"data\":{\"id\":\"7d3137ab-7d6a-5358-b791-26ead4540e09\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-21T12:31:55.799078Z\",\"prompt_id\":\"Test-Create_an_Agent_Observability_prompt_returns_OK_response-1784637113\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -485,7 +485,7 @@
           }
         }
       ],
-      "scenario": "Create an LLM Observability prompt returns \"OK\" response",
+      "scenario": "Create an Agent Observability prompt returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -516,7 +516,7 @@
           }
         }
       ],
-      "scenario": "Delete an LLM Observability prompt returns \"Not Found\" response",
+      "scenario": "Delete an Agent Observability prompt returns \"Not Found\" response",
       "version": "v2"
     },
     {
@@ -530,7 +530,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202",
+                    "prompt_id": "Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202",
                     "template": [
                       {
                         "content": "Hello",
@@ -550,7 +550,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:02.660067768Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:02.660067768Z\",\"num_versions\":1,\"prompt_id\":\"Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:02.660067768Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:02.660067768Z\",\"num_versions\":1,\"prompt_id\":\"Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -567,13 +567,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:03.299559Z\",\"prompt_id\":\"Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202\"}}}"
+              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:03.299559Z\",\"prompt_id\":\"Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -590,13 +590,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:03.637257Z\",\"prompt_id\":\"Test-Delete_an_LLM_Observability_prompt_returns_OK_response-1784539202\"}}}"
+              "value": "{\"data\":{\"id\":\"d5df9e4e-acd0-5d9f-b0d5-c09a643c33e2\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:03.637257Z\",\"prompt_id\":\"Test-Delete_an_Agent_Observability_prompt_returns_OK_response-1784539202\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -606,7 +606,7 @@
           }
         }
       ],
-      "scenario": "Delete an LLM Observability prompt returns \"OK\" response",
+      "scenario": "Delete an Agent Observability prompt returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -637,7 +637,7 @@
           }
         }
       ],
-      "scenario": "Get a specific LLM Observability prompt version returns \"Not Found\" response",
+      "scenario": "Get a specific Agent Observability prompt version returns \"Not Found\" response",
       "version": "v2"
     },
     {
@@ -651,7 +651,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285",
+                    "prompt_id": "Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285",
                     "template": [
                       {
                         "content": "Hello",
@@ -671,7 +671,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.021742711Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T12:24:46.021742711Z\",\"num_versions\":1,\"prompt_id\":\"Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.021742711Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T12:24:46.021742711Z\",\"num_versions\":1,\"prompt_id\":\"Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -700,13 +700,13 @@
             },
             "content_type": "application/json",
             "method": "POST",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285/versions",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285/versions",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"d80790f5-cd99-5d57-b6e0-4d4bbbc21514\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.796641541Z\",\"prompt_id\":\"Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285\",\"prompt_uuid\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"template\":[{\"content\":\"Hello v2\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-20T12:24:46.796641541Z\"}}}"
+              "value": "{\"data\":{\"id\":\"d80790f5-cd99-5d57-b6e0-4d4bbbc21514\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.796641541Z\",\"prompt_id\":\"Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285\",\"prompt_uuid\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"template\":[{\"content\":\"Hello v2\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-20T12:24:46.796641541Z\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -723,13 +723,13 @@
             },
             "content_type": "",
             "method": "GET",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285/versions/2",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285/versions/2",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"d80790f5-cd99-5d57-b6e0-4d4bbbc21514\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.796641Z\",\"prompt_id\":\"Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285\",\"prompt_uuid\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"template\":[{\"role\":\"user\",\"content\":\"Hello v2\"}],\"version\":2,\"version_created_at\":\"2026-07-20T12:24:46.796641Z\"}}}"
+              "value": "{\"data\":{\"id\":\"d80790f5-cd99-5d57-b6e0-4d4bbbc21514\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T12:24:46.796641Z\",\"prompt_id\":\"Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285\",\"prompt_uuid\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"template\":[{\"role\":\"user\",\"content\":\"Hello v2\"}],\"version\":2,\"version_created_at\":\"2026-07-20T12:24:46.796641Z\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -746,13 +746,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T12:24:48.753279Z\",\"prompt_id\":\"Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285\"}}}"
+              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T12:24:48.753279Z\",\"prompt_id\":\"Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -769,13 +769,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T12:24:49.086069Z\",\"prompt_id\":\"Test-Get_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784550285\"}}}"
+              "value": "{\"data\":{\"id\":\"599ee1f4-9680-5ff8-92c9-ca31130057f3\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T12:24:49.086069Z\",\"prompt_id\":\"Test-Get_a_specific_Agent_Observability_prompt_version_returns_OK_response-1784550285\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -785,7 +785,7 @@
           }
         }
       ],
-      "scenario": "Get a specific LLM Observability prompt version returns \"OK\" response",
+      "scenario": "Get a specific Agent Observability prompt version returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -816,7 +816,7 @@
           }
         }
       ],
-      "scenario": "Get an LLM Observability prompt returns \"Not Found\" response",
+      "scenario": "Get an Agent Observability prompt returns \"Not Found\" response",
       "version": "v2"
     },
     {
@@ -830,7 +830,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208",
+                    "prompt_id": "Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208",
                     "template": [
                       {
                         "content": "Hello",
@@ -850,7 +850,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:09.112910708Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:09.112910708Z\",\"num_versions\":1,\"prompt_id\":\"Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:09.112910708Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:09.112910708Z\",\"num_versions\":1,\"prompt_id\":\"Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -867,13 +867,13 @@
             },
             "content_type": "",
             "method": "GET",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"chat_template\":[{\"role\":\"user\",\"content\":\"Hello\"}],\"prompt_id\":\"Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208\",\"prompt_version_uuid\":\"9cd92cc7-2f51-5867-8148-eaf41efee79d\",\"version\":\"1\"}}}"
+              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"chat_template\":[{\"role\":\"user\",\"content\":\"Hello\"}],\"prompt_id\":\"Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208\",\"prompt_version_uuid\":\"9cd92cc7-2f51-5867-8148-eaf41efee79d\",\"version\":\"1\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -890,13 +890,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:10.172623Z\",\"prompt_id\":\"Test-Get_an_LLM_Observability_prompt_returns_OK_response-1784539208\"}}}"
+              "value": "{\"data\":{\"id\":\"95e93a91-1020-5a23-9cb7-c8ca6e3b1785\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:10.172623Z\",\"prompt_id\":\"Test-Get_an_Agent_Observability_prompt_returns_OK_response-1784539208\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -906,7 +906,7 @@
           }
         }
       ],
-      "scenario": "Get an LLM Observability prompt returns \"OK\" response",
+      "scenario": "Get an Agent Observability prompt returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -920,7 +920,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-List_LLM_Observability_prompts_returns_OK_response-1784539804",
+                    "prompt_id": "Test-List_Agent_Observability_prompts_returns_OK_response-1784539804",
                     "template": [
                       {
                         "content": "Hello",
@@ -940,7 +940,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:30:04.928462935Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:30:04.928462935Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_LLM_Observability_prompts_returns_OK_response-1784539804\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:30:04.928462935Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:30:04.928462935Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_Agent_Observability_prompts_returns_OK_response-1784539804\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -961,14 +961,14 @@
             "query": [
               [
                 "filter[prompt_id]",
-                "Test-List_LLM_Observability_prompts_returns_OK_response-1784539804"
+                "Test-List_Agent_Observability_prompts_returns_OK_response-1784539804"
               ]
             ]
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":[{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:30:04.928462Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:30:04.928462Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_LLM_Observability_prompts_returns_OK_response-1784539804\",\"source\":\"registry\"}}]}"
+              "value": "{\"data\":[{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:30:04.928462Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:30:04.928462Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_Agent_Observability_prompts_returns_OK_response-1784539804\",\"source\":\"registry\"}}]}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -985,13 +985,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-List_LLM_Observability_prompts_returns_OK_response-1784539804",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-List_Agent_Observability_prompts_returns_OK_response-1784539804",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:30:06.787619Z\",\"prompt_id\":\"Test-List_LLM_Observability_prompts_returns_OK_response-1784539804\"}}}"
+              "value": "{\"data\":{\"id\":\"b04a1ded-d2da-578c-a520-1c1dd2046d1c\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:30:06.787619Z\",\"prompt_id\":\"Test-List_Agent_Observability_prompts_returns_OK_response-1784539804\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1001,7 +1001,7 @@
           }
         }
       ],
-      "scenario": "List LLM Observability prompts returns \"OK\" response",
+      "scenario": "List Agent Observability prompts returns \"OK\" response",
       "version": "v2"
     },
     {
@@ -1015,7 +1015,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212",
+                    "prompt_id": "Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212",
                     "template": [
                       {
                         "content": "Hello",
@@ -1035,7 +1035,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:13.145132213Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:13.145132213Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:13.145132213Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:13.145132213Z\",\"num_versions\":1,\"prompt_id\":\"Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1052,13 +1052,13 @@
             },
             "content_type": "",
             "method": "GET",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212/versions",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212/versions",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":[{\"id\":\"e0cc7c1d-cbb6-589c-bcd9-d9c1b35aec60\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:13.145132Z\",\"prompt_id\":\"Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212\",\"prompt_uuid\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"version\":1,\"version_created_at\":\"2026-07-20T09:20:13.145132Z\"}}]}"
+              "value": "{\"data\":[{\"id\":\"e0cc7c1d-cbb6-589c-bcd9-d9c1b35aec60\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:13.145132Z\",\"prompt_id\":\"Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212\",\"prompt_uuid\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"version\":1,\"version_created_at\":\"2026-07-20T09:20:13.145132Z\"}}]}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1075,13 +1075,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:15.144489Z\",\"prompt_id\":\"Test-List_versions_of_an_LLM_Observability_prompt_returns_OK_response-1784539212\"}}}"
+              "value": "{\"data\":{\"id\":\"31fdf246-89b8-5a48-9544-ff84c4504939\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:15.144489Z\",\"prompt_id\":\"Test-List_versions_of_an_Agent_Observability_prompt_returns_OK_response-1784539212\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1091,51 +1091,12 @@
           }
         }
       ],
-      "scenario": "List versions of an LLM Observability prompt returns \"OK\" response",
+      "scenario": "List versions of an Agent Observability prompt returns \"OK\" response",
       "version": "v2"
     },
     {
       "feature": "LLM Observability",
-      "frozen_at": "2026-07-20T10:29:38.039Z",
-      "interactions": [
-        {
-          "request": {
-            "body": {
-              "type": "json",
-              "value": {
-                "data": {
-                  "attributes": {
-                    "env_ids": [],
-                    "labels": []
-                  },
-                  "type": "prompt-template-versions"
-                }
-              }
-            },
-            "content_type": "application/json",
-            "method": "PATCH",
-            "path": "/api/v2/llm-obs/v1/prompts/nonexistent-prompt/versions/1",
-            "query": []
-          },
-          "response": {
-            "body": {
-              "encoding": "text",
-              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"prompt template version not found\"}]}"
-            },
-            "headers": {
-              "content-type": "application/vnd.api+json"
-            },
-            "reason": "Not Found",
-            "status": 404
-          }
-        }
-      ],
-      "scenario": "Update a specific LLM Observability prompt version returns \"Not Found\" response",
-      "version": "v2"
-    },
-    {
-      "feature": "LLM Observability",
-      "frozen_at": "2026-07-20T15:43:10.740Z",
+      "frozen_at": "2026-07-20T09:20:18.946Z",
       "interactions": [
         {
           "request": {
@@ -1144,7 +1105,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190",
+                    "prompt_id": "Test-Update_an_Agent_Observability_prompt_returns_Bad_Request_response-1784539218",
                     "template": [
                       {
                         "content": "Hello",
@@ -1164,42 +1125,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:11.158625133Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T15:43:11.158625133Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190\",\"source\":\"registry\"}}}"
-            },
-            "headers": {
-              "content-type": "application/vnd.api+json"
-            },
-            "reason": "OK",
-            "status": 200
-          }
-        },
-        {
-          "request": {
-            "body": {
-              "type": "json",
-              "value": {
-                "data": {
-                  "attributes": {
-                    "template": [
-                      {
-                        "content": "Hello v2",
-                        "role": "user"
-                      }
-                    ]
-                  },
-                  "type": "prompt-template-versions"
-                }
-              }
-            },
-            "content_type": "application/json",
-            "method": "POST",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190/versions",
-            "query": []
-          },
-          "response": {
-            "body": {
-              "encoding": "text",
-              "value": "{\"data\":{\"id\":\"c5593d94-81b0-522b-8cae-7fa643ea7ec9\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:12.623730838Z\",\"prompt_id\":\"Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190\",\"prompt_uuid\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"template\":[{\"content\":\"Hello v2\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-20T15:43:12.623730838Z\"}}}"
+              "value": "{\"data\":{\"id\":\"b28f22d5-eec8-57f0-be7f-5042b6bb4ae1\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:19.301545921Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:19.301545921Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_returns_Bad_Request_response-1784539218\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1214,28 +1140,26 @@
               "type": "json",
               "value": {
                 "data": {
-                  "attributes": {
-                    "description": "Give concise answers and cite relevant help-center articles."
-                  },
-                  "type": "prompt-template-versions"
+                  "attributes": {},
+                  "type": "prompt-templates"
                 }
               }
             },
             "content_type": "application/json",
             "method": "PATCH",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190/versions/2",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_returns_Bad_Request_response-1784539218",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"c5593d94-81b0-522b-8cae-7fa643ea7ec9\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:12.62373Z\",\"description\":\"Give concise answers and cite relevant help-center articles.\",\"prompt_id\":\"Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190\",\"prompt_uuid\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"template\":[{\"role\":\"user\",\"content\":\"Hello v2\"}],\"version\":2,\"version_created_at\":\"2026-07-20T15:43:12.62373Z\"}}}"
+              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"at least one of title or description must be provided\"}]}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
             },
-            "reason": "OK",
-            "status": 200
+            "reason": "Bad Request",
+            "status": 400
           }
         },
         {
@@ -1246,13 +1170,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_returns_Bad_Request_response-1784539218",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:13.804223Z\",\"prompt_id\":\"Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190\"}}}"
+              "value": "{\"data\":{\"id\":\"b28f22d5-eec8-57f0-be7f-5042b6bb4ae1\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:20.235152Z\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_returns_Bad_Request_response-1784539218\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1260,37 +1184,52 @@
             "reason": "OK",
             "status": 200
           }
-        },
+        }
+      ],
+      "scenario": "Update an Agent Observability prompt returns \"Bad Request\" response",
+      "version": "v2"
+    },
+    {
+      "feature": "LLM Observability",
+      "frozen_at": "2026-07-20T09:20:20.319Z",
+      "interactions": [
         {
           "request": {
             "body": {
-              "type": "empty",
-              "value": null
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "title": "New title"
+                  },
+                  "type": "prompt-templates"
+                }
+              }
             },
-            "content_type": "",
-            "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190",
+            "content_type": "application/json",
+            "method": "PATCH",
+            "path": "/api/v2/llm-obs/v1/prompts/nonexistent-prompt",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:14.36251Z\",\"prompt_id\":\"Test-Update_a_specific_LLM_Observability_prompt_version_returns_OK_response-1784562190\"}}}"
+              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"prompt template not found\"}]}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
             },
-            "reason": "OK",
-            "status": 200
+            "reason": "Not Found",
+            "status": 404
           }
         }
       ],
-      "scenario": "Update a specific LLM Observability prompt version returns \"OK\" response",
+      "scenario": "Update an Agent Observability prompt returns \"Not Found\" response",
       "version": "v2"
     },
     {
       "feature": "LLM Observability",
-      "frozen_at": "2026-07-20T09:20:18.946Z",
+      "frozen_at": "2026-07-20T15:43:14.374Z",
       "interactions": [
         {
           "request": {
@@ -1299,7 +1238,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Update_an_LLM_Observability_prompt_returns_Bad_Request_response-1784539218",
+                    "prompt_id": "Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194",
                     "template": [
                       {
                         "content": "Hello",
@@ -1319,7 +1258,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"b28f22d5-eec8-57f0-be7f-5042b6bb4ae1\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T09:20:19.301545921Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T09:20:19.301545921Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_an_LLM_Observability_prompt_returns_Bad_Request_response-1784539218\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:14.698626703Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T15:43:14.698626703Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1334,26 +1273,28 @@
               "type": "json",
               "value": {
                 "data": {
-                  "attributes": {},
+                  "attributes": {
+                    "title": "Customer Support Assistant"
+                  },
                   "type": "prompt-templates"
                 }
               }
             },
             "content_type": "application/json",
             "method": "PATCH",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_LLM_Observability_prompt_returns_Bad_Request_response-1784539218",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"at least one of title or description must be provided\"}]}"
+              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:14.698626Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"num_versions\":0,\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194\",\"source\":\"registry\",\"title\":\"Customer Support Assistant\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
             },
-            "reason": "Bad Request",
-            "status": 400
+            "reason": "OK",
+            "status": 200
           }
         },
         {
@@ -1364,13 +1305,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_LLM_Observability_prompt_returns_Bad_Request_response-1784539218",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"b28f22d5-eec8-57f0-be7f-5042b6bb4ae1\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T09:20:20.235152Z\",\"prompt_id\":\"Test-Update_an_LLM_Observability_prompt_returns_Bad_Request_response-1784539218\"}}}"
+              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:16.39072Z\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_returns_OK_response-1784562194\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1380,12 +1321,12 @@
           }
         }
       ],
-      "scenario": "Update an LLM Observability prompt returns \"Bad Request\" response",
+      "scenario": "Update an Agent Observability prompt returns \"OK\" response",
       "version": "v2"
     },
     {
       "feature": "LLM Observability",
-      "frozen_at": "2026-07-20T09:20:20.319Z",
+      "frozen_at": "2026-07-20T10:29:38.039Z",
       "interactions": [
         {
           "request": {
@@ -1394,21 +1335,22 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "title": "New title"
+                    "env_ids": [],
+                    "labels": []
                   },
-                  "type": "prompt-templates"
+                  "type": "prompt-template-versions"
                 }
               }
             },
             "content_type": "application/json",
             "method": "PATCH",
-            "path": "/api/v2/llm-obs/v1/prompts/nonexistent-prompt",
+            "path": "/api/v2/llm-obs/v1/prompts/nonexistent-prompt/versions/1",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"prompt template not found\"}]}"
+              "value": "{\"errors\":[{\"title\":\"Generic Error\",\"detail\":\"prompt template version not found\"}]}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1418,12 +1360,12 @@
           }
         }
       ],
-      "scenario": "Update an LLM Observability prompt returns \"Not Found\" response",
+      "scenario": "Update an Agent Observability prompt version returns \"Not Found\" response",
       "version": "v2"
     },
     {
       "feature": "LLM Observability",
-      "frozen_at": "2026-07-20T15:43:14.374Z",
+      "frozen_at": "2026-07-20T15:43:10.740Z",
       "interactions": [
         {
           "request": {
@@ -1432,7 +1374,7 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "prompt_id": "Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194",
+                    "prompt_id": "Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190",
                     "template": [
                       {
                         "content": "Hello",
@@ -1452,7 +1394,7 @@
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:14.698626703Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T15:43:14.698626703Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194\",\"source\":\"registry\"}}}"
+              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:11.158625133Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"last_version_created_at\":\"2026-07-20T15:43:11.158625133Z\",\"num_versions\":1,\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190\",\"source\":\"registry\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1468,21 +1410,79 @@
               "value": {
                 "data": {
                   "attributes": {
-                    "title": "Customer Support Assistant"
+                    "template": [
+                      {
+                        "content": "Hello v2",
+                        "role": "user"
+                      }
+                    ]
                   },
-                  "type": "prompt-templates"
+                  "type": "prompt-template-versions"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190/versions",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"c5593d94-81b0-522b-8cae-7fa643ea7ec9\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:12.623730838Z\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190\",\"prompt_uuid\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"template\":[{\"content\":\"Hello v2\",\"role\":\"user\"}],\"version\":2,\"version_created_at\":\"2026-07-20T15:43:12.623730838Z\"}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "description": "Give concise answers and cite relevant help-center articles."
+                  },
+                  "type": "prompt-template-versions"
                 }
               }
             },
             "content_type": "application/json",
             "method": "PATCH",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190/versions/2",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"c5593d94-81b0-522b-8cae-7fa643ea7ec9\",\"type\":\"prompt-template-versions\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:12.62373Z\",\"description\":\"Give concise answers and cite relevant help-center articles.\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190\",\"prompt_uuid\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"template\":[{\"role\":\"user\",\"content\":\"Hello v2\"}],\"version\":2,\"version_created_at\":\"2026-07-20T15:43:12.62373Z\"}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"author\":\"c5e19e5a-ad6b-11ed-ab4f-927130d31ef9\",\"created_at\":\"2026-07-20T15:43:14.698626Z\",\"created_from\":\"sdk-registry\",\"in_registry\":true,\"num_versions\":0,\"prompt_id\":\"Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194\",\"source\":\"registry\",\"title\":\"Customer Support Assistant\"}}}"
+              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:13.804223Z\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1499,13 +1499,13 @@
             },
             "content_type": "",
             "method": "DELETE",
-            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194",
+            "path": "/api/v2/llm-obs/v1/prompts/Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190",
             "query": []
           },
           "response": {
             "body": {
               "encoding": "text",
-              "value": "{\"data\":{\"id\":\"a36505e7-3c2f-5482-b8ac-ac51250a0116\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:16.39072Z\",\"prompt_id\":\"Test-Update_an_LLM_Observability_prompt_returns_OK_response-1784562194\"}}}"
+              "value": "{\"data\":{\"id\":\"3c7ea2ea-52df-5324-8e77-0f01cf441ef9\",\"type\":\"prompt-templates\",\"attributes\":{\"deleted_at\":\"2026-07-20T15:43:14.36251Z\",\"prompt_id\":\"Test-Update_an_Agent_Observability_prompt_version_returns_OK_response-1784562190\"}}}"
             },
             "headers": {
               "content-type": "application/vnd.api+json"
@@ -1515,7 +1515,7 @@
           }
         }
       ],
-      "scenario": "Update an LLM Observability prompt returns \"OK\" response",
+      "scenario": "Update an Agent Observability prompt version returns \"OK\" response",
       "version": "v2"
     }
   ],
diff --git a/generated-test/test-server-data/v2/security-monitoring.json b/generated-test/test-server-data/v2/security-monitoring.json
index 6424cf6b1c36..8dd359c09a46 100644
--- a/generated-test/test-server-data/v2/security-monitoring.json
+++ b/generated-test/test-server-data/v2/security-monitoring.json
@@ -3531,6 +3531,77 @@
       "scenario": "Create a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:20:55.439Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "description": "Lower severity for dev environment noise",
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Downgrade misconfigurations in dev",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:prod team:platform"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"a14d6808-eab2-4381-8a15-ae4874d33b9e\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\",\"description\":\"Lower severity for dev environment noise\"},\"created_at\":1787037657563,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037657563,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Downgrade misconfigurations in dev\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:prod team:platform\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/a14d6808-eab2-4381-8a15-ae4874d33b9e",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        }
+      ],
+      "scenario": "Create a severity modifier rule returns \"Successfully created the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2025-11-07T12:27:25.514Z",
@@ -4752,6 +4823,99 @@
       "scenario": "Delete a security filter returns \"No Content\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:20:58.050Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Test-Delete_a_severity_modifier_rule_returns_Rule_successfully_deleted_response-1787037658",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:staging"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"89935049-6349-4c1b-b54a-25f340248515\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037658168,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037658168,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Delete_a_severity_modifier_rule_returns_Rule_successfully_deleted_response-1787037658\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/89935049-6349-4c1b-b54a-25f340248515",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/89935049-6349-4c1b-b54a-25f340248515",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"errors\":[{\"status\":\"404\",\"title\":\"Not Found\",\"detail\":\"rule does not exist\"}]}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Not Found",
+            "status": 404
+          }
+        }
+      ],
+      "scenario": "Delete a severity modifier rule returns \"Rule successfully deleted\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2025-02-05T13:45:43.873Z",
@@ -6915,6 +7079,99 @@
       "scenario": "Get a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:20:58.799Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Test-Get_a_severity_modifier_rule_returns_Successfully_retrieved_the_severity_modifier_rule_response-1787037658",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:staging"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"a27e8943-8a97-472f-9468-fc1c7a197688\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037658926,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037658926,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Get_a_severity_modifier_rule_returns_Successfully_retrieved_the_severity_modifier_rule_response-1787037658\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "GET",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/a27e8943-8a97-472f-9468-fc1c7a197688",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"a27e8943-8a97-472f-9468-fc1c7a197688\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037658926,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037658926,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Get_a_severity_modifier_rule_returns_Successfully_retrieved_the_severity_modifier_rule_response-1787037658\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/a27e8943-8a97-472f-9468-fc1c7a197688",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        }
+      ],
+      "scenario": "Get a severity modifier rule returns \"Successfully retrieved the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2022-09-23T14:12:23.353Z",
@@ -7565,6 +7822,99 @@
       "scenario": "Get all security filters returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:20:59.542Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Test-Get_all_severity_modifier_rules_returns_Successfully_retrieved_the_list_of_severity_modifier_rules_r-1787037659",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:staging"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"23e58787-df52-4cd0-b5c8-bf2ba53c5739\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037659669,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037659669,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Get_all_severity_modifier_rules_returns_Successfully_retrieved_the_list_of_severity_modifier_rules_r-1787037659\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "GET",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":[{\"id\":\"23e58787-df52-4cd0-b5c8-bf2ba53c5739\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037659669,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037659669,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Get_all_severity_modifier_rules_returns_Successfully_retrieved_the_list_of_severity_modifier_rules_r-1787037659\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}],\"meta\":{\"page\":{\"total_filtered_count\":1}},\"links\":{\"first\":\"/api/v2/security/findings/automation/severity_modifier_rules?page[size]=1000\\u0026page[number]=0\",\"last\":\"/api/v2/security/findings/automation/severity_modifier_rules?page[size]=1000\\u0026page[number]=0\"}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/23e58787-df52-4cd0-b5c8-bf2ba53c5739",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        }
+      ],
+      "scenario": "Get all severity modifier rules returns \"Successfully retrieved the list of severity modifier rules\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2026-01-21T15:35:06.001Z",
@@ -10933,6 +11283,106 @@
       "scenario": "Reorder mute rules returns \"Successfully reordered the mute rules\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:21:00.320Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Test-Reorder_severity_modifier_rules_returns_Successfully_reordered_the_severity_modifier_rules_response-1787037660",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:staging"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"25a8393e-3888-4ac3-81be-c45b6d23da3f\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037660440,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037660440,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Reorder_severity_modifier_rules_returns_Successfully_reordered_the_severity_modifier_rules_response-1787037660\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": [
+                  {
+                    "id": "25a8393e-3888-4ac3-81be-c45b6d23da3f",
+                    "type": "severity_modifier_rules"
+                  }
+                ]
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/reorder",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":[{\"type\":\"severity_modifier_rules\",\"id\":\"25a8393e-3888-4ac3-81be-c45b6d23da3f\"}]}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/25a8393e-3888-4ac3-81be-c45b6d23da3f",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        }
+      ],
+      "scenario": "Reorder severity modifier rules returns \"Successfully reordered the severity modifier rules\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2026-06-16T15:41:17.183Z",
@@ -12854,6 +13304,118 @@
       "scenario": "Update a security filter returns \"OK\" response",
       "version": "v2"
     },
+    {
+      "feature": "Security Monitoring",
+      "frozen_at": "2026-08-18T07:21:01.200Z",
+      "interactions": [
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Test-Update_a_severity_modifier_rule_returns_Successfully_updated_the_severity_modifier_rule_response-1787037661",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:staging"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "POST",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"c58887bd-5c87-497c-adb8-db08a3593bbb\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\"},\"created_at\":1787037661319,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037661319,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Test-Update_a_severity_modifier_rule_returns_Successfully_updated_the_severity_modifier_rule_response-1787037661\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:staging\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "Created",
+            "status": 201
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "json",
+              "value": {
+                "data": {
+                  "attributes": {
+                    "action": {
+                      "description": "Lower severity for dev environment noise",
+                      "severity": "low",
+                      "type": "set"
+                    },
+                    "enabled": true,
+                    "name": "Downgrade misconfigurations in dev",
+                    "rule": {
+                      "finding_types": [
+                        "misconfiguration"
+                      ],
+                      "query": "env:prod team:platform"
+                    }
+                  },
+                  "type": "severity_modifier_rules"
+                }
+              }
+            },
+            "content_type": "application/json",
+            "method": "PUT",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/c58887bd-5c87-497c-adb8-db08a3593bbb",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": "{\"data\":{\"id\":\"c58887bd-5c87-497c-adb8-db08a3593bbb\",\"type\":\"severity_modifier_rules\",\"attributes\":{\"action\":{\"type\":\"set\",\"severity\":\"low\",\"description\":\"Lower severity for dev environment noise\"},\"created_at\":1787037661319,\"created_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"enabled\":true,\"modified_at\":1787037661614,\"modified_by\":{\"type\":\"user\",\"id\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"CI Account\"},\"name\":\"Downgrade misconfigurations in dev\",\"rule\":{\"finding_types\":[\"misconfiguration\"],\"query\":\"env:prod team:platform\"}}}}"
+            },
+            "headers": {
+              "content-type": "application/vnd.api+json"
+            },
+            "reason": "OK",
+            "status": 200
+          }
+        },
+        {
+          "request": {
+            "body": {
+              "type": "empty",
+              "value": null
+            },
+            "content_type": "",
+            "method": "DELETE",
+            "path": "/api/v2/security/findings/automation/severity_modifier_rules/c58887bd-5c87-497c-adb8-db08a3593bbb",
+            "query": []
+          },
+          "response": {
+            "body": {
+              "encoding": "text",
+              "value": ""
+            },
+            "headers": {},
+            "reason": "No Content",
+            "status": 204
+          }
+        }
+      ],
+      "scenario": "Update a severity modifier rule returns \"Successfully updated the severity modifier rule\" response",
+      "version": "v2"
+    },
     {
       "feature": "Security Monitoring",
       "frozen_at": "2026-01-21T15:35:07.497Z",
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index a18c5e228da6..0b9c2762236e 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -6654,6 +6654,19 @@ def overrides
           "v2.rum_retention_filter_update_attributes" => "RumRetentionFilterUpdateAttributes",
           "v2.rum_retention_filter_update_data" => "RumRetentionFilterUpdateData",
           "v2.rum_retention_filter_update_request" => "RumRetentionFilterUpdateRequest",
+          "v2.rum_retention_quota_adaptive_config" => "RumRetentionQuotaAdaptiveConfig",
+          "v2.rum_retention_quota_config_attributes" => "RumRetentionQuotaConfigAttributes",
+          "v2.rum_retention_quota_config_data" => "RumRetentionQuotaConfigData",
+          "v2.rum_retention_quota_config_response" => "RumRetentionQuotaConfigResponse",
+          "v2.rum_retention_quota_config_type" => "RumRetentionQuotaConfigType",
+          "v2.rum_retention_quota_config_update_attributes" => "RumRetentionQuotaConfigUpdateAttributes",
+          "v2.rum_retention_quota_config_update_data" => "RumRetentionQuotaConfigUpdateData",
+          "v2.rum_retention_quota_config_update_request" => "RumRetentionQuotaConfigUpdateRequest",
+          "v2.rum_retention_quota_custom_config" => "RumRetentionQuotaCustomConfig",
+          "v2.rum_retention_quota_mode" => "RumRetentionQuotaMode",
+          "v2.rum_retention_quota_reached_action" => "RumRetentionQuotaReachedAction",
+          "v2.rum_retention_quota_scope_type" => "RumRetentionQuotaScopeType",
+          "v2.rum_retention_quota_window_type" => "RumRetentionQuotaWindowType",
           "v2.rum_sdk_config_attributes" => "RumSdkConfigAttributes",
           "v2.rum_sdk_config_data" => "RumSdkConfigData",
           "v2.rum_sdk_config_dynamic_option" => "RumSdkConfigDynamicOption",
@@ -8568,6 +8581,7 @@ def overrides
         "v1.webhooks_integration_api" => "WebhooksIntegrationAPI",
         "v2.action_connection_api" => "ActionConnectionAPI",
         "v2.actions_datastores_api" => "ActionsDatastoresAPI",
+        "v2.agent_observability_api" => "AgentObservabilityAPI",
         "v2.agentless_scanning_api" => "AgentlessScanningAPI",
         "v2.annotations_api" => "AnnotationsAPI",
         "v2.api_management_api" => "APIManagementAPI",
@@ -8634,7 +8648,6 @@ def overrides
         "v2.ip_allowlist_api" => "IPAllowlistAPI",
         "v2.jira_integration_api" => "JiraIntegrationAPI",
         "v2.key_management_api" => "KeyManagementAPI",
-        "v2.llm_observability_api" => "LLMObservabilityAPI",
         "v2.logs_api" => "LogsAPI",
         "v2.logs_archives_api" => "LogsArchivesAPI",
         "v2.logs_custom_destinations_api" => "LogsCustomDestinationsAPI",
@@ -8677,6 +8690,7 @@ def overrides
         "v2.rum_replay_sessions_api" => "RumReplaySessionsAPI",
         "v2.rum_replay_viewership_api" => "RumReplayViewershipAPI",
         "v2.rum_retention_filters_api" => "RumRetentionFiltersAPI",
+        "v2.rum_retention_quota_api" => "RUMRetentionQuotaAPI",
         "v2.salesforce_integration_api" => "SalesforceIntegrationAPI",
         "v2.scorecards_api" => "ScorecardsAPI",
         "v2.seats_api" => "SeatsAPI",
diff --git a/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb b/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb
index 736a83da3216..d07e2ff07367 100644
--- a/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb
+++ b/lib/datadog_api_client/v1/api/aws_logs_integration_api.rb
@@ -33,7 +33,7 @@ def check_aws_logs_lambda_async(body, opts = {})
 
     # Check that an AWS Lambda Function exists.
     #
-    # Test if permissions are present to add a log-forwarding triggers for the given services and AWS account. The input
+    # **This endpoint is deprecated.** Test if permissions are present to add a log-forwarding triggers for the given services and AWS account. The input
     # is the same as for Enable an AWS service log collection. Subsequent requests will always repeat the above, so this
     # endpoint can be polled intermittently instead of blocking.
     #
@@ -42,10 +42,13 @@ def check_aws_logs_lambda_async(body, opts = {})
     # - Returns a status of 'checked and ok' if the Lambda exists.
     # - Returns a status of 'error' if the Lambda does not exist.
     #
+    # @deprecated This API is deprecated.
+    #
     # @param body [AWSAccountAndLambdaRequest] Check AWS Log Lambda Async request body.
     # @param opts [Hash] the optional parameters
     # @return [Array<(AWSLogsAsyncResponse, Integer, Hash)>] AWSLogsAsyncResponse data, response status code and response headers
     def check_aws_logs_lambda_async_with_http_info(body, opts = {})
+      warn "[DEPRECATION] `CheckAWSLogsLambdaAsync` is deprecated."
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.check_aws_logs_lambda_async ...'
@@ -107,7 +110,7 @@ def check_aws_logs_services_async(body, opts = {})
 
     # Check permissions for log services.
     #
-    # Test if permissions are present to add log-forwarding triggers for the
+    # **This endpoint is deprecated.** Test if permissions are present to add log-forwarding triggers for the
     # given services and AWS account. Input is the same as for `EnableAWSLogServices`.
     # Done async, so can be repeatedly polled in a non-blocking fashion until
     # the async request completes.
@@ -118,10 +121,13 @@ def check_aws_logs_services_async(body, opts = {})
     # - Returns a status of `checked and ok` if the Lambda exists.
     # - Returns a status of `error` if the Lambda does not exist.
     #
+    # @deprecated This API is deprecated.
+    #
     # @param body [AWSLogsServicesRequest] Check AWS Logs Async Services request body.
     # @param opts [Hash] the optional parameters
     # @return [Array<(AWSLogsAsyncResponse, Integer, Hash)>] AWSLogsAsyncResponse data, response status code and response headers
     def check_aws_logs_services_async_with_http_info(body, opts = {})
+      warn "[DEPRECATION] `CheckAWSLogsServicesAsync` is deprecated."
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.check_aws_logs_services_async ...'
@@ -183,12 +189,15 @@ def create_aws_lambda_arn(body, opts = {})
 
     # Add AWS Log Lambda ARN.
     #
-    # Attach the Lambda ARN of the Lambda created for the Datadog-AWS log collection to your AWS account ID to enable log collection.
+    # **This endpoint is deprecated.** Attach the Lambda ARN of the Lambda created for the Datadog-AWS log collection to your AWS account ID to enable log collection.
+    #
+    # @deprecated This API is deprecated.
     #
     # @param body [AWSAccountAndLambdaRequest] AWS Log Lambda Async request body.
     # @param opts [Hash] the optional parameters
     # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers
     def create_aws_lambda_arn_with_http_info(body, opts = {})
+      warn "[DEPRECATION] `CreateAWSLambdaARN` is deprecated."
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.create_aws_lambda_arn ...'
@@ -250,12 +259,15 @@ def delete_aws_lambda_arn(body, opts = {})
 
     # Delete an AWS Logs integration.
     #
-    # Delete a Datadog-AWS logs configuration by removing the specific Lambda ARN associated with a given AWS account.
+    # **This endpoint is deprecated.** Delete a Datadog-AWS logs configuration by removing the specific Lambda ARN associated with a given AWS account.
+    #
+    # @deprecated This API is deprecated.
     #
     # @param body [AWSAccountAndLambdaRequest] Delete AWS Lambda ARN request body.
     # @param opts [Hash] the optional parameters
     # @return [Array<(Object, Integer, Hash)>] Object data, response status code and response headers
     def delete_aws_lambda_arn_with_http_info(body, opts = {})
+      warn "[DEPRECATION] `DeleteAWSLambdaARN` is deprecated."
 
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: AWSLogsIntegrationAPI.delete_aws_lambda_arn ...'
diff --git a/lib/datadog_api_client/v1/models/monthly_usage_attribution_values.rb b/lib/datadog_api_client/v1/models/monthly_usage_attribution_values.rb
index 2cce85c1c26b..24ff642cf74c 100644
--- a/lib/datadog_api_client/v1/models/monthly_usage_attribution_values.rb
+++ b/lib/datadog_api_client/v1/models/monthly_usage_attribution_values.rb
@@ -279,10 +279,10 @@ class MonthlyUsageAttributionValues
     # The Serverless APM usage by tag(s).
     attr_accessor :lambda_traced_invocations_usage
 
-    # The percentage of LLM Observability usage by tag(s).
+    # The percentage of Agent Observability usage by tag(s).
     attr_accessor :llm_observability_percentage
 
-    # The LLM Observability usage by tag(s).
+    # The Agent Observability usage by tag(s).
     attr_accessor :llm_observability_usage
 
     # The percentage of LLM Spans usage by tag(s).
diff --git a/lib/datadog_api_client/v1/models/usage_summary_date.rb b/lib/datadog_api_client/v1/models/usage_summary_date.rb
index 56cd889aab94..fa219d847e2f 100644
--- a/lib/datadog_api_client/v1/models/usage_summary_date.rb
+++ b/lib/datadog_api_client/v1/models/usage_summary_date.rb
@@ -573,22 +573,22 @@ class UsageSummaryDate
     # Shows the 99th percentile of all IoT devices over all hours in the current date all organizations.
     attr_accessor :iot_device_top99p
 
-    # Shows the sum of all LLM Observability 15-day retention spans over all hours in the current date for all organizations.
+    # Shows the sum of all Agent Observability 15-day retention spans over all hours in the current date for all organizations.
     attr_accessor :llm_observability_15day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 30-day retention spans over all hours in the current date for all organizations.
+    # Shows the sum of all Agent Observability 30-day retention spans over all hours in the current date for all organizations.
     attr_accessor :llm_observability_30day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 60-day retention spans over all hours in the current date for all organizations.
+    # Shows the sum of all Agent Observability 60-day retention spans over all hours in the current date for all organizations.
     attr_accessor :llm_observability_60day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 90-day retention spans over all hours in the current date for all organizations.
+    # Shows the sum of all Agent Observability 90-day retention spans over all hours in the current date for all organizations.
     attr_accessor :llm_observability_90day_retention_spans_sum
 
-    # Sum of all LLM observability minimum spend over all hours in the current date for all organizations.
+    # Sum of all Agent observability minimum spend over all hours in the current date for all organizations.
     attr_accessor :llm_observability_min_spend_sum
 
-    # Sum of all LLM observability sessions over all hours in the current date for all organizations.
+    # Sum of all Agent observability sessions over all hours in the current date for all organizations.
     attr_accessor :llm_observability_sum
 
     # Shows the sum of all Logs Archive Search scanned data over all hours in the current date for all organizations.
diff --git a/lib/datadog_api_client/v1/models/usage_summary_date_org.rb b/lib/datadog_api_client/v1/models/usage_summary_date_org.rb
index 1142baa2c24b..e8f621c6cf4b 100644
--- a/lib/datadog_api_client/v1/models/usage_summary_date_org.rb
+++ b/lib/datadog_api_client/v1/models/usage_summary_date_org.rb
@@ -585,22 +585,22 @@ class UsageSummaryDateOrg
     # Shows the 99th percentile of all IoT devices over all hours in the current date for the given org.
     attr_accessor :iot_device_top99p_sum
 
-    # Shows the sum of all LLM Observability 15-day retention spans over all hours in the current date for the given org.
+    # Shows the sum of all Agent Observability 15-day retention spans over all hours in the current date for the given org.
     attr_accessor :llm_observability_15day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 30-day retention spans over all hours in the current date for the given org.
+    # Shows the sum of all Agent Observability 30-day retention spans over all hours in the current date for the given org.
     attr_accessor :llm_observability_30day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 60-day retention spans over all hours in the current date for the given org.
+    # Shows the sum of all Agent Observability 60-day retention spans over all hours in the current date for the given org.
     attr_accessor :llm_observability_60day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability 90-day retention spans over all hours in the current date for the given org.
+    # Shows the sum of all Agent Observability 90-day retention spans over all hours in the current date for the given org.
     attr_accessor :llm_observability_90day_retention_spans_sum
 
-    # Shows the sum of all LLM Observability minimum spend over all hours in the current date for the given org.
+    # Shows the sum of all Agent Observability minimum spend over all hours in the current date for the given org.
     attr_accessor :llm_observability_min_spend_sum
 
-    # Shows the sum of all LLM observability sessions over all hours in the current date for the given org.
+    # Shows the sum of all Agent observability sessions over all hours in the current date for the given org.
     attr_accessor :llm_observability_sum
 
     # Shows the sum of all Logs Archive Search scanned data over all hours in the current date for the given org.
diff --git a/lib/datadog_api_client/v1/models/usage_summary_response.rb b/lib/datadog_api_client/v1/models/usage_summary_response.rb
index 2df6ff1a370f..1843c8641ee3 100644
--- a/lib/datadog_api_client/v1/models/usage_summary_response.rb
+++ b/lib/datadog_api_client/v1/models/usage_summary_response.rb
@@ -592,22 +592,22 @@ class UsageSummaryResponse
     # Shows the sum of all live logs bytes ingested over all hours in the current month for all organizations (data available as of December 1, 2020).
     attr_accessor :live_ingested_bytes_agg_sum
 
-    # Shows the sum of all LLM Observability 15-day retention spans over all hours in the current month for all organizations.
+    # Shows the sum of all Agent Observability 15-day retention spans over all hours in the current month for all organizations.
     attr_accessor :llm_observability_15day_retention_spans_agg_sum
 
-    # Shows the sum of all LLM Observability 30-day retention spans over all hours in the current month for all organizations.
+    # Shows the sum of all Agent Observability 30-day retention spans over all hours in the current month for all organizations.
     attr_accessor :llm_observability_30day_retention_spans_agg_sum
 
-    # Shows the sum of all LLM Observability 60-day retention spans over all hours in the current month for all organizations.
+    # Shows the sum of all Agent Observability 60-day retention spans over all hours in the current month for all organizations.
     attr_accessor :llm_observability_60day_retention_spans_agg_sum
 
-    # Shows the sum of all LLM Observability 90-day retention spans over all hours in the current month for all organizations.
+    # Shows the sum of all Agent Observability 90-day retention spans over all hours in the current month for all organizations.
     attr_accessor :llm_observability_90day_retention_spans_agg_sum
 
-    # Sum of all LLM observability sessions for all hours in the current month for all organizations.
+    # Sum of all Agent observability sessions for all hours in the current month for all organizations.
     attr_accessor :llm_observability_agg_sum
 
-    # Minimum spend for LLM observability sessions for all hours in the current month for all organizations.
+    # Minimum spend for Agent observability sessions for all hours in the current month for all organizations.
     attr_accessor :llm_observability_min_spend_agg_sum
 
     # Shows the sum of all Logs Archive Search scanned data over all hours in the current month for all organizations.
diff --git a/lib/datadog_api_client/v2/api/llm_observability_api.rb b/lib/datadog_api_client/v2/api/agent_observability_api.rb
similarity index 84%
rename from lib/datadog_api_client/v2/api/llm_observability_api.rb
rename to lib/datadog_api_client/v2/api/agent_observability_api.rb
index a1c60ad5c1b3..7c2fc3288264 100644
--- a/lib/datadog_api_client/v2/api/llm_observability_api.rb
+++ b/lib/datadog_api_client/v2/api/agent_observability_api.rb
@@ -16,14 +16,14 @@
 require 'cgi'
 
 module DatadogAPIClient::V2
-  class LLMObservabilityAPI
+  class AgentObservabilityAPI
     attr_accessor :api_client
 
     def initialize(api_client = DatadogAPIClient::APIClient.default)
       @api_client = api_client
     end
 
-    # Aggregate LLM Observability experimentation.
+    # Aggregate Agent Observability experimentation.
     #
     # @see #aggregate_llm_obs_experimentation_with_http_info
     def aggregate_llm_obs_experimentation(body, opts = {})
@@ -31,9 +31,9 @@ def aggregate_llm_obs_experimentation(body, opts = {})
       data
     end
 
-    # Aggregate LLM Observability experimentation.
+    # Aggregate Agent Observability experimentation.
     #
-    # Execute an analytics aggregation over LLM Observability experimentation data.
+    # Execute an analytics aggregation over Agent Observability experimentation data.
     # Use this endpoint to compute metrics (for example average eval scores) grouped by fields such as `span_id` or `experiment_id`.
     #
     # At least one `compute` definition and one `index` must be provided.
@@ -50,11 +50,11 @@ def aggregate_llm_obs_experimentation_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.aggregate_llm_obs_experimentation ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.aggregate_llm_obs_experimentation ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.aggregate_llm_obs_experimentation"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.aggregate_llm_obs_experimentation"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experimentation/analytics'
@@ -94,12 +94,12 @@ def aggregate_llm_obs_experimentation_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#aggregate_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#aggregate_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Batch update LLM Observability dataset records.
+    # Batch update Agent Observability dataset records.
     #
     # @see #batch_update_llm_obs_dataset_with_http_info
     def batch_update_llm_obs_dataset(project_id, dataset_id, body, opts = {})
@@ -107,12 +107,12 @@ def batch_update_llm_obs_dataset(project_id, dataset_id, body, opts = {})
       data
     end
 
-    # Batch update LLM Observability dataset records.
+    # Batch update Agent Observability dataset records.
     #
     # Insert, update, and delete records in a single dataset operation. By default, a new dataset version is created when the batch is applied.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDatasetBatchUpdateRequest] Batch update payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetRecordsMutationResponse, Integer, Hash)>] LLMObsDatasetRecordsMutationResponse data, response status code and response headers
@@ -125,19 +125,19 @@ def batch_update_llm_obs_dataset_with_http_info(project_id, dataset_id, body, op
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.batch_update_llm_obs_dataset ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.batch_update_llm_obs_dataset ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.batch_update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.batch_update_llm_obs_dataset"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.batch_update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.batch_update_llm_obs_dataset"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.batch_update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.batch_update_llm_obs_dataset"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/batch_update'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -177,12 +177,12 @@ def batch_update_llm_obs_dataset_with_http_info(project_id, dataset_id, body, op
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#batch_update_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#batch_update_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Clone an LLM Observability dataset.
+    # Clone an Agent Observability dataset.
     #
     # @see #clone_llm_obs_dataset_with_http_info
     def clone_llm_obs_dataset(project_id, dataset_id, body, opts = {})
@@ -190,12 +190,12 @@ def clone_llm_obs_dataset(project_id, dataset_id, body, opts = {})
       data
     end
 
-    # Clone an LLM Observability dataset.
+    # Clone an Agent Observability dataset.
     #
     # Clone a dataset, copying its current records into a new dataset within the same project.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the source LLM Observability dataset to clone.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the source Agent Observability dataset to clone.
     # @param body [LLMObsDatasetCloneRequest] Clone dataset payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetResponse, Integer, Hash)>] LLMObsDatasetResponse data, response status code and response headers
@@ -208,19 +208,19 @@ def clone_llm_obs_dataset_with_http_info(project_id, dataset_id, body, opts = {}
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.clone_llm_obs_dataset ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.clone_llm_obs_dataset ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.clone_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.clone_llm_obs_dataset"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.clone_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.clone_llm_obs_dataset"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.clone_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.clone_llm_obs_dataset"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/clone'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -260,12 +260,12 @@ def clone_llm_obs_dataset_with_http_info(project_id, dataset_id, body, opts = {}
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#clone_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#clone_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create an LLM Observability annotation queue.
+    # Create an Agent Observability annotation queue.
     #
     # @see #create_llm_obs_annotation_queue_with_http_info
     def create_llm_obs_annotation_queue(body, opts = {})
@@ -273,7 +273,7 @@ def create_llm_obs_annotation_queue(body, opts = {})
       data
     end
 
-    # Create an LLM Observability annotation queue.
+    # Create an Agent Observability annotation queue.
     #
     # Create an annotation queue. The `name` and `project_id` fields are required.
     # An optional `annotation_schema` can be provided to define the labels for the queue.
@@ -292,11 +292,11 @@ def create_llm_obs_annotation_queue_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_annotation_queue ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_annotation_queue ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_annotation_queue"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_annotation_queue"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues'
@@ -336,7 +336,7 @@ def create_llm_obs_annotation_queue_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -362,7 +362,7 @@ def create_llm_obs_annotation_queue_interactions(queue_id, body, opts = {})
     #
     # Items of different types can be mixed in a single request.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsAnnotationQueueInteractionsRequest] Add interactions payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotationQueueInteractionsResponse, Integer, Hash)>] LLMObsAnnotationQueueInteractionsResponse data, response status code and response headers
@@ -375,15 +375,15 @@ def create_llm_obs_annotation_queue_interactions_with_http_info(queue_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_annotation_queue_interactions ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_annotation_queue_interactions ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.create_llm_obs_annotation_queue_interactions"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.create_llm_obs_annotation_queue_interactions"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_annotation_queue_interactions"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_annotation_queue_interactions"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/interactions'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -423,12 +423,12 @@ def create_llm_obs_annotation_queue_interactions_with_http_info(queue_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_annotation_queue_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_annotation_queue_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create an LLM Observability dataset.
+    # Create an Agent Observability dataset.
     #
     # @see #create_llm_obs_dataset_with_http_info
     def create_llm_obs_dataset(project_id, body, opts = {})
@@ -436,11 +436,11 @@ def create_llm_obs_dataset(project_id, body, opts = {})
       data
     end
 
-    # Create an LLM Observability dataset.
+    # Create an Agent Observability dataset.
     #
-    # Create a new LLM Observability dataset within the specified project.
+    # Create a new Agent Observability dataset within the specified project.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
+    # @param project_id [String] The ID of the Agent Observability project.
     # @param body [LLMObsDatasetRequest] Create dataset payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetResponse, Integer, Hash)>] LLMObsDatasetResponse data, response status code and response headers
@@ -453,15 +453,15 @@ def create_llm_obs_dataset_with_http_info(project_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_dataset ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_dataset ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.create_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.create_llm_obs_dataset"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_dataset"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/'))
@@ -501,12 +501,12 @@ def create_llm_obs_dataset_with_http_info(project_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Append records to an LLM Observability dataset.
+    # Append records to an Agent Observability dataset.
     #
     # @see #create_llm_obs_dataset_records_with_http_info
     def create_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
@@ -514,12 +514,12 @@ def create_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
       data
     end
 
-    # Append records to an LLM Observability dataset.
+    # Append records to an Agent Observability dataset.
     #
-    # Append one or more records to an LLM Observability dataset.
+    # Append one or more records to an Agent Observability dataset.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDatasetRecordsRequest] Append records payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetRecordsMutationResponse, Integer, Hash)>] LLMObsDatasetRecordsMutationResponse data, response status code and response headers
@@ -532,19 +532,19 @@ def create_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_dataset_records ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_dataset_records ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.create_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.create_llm_obs_dataset_records"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.create_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.create_llm_obs_dataset_records"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_dataset_records"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -584,12 +584,12 @@ def create_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create an LLM Observability experiment.
+    # Create an Agent Observability experiment.
     #
     # @see #create_llm_obs_experiment_with_http_info
     def create_llm_obs_experiment(body, opts = {})
@@ -597,9 +597,9 @@ def create_llm_obs_experiment(body, opts = {})
       data
     end
 
-    # Create an LLM Observability experiment.
+    # Create an Agent Observability experiment.
     #
-    # Create a new LLM Observability experiment.
+    # Create a new Agent Observability experiment.
     #
     # @param body [LLMObsExperimentRequest] Create experiment payload.
     # @param opts [Hash] the optional parameters
@@ -613,11 +613,11 @@ def create_llm_obs_experiment_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_experiment ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_experiment ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_experiment"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_experiment"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments'
@@ -657,12 +657,12 @@ def create_llm_obs_experiment_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_experiment\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_experiment\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Push events for an LLM Observability experiment.
+    # Push events for an Agent Observability experiment.
     #
     # @see #create_llm_obs_experiment_events_with_http_info
     def create_llm_obs_experiment_events(experiment_id, body, opts = {})
@@ -670,11 +670,11 @@ def create_llm_obs_experiment_events(experiment_id, body, opts = {})
       nil
     end
 
-    # Push events for an LLM Observability experiment.
+    # Push events for an Agent Observability experiment.
     #
-    # Push spans and metrics for an LLM Observability experiment.
+    # Push spans and metrics for an Agent Observability experiment.
     #
-    # @param experiment_id [String] The ID of the LLM Observability experiment.
+    # @param experiment_id [String] The ID of the Agent Observability experiment.
     # @param body [LLMObsExperimentEventsRequest] Experiment events payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -687,15 +687,15 @@ def create_llm_obs_experiment_events_with_http_info(experiment_id, body, opts =
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_experiment_events ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_experiment_events ...'
       end
       # verify the required parameter 'experiment_id' is set
       if @api_client.config.client_side_validation && experiment_id.nil?
-        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling LLMObservabilityAPI.create_llm_obs_experiment_events"
+        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling AgentObservabilityAPI.create_llm_obs_experiment_events"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_experiment_events"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_experiment_events"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments/{experiment_id}/events'.sub('{experiment_id}', CGI.escape(experiment_id.to_s).gsub('%2F', '/'))
@@ -735,7 +735,7 @@ def create_llm_obs_experiment_events_with_http_info(experiment_id, body, opts =
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_experiment_events\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_experiment_events\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -766,11 +766,11 @@ def create_llm_obs_integration_inference_with_http_info(integration, account_id,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_integration_inference ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_integration_inference ...'
       end
       # verify the required parameter 'integration' is set
       if @api_client.config.client_side_validation && integration.nil?
-        fail ArgumentError, "Missing the required parameter 'integration' when calling LLMObservabilityAPI.create_llm_obs_integration_inference"
+        fail ArgumentError, "Missing the required parameter 'integration' when calling AgentObservabilityAPI.create_llm_obs_integration_inference"
       end
       # verify enum value
       allowable_values = ['openai', 'amazon_bedrock', 'anthropic', 'azure_openai', 'vertex_ai', 'llmproxy']
@@ -779,11 +779,11 @@ def create_llm_obs_integration_inference_with_http_info(integration, account_id,
       end
       # verify the required parameter 'account_id' is set
       if @api_client.config.client_side_validation && account_id.nil?
-        fail ArgumentError, "Missing the required parameter 'account_id' when calling LLMObservabilityAPI.create_llm_obs_integration_inference"
+        fail ArgumentError, "Missing the required parameter 'account_id' when calling AgentObservabilityAPI.create_llm_obs_integration_inference"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_integration_inference"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_integration_inference"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/integrations/{integration}/{account_id}/inference'.sub('{integration}', CGI.escape(integration.to_s).gsub('%2F', '/')).sub('{account_id}', CGI.escape(account_id.to_s).gsub('%2F', '/'))
@@ -823,12 +823,12 @@ def create_llm_obs_integration_inference_with_http_info(integration, account_id,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_integration_inference\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_integration_inference\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create an LLM Observability project.
+    # Create an Agent Observability project.
     #
     # @see #create_llm_obs_project_with_http_info
     def create_llm_obs_project(body, opts = {})
@@ -836,9 +836,9 @@ def create_llm_obs_project(body, opts = {})
       data
     end
 
-    # Create an LLM Observability project.
+    # Create an Agent Observability project.
     #
-    # Create a new LLM Observability project. Returns the existing project if a name conflict occurs.
+    # Create a new Agent Observability project. Returns the existing project if a name conflict occurs.
     #
     # @param body [LLMObsProjectRequest] Create project payload.
     # @param opts [Hash] the optional parameters
@@ -852,11 +852,11 @@ def create_llm_obs_project_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_project ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_project ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_project"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_project"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/projects'
@@ -896,12 +896,12 @@ def create_llm_obs_project_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create an LLM Observability prompt.
+    # Create an Agent Observability prompt.
     #
     # @see #create_llm_obs_prompt_with_http_info
     def create_llm_obs_prompt(body, opts = {})
@@ -909,9 +909,9 @@ def create_llm_obs_prompt(body, opts = {})
       data
     end
 
-    # Create an LLM Observability prompt.
+    # Create an Agent Observability prompt.
     #
-    # Create a new prompt (and its first version) in the LLM Observability prompt registry.
+    # Create a new prompt (and its first version) in the Agent Observability prompt registry.
     #
     # @param body [LLMObsCreatePromptRequest] Create prompt payload.
     # @param opts [Hash] the optional parameters
@@ -925,11 +925,11 @@ def create_llm_obs_prompt_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_prompt ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_prompt ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_prompt"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_prompt"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts'
@@ -969,12 +969,12 @@ def create_llm_obs_prompt_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Create a new LLM Observability prompt version.
+    # Create a new Agent Observability prompt version.
     #
     # @see #create_llm_obs_prompt_version_with_http_info
     def create_llm_obs_prompt_version(prompt_id, body, opts = {})
@@ -982,11 +982,11 @@ def create_llm_obs_prompt_version(prompt_id, body, opts = {})
       data
     end
 
-    # Create a new LLM Observability prompt version.
+    # Create a new Agent Observability prompt version.
     #
-    # Create a new version of an existing LLM Observability prompt.
+    # Create a new version of an existing Agent Observability prompt.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
     # @param body [LLMObsCreatePromptVersionRequest] Create prompt version payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsPromptVersionResponse, Integer, Hash)>] LLMObsPromptVersionResponse data, response status code and response headers
@@ -999,15 +999,15 @@ def create_llm_obs_prompt_version_with_http_info(prompt_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.create_llm_obs_prompt_version ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.create_llm_obs_prompt_version ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.create_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.create_llm_obs_prompt_version"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.create_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.create_llm_obs_prompt_version"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}/versions'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/'))
@@ -1047,12 +1047,12 @@ def create_llm_obs_prompt_version_with_http_info(prompt_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#create_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#create_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete an LLM Observability annotation queue.
+    # Delete an Agent Observability annotation queue.
     #
     # @see #delete_llm_obs_annotation_queue_with_http_info
     def delete_llm_obs_annotation_queue(queue_id, opts = {})
@@ -1060,11 +1060,11 @@ def delete_llm_obs_annotation_queue(queue_id, opts = {})
       nil
     end
 
-    # Delete an LLM Observability annotation queue.
+    # Delete an Agent Observability annotation queue.
     #
     # Delete an annotation queue by its ID.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_llm_obs_annotation_queue_with_http_info(queue_id, opts = {})
@@ -1076,11 +1076,11 @@ def delete_llm_obs_annotation_queue_with_http_info(queue_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_annotation_queue ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_annotation_queue ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.delete_llm_obs_annotation_queue"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.delete_llm_obs_annotation_queue"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -1118,7 +1118,7 @@ def delete_llm_obs_annotation_queue_with_http_info(queue_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1135,7 +1135,7 @@ def delete_llm_obs_annotation_queue_interactions(queue_id, body, opts = {})
     #
     # Delete one or more interactions from an annotation queue.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsDeleteAnnotationQueueInteractionsRequest] Delete interactions payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -1148,15 +1148,15 @@ def delete_llm_obs_annotation_queue_interactions_with_http_info(queue_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_annotation_queue_interactions ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_annotation_queue_interactions ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.delete_llm_obs_annotation_queue_interactions"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.delete_llm_obs_annotation_queue_interactions"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_annotation_queue_interactions"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_annotation_queue_interactions"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/interactions/delete'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -1196,7 +1196,7 @@ def delete_llm_obs_annotation_queue_interactions_with_http_info(queue_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_annotation_queue_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_annotation_queue_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1213,7 +1213,7 @@ def delete_llm_obs_annotations(queue_id, body, opts = {})
     #
     # Delete one or more annotations from an annotation queue.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsDeleteAnnotationsRequest] Delete annotations payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDeleteAnnotationsResponse, Integer, Hash)>] LLMObsDeleteAnnotationsResponse data, response status code and response headers
@@ -1226,15 +1226,15 @@ def delete_llm_obs_annotations_with_http_info(queue_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_annotations ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_annotations ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.delete_llm_obs_annotations"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.delete_llm_obs_annotations"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_annotations"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_annotations"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/annotations/delete'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -1274,7 +1274,7 @@ def delete_llm_obs_annotations_with_http_info(queue_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_annotations\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_annotations\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1289,9 +1289,9 @@ def delete_llm_obs_custom_eval_config(eval_name, opts = {})
 
     # Delete a custom evaluator configuration.
     #
-    # Delete a custom LLM Observability evaluator configuration by its name.
+    # Delete a custom Agent Observability evaluator configuration by its name.
     #
-    # @param eval_name [String] The name of the custom LLM Observability evaluator configuration.
+    # @param eval_name [String] The name of the custom Agent Observability evaluator configuration.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
@@ -1303,11 +1303,11 @@ def delete_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_custom_eval_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_custom_eval_config ...'
       end
       # verify the required parameter 'eval_name' is set
       if @api_client.config.client_side_validation && eval_name.nil?
-        fail ArgumentError, "Missing the required parameter 'eval_name' when calling LLMObservabilityAPI.delete_llm_obs_custom_eval_config"
+        fail ArgumentError, "Missing the required parameter 'eval_name' when calling AgentObservabilityAPI.delete_llm_obs_custom_eval_config"
       end
       # resource path
       local_var_path = '/api/unstable/llm-obs/config/evaluators/custom/{eval_name}'.sub('{eval_name}', CGI.escape(eval_name.to_s).gsub('%2F', '/'))
@@ -1345,12 +1345,12 @@ def delete_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete LLM Observability dataset records.
+    # Delete Agent Observability dataset records.
     #
     # @see #delete_llm_obs_dataset_records_with_http_info
     def delete_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
@@ -1358,12 +1358,12 @@ def delete_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
       nil
     end
 
-    # Delete LLM Observability dataset records.
+    # Delete Agent Observability dataset records.
     #
-    # Delete one or more records from an LLM Observability dataset.
+    # Delete one or more records from an Agent Observability dataset.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDeleteDatasetRecordsRequest] Delete records payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -1376,19 +1376,19 @@ def delete_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_dataset_records ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_dataset_records ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.delete_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.delete_llm_obs_dataset_records"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.delete_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.delete_llm_obs_dataset_records"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_dataset_records"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records/delete'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -1428,12 +1428,12 @@ def delete_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete LLM Observability datasets.
+    # Delete Agent Observability datasets.
     #
     # @see #delete_llm_obs_datasets_with_http_info
     def delete_llm_obs_datasets(project_id, body, opts = {})
@@ -1441,11 +1441,11 @@ def delete_llm_obs_datasets(project_id, body, opts = {})
       nil
     end
 
-    # Delete LLM Observability datasets.
+    # Delete Agent Observability datasets.
     #
-    # Delete one or more LLM Observability datasets within the specified project.
+    # Delete one or more Agent Observability datasets within the specified project.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
+    # @param project_id [String] The ID of the Agent Observability project.
     # @param body [LLMObsDeleteDatasetsRequest] Delete datasets payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -1458,15 +1458,15 @@ def delete_llm_obs_datasets_with_http_info(project_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_datasets ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_datasets ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.delete_llm_obs_datasets"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.delete_llm_obs_datasets"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_datasets"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_datasets"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/delete'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/'))
@@ -1506,12 +1506,12 @@ def delete_llm_obs_datasets_with_http_info(project_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_datasets\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_datasets\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete LLM Observability experiments.
+    # Delete Agent Observability experiments.
     #
     # @see #delete_llm_obs_experiments_with_http_info
     def delete_llm_obs_experiments(body, opts = {})
@@ -1519,9 +1519,9 @@ def delete_llm_obs_experiments(body, opts = {})
       nil
     end
 
-    # Delete LLM Observability experiments.
+    # Delete Agent Observability experiments.
     #
-    # Delete one or more LLM Observability experiments.
+    # Delete one or more Agent Observability experiments.
     #
     # @param body [LLMObsDeleteExperimentsRequest] Delete experiments payload.
     # @param opts [Hash] the optional parameters
@@ -1535,11 +1535,11 @@ def delete_llm_obs_experiments_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_experiments ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_experiments ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_experiments"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_experiments"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments/delete'
@@ -1579,7 +1579,7 @@ def delete_llm_obs_experiments_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_experiments\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_experiments\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1608,11 +1608,11 @@ def delete_llm_obs_patterns_config_with_http_info(config_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_patterns_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_patterns_config ...'
       end
       # verify the required parameter 'config_id' is set
       if @api_client.config.client_side_validation && config_id.nil?
-        fail ArgumentError, "Missing the required parameter 'config_id' when calling LLMObservabilityAPI.delete_llm_obs_patterns_config"
+        fail ArgumentError, "Missing the required parameter 'config_id' when calling AgentObservabilityAPI.delete_llm_obs_patterns_config"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-configs/{config_id}'.sub('{config_id}', CGI.escape(config_id.to_s).gsub('%2F', '/'))
@@ -1650,12 +1650,12 @@ def delete_llm_obs_patterns_config_with_http_info(config_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete LLM Observability projects.
+    # Delete Agent Observability projects.
     #
     # @see #delete_llm_obs_projects_with_http_info
     def delete_llm_obs_projects(body, opts = {})
@@ -1663,9 +1663,9 @@ def delete_llm_obs_projects(body, opts = {})
       nil
     end
 
-    # Delete LLM Observability projects.
+    # Delete Agent Observability projects.
     #
-    # Delete one or more LLM Observability projects.
+    # Delete one or more Agent Observability projects.
     #
     # @param body [LLMObsDeleteProjectsRequest] Delete projects payload.
     # @param opts [Hash] the optional parameters
@@ -1679,11 +1679,11 @@ def delete_llm_obs_projects_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_projects ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_projects ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.delete_llm_obs_projects"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.delete_llm_obs_projects"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/projects/delete'
@@ -1723,12 +1723,12 @@ def delete_llm_obs_projects_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_projects\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_projects\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Delete an LLM Observability prompt.
+    # Delete an Agent Observability prompt.
     #
     # @see #delete_llm_obs_prompt_with_http_info
     def delete_llm_obs_prompt(prompt_id, opts = {})
@@ -1736,11 +1736,11 @@ def delete_llm_obs_prompt(prompt_id, opts = {})
       data
     end
 
-    # Delete an LLM Observability prompt.
+    # Delete an Agent Observability prompt.
     #
-    # Soft-delete an LLM Observability prompt. The prompt's version rows are retained, but they are no longer accessible through the public prompt registry endpoints.
+    # Soft-delete an Agent Observability prompt. The prompt's version rows are retained, but they are no longer accessible through the public prompt registry endpoints.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDeletedPromptResponse, Integer, Hash)>] LLMObsDeletedPromptResponse data, response status code and response headers
     def delete_llm_obs_prompt_with_http_info(prompt_id, opts = {})
@@ -1752,11 +1752,11 @@ def delete_llm_obs_prompt_with_http_info(prompt_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.delete_llm_obs_prompt ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.delete_llm_obs_prompt ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.delete_llm_obs_prompt"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.delete_llm_obs_prompt"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/'))
@@ -1794,12 +1794,12 @@ def delete_llm_obs_prompt_with_http_info(prompt_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#delete_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#delete_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Export an LLM Observability dataset.
+    # Export an Agent Observability dataset.
     #
     # @see #export_llm_obs_dataset_with_http_info
     def export_llm_obs_dataset(project_id, dataset_id, opts = {})
@@ -1807,12 +1807,12 @@ def export_llm_obs_dataset(project_id, dataset_id, opts = {})
       data
     end
 
-    # Export an LLM Observability dataset.
+    # Export an Agent Observability dataset.
     #
     # Download the contents of a dataset as a CSV file. The download is streamed and includes one row per dataset record.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @option opts [LLMObsDatasetExportFormat] :format Export format for the dataset contents. Only `csv` is currently supported.
     # @option opts [Integer] :version Version of the dataset to export. If omitted, the current version is used. Must be between 0 and the current version of the dataset, inclusive.
@@ -1826,22 +1826,22 @@ def export_llm_obs_dataset_with_http_info(project_id, dataset_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.export_llm_obs_dataset ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.export_llm_obs_dataset ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.export_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.export_llm_obs_dataset"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.export_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.export_llm_obs_dataset"
       end
       allowable_values = ['csv']
       if @api_client.config.client_side_validation && opts[:'format'] && !allowable_values.include?(opts[:'format'])
         fail ArgumentError, "invalid value for \"format\", must be one of #{allowable_values}"
       end
       if @api_client.config.client_side_validation && !opts[:'version'].nil? && opts[:'version'] > 2147483647
-        fail ArgumentError, 'invalid value for "opts[:"version"]" when calling LLMObservabilityAPI.export_llm_obs_dataset, must be smaller than or equal to 2147483647.'
+        fail ArgumentError, 'invalid value for "opts[:"version"]" when calling AgentObservabilityAPI.export_llm_obs_dataset, must be smaller than or equal to 2147483647.'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/export'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -1881,7 +1881,7 @@ def export_llm_obs_dataset_with_http_info(project_id, dataset_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#export_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#export_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1898,7 +1898,7 @@ def get_llm_obs_annotated_interactions(queue_id, opts = {})
     #
     # Retrieve all interactions (traces and sessions) and their annotations for a given annotation queue.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotatedInteractionsResponse, Integer, Hash)>] LLMObsAnnotatedInteractionsResponse data, response status code and response headers
     def get_llm_obs_annotated_interactions_with_http_info(queue_id, opts = {})
@@ -1910,11 +1910,11 @@ def get_llm_obs_annotated_interactions_with_http_info(queue_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_annotated_interactions ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_annotated_interactions ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/annotated-interactions'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -1952,7 +1952,7 @@ def get_llm_obs_annotated_interactions_with_http_info(queue_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_annotated_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_annotated_interactions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -1984,23 +1984,23 @@ def get_llm_obs_annotated_interactions_by_trace_i_ds_with_http_info(content_ids,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds ...'
       end
       # verify the required parameter 'content_ids' is set
       if @api_client.config.client_side_validation && content_ids.nil?
-        fail ArgumentError, "Missing the required parameter 'content_ids' when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds"
+        fail ArgumentError, "Missing the required parameter 'content_ids' when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds"
       end
       if @api_client.config.client_side_validation && !opts[:'offset'].nil? && opts[:'offset'] > 2147483647
-        fail ArgumentError, 'invalid value for "opts[:"offset"]" when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be smaller than or equal to 2147483647.'
+        fail ArgumentError, 'invalid value for "opts[:"offset"]" when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be smaller than or equal to 2147483647.'
       end
       if @api_client.config.client_side_validation && !opts[:'offset'].nil? && opts[:'offset'] < 0
-        fail ArgumentError, 'invalid value for "opts[:"offset"]" when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be greater than or equal to 0.'
+        fail ArgumentError, 'invalid value for "opts[:"offset"]" when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be greater than or equal to 0.'
       end
       if @api_client.config.client_side_validation && !opts[:'limit'].nil? && opts[:'limit'] > 2147483647
-        fail ArgumentError, 'invalid value for "opts[:"limit"]" when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be smaller than or equal to 2147483647.'
+        fail ArgumentError, 'invalid value for "opts[:"limit"]" when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be smaller than or equal to 2147483647.'
       end
       if @api_client.config.client_side_validation && !opts[:'limit'].nil? && opts[:'limit'] < 1
-        fail ArgumentError, 'invalid value for "opts[:"limit"]" when calling LLMObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be greater than or equal to 1.'
+        fail ArgumentError, 'invalid value for "opts[:"limit"]" when calling AgentObservabilityAPI.get_llm_obs_annotated_interactions_by_trace_i_ds, must be greater than or equal to 1.'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotated-interactions'
@@ -2042,7 +2042,7 @@ def get_llm_obs_annotated_interactions_by_trace_i_ds_with_http_info(content_ids,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_annotated_interactions_by_trace_i_ds\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_annotated_interactions_by_trace_i_ds\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -2059,7 +2059,7 @@ def get_llm_obs_annotation_queue_label_schema(queue_id, opts = {})
     #
     # Retrieve the label schema for a given annotation queue.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotationQueueLabelSchemaResponse, Integer, Hash)>] LLMObsAnnotationQueueLabelSchemaResponse data, response status code and response headers
     def get_llm_obs_annotation_queue_label_schema_with_http_info(queue_id, opts = {})
@@ -2071,11 +2071,11 @@ def get_llm_obs_annotation_queue_label_schema_with_http_info(queue_id, opts = {}
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_annotation_queue_label_schema ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_annotation_queue_label_schema ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.get_llm_obs_annotation_queue_label_schema"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.get_llm_obs_annotation_queue_label_schema"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/label-schema'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -2113,7 +2113,7 @@ def get_llm_obs_annotation_queue_label_schema_with_http_info(queue_id, opts = {}
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_annotation_queue_label_schema\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_annotation_queue_label_schema\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -2128,9 +2128,9 @@ def get_llm_obs_custom_eval_config(eval_name, opts = {})
 
     # Get a custom evaluator configuration.
     #
-    # Retrieve a custom LLM Observability evaluator configuration by its name.
+    # Retrieve a custom Agent Observability evaluator configuration by its name.
     #
-    # @param eval_name [String] The name of the custom LLM Observability evaluator configuration.
+    # @param eval_name [String] The name of the custom Agent Observability evaluator configuration.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsCustomEvalConfigResponse, Integer, Hash)>] LLMObsCustomEvalConfigResponse data, response status code and response headers
     def get_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
@@ -2142,11 +2142,11 @@ def get_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_custom_eval_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_custom_eval_config ...'
       end
       # verify the required parameter 'eval_name' is set
       if @api_client.config.client_side_validation && eval_name.nil?
-        fail ArgumentError, "Missing the required parameter 'eval_name' when calling LLMObservabilityAPI.get_llm_obs_custom_eval_config"
+        fail ArgumentError, "Missing the required parameter 'eval_name' when calling AgentObservabilityAPI.get_llm_obs_custom_eval_config"
       end
       # resource path
       local_var_path = '/api/unstable/llm-obs/config/evaluators/custom/{eval_name}'.sub('{eval_name}', CGI.escape(eval_name.to_s).gsub('%2F', '/'))
@@ -2184,12 +2184,12 @@ def get_llm_obs_custom_eval_config_with_http_info(eval_name, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Get LLM Observability dataset draft state.
+    # Get Agent Observability dataset draft state.
     #
     # @see #get_llm_obs_dataset_draft_state_with_http_info
     def get_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
@@ -2197,12 +2197,12 @@ def get_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
       data
     end
 
-    # Get LLM Observability dataset draft state.
+    # Get Agent Observability dataset draft state.
     #
     # Retrieve the draft state of a dataset, including whether it is currently locked for editing and which user holds the lock.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetDraftStateResponse, Integer, Hash)>] LLMObsDatasetDraftStateResponse data, response status code and response headers
     def get_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts = {})
@@ -2214,15 +2214,15 @@ def get_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_dataset_draft_state ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_dataset_draft_state ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.get_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.get_llm_obs_dataset_draft_state"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.get_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.get_llm_obs_dataset_draft_state"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -2260,7 +2260,7 @@ def get_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -2288,7 +2288,7 @@ def get_llm_obs_patterns_config_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_patterns_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_patterns_config ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-configs/latest'
@@ -2326,7 +2326,7 @@ def get_llm_obs_patterns_config_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -2356,11 +2356,11 @@ def get_llm_obs_patterns_run_status_with_http_info(config_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_patterns_run_status ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_patterns_run_status ...'
       end
       # verify the required parameter 'config_id' is set
       if @api_client.config.client_side_validation && config_id.nil?
-        fail ArgumentError, "Missing the required parameter 'config_id' when calling LLMObservabilityAPI.get_llm_obs_patterns_run_status"
+        fail ArgumentError, "Missing the required parameter 'config_id' when calling AgentObservabilityAPI.get_llm_obs_patterns_run_status"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-runs/status'
@@ -2399,12 +2399,12 @@ def get_llm_obs_patterns_run_status_with_http_info(config_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_patterns_run_status\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_patterns_run_status\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Get an LLM Observability prompt.
+    # Get an Agent Observability prompt.
     #
     # @see #get_llm_obs_prompt_with_http_info
     def get_llm_obs_prompt(prompt_id, opts = {})
@@ -2412,11 +2412,11 @@ def get_llm_obs_prompt(prompt_id, opts = {})
       data
     end
 
-    # Get an LLM Observability prompt.
+    # Get an Agent Observability prompt.
     #
-    # Get the latest version of an LLM Observability prompt by prompt ID.
+    # Get the latest version of an Agent Observability prompt by prompt ID.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
     # @param opts [Hash] the optional parameters
     # @option opts [String] :label **Deprecated.** Optional label of the prompt version to return. Do not use this parameter for new integrations. If omitted, the latest version is returned. If the prompt has no labels, the latest version is returned even when a label is requested. If the prompt has labels but none match the requested label, a 404 response is returned.
     # @return [Array<(LLMObsPromptSDKResponse, Integer, Hash)>] LLMObsPromptSDKResponse data, response status code and response headers
@@ -2429,11 +2429,11 @@ def get_llm_obs_prompt_with_http_info(prompt_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_prompt ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_prompt ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.get_llm_obs_prompt"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.get_llm_obs_prompt"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/'))
@@ -2472,12 +2472,12 @@ def get_llm_obs_prompt_with_http_info(prompt_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Get a specific LLM Observability prompt version.
+    # Get a specific Agent Observability prompt version.
     #
     # @see #get_llm_obs_prompt_version_with_http_info
     def get_llm_obs_prompt_version(prompt_id, version, opts = {})
@@ -2485,12 +2485,12 @@ def get_llm_obs_prompt_version(prompt_id, version, opts = {})
       data
     end
 
-    # Get a specific LLM Observability prompt version.
+    # Get a specific Agent Observability prompt version.
     #
-    # Get the full template of a single, specific version of an LLM Observability prompt.
+    # Get the full template of a single, specific version of an Agent Observability prompt.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
-    # @param version [Integer] The version number of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
+    # @param version [Integer] The version number of the Agent Observability prompt.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsPromptVersionResponse, Integer, Hash)>] LLMObsPromptVersionResponse data, response status code and response headers
     def get_llm_obs_prompt_version_with_http_info(prompt_id, version, opts = {})
@@ -2502,18 +2502,18 @@ def get_llm_obs_prompt_version_with_http_info(prompt_id, version, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.get_llm_obs_prompt_version ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.get_llm_obs_prompt_version ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.get_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.get_llm_obs_prompt_version"
       end
       # verify the required parameter 'version' is set
       if @api_client.config.client_side_validation && version.nil?
-        fail ArgumentError, "Missing the required parameter 'version' when calling LLMObservabilityAPI.get_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'version' when calling AgentObservabilityAPI.get_llm_obs_prompt_version"
       end
       if @api_client.config.client_side_validation && version < 1
-        fail ArgumentError, 'invalid value for "version" when calling LLMObservabilityAPI.get_llm_obs_prompt_version, must be greater than or equal to 1.'
+        fail ArgumentError, 'invalid value for "version" when calling AgentObservabilityAPI.get_llm_obs_prompt_version, must be greater than or equal to 1.'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/')).sub('{version}', CGI.escape(version.to_s).gsub('%2F', '/'))
@@ -2551,12 +2551,12 @@ def get_llm_obs_prompt_version_with_http_info(prompt_id, version, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#get_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#get_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability annotation queues.
+    # List Agent Observability annotation queues.
     #
     # @see #list_llm_obs_annotation_queues_with_http_info
     def list_llm_obs_annotation_queues(opts = {})
@@ -2564,7 +2564,7 @@ def list_llm_obs_annotation_queues(opts = {})
       data
     end
 
-    # List LLM Observability annotation queues.
+    # List Agent Observability annotation queues.
     #
     # List annotation queues. Optionally filter by project ID or queue IDs. These parameters are mutually exclusive.
     # If neither is provided, all queues in the organization are returned.
@@ -2582,7 +2582,7 @@ def list_llm_obs_annotation_queues_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_annotation_queues ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_annotation_queues ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues'
@@ -2623,7 +2623,7 @@ def list_llm_obs_annotation_queues_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_annotation_queues\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_annotation_queues\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -2638,7 +2638,7 @@ def list_llm_obs_custom_eval_configs(opts = {})
 
     # List custom evaluator configurations.
     #
-    # List all custom LLM Observability evaluator configurations for the organization.
+    # List all custom Agent Observability evaluator configurations for the organization.
     #
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsCustomEvalConfigListResponse, Integer, Hash)>] LLMObsCustomEvalConfigListResponse data, response status code and response headers
@@ -2651,7 +2651,7 @@ def list_llm_obs_custom_eval_configs_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_custom_eval_configs ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_custom_eval_configs ...'
       end
       # resource path
       local_var_path = '/api/unstable/llm-obs/config/evaluators/custom'
@@ -2689,12 +2689,12 @@ def list_llm_obs_custom_eval_configs_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_custom_eval_configs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_custom_eval_configs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability dataset records.
+    # List Agent Observability dataset records.
     #
     # @see #list_llm_obs_dataset_records_with_http_info
     def list_llm_obs_dataset_records(project_id, dataset_id, opts = {})
@@ -2702,12 +2702,12 @@ def list_llm_obs_dataset_records(project_id, dataset_id, opts = {})
       data
     end
 
-    # List LLM Observability dataset records.
+    # List Agent Observability dataset records.
     #
-    # List all records in an LLM Observability dataset, sorted by creation date, newest first.
+    # List all records in an Agent Observability dataset, sorted by creation date, newest first.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @option opts [Integer] :filter_version Retrieve records from a specific dataset version. Defaults to the current version.
     # @option opts [String] :page_cursor Use the Pagination cursor to retrieve the next page of results.
@@ -2722,15 +2722,15 @@ def list_llm_obs_dataset_records_with_http_info(project_id, dataset_id, opts = {
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_dataset_records ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_dataset_records ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.list_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.list_llm_obs_dataset_records"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.list_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.list_llm_obs_dataset_records"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -2771,12 +2771,12 @@ def list_llm_obs_dataset_records_with_http_info(project_id, dataset_id, opts = {
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability datasets.
+    # List Agent Observability datasets.
     #
     # @see #list_llm_obs_datasets_with_http_info
     def list_llm_obs_datasets(project_id, opts = {})
@@ -2784,11 +2784,11 @@ def list_llm_obs_datasets(project_id, opts = {})
       data
     end
 
-    # List LLM Observability datasets.
+    # List Agent Observability datasets.
     #
-    # List all LLM Observability datasets for a project, sorted by creation date, newest first.
+    # List all Agent Observability datasets for a project, sorted by creation date, newest first.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
+    # @param project_id [String] The ID of the Agent Observability project.
     # @param opts [Hash] the optional parameters
     # @option opts [String] :filter_name Filter datasets by name.
     # @option opts [String] :filter_id Filter datasets by dataset ID.
@@ -2804,11 +2804,11 @@ def list_llm_obs_datasets_with_http_info(project_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_datasets ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_datasets ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.list_llm_obs_datasets"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.list_llm_obs_datasets"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/'))
@@ -2850,12 +2850,12 @@ def list_llm_obs_datasets_with_http_info(project_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_datasets\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_datasets\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability dataset versions.
+    # List Agent Observability dataset versions.
     #
     # @see #list_llm_obs_dataset_versions_with_http_info
     def list_llm_obs_dataset_versions(project_id, dataset_id, opts = {})
@@ -2863,12 +2863,12 @@ def list_llm_obs_dataset_versions(project_id, dataset_id, opts = {})
       data
     end
 
-    # List LLM Observability dataset versions.
+    # List Agent Observability dataset versions.
     #
     # List the active versions of a dataset. A version is created each time a dataset is referenced by an experiment run.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetVersionsResponse, Integer, Hash)>] LLMObsDatasetVersionsResponse data, response status code and response headers
     def list_llm_obs_dataset_versions_with_http_info(project_id, dataset_id, opts = {})
@@ -2880,15 +2880,15 @@ def list_llm_obs_dataset_versions_with_http_info(project_id, dataset_id, opts =
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_dataset_versions ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_dataset_versions ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.list_llm_obs_dataset_versions"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.list_llm_obs_dataset_versions"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.list_llm_obs_dataset_versions"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.list_llm_obs_dataset_versions"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/versions'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -2926,12 +2926,12 @@ def list_llm_obs_dataset_versions_with_http_info(project_id, dataset_id, opts =
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_dataset_versions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_dataset_versions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List events for an LLM Observability experiment.
+    # List events for an Agent Observability experiment.
     #
     # @see #list_llm_obs_experiment_events_with_http_info
     def list_llm_obs_experiment_events(experiment_id, opts = {})
@@ -2939,11 +2939,11 @@ def list_llm_obs_experiment_events(experiment_id, opts = {})
       data
     end
 
-    # List events for an LLM Observability experiment.
+    # List events for an Agent Observability experiment.
     #
     # Retrieve spans and experiment-level summary metrics for a given experiment with cursor-based pagination.
     #
-    # @param experiment_id [String] The ID of the LLM Observability experiment.
+    # @param experiment_id [String] The ID of the Agent Observability experiment.
     # @param opts [Hash] the optional parameters
     # @option opts [Integer] :page_limit Maximum number of spans to return per page. Defaults to 5000.
     # @option opts [String] :page_cursor Opaque cursor from a previous response to fetch the next page of results.
@@ -2957,11 +2957,11 @@ def list_llm_obs_experiment_events_with_http_info(experiment_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_experiment_events ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_experiment_events ...'
       end
       # verify the required parameter 'experiment_id' is set
       if @api_client.config.client_side_validation && experiment_id.nil?
-        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling LLMObservabilityAPI.list_llm_obs_experiment_events"
+        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling AgentObservabilityAPI.list_llm_obs_experiment_events"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v3/experiments/{experiment_id}/events'.sub('{experiment_id}', CGI.escape(experiment_id.to_s).gsub('%2F', '/'))
@@ -3001,12 +3001,12 @@ def list_llm_obs_experiment_events_with_http_info(experiment_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_experiment_events\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_experiment_events\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability experiment spans (v1).
+    # List Agent Observability experiment spans (v1).
     #
     # @see #list_llm_obs_experiment_events_v1_with_http_info
     def list_llm_obs_experiment_events_v1(experiment_id, opts = {})
@@ -3014,13 +3014,13 @@ def list_llm_obs_experiment_events_v1(experiment_id, opts = {})
       data
     end
 
-    # List LLM Observability experiment spans (v1).
+    # List Agent Observability experiment spans (v1).
     #
     # Retrieve spans with their evaluation metrics for a given experiment. Returns spans only, with no summary metrics and no pagination. Deprecated in favor of `ListLLMObsExperimentEventsV3`.
     #
     # @deprecated This API is deprecated.
     #
-    # @param experiment_id [String] The ID of the LLM Observability experiment.
+    # @param experiment_id [String] The ID of the Agent Observability experiment.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsExperimentSpansResponse, Integer, Hash)>] LLMObsExperimentSpansResponse data, response status code and response headers
     def list_llm_obs_experiment_events_v1_with_http_info(experiment_id, opts = {})
@@ -3033,11 +3033,11 @@ def list_llm_obs_experiment_events_v1_with_http_info(experiment_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_experiment_events_v1 ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_experiment_events_v1 ...'
       end
       # verify the required parameter 'experiment_id' is set
       if @api_client.config.client_side_validation && experiment_id.nil?
-        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling LLMObservabilityAPI.list_llm_obs_experiment_events_v1"
+        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling AgentObservabilityAPI.list_llm_obs_experiment_events_v1"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments/{experiment_id}/events'.sub('{experiment_id}', CGI.escape(experiment_id.to_s).gsub('%2F', '/'))
@@ -3075,12 +3075,12 @@ def list_llm_obs_experiment_events_v1_with_http_info(experiment_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_experiment_events_v1\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_experiment_events_v1\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability experiment events (v2).
+    # List Agent Observability experiment events (v2).
     #
     # @see #list_llm_obs_experiment_events_v2_with_http_info
     def list_llm_obs_experiment_events_v2(experiment_id, opts = {})
@@ -3088,13 +3088,13 @@ def list_llm_obs_experiment_events_v2(experiment_id, opts = {})
       data
     end
 
-    # List LLM Observability experiment events (v2).
+    # List Agent Observability experiment events (v2).
     #
     # Retrieve spans and experiment-level summary metrics for a given experiment. Returns the full events payload without pagination. Deprecated: use `ListLLMObsExperimentEventsV3` instead.
     #
     # @deprecated This API is deprecated.
     #
-    # @param experiment_id [String] The ID of the LLM Observability experiment.
+    # @param experiment_id [String] The ID of the Agent Observability experiment.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsExperimentEventsV2Response, Integer, Hash)>] LLMObsExperimentEventsV2Response data, response status code and response headers
     def list_llm_obs_experiment_events_v2_with_http_info(experiment_id, opts = {})
@@ -3107,11 +3107,11 @@ def list_llm_obs_experiment_events_v2_with_http_info(experiment_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_experiment_events_v2 ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_experiment_events_v2 ...'
       end
       # verify the required parameter 'experiment_id' is set
       if @api_client.config.client_side_validation && experiment_id.nil?
-        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling LLMObservabilityAPI.list_llm_obs_experiment_events_v2"
+        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling AgentObservabilityAPI.list_llm_obs_experiment_events_v2"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v2/experiments/{experiment_id}/events'.sub('{experiment_id}', CGI.escape(experiment_id.to_s).gsub('%2F', '/'))
@@ -3149,12 +3149,12 @@ def list_llm_obs_experiment_events_v2_with_http_info(experiment_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_experiment_events_v2\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_experiment_events_v2\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability experiments.
+    # List Agent Observability experiments.
     #
     # @see #list_llm_obs_experiments_with_http_info
     def list_llm_obs_experiments(opts = {})
@@ -3162,9 +3162,9 @@ def list_llm_obs_experiments(opts = {})
       data
     end
 
-    # List LLM Observability experiments.
+    # List Agent Observability experiments.
     #
-    # List all LLM Observability experiments sorted by creation date, newest first.
+    # List all Agent Observability experiments sorted by creation date, newest first.
     #
     # @param opts [Hash] the optional parameters
     # @option opts [String] :filter_project_id Filter experiments by project ID. Required if `filter[dataset_id]` is not provided.
@@ -3189,10 +3189,10 @@ def list_llm_obs_experiments_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_experiments ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_experiments ...'
       end
       if @api_client.config.client_side_validation && !opts[:'page_limit'].nil? && opts[:'page_limit'] > 5000
-        fail ArgumentError, 'invalid value for "opts[:"page_limit"]" when calling LLMObservabilityAPI.list_llm_obs_experiments, must be smaller than or equal to 5000.'
+        fail ArgumentError, 'invalid value for "opts[:"page_limit"]" when calling AgentObservabilityAPI.list_llm_obs_experiments, must be smaller than or equal to 5000.'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments'
@@ -3242,7 +3242,7 @@ def list_llm_obs_experiments_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_experiments\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_experiments\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3271,11 +3271,11 @@ def list_llm_obs_integration_accounts_with_http_info(integration, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_integration_accounts ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_integration_accounts ...'
       end
       # verify the required parameter 'integration' is set
       if @api_client.config.client_side_validation && integration.nil?
-        fail ArgumentError, "Missing the required parameter 'integration' when calling LLMObservabilityAPI.list_llm_obs_integration_accounts"
+        fail ArgumentError, "Missing the required parameter 'integration' when calling AgentObservabilityAPI.list_llm_obs_integration_accounts"
       end
       # verify enum value
       allowable_values = ['openai', 'amazon_bedrock', 'anthropic', 'azure_openai', 'vertex_ai', 'llmproxy']
@@ -3318,7 +3318,7 @@ def list_llm_obs_integration_accounts_with_http_info(integration, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_integration_accounts\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_integration_accounts\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3348,11 +3348,11 @@ def list_llm_obs_integration_models_with_http_info(integration, account_id, opts
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_integration_models ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_integration_models ...'
       end
       # verify the required parameter 'integration' is set
       if @api_client.config.client_side_validation && integration.nil?
-        fail ArgumentError, "Missing the required parameter 'integration' when calling LLMObservabilityAPI.list_llm_obs_integration_models"
+        fail ArgumentError, "Missing the required parameter 'integration' when calling AgentObservabilityAPI.list_llm_obs_integration_models"
       end
       # verify enum value
       allowable_values = ['openai', 'amazon_bedrock', 'anthropic', 'azure_openai', 'vertex_ai', 'llmproxy']
@@ -3361,7 +3361,7 @@ def list_llm_obs_integration_models_with_http_info(integration, account_id, opts
       end
       # verify the required parameter 'account_id' is set
       if @api_client.config.client_side_validation && account_id.nil?
-        fail ArgumentError, "Missing the required parameter 'account_id' when calling LLMObservabilityAPI.list_llm_obs_integration_models"
+        fail ArgumentError, "Missing the required parameter 'account_id' when calling AgentObservabilityAPI.list_llm_obs_integration_models"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/integrations/{integration}/{account_id}/models'.sub('{integration}', CGI.escape(integration.to_s).gsub('%2F', '/')).sub('{account_id}', CGI.escape(account_id.to_s).gsub('%2F', '/'))
@@ -3399,7 +3399,7 @@ def list_llm_obs_integration_models_with_http_info(integration, account_id, opts
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_integration_models\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_integration_models\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3431,11 +3431,11 @@ def list_llm_obs_patterns_clustered_points_with_http_info(topic_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_patterns_clustered_points ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_patterns_clustered_points ...'
       end
       # verify the required parameter 'topic_id' is set
       if @api_client.config.client_side_validation && topic_id.nil?
-        fail ArgumentError, "Missing the required parameter 'topic_id' when calling LLMObservabilityAPI.list_llm_obs_patterns_clustered_points"
+        fail ArgumentError, "Missing the required parameter 'topic_id' when calling AgentObservabilityAPI.list_llm_obs_patterns_clustered_points"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-clustered-points'
@@ -3476,7 +3476,7 @@ def list_llm_obs_patterns_clustered_points_with_http_info(topic_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_patterns_clustered_points\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_patterns_clustered_points\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3504,7 +3504,7 @@ def list_llm_obs_patterns_configs_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_patterns_configs ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_patterns_configs ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-configs'
@@ -3542,7 +3542,7 @@ def list_llm_obs_patterns_configs_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_patterns_configs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_patterns_configs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3571,11 +3571,11 @@ def list_llm_obs_patterns_runs_with_http_info(config_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_patterns_runs ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_patterns_runs ...'
       end
       # verify the required parameter 'config_id' is set
       if @api_client.config.client_side_validation && config_id.nil?
-        fail ArgumentError, "Missing the required parameter 'config_id' when calling LLMObservabilityAPI.list_llm_obs_patterns_runs"
+        fail ArgumentError, "Missing the required parameter 'config_id' when calling AgentObservabilityAPI.list_llm_obs_patterns_runs"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-runs'
@@ -3614,7 +3614,7 @@ def list_llm_obs_patterns_runs_with_http_info(config_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_patterns_runs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_patterns_runs\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3645,11 +3645,11 @@ def list_llm_obs_patterns_topics_with_http_info(config_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_patterns_topics ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_patterns_topics ...'
       end
       # verify the required parameter 'config_id' is set
       if @api_client.config.client_side_validation && config_id.nil?
-        fail ArgumentError, "Missing the required parameter 'config_id' when calling LLMObservabilityAPI.list_llm_obs_patterns_topics"
+        fail ArgumentError, "Missing the required parameter 'config_id' when calling AgentObservabilityAPI.list_llm_obs_patterns_topics"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-topics'
@@ -3689,7 +3689,7 @@ def list_llm_obs_patterns_topics_with_http_info(config_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_patterns_topics\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_patterns_topics\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -3722,11 +3722,11 @@ def list_llm_obs_patterns_topics_with_clustered_points_with_http_info(config_id,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_patterns_topics_with_clustered_points ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_patterns_topics_with_clustered_points ...'
       end
       # verify the required parameter 'config_id' is set
       if @api_client.config.client_side_validation && config_id.nil?
-        fail ArgumentError, "Missing the required parameter 'config_id' when calling LLMObservabilityAPI.list_llm_obs_patterns_topics_with_clustered_points"
+        fail ArgumentError, "Missing the required parameter 'config_id' when calling AgentObservabilityAPI.list_llm_obs_patterns_topics_with_clustered_points"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-topics/with-cluster-points'
@@ -3767,12 +3767,12 @@ def list_llm_obs_patterns_topics_with_clustered_points_with_http_info(config_id,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_patterns_topics_with_clustered_points\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_patterns_topics_with_clustered_points\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability projects.
+    # List Agent Observability projects.
     #
     # @see #list_llm_obs_projects_with_http_info
     def list_llm_obs_projects(opts = {})
@@ -3780,9 +3780,9 @@ def list_llm_obs_projects(opts = {})
       data
     end
 
-    # List LLM Observability projects.
+    # List Agent Observability projects.
     #
-    # List all LLM Observability projects sorted by creation date, newest first.
+    # List all Agent Observability projects sorted by creation date, newest first.
     #
     # @param opts [Hash] the optional parameters
     # @option opts [String] :filter_id Filter projects by project ID.
@@ -3799,7 +3799,7 @@ def list_llm_obs_projects_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_projects ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_projects ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/projects'
@@ -3841,12 +3841,12 @@ def list_llm_obs_projects_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_projects\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_projects\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability prompts.
+    # List Agent Observability prompts.
     #
     # @see #list_llm_obs_prompts_with_http_info
     def list_llm_obs_prompts(opts = {})
@@ -3854,9 +3854,9 @@ def list_llm_obs_prompts(opts = {})
       data
     end
 
-    # List LLM Observability prompts.
+    # List Agent Observability prompts.
     #
-    # List all LLM Observability prompts in the prompt registry for the organization.
+    # List all Agent Observability prompts in the prompt registry for the organization.
     #
     # @param opts [Hash] the optional parameters
     # @option opts [String] :filter_prompt_id Optional filter for prompts by prompt ID.
@@ -3870,7 +3870,7 @@ def list_llm_obs_prompts_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_prompts ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_prompts ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts'
@@ -3909,12 +3909,12 @@ def list_llm_obs_prompts_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_prompts\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_prompts\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List versions of an LLM Observability prompt.
+    # List versions of an Agent Observability prompt.
     #
     # @see #list_llm_obs_prompt_versions_with_http_info
     def list_llm_obs_prompt_versions(prompt_id, opts = {})
@@ -3922,11 +3922,11 @@ def list_llm_obs_prompt_versions(prompt_id, opts = {})
       data
     end
 
-    # List versions of an LLM Observability prompt.
+    # List versions of an Agent Observability prompt.
     #
-    # List all versions of an LLM Observability prompt, ordered newest to oldest. If the prompt does not exist, is not registered, or is archived, the response contains an empty list.
+    # List all versions of an Agent Observability prompt, ordered newest to oldest. If the prompt does not exist, is not registered, or is archived, the response contains an empty list.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsPromptVersionsResponse, Integer, Hash)>] LLMObsPromptVersionsResponse data, response status code and response headers
     def list_llm_obs_prompt_versions_with_http_info(prompt_id, opts = {})
@@ -3938,11 +3938,11 @@ def list_llm_obs_prompt_versions_with_http_info(prompt_id, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_prompt_versions ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_prompt_versions ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.list_llm_obs_prompt_versions"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.list_llm_obs_prompt_versions"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}/versions'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/'))
@@ -3980,12 +3980,12 @@ def list_llm_obs_prompt_versions_with_http_info(prompt_id, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_prompt_versions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_prompt_versions\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # List LLM Observability spans.
+    # List Agent Observability spans.
     #
     # @see #list_llm_obs_spans_with_http_info
     def list_llm_obs_spans(opts = {})
@@ -3993,14 +3993,14 @@ def list_llm_obs_spans(opts = {})
       data
     end
 
-    # List LLM Observability spans.
+    # List Agent Observability spans.
     #
-    # List LLM Observability spans matching the specified filters.
+    # List Agent Observability spans matching the specified filters.
     #
     # @param opts [Hash] the optional parameters
     # @option opts [String] :filter_from Start of the time range. Accepts ISO 8601 or relative format (e.g., `now-15m`). Defaults to `now-15m`.
     # @option opts [String] :filter_to End of the time range. Accepts ISO 8601 or relative format. Defaults to `now`.
-    # @option opts [String] :filter_query Search query using LLM Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`filter[span_id]`, `filter[trace_id]`, etc.) are ignored.
+    # @option opts [String] :filter_query Search query using Agent Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`filter[span_id]`, `filter[trace_id]`, etc.) are ignored.
     # @option opts [String] :filter_span_id Filter by exact span ID.
     # @option opts [String] :filter_trace_id Filter by exact trace ID.
     # @option opts [String] :filter_span_kind Filter by span kind (e.g., llm, agent, tool, task, workflow).
@@ -4020,7 +4020,7 @@ def list_llm_obs_spans_with_http_info(opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.list_llm_obs_spans ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.list_llm_obs_spans ...'
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/spans/events'
@@ -4070,12 +4070,12 @@ def list_llm_obs_spans_with_http_info(opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#list_llm_obs_spans\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#list_llm_obs_spans\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Lock LLM Observability dataset draft state.
+    # Lock Agent Observability dataset draft state.
     #
     # @see #lock_llm_obs_dataset_draft_state_with_http_info
     def lock_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
@@ -4083,12 +4083,12 @@ def lock_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
       data
     end
 
-    # Lock LLM Observability dataset draft state.
+    # Lock Agent Observability dataset draft state.
     #
     # Acquire the draft lock on a dataset for the calling user. The lock prevents other users from concurrently editing the dataset draft.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetDraftStateResponse, Integer, Hash)>] LLMObsDatasetDraftStateResponse data, response status code and response headers
     def lock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts = {})
@@ -4100,15 +4100,15 @@ def lock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.lock_llm_obs_dataset_draft_state ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.lock_llm_obs_dataset_draft_state ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.lock_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.lock_llm_obs_dataset_draft_state"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.lock_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.lock_llm_obs_dataset_draft_state"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/lock'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -4146,12 +4146,12 @@ def lock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#lock_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#lock_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Restore an LLM Observability dataset version.
+    # Restore an Agent Observability dataset version.
     #
     # @see #restore_llm_obs_dataset_version_with_http_info
     def restore_llm_obs_dataset_version(project_id, dataset_id, body, opts = {})
@@ -4159,12 +4159,12 @@ def restore_llm_obs_dataset_version(project_id, dataset_id, body, opts = {})
       nil
     end
 
-    # Restore an LLM Observability dataset version.
+    # Restore an Agent Observability dataset version.
     #
     # Restore a dataset to a previous version. The dataset's current version is bumped, and its records are replaced with the records from the specified prior version.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDatasetRestoreVersionRequest] Restore dataset version payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -4177,19 +4177,19 @@ def restore_llm_obs_dataset_version_with_http_info(project_id, dataset_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.restore_llm_obs_dataset_version ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.restore_llm_obs_dataset_version ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.restore_llm_obs_dataset_version"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.restore_llm_obs_dataset_version"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.restore_llm_obs_dataset_version"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.restore_llm_obs_dataset_version"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.restore_llm_obs_dataset_version"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.restore_llm_obs_dataset_version"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/restore'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -4229,12 +4229,12 @@ def restore_llm_obs_dataset_version_with_http_info(project_id, dataset_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#restore_llm_obs_dataset_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#restore_llm_obs_dataset_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Search LLM Observability experimentation entities.
+    # Search Agent Observability experimentation.
     #
     # @see #search_llm_obs_experimentation_with_http_info
     def search_llm_obs_experimentation(body, opts = {})
@@ -4242,9 +4242,9 @@ def search_llm_obs_experimentation(body, opts = {})
       data
     end
 
-    # Search LLM Observability experimentation entities.
+    # Search Agent Observability experimentation.
     #
-    # Search across LLM Observability experimentation entities — projects, datasets, dataset records, experiments, and experiment runs — using cursor-based pagination.
+    # Search across Agent Observability experimentation entities — projects, datasets, dataset records, experiments, and experiment runs — using cursor-based pagination.
     #
     # The `filter.scope` field controls which entity types are returned. At least one valid scope must be provided.
     #
@@ -4262,11 +4262,11 @@ def search_llm_obs_experimentation_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.search_llm_obs_experimentation ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.search_llm_obs_experimentation ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.search_llm_obs_experimentation"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.search_llm_obs_experimentation"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experimentation/search'
@@ -4306,12 +4306,12 @@ def search_llm_obs_experimentation_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#search_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#search_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Search LLM Observability spans.
+    # Search Agent Observability spans.
     #
     # @see #search_llm_obs_spans_with_http_info
     def search_llm_obs_spans(body, opts = {})
@@ -4319,9 +4319,9 @@ def search_llm_obs_spans(body, opts = {})
       data
     end
 
-    # Search LLM Observability spans.
+    # Search Agent Observability spans.
     #
-    # Search LLM Observability spans using structured filters in the request body.
+    # Search Agent Observability spans using structured filters in the request body.
     #
     # @param body [LLMObsSearchSpansRequest] Search spans payload.
     # @param opts [Hash] the optional parameters
@@ -4335,11 +4335,11 @@ def search_llm_obs_spans_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.search_llm_obs_spans ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.search_llm_obs_spans ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.search_llm_obs_spans"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.search_llm_obs_spans"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/spans/events/search'
@@ -4379,7 +4379,7 @@ def search_llm_obs_spans_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#search_llm_obs_spans\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#search_llm_obs_spans\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -4394,7 +4394,7 @@ def simple_search_llm_obs_experimentation(body, opts = {})
 
     # Simple search experimentation entities.
     #
-    # Search across LLM Observability experimentation entities using offset-based (page-number) pagination.
+    # Search across Agent Observability experimentation entities using offset-based (page-number) pagination.
     # Use this endpoint when you need total page count or want to navigate to a specific page number.
     #
     # The `filter.scope` field controls which entity types are returned. At least one valid scope must be provided.
@@ -4411,11 +4411,11 @@ def simple_search_llm_obs_experimentation_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.simple_search_llm_obs_experimentation ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.simple_search_llm_obs_experimentation ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.simple_search_llm_obs_experimentation"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.simple_search_llm_obs_experimentation"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experimentation/simple-search'
@@ -4455,7 +4455,7 @@ def simple_search_llm_obs_experimentation_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#simple_search_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#simple_search_llm_obs_experimentation\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -4484,11 +4484,11 @@ def trigger_llm_obs_patterns_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.trigger_llm_obs_patterns ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.trigger_llm_obs_patterns ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.trigger_llm_obs_patterns"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.trigger_llm_obs_patterns"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-runs'
@@ -4528,12 +4528,12 @@ def trigger_llm_obs_patterns_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#trigger_llm_obs_patterns\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#trigger_llm_obs_patterns\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Unlock LLM Observability dataset draft state.
+    # Unlock Agent Observability dataset draft state.
     #
     # @see #unlock_llm_obs_dataset_draft_state_with_http_info
     def unlock_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
@@ -4541,12 +4541,12 @@ def unlock_llm_obs_dataset_draft_state(project_id, dataset_id, opts = {})
       nil
     end
 
-    # Unlock LLM Observability dataset draft state.
+    # Unlock Agent Observability dataset draft state.
     #
     # Release the draft lock on a dataset held by the calling user, allowing other users to edit the dataset draft.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def unlock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, opts = {})
@@ -4558,15 +4558,15 @@ def unlock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, op
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.unlock_llm_obs_dataset_draft_state ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.unlock_llm_obs_dataset_draft_state ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.unlock_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.unlock_llm_obs_dataset_draft_state"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.unlock_llm_obs_dataset_draft_state"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.unlock_llm_obs_dataset_draft_state"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/draft_state/unlock'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -4604,12 +4604,12 @@ def unlock_llm_obs_dataset_draft_state_with_http_info(project_id, dataset_id, op
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#unlock_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#unlock_llm_obs_dataset_draft_state\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update an LLM Observability annotation queue.
+    # Update an Agent Observability annotation queue.
     #
     # @see #update_llm_obs_annotation_queue_with_http_info
     def update_llm_obs_annotation_queue(queue_id, body, opts = {})
@@ -4617,11 +4617,11 @@ def update_llm_obs_annotation_queue(queue_id, body, opts = {})
       data
     end
 
-    # Update an LLM Observability annotation queue.
+    # Update an Agent Observability annotation queue.
     #
     # Partially update an annotation queue. The `name`, `description`, and `annotation_schema` fields can be updated.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsAnnotationQueueUpdateRequest] Update annotation queue payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotationQueueResponse, Integer, Hash)>] LLMObsAnnotationQueueResponse data, response status code and response headers
@@ -4634,15 +4634,15 @@ def update_llm_obs_annotation_queue_with_http_info(queue_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_annotation_queue ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_annotation_queue ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.update_llm_obs_annotation_queue"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.update_llm_obs_annotation_queue"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_annotation_queue"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_annotation_queue"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -4682,7 +4682,7 @@ def update_llm_obs_annotation_queue_with_http_info(queue_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_annotation_queue\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -4702,7 +4702,7 @@ def update_llm_obs_annotation_queue_label_schema(queue_id, body, opts = {})
     # Label names must be unique within the queue and match the pattern `^[a-zA-Z0-9_-]+$`.
     # Each label must have a valid type: score, categorical, boolean, or text.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsAnnotationQueueLabelSchemaUpdateRequest] Update label schema payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotationQueueLabelSchemaResponse, Integer, Hash)>] LLMObsAnnotationQueueLabelSchemaResponse data, response status code and response headers
@@ -4715,15 +4715,15 @@ def update_llm_obs_annotation_queue_label_schema_with_http_info(queue_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_annotation_queue_label_schema ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_annotation_queue_label_schema ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.update_llm_obs_annotation_queue_label_schema"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.update_llm_obs_annotation_queue_label_schema"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_annotation_queue_label_schema"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_annotation_queue_label_schema"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/label-schema'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -4763,7 +4763,7 @@ def update_llm_obs_annotation_queue_label_schema_with_http_info(queue_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Put, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_annotation_queue_label_schema\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_annotation_queue_label_schema\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -4778,9 +4778,9 @@ def update_llm_obs_custom_eval_config(eval_name, body, opts = {})
 
     # Create or update a custom evaluator configuration.
     #
-    # Create or update a custom LLM Observability evaluator configuration by its name.
+    # Create or update a custom Agent Observability evaluator configuration by its name.
     #
-    # @param eval_name [String] The name of the custom LLM Observability evaluator configuration.
+    # @param eval_name [String] The name of the custom Agent Observability evaluator configuration.
     # @param body [LLMObsCustomEvalConfigUpdateRequest] Custom evaluator configuration payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
@@ -4793,15 +4793,15 @@ def update_llm_obs_custom_eval_config_with_http_info(eval_name, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_custom_eval_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_custom_eval_config ...'
       end
       # verify the required parameter 'eval_name' is set
       if @api_client.config.client_side_validation && eval_name.nil?
-        fail ArgumentError, "Missing the required parameter 'eval_name' when calling LLMObservabilityAPI.update_llm_obs_custom_eval_config"
+        fail ArgumentError, "Missing the required parameter 'eval_name' when calling AgentObservabilityAPI.update_llm_obs_custom_eval_config"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_custom_eval_config"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_custom_eval_config"
       end
       # resource path
       local_var_path = '/api/unstable/llm-obs/config/evaluators/custom/{eval_name}'.sub('{eval_name}', CGI.escape(eval_name.to_s).gsub('%2F', '/'))
@@ -4841,12 +4841,12 @@ def update_llm_obs_custom_eval_config_with_http_info(eval_name, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Put, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_custom_eval_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update an LLM Observability dataset.
+    # Update an Agent Observability dataset.
     #
     # @see #update_llm_obs_dataset_with_http_info
     def update_llm_obs_dataset(project_id, dataset_id, body, opts = {})
@@ -4854,12 +4854,12 @@ def update_llm_obs_dataset(project_id, dataset_id, body, opts = {})
       data
     end
 
-    # Update an LLM Observability dataset.
+    # Update an Agent Observability dataset.
     #
-    # Partially update an existing LLM Observability dataset within the specified project.
+    # Partially update an existing Agent Observability dataset within the specified project.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDatasetUpdateRequest] Update dataset payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetResponse, Integer, Hash)>] LLMObsDatasetResponse data, response status code and response headers
@@ -4872,19 +4872,19 @@ def update_llm_obs_dataset_with_http_info(project_id, dataset_id, body, opts = {
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_dataset ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_dataset ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.update_llm_obs_dataset"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.update_llm_obs_dataset"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_dataset"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_dataset"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -4924,12 +4924,12 @@ def update_llm_obs_dataset_with_http_info(project_id, dataset_id, body, opts = {
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_dataset\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update LLM Observability dataset records.
+    # Update Agent Observability dataset records.
     #
     # @see #update_llm_obs_dataset_records_with_http_info
     def update_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
@@ -4937,12 +4937,12 @@ def update_llm_obs_dataset_records(project_id, dataset_id, body, opts = {})
       data
     end
 
-    # Update LLM Observability dataset records.
+    # Update Agent Observability dataset records.
     #
-    # Update one or more existing records in an LLM Observability dataset.
+    # Update one or more existing records in an Agent Observability dataset.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param body [LLMObsDatasetRecordsUpdateRequest] Update records payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsDatasetRecordsMutationResponse, Integer, Hash)>] LLMObsDatasetRecordsMutationResponse data, response status code and response headers
@@ -4955,19 +4955,19 @@ def update_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_dataset_records ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_dataset_records ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.update_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.update_llm_obs_dataset_records"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.update_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.update_llm_obs_dataset_records"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_dataset_records"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_dataset_records"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/{project_id}/datasets/{dataset_id}/records'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -5007,12 +5007,12 @@ def update_llm_obs_dataset_records_with_http_info(project_id, dataset_id, body,
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_dataset_records\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update an LLM Observability experiment.
+    # Update an Agent Observability experiment.
     #
     # @see #update_llm_obs_experiment_with_http_info
     def update_llm_obs_experiment(experiment_id, body, opts = {})
@@ -5020,11 +5020,11 @@ def update_llm_obs_experiment(experiment_id, body, opts = {})
       data
     end
 
-    # Update an LLM Observability experiment.
+    # Update an Agent Observability experiment.
     #
-    # Partially update an existing LLM Observability experiment.
+    # Partially update an existing Agent Observability experiment.
     #
-    # @param experiment_id [String] The ID of the LLM Observability experiment.
+    # @param experiment_id [String] The ID of the Agent Observability experiment.
     # @param body [LLMObsExperimentUpdateRequest] Update experiment payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsExperimentResponse, Integer, Hash)>] LLMObsExperimentResponse data, response status code and response headers
@@ -5037,15 +5037,15 @@ def update_llm_obs_experiment_with_http_info(experiment_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_experiment ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_experiment ...'
       end
       # verify the required parameter 'experiment_id' is set
       if @api_client.config.client_side_validation && experiment_id.nil?
-        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling LLMObservabilityAPI.update_llm_obs_experiment"
+        fail ArgumentError, "Missing the required parameter 'experiment_id' when calling AgentObservabilityAPI.update_llm_obs_experiment"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_experiment"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_experiment"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/experiments/{experiment_id}'.sub('{experiment_id}', CGI.escape(experiment_id.to_s).gsub('%2F', '/'))
@@ -5085,12 +5085,12 @@ def update_llm_obs_experiment_with_http_info(experiment_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_experiment\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_experiment\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update an LLM Observability project.
+    # Update an Agent Observability project.
     #
     # @see #update_llm_obs_project_with_http_info
     def update_llm_obs_project(project_id, body, opts = {})
@@ -5098,11 +5098,11 @@ def update_llm_obs_project(project_id, body, opts = {})
       data
     end
 
-    # Update an LLM Observability project.
+    # Update an Agent Observability project.
     #
-    # Partially update an existing LLM Observability project.
+    # Partially update an existing Agent Observability project.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
+    # @param project_id [String] The ID of the Agent Observability project.
     # @param body [LLMObsProjectUpdateRequest] Update project payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsProjectResponse, Integer, Hash)>] LLMObsProjectResponse data, response status code and response headers
@@ -5115,15 +5115,15 @@ def update_llm_obs_project_with_http_info(project_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_project ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_project ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.update_llm_obs_project"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.update_llm_obs_project"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_project"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_project"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/projects/{project_id}'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/'))
@@ -5163,12 +5163,12 @@ def update_llm_obs_project_with_http_info(project_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update an LLM Observability prompt.
+    # Update an Agent Observability prompt.
     #
     # @see #update_llm_obs_prompt_with_http_info
     def update_llm_obs_prompt(prompt_id, body, opts = {})
@@ -5176,11 +5176,11 @@ def update_llm_obs_prompt(prompt_id, body, opts = {})
       data
     end
 
-    # Update an LLM Observability prompt.
+    # Update an Agent Observability prompt.
     #
-    # Update the title, the description, or both, for an LLM Observability prompt.
+    # Update the title, the description, or both, for an Agent Observability prompt.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
     # @param body [LLMObsUpdatePromptRequest] Update prompt payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsPromptResponse, Integer, Hash)>] LLMObsPromptResponse data, response status code and response headers
@@ -5193,15 +5193,15 @@ def update_llm_obs_prompt_with_http_info(prompt_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_prompt ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_prompt ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.update_llm_obs_prompt"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.update_llm_obs_prompt"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_prompt"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_prompt"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/'))
@@ -5241,12 +5241,12 @@ def update_llm_obs_prompt_with_http_info(prompt_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_prompt\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Update a specific LLM Observability prompt version.
+    # Update an Agent Observability prompt version.
     #
     # @see #update_llm_obs_prompt_version_with_http_info
     def update_llm_obs_prompt_version(prompt_id, version, body, opts = {})
@@ -5254,12 +5254,12 @@ def update_llm_obs_prompt_version(prompt_id, version, body, opts = {})
       data
     end
 
-    # Update a specific LLM Observability prompt version.
+    # Update an Agent Observability prompt version.
     #
-    # Update the description, the feature-flag environments, or both, for a specific version of an LLM Observability prompt.
+    # Update the description, the feature-flag environments, or both, for a specific version of an Agent Observability prompt.
     #
-    # @param prompt_id [String] The customer-provided identifier of the LLM Observability prompt.
-    # @param version [Integer] The version number of the LLM Observability prompt.
+    # @param prompt_id [String] The customer-provided identifier of the Agent Observability prompt.
+    # @param version [Integer] The version number of the Agent Observability prompt.
     # @param body [LLMObsUpdatePromptVersionRequest] Update prompt version payload.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsPromptVersionResponse, Integer, Hash)>] LLMObsPromptVersionResponse data, response status code and response headers
@@ -5272,22 +5272,22 @@ def update_llm_obs_prompt_version_with_http_info(prompt_id, version, body, opts
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.update_llm_obs_prompt_version ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.update_llm_obs_prompt_version ...'
       end
       # verify the required parameter 'prompt_id' is set
       if @api_client.config.client_side_validation && prompt_id.nil?
-        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling LLMObservabilityAPI.update_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'prompt_id' when calling AgentObservabilityAPI.update_llm_obs_prompt_version"
       end
       # verify the required parameter 'version' is set
       if @api_client.config.client_side_validation && version.nil?
-        fail ArgumentError, "Missing the required parameter 'version' when calling LLMObservabilityAPI.update_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'version' when calling AgentObservabilityAPI.update_llm_obs_prompt_version"
       end
       if @api_client.config.client_side_validation && version < 1
-        fail ArgumentError, 'invalid value for "version" when calling LLMObservabilityAPI.update_llm_obs_prompt_version, must be greater than or equal to 1.'
+        fail ArgumentError, 'invalid value for "version" when calling AgentObservabilityAPI.update_llm_obs_prompt_version, must be greater than or equal to 1.'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.update_llm_obs_prompt_version"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.update_llm_obs_prompt_version"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/prompts/{prompt_id}/versions/{version}'.sub('{prompt_id}', CGI.escape(prompt_id.to_s).gsub('%2F', '/')).sub('{version}', CGI.escape(version.to_s).gsub('%2F', '/'))
@@ -5327,12 +5327,12 @@ def update_llm_obs_prompt_version_with_http_info(prompt_id, version, body, opts
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Patch, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#update_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#update_llm_obs_prompt_version\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
 
-    # Upload records to an LLM Observability dataset.
+    # Upload records to an Agent Observability dataset.
     #
     # @see #upload_llm_obs_dataset_records_file_with_http_info
     def upload_llm_obs_dataset_records_file(project_id, dataset_id, opts = {})
@@ -5340,7 +5340,7 @@ def upload_llm_obs_dataset_records_file(project_id, dataset_id, opts = {})
       nil
     end
 
-    # Upload records to an LLM Observability dataset.
+    # Upload records to an Agent Observability dataset.
     #
     # Upload records to a dataset from a file. The request is a `multipart/form-data` upload containing a single `file` part.
     # Currently only CSV is supported. The CSV must include an `input` column. Optional columns are `id`, `expected_output`, `metadata`, and `tags`.
@@ -5350,8 +5350,8 @@ def upload_llm_obs_dataset_records_file(project_id, dataset_id, opts = {})
     #   - `completed`: terminal event with a JSON body containing `records_created`.
     #   - `error`: terminal event with a JSON body containing an error `message`.
     #
-    # @param project_id [String] The ID of the LLM Observability project.
-    # @param dataset_id [String] The ID of the LLM Observability dataset.
+    # @param project_id [String] The ID of the Agent Observability project.
+    # @param dataset_id [String] The ID of the Agent Observability dataset.
     # @param opts [Hash] the optional parameters
     # @option opts [Boolean] :deduplicate Whether to skip records whose `input` already exists in the dataset. Defaults to `false`.
     # @option opts [Boolean] :overwrite Whether to overwrite existing records that share the same user-provided `id`. Defaults to `true`.
@@ -5368,15 +5368,15 @@ def upload_llm_obs_dataset_records_file_with_http_info(project_id, dataset_id, o
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.upload_llm_obs_dataset_records_file ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.upload_llm_obs_dataset_records_file ...'
       end
       # verify the required parameter 'project_id' is set
       if @api_client.config.client_side_validation && project_id.nil?
-        fail ArgumentError, "Missing the required parameter 'project_id' when calling LLMObservabilityAPI.upload_llm_obs_dataset_records_file"
+        fail ArgumentError, "Missing the required parameter 'project_id' when calling AgentObservabilityAPI.upload_llm_obs_dataset_records_file"
       end
       # verify the required parameter 'dataset_id' is set
       if @api_client.config.client_side_validation && dataset_id.nil?
-        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling LLMObservabilityAPI.upload_llm_obs_dataset_records_file"
+        fail ArgumentError, "Missing the required parameter 'dataset_id' when calling AgentObservabilityAPI.upload_llm_obs_dataset_records_file"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v2/{project_id}/datasets/{dataset_id}/records/upload'.sub('{project_id}', CGI.escape(project_id.to_s).gsub('%2F', '/')).sub('{dataset_id}', CGI.escape(dataset_id.to_s).gsub('%2F', '/'))
@@ -5422,7 +5422,7 @@ def upload_llm_obs_dataset_records_file_with_http_info(project_id, dataset_id, o
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#upload_llm_obs_dataset_records_file\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#upload_llm_obs_dataset_records_file\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -5442,7 +5442,7 @@ def upsert_llm_obs_annotations(queue_id, body, opts = {})
     # Results and errors in the response are linked to request items by `interaction_id`.
     # Errors for individual items are returned in the `errors` field without blocking the rest of the batch.
     #
-    # @param queue_id [String] The ID of the LLM Observability annotation queue.
+    # @param queue_id [String] The ID of the Agent Observability annotation queue.
     # @param body [LLMObsAnnotationsRequest] Payload for creating or updating annotations.
     # @param opts [Hash] the optional parameters
     # @return [Array<(LLMObsAnnotationsResponse, Integer, Hash)>] LLMObsAnnotationsResponse data, response status code and response headers
@@ -5455,15 +5455,15 @@ def upsert_llm_obs_annotations_with_http_info(queue_id, body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.upsert_llm_obs_annotations ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.upsert_llm_obs_annotations ...'
       end
       # verify the required parameter 'queue_id' is set
       if @api_client.config.client_side_validation && queue_id.nil?
-        fail ArgumentError, "Missing the required parameter 'queue_id' when calling LLMObservabilityAPI.upsert_llm_obs_annotations"
+        fail ArgumentError, "Missing the required parameter 'queue_id' when calling AgentObservabilityAPI.upsert_llm_obs_annotations"
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.upsert_llm_obs_annotations"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.upsert_llm_obs_annotations"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/annotation-queues/{queue_id}/annotations'.sub('{queue_id}', CGI.escape(queue_id.to_s).gsub('%2F', '/'))
@@ -5503,7 +5503,7 @@ def upsert_llm_obs_annotations_with_http_info(queue_id, body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Post, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#upsert_llm_obs_annotations\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#upsert_llm_obs_annotations\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
@@ -5532,11 +5532,11 @@ def upsert_llm_obs_patterns_config_with_http_info(body, opts = {})
       end
 
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: LLMObservabilityAPI.upsert_llm_obs_patterns_config ...'
+        @api_client.config.logger.debug 'Calling API: AgentObservabilityAPI.upsert_llm_obs_patterns_config ...'
       end
       # verify the required parameter 'body' is set
       if @api_client.config.client_side_validation && body.nil?
-        fail ArgumentError, "Missing the required parameter 'body' when calling LLMObservabilityAPI.upsert_llm_obs_patterns_config"
+        fail ArgumentError, "Missing the required parameter 'body' when calling AgentObservabilityAPI.upsert_llm_obs_patterns_config"
       end
       # resource path
       local_var_path = '/api/v2/llm-obs/v1/topic-discovery-configs'
@@ -5576,7 +5576,7 @@ def upsert_llm_obs_patterns_config_with_http_info(body, opts = {})
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Put, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: LLMObservabilityAPI#upsert_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: AgentObservabilityAPI#upsert_llm_obs_patterns_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end
diff --git a/lib/datadog_api_client/v2/api/authn_mappings_api.rb b/lib/datadog_api_client/v2/api/authn_mappings_api.rb
index 49ec0f82b3d4..6f0e23821cff 100644
--- a/lib/datadog_api_client/v2/api/authn_mappings_api.rb
+++ b/lib/datadog_api_client/v2/api/authn_mappings_api.rb
@@ -233,7 +233,7 @@ def list_authn_mappings(opts = {})
     # List all AuthN Mappings in the org.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [AuthNMappingsSort] :sort Sort AuthN Mappings depending on the given field.
     # @option opts [String] :filter Filter all mappings by the given string.
diff --git a/lib/datadog_api_client/v2/api/case_management_api.rb b/lib/datadog_api_client/v2/api/case_management_api.rb
index 66fc8187a1e3..f00c1d1fe6f7 100644
--- a/lib/datadog_api_client/v2/api/case_management_api.rb
+++ b/lib/datadog_api_client/v2/api/case_management_api.rb
@@ -3103,7 +3103,7 @@ def search_cases(opts = {})
     # Search cases.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [CaseSortableField] :sort_field Specify which field to sort
     # @option opts [String] :filter Search query
diff --git a/lib/datadog_api_client/v2/api/events_api.rb b/lib/datadog_api_client/v2/api/events_api.rb
index f87fde1a6527..3bf31cd92234 100644
--- a/lib/datadog_api_client/v2/api/events_api.rb
+++ b/lib/datadog_api_client/v2/api/events_api.rb
@@ -312,7 +312,7 @@ def search_events_with_http_info(opts = {})
       return_type = opts[:debug_return_type] || 'EventsListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :search_events,
diff --git a/lib/datadog_api_client/v2/api/identity_providers_api.rb b/lib/datadog_api_client/v2/api/identity_providers_api.rb
index ffdeb5e98ede..551c0b2f79bc 100644
--- a/lib/datadog_api_client/v2/api/identity_providers_api.rb
+++ b/lib/datadog_api_client/v2/api/identity_providers_api.rb
@@ -98,7 +98,7 @@ def list_identity_provider_users(idp_id, opts = {})
     #
     # @param idp_id [String] The ID of the identity provider.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :sort User attribute to order results by. Options include `email` and `name`.
     # @option opts [QuerySortOrder] :sort_dir Direction of sort. Options: `asc`, `desc`.
diff --git a/lib/datadog_api_client/v2/api/incidents_api.rb b/lib/datadog_api_client/v2/api/incidents_api.rb
index 3402a7043404..efe86259213d 100644
--- a/lib/datadog_api_client/v2/api/incidents_api.rb
+++ b/lib/datadog_api_client/v2/api/incidents_api.rb
@@ -4804,7 +4804,7 @@ def list_incidents(opts = {})
     #
     # @param opts [Hash] the optional parameters
     # @option opts [Array<IncidentRelatedObject>] :include Specifies which types of related objects should be included in the response.
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_offset Specific offset to use as the beginning of the returned page.
     # @return [Array<(IncidentsResponse, Integer, Hash)>] IncidentsResponse data, response status code and response headers
     def list_incidents_with_http_info(opts = {})
@@ -5423,7 +5423,7 @@ def search_incidents(query, opts = {})
     # @param opts [Hash] the optional parameters
     # @option opts [IncidentRelatedObject] :include Specifies which types of related objects should be included in the response.
     # @option opts [IncidentSearchSortOrder] :sort Specifies the order of returned incidents.
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_offset Specific offset to use as the beginning of the returned page.
     # @return [Array<(IncidentSearchResponse, Integer, Hash)>] IncidentSearchResponse data, response status code and response headers
     def search_incidents_with_http_info(query, opts = {})
diff --git a/lib/datadog_api_client/v2/api/key_management_api.rb b/lib/datadog_api_client/v2/api/key_management_api.rb
index 5b23a16920d7..0c87d9a8f59e 100644
--- a/lib/datadog_api_client/v2/api/key_management_api.rb
+++ b/lib/datadog_api_client/v2/api/key_management_api.rb
@@ -697,7 +697,7 @@ def list_api_keys(opts = {})
     # List all API keys available for your account.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [APIKeysSort] :sort API key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter API keys by the specified string.
@@ -783,7 +783,7 @@ def list_application_keys(opts = {})
     # List all application keys available for your org
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [ApplicationKeysSort] :sort Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter application keys by the specified string.
@@ -863,7 +863,7 @@ def list_current_user_application_keys(opts = {})
     # List all application keys available for current user
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [ApplicationKeysSort] :sort Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter application keys by the specified string.
@@ -941,7 +941,7 @@ def list_personal_access_tokens(opts = {})
     # List all access tokens for the organization.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [PersonalAccessTokensSort] :sort Access token attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter access tokens by the specified string.
diff --git a/lib/datadog_api_client/v2/api/logs_api.rb b/lib/datadog_api_client/v2/api/logs_api.rb
index 1a3fd91fa940..952a159991d6 100644
--- a/lib/datadog_api_client/v2/api/logs_api.rb
+++ b/lib/datadog_api_client/v2/api/logs_api.rb
@@ -70,7 +70,7 @@ def aggregate_logs_with_http_info(body, opts = {})
       return_type = opts[:debug_return_type] || 'LogsAggregateResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :aggregate_logs,
@@ -143,7 +143,7 @@ def list_logs_with_http_info(opts = {})
       return_type = opts[:debug_return_type] || 'LogsListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :list_logs,
diff --git a/lib/datadog_api_client/v2/api/logs_restriction_queries_api.rb b/lib/datadog_api_client/v2/api/logs_restriction_queries_api.rb
index 67dbeb449ebb..5c5525b5aa51 100644
--- a/lib/datadog_api_client/v2/api/logs_restriction_queries_api.rb
+++ b/lib/datadog_api_client/v2/api/logs_restriction_queries_api.rb
@@ -402,7 +402,7 @@ def list_restriction_queries(opts = {})
     # Returns all restriction queries, including their names and IDs.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(RestrictionQueryListResponse, Integer, Hash)>] RestrictionQueryListResponse data, response status code and response headers
     def list_restriction_queries_with_http_info(opts = {})
@@ -473,7 +473,7 @@ def list_restriction_query_roles(restriction_query_id, opts = {})
     #
     # @param restriction_query_id [String] The ID of the restriction query.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(RestrictionQueryRolesResponse, Integer, Hash)>] RestrictionQueryRolesResponse data, response status code and response headers
     def list_restriction_query_roles_with_http_info(restriction_query_id, opts = {})
diff --git a/lib/datadog_api_client/v2/api/observability_pipelines_api.rb b/lib/datadog_api_client/v2/api/observability_pipelines_api.rb
index 18e2b53fed7d..05932de95116 100644
--- a/lib/datadog_api_client/v2/api/observability_pipelines_api.rb
+++ b/lib/datadog_api_client/v2/api/observability_pipelines_api.rb
@@ -233,7 +233,7 @@ def list_pipelines(opts = {})
     # Retrieve a list of pipelines.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(ListPipelinesResponse, Integer, Hash)>] ListPipelinesResponse data, response status code and response headers
     def list_pipelines_with_http_info(opts = {})
diff --git a/lib/datadog_api_client/v2/api/org_authorized_clients_api.rb b/lib/datadog_api_client/v2/api/org_authorized_clients_api.rb
index 9714c9bb9280..e24756cc4244 100644
--- a/lib/datadog_api_client/v2/api/org_authorized_clients_api.rb
+++ b/lib/datadog_api_client/v2/api/org_authorized_clients_api.rb
@@ -312,7 +312,7 @@ def list_org_authorized_clients(opts = {})
     # Get a list of all OAuth2 clients authorized for the current organization.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :sort Field to sort results by. Options include `oauth2_client.name`.
     # @option opts [String] :filter Filter results by client name, app title, or app description.
@@ -409,7 +409,7 @@ def list_org_authorized_client_user_authorizations(org_authorized_client_id, opt
     #
     # @param org_authorized_client_id [String] The ID of the org authorized client.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [OrgAuthorizedClientUserAuthorizationsSort] :sort Field to sort results by. Options: `user.name`, `user.email`, `oauth2_client.name`.
     # @option opts [String] :filter_disabled Filter results by the user authorization disabled status.
diff --git a/lib/datadog_api_client/v2/api/roles_api.rb b/lib/datadog_api_client/v2/api/roles_api.rb
index fcd968b9cdab..966930dd66dd 100644
--- a/lib/datadog_api_client/v2/api/roles_api.rb
+++ b/lib/datadog_api_client/v2/api/roles_api.rb
@@ -587,7 +587,7 @@ def list_roles(opts = {})
     # Returns all roles, including their names and their unique identifiers.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [RolesSort] :sort Sort roles depending on the given field. Sort order is **ascending** by default. Sort order is **descending** if the field is prefixed by a negative sign, for example: `sort=-name`.
     # @option opts [String] :filter Filter all roles by the given string.
@@ -728,7 +728,7 @@ def list_role_users(role_id, opts = {})
     #
     # @param role_id [String] The unique identifier of the role.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :sort User attribute to order results by. Sort order is **ascending** by default. Sort order is **descending** if the field is prefixed by a negative sign, for example `sort=-name`. Options: `name`, `email`, `status`.
     # @option opts [String] :filter Filter all users by the given string. Defaults to no filtering.
diff --git a/lib/datadog_api_client/v2/api/rum_retention_quota_api.rb b/lib/datadog_api_client/v2/api/rum_retention_quota_api.rb
new file mode 100644
index 000000000000..65fe397690bd
--- /dev/null
+++ b/lib/datadog_api_client/v2/api/rum_retention_quota_api.rb
@@ -0,0 +1,259 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'cgi'
+
+module DatadogAPIClient::V2
+  class RUMRetentionQuotaAPI
+    attr_accessor :api_client
+
+    def initialize(api_client = DatadogAPIClient::APIClient.default)
+      @api_client = api_client
+    end
+
+    # Delete a RUM retention quota configuration.
+    #
+    # @see #delete_rum_quota_config_with_http_info
+    def delete_rum_quota_config(scope_type, scope_id, opts = {})
+      delete_rum_quota_config_with_http_info(scope_type, scope_id, opts)
+      nil
+    end
+
+    # Delete a RUM retention quota configuration.
+    #
+    # Delete the RUM retention quota configuration for a given scope.
+    #
+    # @param scope_type [RumRetentionQuotaScopeType] The type of scope the retention quota configuration applies to.
+    # @param scope_id [String] The identifier of the scope the retention quota configuration applies to. For the `application` scope, this is the RUM application ID.
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
+    def delete_rum_quota_config_with_http_info(scope_type, scope_id, opts = {})
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: RUMRetentionQuotaAPI.delete_rum_quota_config ...'
+      end
+      # verify the required parameter 'scope_type' is set
+      if @api_client.config.client_side_validation && scope_type.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_type' when calling RUMRetentionQuotaAPI.delete_rum_quota_config"
+      end
+      # verify enum value
+      allowable_values = ['application']
+      if @api_client.config.client_side_validation && !allowable_values.include?(scope_type)
+        fail ArgumentError, "invalid value for \"scope_type\", must be one of #{allowable_values}"
+      end
+      # verify the required parameter 'scope_id' is set
+      if @api_client.config.client_side_validation && scope_id.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_id' when calling RUMRetentionQuotaAPI.delete_rum_quota_config"
+      end
+      # resource path
+      local_var_path = '/api/v2/rum/config/retention-quota/{scope_type}/{scope_id}'.sub('{scope_type}', CGI.escape(scope_type.to_s).gsub('%2F', '/')).sub('{scope_id}', CGI.escape(scope_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type]
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :delete_rum_quota_config,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Delete, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: RUMRetentionQuotaAPI#delete_rum_quota_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Get a RUM retention quota configuration.
+    #
+    # @see #get_rum_quota_config_with_http_info
+    def get_rum_quota_config(scope_type, scope_id, opts = {})
+      data, _status_code, _headers = get_rum_quota_config_with_http_info(scope_type, scope_id, opts)
+      data
+    end
+
+    # Get a RUM retention quota configuration.
+    #
+    # Get the RUM retention quota configuration for a given scope.
+    #
+    # @param scope_type [RumRetentionQuotaScopeType] The type of scope the retention quota configuration applies to.
+    # @param scope_id [String] The identifier of the scope the retention quota configuration applies to. For the `application` scope, this is the RUM application ID.
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(RumRetentionQuotaConfigResponse, Integer, Hash)>] RumRetentionQuotaConfigResponse data, response status code and response headers
+    def get_rum_quota_config_with_http_info(scope_type, scope_id, opts = {})
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: RUMRetentionQuotaAPI.get_rum_quota_config ...'
+      end
+      # verify the required parameter 'scope_type' is set
+      if @api_client.config.client_side_validation && scope_type.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_type' when calling RUMRetentionQuotaAPI.get_rum_quota_config"
+      end
+      # verify enum value
+      allowable_values = ['application']
+      if @api_client.config.client_side_validation && !allowable_values.include?(scope_type)
+        fail ArgumentError, "invalid value for \"scope_type\", must be one of #{allowable_values}"
+      end
+      # verify the required parameter 'scope_id' is set
+      if @api_client.config.client_side_validation && scope_id.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_id' when calling RUMRetentionQuotaAPI.get_rum_quota_config"
+      end
+      # resource path
+      local_var_path = '/api/v2/rum/config/retention-quota/{scope_type}/{scope_id}'.sub('{scope_type}', CGI.escape(scope_type.to_s).gsub('%2F', '/')).sub('{scope_id}', CGI.escape(scope_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'RumRetentionQuotaConfigResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :get_rum_quota_config,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: RUMRetentionQuotaAPI#get_rum_quota_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Create or update a RUM retention quota config.
+    #
+    # @see #upsert_rum_quota_config_with_http_info
+    def upsert_rum_quota_config(scope_type, scope_id, body, opts = {})
+      data, _status_code, _headers = upsert_rum_quota_config_with_http_info(scope_type, scope_id, body, opts)
+      data
+    end
+
+    # Create or update a RUM retention quota config.
+    #
+    # Create or update the RUM retention quota configuration for a given scope.
+    # Returns the retention quota configuration object when the request is successful.
+    #
+    # @param scope_type [RumRetentionQuotaScopeType] The type of scope the retention quota configuration applies to.
+    # @param scope_id [String] The identifier of the scope the retention quota configuration applies to. For the `application` scope, this is the RUM application ID.
+    # @param body [RumRetentionQuotaConfigUpdateRequest] The definition of the RUM retention quota configuration to create or update.
+    # @param opts [Hash] the optional parameters
+    # @return [Array<(RumRetentionQuotaConfigResponse, Integer, Hash)>] RumRetentionQuotaConfigResponse data, response status code and response headers
+    def upsert_rum_quota_config_with_http_info(scope_type, scope_id, body, opts = {})
+
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: RUMRetentionQuotaAPI.upsert_rum_quota_config ...'
+      end
+      # verify the required parameter 'scope_type' is set
+      if @api_client.config.client_side_validation && scope_type.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_type' when calling RUMRetentionQuotaAPI.upsert_rum_quota_config"
+      end
+      # verify enum value
+      allowable_values = ['application']
+      if @api_client.config.client_side_validation && !allowable_values.include?(scope_type)
+        fail ArgumentError, "invalid value for \"scope_type\", must be one of #{allowable_values}"
+      end
+      # verify the required parameter 'scope_id' is set
+      if @api_client.config.client_side_validation && scope_id.nil?
+        fail ArgumentError, "Missing the required parameter 'scope_id' when calling RUMRetentionQuotaAPI.upsert_rum_quota_config"
+      end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling RUMRetentionQuotaAPI.upsert_rum_quota_config"
+      end
+      # resource path
+      local_var_path = '/api/v2/rum/config/retention-quota/{scope_type}/{scope_id}'.sub('{scope_type}', CGI.escape(scope_type.to_s).gsub('%2F', '/')).sub('{scope_id}', CGI.escape(scope_id.to_s).gsub('%2F', '/'))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'RumRetentionQuotaConfigResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+
+      new_options = opts.merge(
+        :operation => :upsert_rum_quota_config,
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type,
+        :api_version => "V2"
+      )
+
+      data, status_code, headers = @api_client.call_api(Net::HTTP::Put, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: RUMRetentionQuotaAPI#upsert_rum_quota_config\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/api/scorecards_api.rb b/lib/datadog_api_client/v2/api/scorecards_api.rb
index 2d1f4c6cbaa1..a31d7a42e381 100644
--- a/lib/datadog_api_client/v2/api/scorecards_api.rb
+++ b/lib/datadog_api_client/v2/api/scorecards_api.rb
@@ -515,7 +515,7 @@ def list_scorecard_outcomes(opts = {})
     # Fetches all rule outcomes.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_offset Specific offset to use as the beginning of the returned page.
     # @option opts [String] :include Include related rule details in the response.
     # @option opts [String] :fields_outcome Return only specified values in the outcome attributes.
@@ -616,7 +616,7 @@ def list_scorecard_rules(opts = {})
     # Fetch all rules.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_offset Specific offset to use as the beginning of the returned page.
     # @option opts [String] :include Include related scorecard details in the response.
     # @option opts [String] :filter_rule_id Filter the rules on a rule ID.
diff --git a/lib/datadog_api_client/v2/api/security_monitoring_api.rb b/lib/datadog_api_client/v2/api/security_monitoring_api.rb
index 11081546ccda..bca774c5880c 100644
--- a/lib/datadog_api_client/v2/api/security_monitoring_api.rb
+++ b/lib/datadog_api_client/v2/api/security_monitoring_api.rb
@@ -5307,7 +5307,7 @@ def get_rule_version_history(rule_id, opts = {})
     #
     # @param rule_id [String] The ID of the rule.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(GetRuleVersionHistoryResponse, Integer, Hash)>] GetRuleVersionHistoryResponse data, response status code and response headers
     def get_rule_version_history_with_http_info(rule_id, opts = {})
@@ -7364,7 +7364,7 @@ def get_suppression_version_history(suppression_id, opts = {})
     #
     # @param suppression_id [String] The ID of the suppression rule
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(GetSuppressionVersionHistoryResponse, Integer, Hash)>] GetSuppressionVersionHistoryResponse data, response status code and response headers
     def get_suppression_version_history_with_http_info(suppression_id, opts = {})
@@ -7927,7 +7927,7 @@ def list_historical_jobs(opts = {})
     # List historical jobs.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :sort The order of the jobs in results.
     # @option opts [String] :filter_query Query used to filter items from the fetched list.
@@ -9213,7 +9213,7 @@ def list_security_monitoring_rules(opts = {})
     # List rules.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :query A search query to filter security rules. You can filter by attributes such as `type`, `source`, `tags`.
     # @option opts [SecurityMonitoringRuleSort] :sort Attribute used to sort rules. Prefix with `-` to sort in descending order.
diff --git a/lib/datadog_api_client/v2/api/service_accounts_api.rb b/lib/datadog_api_client/v2/api/service_accounts_api.rb
index 551d4f890c85..9c8da1af1af8 100644
--- a/lib/datadog_api_client/v2/api/service_accounts_api.rb
+++ b/lib/datadog_api_client/v2/api/service_accounts_api.rb
@@ -458,7 +458,7 @@ def list_service_account_access_tokens(service_account_id, opts = {})
     #
     # @param service_account_id [String] The ID of the service account.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [PersonalAccessTokensSort] :sort Access token attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter access tokens by the specified string.
@@ -535,7 +535,7 @@ def list_service_account_application_keys(service_account_id, opts = {})
     #
     # @param service_account_id [String] The ID of the service account.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [ApplicationKeysSort] :sort Application key attribute used to sort results. Sort order is ascending by default. In order to specify a descending sort, prefix the attribute with a minus sign.
     # @option opts [String] :filter Filter application keys by the specified string.
diff --git a/lib/datadog_api_client/v2/api/service_definition_api.rb b/lib/datadog_api_client/v2/api/service_definition_api.rb
index d2eda9a7cf69..1d19c5d25029 100644
--- a/lib/datadog_api_client/v2/api/service_definition_api.rb
+++ b/lib/datadog_api_client/v2/api/service_definition_api.rb
@@ -239,7 +239,7 @@ def list_service_definitions(opts = {})
     # Get a list of all service definitions from the Datadog Service Catalog.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [ServiceDefinitionSchemaVersions] :schema_version The schema version desired in the response.
     # @return [Array<(ServiceDefinitionsListResponse, Integer, Hash)>] ServiceDefinitionsListResponse data, response status code and response headers
diff --git a/lib/datadog_api_client/v2/api/teams_api.rb b/lib/datadog_api_client/v2/api/teams_api.rb
index 702dba4a46ac..baf115bb6a37 100644
--- a/lib/datadog_api_client/v2/api/teams_api.rb
+++ b/lib/datadog_api_client/v2/api/teams_api.rb
@@ -1144,7 +1144,7 @@ def get_team_memberships(team_id, opts = {})
     #
     # @param team_id [String] None
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [GetTeamMembershipsSort] :sort Specifies the order of returned team memberships
     # @option opts [String] :filter_keyword Search query, can be user email or name
@@ -1579,7 +1579,7 @@ def list_member_teams(super_team_id, opts = {})
     #
     # @param super_team_id [String] None
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [Array<TeamsField>] :fields_team List of fields that need to be fetched.
     # @return [Array<(TeamsResponse, Integer, Hash)>] TeamsResponse data, response status code and response headers
@@ -1678,7 +1678,7 @@ def list_team_connections(opts = {})
     # Returns all team connections.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [Array<String>] :filter_sources Filter team connections by external source systems.
     # @option opts [Array<String>] :filter_team_ids Filter team connections by Datadog team IDs.
@@ -1773,7 +1773,7 @@ def list_team_hierarchy_links(opts = {})
     #
     # @param opts [Hash] the optional parameters
     # @option opts [Integer] :page_number Specific page number to return.
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [String] :filter_parent_team Filter by parent team ID
     # @option opts [String] :filter_sub_team Filter by sub team ID
     # @return [Array<(TeamHierarchyLinksResponse, Integer, Hash)>] TeamHierarchyLinksResponse data, response status code and response headers
@@ -1864,7 +1864,7 @@ def list_teams(opts = {})
     #
     # @param opts [Hash] the optional parameters
     # @option opts [Integer] :page_number Specific page number to return.
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [ListTeamsSort] :sort Specifies the order of the returned teams
     # @option opts [Array<ListTeamsInclude>] :include Included related resources optionally requested. Allowed enum values: `team_links, user_team_permissions`
     # @option opts [String] :filter_keyword Search query. Can be team name, team handle, or email of team member
diff --git a/lib/datadog_api_client/v2/api/user_authorized_clients_api.rb b/lib/datadog_api_client/v2/api/user_authorized_clients_api.rb
index d6b06a9e16a4..2edc308ccd21 100644
--- a/lib/datadog_api_client/v2/api/user_authorized_clients_api.rb
+++ b/lib/datadog_api_client/v2/api/user_authorized_clients_api.rb
@@ -231,7 +231,7 @@ def list_user_authorized_clients(opts = {})
     # Get a list of all OAuth2 clients authorized by the current user.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :filter Filter results by client name, app title, or app description.
     # @option opts [String] :filter_disabled Filter results by the user-level disabled status.
diff --git a/lib/datadog_api_client/v2/api/users_api.rb b/lib/datadog_api_client/v2/api/users_api.rb
index 1ee09a053885..343d3edce5bb 100644
--- a/lib/datadog_api_client/v2/api/users_api.rb
+++ b/lib/datadog_api_client/v2/api/users_api.rb
@@ -702,7 +702,7 @@ def list_users(opts = {})
     # all users even if they are deactivated or unverified.
     #
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @option opts [String] :sort User attribute to order results by. Sort order is ascending by default. Sort order is descending if the field is prefixed by a negative sign, for example `sort=-name`. Options: `name`, `modified_at`, `user_count`.
     # @option opts [QuerySortOrder] :sort_dir Direction of sort. Options: `asc`, `desc`.
diff --git a/lib/datadog_api_client/v2/api/workflow_automation_api.rb b/lib/datadog_api_client/v2/api/workflow_automation_api.rb
index b6d01df4dacc..5120175cdf33 100644
--- a/lib/datadog_api_client/v2/api/workflow_automation_api.rb
+++ b/lib/datadog_api_client/v2/api/workflow_automation_api.rb
@@ -446,7 +446,7 @@ def list_workflow_instances(workflow_id, opts = {})
     #
     # @param workflow_id [String] The ID of the workflow.
     # @param opts [Hash] the optional parameters
-    # @option opts [Integer] :page_size Size for a given page. The maximum allowed value is 100.
+    # @option opts [Integer] :page_size Number of items to return per page. The maximum allowed value is 100.
     # @option opts [Integer] :page_number Specific page number to return.
     # @return [Array<(WorkflowListInstancesResponse, Integer, Hash)>] WorkflowListInstancesResponse data, response status code and response headers
     def list_workflow_instances_with_http_info(workflow_id, opts = {})
diff --git a/lib/datadog_api_client/v2/models/input_schema.rb b/lib/datadog_api_client/v2/models/input_schema.rb
index 8880628a2c10..ef844f79a37c 100644
--- a/lib/datadog_api_client/v2/models/input_schema.rb
+++ b/lib/datadog_api_client/v2/models/input_schema.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A list of input parameters for the workflow. These can be used as dynamic runtime values in your workflow.
+  # A list of input parameters for the workflow. Input parameters are available under the `Trigger` object and can be referenced in workflow steps using `{{ Trigger.<parameter_name> }}`.
   class InputSchema
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_request.rb
index 4a71521ca893..127fff50a826 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating an LLM Observability annotation queue.
+  # Attributes for creating an Agent Observability annotation queue.
   class LLMObsAnnotationQueueDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_response.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_response.rb
index e8f86a8d09bd..652757111463 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_attributes_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability annotation queue.
+  # Attributes of an Agent Observability annotation queue.
   class LLMObsAnnotationQueueDataAttributesResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_request.rb
index c9575e15ad7e..36b0ef767387 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability annotation queue.
+  # Data object for creating an Agent Observability annotation queue.
   class LLMObsAnnotationQueueDataRequest
     include BaseGenericModel
 
-    # Attributes for creating an LLM Observability annotation queue.
+    # Attributes for creating an Agent Observability annotation queue.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability annotation queue.
+    # Resource type of an Agent Observability annotation queue.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_response.rb
index 5ebbe6f47fdd..c830564d991e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_data_response.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability annotation queue.
+  # Data object for an Agent Observability annotation queue.
   class LLMObsAnnotationQueueDataResponse
     include BaseGenericModel
 
-    # Attributes of an LLM Observability annotation queue.
+    # Attributes of an Agent Observability annotation queue.
     attr_reader :attributes
 
     # Unique identifier of the annotation queue.
     attr_reader :id
 
-    # Resource type of an LLM Observability annotation queue.
+    # Resource type of an Agent Observability annotation queue.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_interactions_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_interactions_request.rb
index 5a4683675b82..5eaa60405b80 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_interactions_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_interactions_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to add interactions to an LLM Observability annotation queue.
+  # Request to add interactions to an Agent Observability annotation queue.
   class LLMObsAnnotationQueueInteractionsRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_data.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_data.rb
index 7636bdb4675c..5bbd694a9fbd 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_data.rb
@@ -27,7 +27,7 @@ class LLMObsAnnotationQueueLabelSchemaData
     # Unique identifier of the annotation queue.
     attr_reader :id
 
-    # Resource type of an LLM Observability annotation queue.
+    # Resource type of an Agent Observability annotation queue.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_update_data.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_update_data.rb
index 92bc8a1b8e05..d08de9ba8cb4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_update_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_label_schema_update_data.rb
@@ -24,7 +24,7 @@ class LLMObsAnnotationQueueLabelSchemaUpdateData
     # Attributes for updating an annotation queue label schema.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability annotation queue.
+    # Resource type of an Agent Observability annotation queue.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_request.rb
index 0b9b0d84bb20..4a9ec3e11e53 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create an LLM Observability annotation queue.
+  # Request to create an Agent Observability annotation queue.
   class LLMObsAnnotationQueueRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability annotation queue.
+    # Data object for creating an Agent Observability annotation queue.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_response.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_response.rb
index eed68785ae86..5dd7aa7cd3d3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability annotation queue.
+  # Response containing a single Agent Observability annotation queue.
   class LLMObsAnnotationQueueResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability annotation queue.
+    # Data object for an Agent Observability annotation queue.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_type.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_type.rb
index 1f87a33b307f..cee28ebd7822 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability annotation queue.
+  # Resource type of an Agent Observability annotation queue.
   class LLMObsAnnotationQueueType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_attributes_request.rb
index 3b008c079661..fc2505b6023b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability annotation queue. All fields are optional.
+  # Attributes for updating an Agent Observability annotation queue. All fields are optional.
   class LLMObsAnnotationQueueUpdateDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_request.rb
index 25fb1d019e5c..9de744b6ba81 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability annotation queue.
+  # Data object for updating an Agent Observability annotation queue.
   class LLMObsAnnotationQueueUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability annotation queue. All fields are optional.
+    # Attributes for updating an Agent Observability annotation queue. All fields are optional.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability annotation queue.
+    # Resource type of an Agent Observability annotation queue.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_request.rb
index 7733589ee789..43002cb2acd2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queue_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to update an LLM Observability annotation queue.
+  # Request to update an Agent Observability annotation queue.
   class LLMObsAnnotationQueueUpdateRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability annotation queue.
+    # Data object for updating an Agent Observability annotation queue.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotation_queues_response.rb b/lib/datadog_api_client/v2/models/llm_obs_annotation_queues_response.rb
index 029173c07e31..e6314b5ab165 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotation_queues_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotation_queues_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability annotation queues.
+  # Response containing a list of Agent Observability annotation queues.
   class LLMObsAnnotationQueuesResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotations_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_annotations_data_request.rb
index a9b36d2e1124..3c7a49e8f89b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotations_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotations_data_request.rb
@@ -24,7 +24,7 @@ class LLMObsAnnotationsDataRequest
     # Attributes for creating or updating annotations.
     attr_reader :attributes
 
-    # Resource type for LLM Observability annotations.
+    # Resource type for Agent Observability annotations.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotations_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_annotations_data_response.rb
index 3dbdf6b6f0bf..35782babc850 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotations_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotations_data_response.rb
@@ -27,7 +27,7 @@ class LLMObsAnnotationsDataResponse
     # The annotation queue ID.
     attr_reader :id
 
-    # Resource type for LLM Observability annotations.
+    # Resource type for Agent Observability annotations.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_annotations_type.rb b/lib/datadog_api_client/v2/models/llm_obs_annotations_type.rb
index 38775c2d1b2e..e12fb46d00c6 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_annotations_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_annotations_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type for LLM Observability annotations.
+  # Resource type for Agent Observability annotations.
   class LLMObsAnnotationsType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data.rb
index e95259e64692..dcb6cfcc8a81 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability prompt.
+  # Data object for creating an Agent Observability prompt.
   class LLMObsCreatePromptData
     include BaseGenericModel
 
-    # Attributes for creating an LLM Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
+    # Attributes for creating an Agent Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability prompt.
+    # Resource type of an Agent Observability prompt.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data_attributes.rb
index 2cf94366b7b2..44edd63c7d73 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating an LLM Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
+  # Attributes for creating an Agent Observability prompt and its first version. `prompt_id` and `template` are required; all other attributes are optional.
   class LLMObsCreatePromptDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_request.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_request.rb
index 93f4c3170fae..364cd91b251a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create an LLM Observability prompt.
+  # Request to create an Agent Observability prompt.
   class LLMObsCreatePromptRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability prompt.
+    # Data object for creating an Agent Observability prompt.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data.rb
index eb9057ce2f66..7ee414ecd2d4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability prompt version.
+  # Data object for creating an Agent Observability prompt version.
   class LLMObsCreatePromptVersionData
     include BaseGenericModel
 
-    # Attributes for creating a new version of an LLM Observability prompt. `template` is required; all other attributes are optional.
+    # Attributes for creating a new version of an Agent Observability prompt. `template` is required; all other attributes are optional.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability prompt version.
+    # Resource type of an Agent Observability prompt version.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data_attributes.rb
index 662c99f221d4..ee66d2210509 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating a new version of an LLM Observability prompt. `template` is required; all other attributes are optional.
+  # Attributes for creating a new version of an Agent Observability prompt. `template` is required; all other attributes are optional.
   class LLMObsCreatePromptVersionDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_request.rb b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_request.rb
index 07cfafa321f3..2d8760d8888e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_create_prompt_version_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create a new version of an LLM Observability prompt.
+  # Request to create a new version of an Agent Observability prompt.
   class LLMObsCreatePromptVersionRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability prompt version.
+    # Data object for creating an Agent Observability prompt version.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_attributes.rb
index 0d9cb82d9bb8..1d2ab66803ad 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of a custom LLM Observability evaluator configuration.
+  # Attributes of a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_data.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_data.rb
index 456fac6a3b76..5e3a7010e4f2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for a custom LLM Observability evaluator configuration.
+  # Data object for a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigData
     include BaseGenericModel
 
-    # Attributes of a custom LLM Observability evaluator configuration.
+    # Attributes of a custom Agent Observability evaluator configuration.
     attr_reader :attributes
 
     # Unique name identifier of the evaluator configuration.
     attr_reader :id
 
-    # Type of the custom LLM Observability evaluator configuration resource.
+    # Type of the custom Agent Observability evaluator configuration resource.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_list_response.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_list_response.rb
index aea95f4d1a79..60fed2bec651 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_list_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_list_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of custom LLM Observability evaluator configurations.
+  # Response containing a list of custom Agent Observability evaluator configurations.
   class LLMObsCustomEvalConfigListResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_response.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_response.rb
index 87e8104287b8..632bbbbe0371 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a custom LLM Observability evaluator configuration.
+  # Response containing a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigResponse
     include BaseGenericModel
 
-    # Data object for a custom LLM Observability evaluator configuration.
+    # Data object for a custom Agent Observability evaluator configuration.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_type.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_type.rb
index 435fb11b8f49..deb1d3af2799 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Type of the custom LLM Observability evaluator configuration resource.
+  # Type of the custom Agent Observability evaluator configuration resource.
   class LLMObsCustomEvalConfigType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_attributes.rb
index 7dc2606aad65..64c60c4e2be8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating or updating a custom LLM Observability evaluator configuration.
+  # Attributes for creating or updating a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigUpdateAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_data.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_data.rb
index 166062962154..38d07504720f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating or updating a custom LLM Observability evaluator configuration.
+  # Data object for creating or updating a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigUpdateData
     include BaseGenericModel
 
-    # Attributes for creating or updating a custom LLM Observability evaluator configuration.
+    # Attributes for creating or updating a custom Agent Observability evaluator configuration.
     attr_reader :attributes
 
     # Name of the evaluator. If provided, must match the eval_name path parameter.
     attr_accessor :id
 
-    # Type of the custom LLM Observability evaluator configuration resource.
+    # Type of the custom Agent Observability evaluator configuration resource.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_request.rb
index 9c3019d84fc7..f501f1219010 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_custom_eval_config_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create or update a custom LLM Observability evaluator configuration.
+  # Request to create or update a custom Agent Observability evaluator configuration.
   class LLMObsCustomEvalConfigUpdateRequest
     include BaseGenericModel
 
-    # Data object for creating or updating a custom LLM Observability evaluator configuration.
+    # Data object for creating or updating a custom Agent Observability evaluator configuration.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_attributes_request.rb
index 8616ccb38b13..bb76d1fbb6f5 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for batch-updating records in an LLM Observability dataset.
+  # Attributes for batch-updating records in an Agent Observability dataset.
   class LLMObsDatasetBatchUpdateDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_request.rb
index 17f9342f9e1a..479e35e5e866 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_data_request.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for batch-updating records in an LLM Observability dataset.
+  # Data object for batch-updating records in an Agent Observability dataset.
   class LLMObsDatasetBatchUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for batch-updating records in an LLM Observability dataset.
+    # Attributes for batch-updating records in an Agent Observability dataset.
     attr_reader :attributes
 
     # Unique identifier of the dataset.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_insert_record.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_insert_record.rb
index c62390142111..480c39bffdb4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_insert_record.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_insert_record.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A record to insert as part of a batch update on an LLM Observability dataset.
+  # A record to insert as part of a batch update on an Agent Observability dataset.
   class LLMObsDatasetBatchUpdateInsertRecord
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_request.rb
index c6d485ea22ec..a27b949ab1c4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to batch-insert, update, and delete records in an LLM Observability dataset.
+  # Request to batch-insert, update, and delete records in an Agent Observability dataset.
   class LLMObsDatasetBatchUpdateRequest
     include BaseGenericModel
 
-    # Data object for batch-updating records in an LLM Observability dataset.
+    # Data object for batch-updating records in an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_update_record.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_update_record.rb
index 66ee0be8b426..dc9cd6429453 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_update_record.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_batch_update_update_record.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A record update payload as part of a batch update on an LLM Observability dataset.
+  # A record update payload as part of a batch update on an Agent Observability dataset.
   class LLMObsDatasetBatchUpdateUpdateRecord
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_attributes_request.rb
index ccb45631dd3c..7ab5367ed45f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for cloning an LLM Observability dataset.
+  # Attributes for cloning an Agent Observability dataset.
   class LLMObsDatasetCloneDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_request.rb
index 65091ebc93e7..16f38bfe2656 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_data_request.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for cloning an LLM Observability dataset.
+  # Data object for cloning an Agent Observability dataset.
   class LLMObsDatasetCloneDataRequest
     include BaseGenericModel
 
-    # Attributes for cloning an LLM Observability dataset.
+    # Attributes for cloning an Agent Observability dataset.
     attr_reader :attributes
 
     # Identifier of the source dataset to clone.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_request.rb
index 0a8a93e40d4c..6115a1bc7f61 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_clone_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to clone an LLM Observability dataset.
+  # Request to clone an Agent Observability dataset.
   class LLMObsDatasetCloneRequest
     include BaseGenericModel
 
-    # Data object for cloning an LLM Observability dataset.
+    # Data object for cloning an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_request.rb
index f30aa9631e06..e6a913d472b1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating an LLM Observability dataset.
+  # Attributes for creating an Agent Observability dataset.
   class LLMObsDatasetDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_response.rb
index 9c04970951ee..4de8d7ee7d9b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_attributes_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability dataset.
+  # Attributes of an Agent Observability dataset.
   class LLMObsDatasetDataAttributesResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_request.rb
index 0b8350b34a5d..cdab816e05c6 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability dataset.
+  # Data object for creating an Agent Observability dataset.
   class LLMObsDatasetDataRequest
     include BaseGenericModel
 
-    # Attributes for creating an LLM Observability dataset.
+    # Attributes for creating an Agent Observability dataset.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_response.rb
index 4a01794df9e0..8a9e2615ce42 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_data_response.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability dataset.
+  # Data object for an Agent Observability dataset.
   class LLMObsDatasetDataResponse
     include BaseGenericModel
 
-    # Attributes of an LLM Observability dataset.
+    # Attributes of an Agent Observability dataset.
     attr_reader :attributes
 
     # Unique identifier of the dataset.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data.rb
index 71b925e6c19c..7db0642303db 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability dataset draft state.
+  # Data object for an Agent Observability dataset draft state.
   class LLMObsDatasetDraftStateData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability dataset draft state.
+    # Attributes of an Agent Observability dataset draft state.
     attr_reader :attributes
 
     # Unique identifier of the dataset draft state. Matches the dataset ID.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset draft state.
+    # Resource type of an Agent Observability dataset draft state.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data_attributes.rb
index b6973ca4ff60..c93563bef02f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability dataset draft state.
+  # Attributes of an Agent Observability dataset draft state.
   class LLMObsDatasetDraftStateDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_response.rb
index 145d689044b6..2638df2b4206 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the draft state of an LLM Observability dataset.
+  # Response containing the draft state of an Agent Observability dataset.
   class LLMObsDatasetDraftStateResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability dataset draft state.
+    # Data object for an Agent Observability dataset draft state.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_type.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_type.rb
index 97ce4ee4e2d5..07a25f319d5b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_draft_state_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability dataset draft state.
+  # Resource type of an Agent Observability dataset draft state.
   class LLMObsDatasetDraftStateType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_export_format.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_export_format.rb
index a677ede43a28..c36ccec5eddd 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_export_format.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_export_format.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Supported export format for an LLM Observability dataset.
+  # Supported export format for an Agent Observability dataset.
   class LLMObsDatasetExportFormat
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_data_response.rb
index 179d4102681b..e193dee0b290 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_data_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A single LLM Observability dataset record.
+  # A single Agent Observability dataset record.
   class LLMObsDatasetRecordDataResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_item.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_item.rb
index 3120b12eee2e..907b0cf5c999 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_item.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_item.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A single record to append to an LLM Observability dataset.
+  # A single record to append to an Agent Observability dataset.
   class LLMObsDatasetRecordItem
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_update_item.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_update_item.rb
index 034b65ae9357..0933793f75c2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_record_update_item.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_record_update_item.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A record update payload for an LLM Observability dataset.
+  # A record update payload for an Agent Observability dataset.
   class LLMObsDatasetRecordUpdateItem
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_attributes_request.rb
index 9ffc15921687..4ccd543dcd52 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for appending records to an LLM Observability dataset.
+  # Attributes for appending records to an Agent Observability dataset.
   class LLMObsDatasetRecordsDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_request.rb
index 7630b5319acc..38431c4e36a0 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for appending records to an LLM Observability dataset.
+  # Data object for appending records to an Agent Observability dataset.
   class LLMObsDatasetRecordsDataRequest
     include BaseGenericModel
 
-    # Attributes for appending records to an LLM Observability dataset.
+    # Attributes for appending records to an Agent Observability dataset.
     attr_reader :attributes
 
-    # Resource type of LLM Observability dataset records.
+    # Resource type of Agent Observability dataset records.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_list_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_list_response.rb
index 77b9d84a66bd..65d3c275f3b9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_list_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_list_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a paginated list of LLM Observability dataset records.
+  # Response containing a paginated list of Agent Observability dataset records.
   class LLMObsDatasetRecordsListResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_request.rb
index 43d00e855250..93272757b324 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to append records to an LLM Observability dataset.
+  # Request to append records to an Agent Observability dataset.
   class LLMObsDatasetRecordsRequest
     include BaseGenericModel
 
-    # Data object for appending records to an LLM Observability dataset.
+    # Data object for appending records to an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_attributes_request.rb
index 757c10c15137..84faf9bd26e3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating records in an LLM Observability dataset.
+  # Attributes for updating records in an Agent Observability dataset.
   class LLMObsDatasetRecordsUpdateDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_request.rb
index 4e91b53333c3..4bdffa84a413 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating records in an LLM Observability dataset.
+  # Data object for updating records in an Agent Observability dataset.
   class LLMObsDatasetRecordsUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for updating records in an LLM Observability dataset.
+    # Attributes for updating records in an Agent Observability dataset.
     attr_reader :attributes
 
-    # Resource type of LLM Observability dataset records.
+    # Resource type of Agent Observability dataset records.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_request.rb
index 301d6fbb59ab..0c8255d29f87 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_records_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to update records in an LLM Observability dataset.
+  # Request to update records in an Agent Observability dataset.
   class LLMObsDatasetRecordsUpdateRequest
     include BaseGenericModel
 
-    # Data object for updating records in an LLM Observability dataset.
+    # Data object for updating records in an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_request.rb
index ca43c578d80a..d97d640f2257 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create an LLM Observability dataset.
+  # Request to create an Agent Observability dataset.
   class LLMObsDatasetRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability dataset.
+    # Data object for creating an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_response.rb
index e8a4b2e2573e..2650813056b1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability dataset.
+  # Response containing a single Agent Observability dataset.
   class LLMObsDatasetResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability dataset.
+    # Data object for an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_attributes_request.rb
index 39976cae2a41..0a607124c854 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for restoring an LLM Observability dataset to a previous version.
+  # Attributes for restoring an Agent Observability dataset to a previous version.
   class LLMObsDatasetRestoreVersionDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_request.rb
index 3297e3813d62..f64af3d8d270 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_data_request.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for restoring an LLM Observability dataset to a previous version.
+  # Data object for restoring an Agent Observability dataset to a previous version.
   class LLMObsDatasetRestoreVersionDataRequest
     include BaseGenericModel
 
-    # Attributes for restoring an LLM Observability dataset to a previous version.
+    # Attributes for restoring an Agent Observability dataset to a previous version.
     attr_reader :attributes
 
     # Unique identifier of the dataset to restore.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_request.rb
index 9bbbcba5833e..b5e01f9ad5cc 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_restore_version_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to restore an LLM Observability dataset to a previous version.
+  # Request to restore an Agent Observability dataset to a previous version.
   class LLMObsDatasetRestoreVersionRequest
     include BaseGenericModel
 
-    # Data object for restoring an LLM Observability dataset to a previous version.
+    # Data object for restoring an Agent Observability dataset to a previous version.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_type.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_type.rb
index f3fc2cb61aa8..8a572c5187bf 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability dataset.
+  # Resource type of an Agent Observability dataset.
   class LLMObsDatasetType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_attributes_request.rb
index fb04c6a559fa..61bda28ca064 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability dataset.
+  # Attributes for updating an Agent Observability dataset.
   class LLMObsDatasetUpdateDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_request.rb
index 6b3cad32705e..07f8486eef4f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability dataset.
+  # Data object for updating an Agent Observability dataset.
   class LLMObsDatasetUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability dataset.
+    # Attributes for updating an Agent Observability dataset.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_request.rb
index c818f2163235..39770d86f3a0 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to partially update an LLM Observability dataset.
+  # Request to partially update an Agent Observability dataset.
   class LLMObsDatasetUpdateRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability dataset.
+    # Data object for updating an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data.rb
index 4c42260a82c6..ef366c27925b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability dataset version.
+  # Data object for an Agent Observability dataset version.
   class LLMObsDatasetVersionData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability dataset version.
+    # Attributes of an Agent Observability dataset version.
     attr_reader :attributes
 
     # Unique identifier of the dataset version.
     attr_reader :id
 
-    # Resource type of an LLM Observability dataset version.
+    # Resource type of an Agent Observability dataset version.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data_attributes.rb
index f45ae7dd8ed5..55c678759ce5 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability dataset version.
+  # Attributes of an Agent Observability dataset version.
   class LLMObsDatasetVersionDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_type.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_type.rb
index f3f7baa282da..68e34995a967 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_version_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_version_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability dataset version.
+  # Resource type of an Agent Observability dataset version.
   class LLMObsDatasetVersionType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_dataset_versions_response.rb b/lib/datadog_api_client/v2/models/llm_obs_dataset_versions_response.rb
index 45b1a9399e3b..1dbebe8c6027 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_dataset_versions_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_dataset_versions_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the active versions of an LLM Observability dataset.
+  # Response containing the active versions of an Agent Observability dataset.
   class LLMObsDatasetVersionsResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_datasets_response.rb b/lib/datadog_api_client/v2/models/llm_obs_datasets_response.rb
index 157399a40bd9..243e0f7d9eea 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_datasets_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_datasets_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability datasets.
+  # Response containing a list of Agent Observability datasets.
   class LLMObsDatasetsResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_annotation_queue_interactions_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_annotation_queue_interactions_request.rb
index 032fc1e0740e..07dc4fd64483 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_annotation_queue_interactions_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_annotation_queue_interactions_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to delete interactions from an LLM Observability annotation queue.
+  # Request to delete interactions from an Agent Observability annotation queue.
   class LLMObsDeleteAnnotationQueueInteractionsRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_request.rb
index fd4690ef396e..13c811fc09d2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_request.rb
@@ -24,7 +24,7 @@ class LLMObsDeleteAnnotationsDataRequest
     # Attributes for deleting annotations.
     attr_reader :attributes
 
-    # Resource type for LLM Observability annotations.
+    # Resource type for Agent Observability annotations.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_response.rb
index af1f37c420a6..580250ce9b99 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_annotations_data_response.rb
@@ -27,7 +27,7 @@ class LLMObsDeleteAnnotationsDataResponse
     # The annotation queue ID.
     attr_reader :id
 
-    # Resource type for LLM Observability annotations.
+    # Resource type for Agent Observability annotations.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_attributes_request.rb
index 0541445d3e25..23a42ebaeb61 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for deleting records from an LLM Observability dataset.
+  # Attributes for deleting records from an Agent Observability dataset.
   class LLMObsDeleteDatasetRecordsDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_request.rb
index 1c486245b72d..945c39dede06 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for deleting records from an LLM Observability dataset.
+  # Data object for deleting records from an Agent Observability dataset.
   class LLMObsDeleteDatasetRecordsDataRequest
     include BaseGenericModel
 
-    # Attributes for deleting records from an LLM Observability dataset.
+    # Attributes for deleting records from an Agent Observability dataset.
     attr_reader :attributes
 
-    # Resource type of LLM Observability dataset records.
+    # Resource type of Agent Observability dataset records.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_request.rb
index 43cc25e407de..84777a7f94c4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_dataset_records_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to delete records from an LLM Observability dataset.
+  # Request to delete records from an Agent Observability dataset.
   class LLMObsDeleteDatasetRecordsRequest
     include BaseGenericModel
 
-    # Data object for deleting records from an LLM Observability dataset.
+    # Data object for deleting records from an Agent Observability dataset.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_attributes_request.rb
index ab0961c7ae42..ec75e21b2757 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for deleting LLM Observability datasets.
+  # Attributes for deleting Agent Observability datasets.
   class LLMObsDeleteDatasetsDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_request.rb
index afc8f9183ec9..efc03dcbfafe 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for deleting LLM Observability datasets.
+  # Data object for deleting Agent Observability datasets.
   class LLMObsDeleteDatasetsDataRequest
     include BaseGenericModel
 
-    # Attributes for deleting LLM Observability datasets.
+    # Attributes for deleting Agent Observability datasets.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability dataset.
+    # Resource type of an Agent Observability dataset.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_request.rb
index c586a7604e7a..4529d26757cf 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_datasets_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to delete one or more LLM Observability datasets.
+  # Request to delete one or more Agent Observability datasets.
   class LLMObsDeleteDatasetsRequest
     include BaseGenericModel
 
-    # Data object for deleting LLM Observability datasets.
+    # Data object for deleting Agent Observability datasets.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_attributes_request.rb
index 8985b42fbe06..0e8add61a5a9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for deleting LLM Observability experiments.
+  # Attributes for deleting Agent Observability experiments.
   class LLMObsDeleteExperimentsDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_request.rb
index 87196478ba89..7207e65863a7 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for deleting LLM Observability experiments.
+  # Data object for deleting Agent Observability experiments.
   class LLMObsDeleteExperimentsDataRequest
     include BaseGenericModel
 
-    # Attributes for deleting LLM Observability experiments.
+    # Attributes for deleting Agent Observability experiments.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability experiment.
+    # Resource type of an Agent Observability experiment.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_request.rb
index 2fa5b5a1e062..e120e20414f3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_experiments_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to delete one or more LLM Observability experiments.
+  # Request to delete one or more Agent Observability experiments.
   class LLMObsDeleteExperimentsRequest
     include BaseGenericModel
 
-    # Data object for deleting LLM Observability experiments.
+    # Data object for deleting Agent Observability experiments.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_attributes_request.rb
index 08882c395844..4a4822210730 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for deleting LLM Observability projects.
+  # Attributes for deleting Agent Observability projects.
   class LLMObsDeleteProjectsDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_request.rb
index 85bd8881ea36..79fab6e2def8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for deleting LLM Observability projects.
+  # Data object for deleting Agent Observability projects.
   class LLMObsDeleteProjectsDataRequest
     include BaseGenericModel
 
-    # Attributes for deleting LLM Observability projects.
+    # Attributes for deleting Agent Observability projects.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability project.
+    # Resource type of an Agent Observability project.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_request.rb b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_request.rb
index 014524b72cdd..887527736fb0 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_delete_projects_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_delete_projects_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to delete one or more LLM Observability projects.
+  # Request to delete one or more Agent Observability projects.
   class LLMObsDeleteProjectsRequest
     include BaseGenericModel
 
-    # Data object for deleting LLM Observability projects.
+    # Data object for deleting Agent Observability projects.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data.rb b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data.rb
index d9fc9ac38f35..888d9839cd0c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object confirming that an LLM Observability prompt was deleted.
+  # Data object confirming that an Agent Observability prompt was deleted.
   class LLMObsDeletedPromptData
     include BaseGenericModel
 
-    # Attributes confirming that an LLM Observability prompt was deleted.
+    # Attributes confirming that an Agent Observability prompt was deleted.
     attr_reader :attributes
 
     # Unique identifier of the deleted prompt.
     attr_reader :id
 
-    # Resource type of an LLM Observability prompt.
+    # Resource type of an Agent Observability prompt.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data_attributes.rb
index 6e33711b0141..b08a3e2281aa 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes confirming that an LLM Observability prompt was deleted.
+  # Attributes confirming that an Agent Observability prompt was deleted.
   class LLMObsDeletedPromptDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_response.rb b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_response.rb
index a5cb0d7599ce..e3c126f06e7c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_deleted_prompt_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response confirming that an LLM Observability prompt was deleted.
+  # Response confirming that an Agent Observability prompt was deleted.
   class LLMObsDeletedPromptResponse
     include BaseGenericModel
 
-    # Data object confirming that an LLM Observability prompt was deleted.
+    # Data object confirming that an Agent Observability prompt was deleted.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_event_type.rb b/lib/datadog_api_client/v2/models/llm_obs_event_type.rb
index c051bf5b5047..e69d2d13b529 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_event_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_event_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type for LLM Observability experiment events.
+  # Resource type for Agent Observability experiment events.
   class LLMObsEventType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_request.rb
index 386751963605..9f299ac4c076 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating an LLM Observability experiment.
+  # Attributes for creating an Agent Observability experiment.
   class LLMObsExperimentDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_response.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_response.rb
index 12595c04149c..e01e8f6abfea 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_attributes_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability experiment.
+  # Attributes of an Agent Observability experiment.
   class LLMObsExperimentDataAttributesResponse
     include BaseGenericModel
 
@@ -70,7 +70,7 @@ class LLMObsExperimentDataAttributesResponse
     # Expected number of runs for this experiment.
     attr_reader :run_count
 
-    # Execution status of an LLM Observability experiment.
+    # Execution status of an Agent Observability experiment.
     attr_accessor :status
 
     # Timestamp when the experiment was last updated.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_request.rb
index 1c308e9c9b6f..9e7f68e37ed9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability experiment.
+  # Data object for creating an Agent Observability experiment.
   class LLMObsExperimentDataRequest
     include BaseGenericModel
 
-    # Attributes for creating an LLM Observability experiment.
+    # Attributes for creating an Agent Observability experiment.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability experiment.
+    # Resource type of an Agent Observability experiment.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_response.rb
index dc20a3c99477..2d5a99d70805 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_data_response.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability experiment.
+  # Data object for an Agent Observability experiment.
   class LLMObsExperimentDataResponse
     include BaseGenericModel
 
-    # Attributes of an LLM Observability experiment.
+    # Attributes of an Agent Observability experiment.
     attr_reader :attributes
 
     # Unique identifier of the experiment.
     attr_reader :id
 
-    # Resource type of an LLM Observability experiment.
+    # Resource type of an Agent Observability experiment.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_eval_metric_event.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_eval_metric_event.rb
index 9b7ff13830a4..dfdb152a890f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_eval_metric_event.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_eval_metric_event.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V2
   class LLMObsExperimentEvalMetricEvent
     include BaseGenericModel
 
-    # Assessment result for an LLM Observability experiment metric.
+    # Assessment result for an Agent Observability experiment metric.
     attr_accessor :assessment
 
     # Boolean value. Present when `metric_type` is `boolean`.
@@ -48,7 +48,7 @@ class LLMObsExperimentEvalMetricEvent
     # Source of the metric. Either `custom` (user-submitted) or `summary` (experiment-level aggregate).
     attr_accessor :metric_source
 
-    # Type of metric recorded for an LLM Observability experiment.
+    # Type of metric recorded for an Agent Observability experiment.
     attr_accessor :metric_type
 
     # Human-readable reasoning for the metric value.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_events_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_events_data_request.rb
index 4f7626097473..03133ffddb87 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_events_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_events_data_request.rb
@@ -24,7 +24,7 @@ class LLMObsExperimentEventsDataRequest
     # Attributes for pushing experiment events including spans and metrics.
     attr_reader :attributes
 
-    # Resource type for LLM Observability experiment events.
+    # Resource type for Agent Observability experiment events.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_events_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_events_request.rb
index 9556cb2a1495..0900402613ba 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_events_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_events_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to push spans and metrics for an LLM Observability experiment.
+  # Request to push spans and metrics for an Agent Observability experiment.
   class LLMObsExperimentEventsRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_metric.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_metric.rb
index 0142b5fe8ed0..7f98d48cec0c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_metric.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_metric.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A metric associated with an LLM Observability experiment span.
+  # A metric associated with an Agent Observability experiment span.
   class LLMObsExperimentMetric
     include BaseGenericModel
 
-    # Assessment result for an LLM Observability experiment metric.
+    # Assessment result for an Agent Observability experiment metric.
     attr_accessor :assessment
 
     # Boolean value. Used when `metric_type` is `boolean`.
@@ -42,7 +42,7 @@ class LLMObsExperimentMetric
     # Arbitrary metadata associated with the metric.
     attr_accessor :metadata
 
-    # Type of metric recorded for an LLM Observability experiment.
+    # Type of metric recorded for an Agent Observability experiment.
     attr_reader :metric_type
 
     # Human-readable reasoning for the metric value.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_request.rb
index e4ea56a5fc8e..9d6579ee9beb 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create an LLM Observability experiment.
+  # Request to create an Agent Observability experiment.
   class LLMObsExperimentRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability experiment.
+    # Data object for creating an Agent Observability experiment.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_response.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_response.rb
index 3fa54b85ac6c..75c04f6337f2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability experiment.
+  # Response containing a single Agent Observability experiment.
   class LLMObsExperimentResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability experiment.
+    # Data object for an Agent Observability experiment.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_run_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_run_data_response.rb
index 1abea49a31d2..d3f9231e458e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_run_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_run_data_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability experiment run.
+  # Data object for an Agent Observability experiment run.
   class LLMObsExperimentRunDataResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_span.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_span.rb
index d0a4c1710769..9610cc6ebd67 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_span.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_span.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A span associated with an LLM Observability experiment.
+  # A span associated with an Agent Observability experiment.
   class LLMObsExperimentSpan
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_status.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_status.rb
index 06d544977b71..996826d443f9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_status.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_status.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Execution status of an LLM Observability experiment.
+  # Execution status of an Agent Observability experiment.
   class LLMObsExperimentStatus
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_type.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_type.rb
index 5b356e1d0973..fd6dfa3389a6 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability experiment.
+  # Resource type of an Agent Observability experiment.
   class LLMObsExperimentType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_attributes_request.rb
index 3673d4f596ad..622552476595 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability experiment.
+  # Attributes for updating an Agent Observability experiment.
   class LLMObsExperimentUpdateDataAttributesRequest
     include BaseGenericModel
 
@@ -36,7 +36,7 @@ class LLMObsExperimentUpdateDataAttributesRequest
     # Updated name of the experiment.
     attr_accessor :name
 
-    # Execution status of an LLM Observability experiment.
+    # Execution status of an Agent Observability experiment.
     attr_accessor :status
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_request.rb
index 39f0e929dab8..78302482340f 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability experiment.
+  # Data object for updating an Agent Observability experiment.
   class LLMObsExperimentUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability experiment.
+    # Attributes for updating an Agent Observability experiment.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability experiment.
+    # Resource type of an Agent Observability experiment.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_request.rb
index 625a88fff1df..7f0f36a22b2d 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiment_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiment_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to partially update an LLM Observability experiment.
+  # Request to partially update an Agent Observability experiment.
   class LLMObsExperimentUpdateRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability experiment.
+    # Data object for updating an Agent Observability experiment.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experimentation_analytics_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experimentation_analytics_request.rb
index a804ad63c95a..2a029c8ac3e1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experimentation_analytics_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experimentation_analytics_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to run an analytics aggregation over LLM Observability experimentation data.
+  # Request to run an analytics aggregation over Agent Observability experimentation data.
   class LLMObsExperimentationAnalyticsRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experimentation_search_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experimentation_search_request.rb
index 4b0a4f91c585..391f3f711e02 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experimentation_search_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experimentation_search_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to search across LLM Observability experimentation entities using cursor-based pagination.
+  # Request to search across Agent Observability experimentation entities using cursor-based pagination.
   class LLMObsExperimentationSearchRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experimentation_simple_search_request.rb b/lib/datadog_api_client/v2/models/llm_obs_experimentation_simple_search_request.rb
index cd3c849000aa..aea0769d078c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experimentation_simple_search_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experimentation_simple_search_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to search across LLM Observability experimentation entities using offset-based pagination.
+  # Request to search across Agent Observability experimentation entities using offset-based pagination.
   class LLMObsExperimentationSimpleSearchRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_experiments_response.rb b/lib/datadog_api_client/v2/models/llm_obs_experiments_response.rb
index df178e0af96a..7cb79e9e2932 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_experiments_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_experiments_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability experiments.
+  # Response containing a list of Agent Observability experiments.
   class LLMObsExperimentsResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_metric_assessment.rb b/lib/datadog_api_client/v2/models/llm_obs_metric_assessment.rb
index 200787d378b4..0fd6bddd9387 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_metric_assessment.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_metric_assessment.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Assessment result for an LLM Observability experiment metric.
+  # Assessment result for an Agent Observability experiment metric.
   class LLMObsMetricAssessment
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_metric_score_type.rb b/lib/datadog_api_client/v2/models/llm_obs_metric_score_type.rb
index 1f5dfb56c408..0a08fb225cdd 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_metric_score_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_metric_score_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Type of metric recorded for an LLM Observability experiment.
+  # Type of metric recorded for an Agent Observability experiment.
   class LLMObsMetricScoreType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response.rb
index f03a30b8b3ba..b2a67c4cfdb3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the clustered points of an LLM Observability topic.
+  # Response containing the clustered points of an Agent Observability topic.
   class LLMObsPatternsClusteredPointsResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns clustered points response.
+    # Data object of an Agent Observability patterns clustered points response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_attributes.rb
index 0526074ef91b..e9eba082c5e1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns clustered points response.
+  # Attributes of an Agent Observability patterns clustered points response.
   class LLMObsPatternsClusteredPointsResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_data.rb
index 4cea12bb8981..0df132ac3493 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns clustered points response.
+  # Data object of an Agent Observability patterns clustered points response.
   class LLMObsPatternsClusteredPointsResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns clustered points response.
+    # Attributes of an Agent Observability patterns clustered points response.
     attr_reader :attributes
 
     # Identifier of the topic the points belong to.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns clustered points response.
+    # Resource type of an Agent Observability patterns clustered points response.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_type.rb
index 22341926fa76..38d6ce91980b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_clustered_points_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns clustered points response.
+  # Resource type of an Agent Observability patterns clustered points response.
   class LLMObsPatternsClusteredPointsType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_attributes.rb
index 86ff20b00da5..5f6c58612526 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns configuration.
+  # Attributes of an Agent Observability patterns configuration.
   class LLMObsPatternsConfigAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_item.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_item.rb
index ddfe330144aa..3a9bfcad7c3a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_item.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_item.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A single LLM Observability patterns configuration in a list response.
+  # A single Agent Observability patterns configuration in a list response.
   class LLMObsPatternsConfigItem
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response.rb
index 3f3133c2416d..78d75b4103a4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability patterns configuration.
+  # Response containing a single Agent Observability patterns configuration.
   class LLMObsPatternsConfigResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns configuration.
+    # Data object of an Agent Observability patterns configuration.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response_data.rb
index 74f887faf232..b54f57b03ef3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns configuration.
+  # Data object of an Agent Observability patterns configuration.
   class LLMObsPatternsConfigResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns configuration.
+    # Attributes of an Agent Observability patterns configuration.
     attr_reader :attributes
 
     # Unique identifier of the configuration.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns configuration.
+    # Resource type of an Agent Observability patterns configuration.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_type.rb
index 6de2bdb327a8..a33ffee2466b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns configuration.
+  # Resource type of an Agent Observability patterns configuration.
   class LLMObsPatternsConfigType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request.rb
index 9d8475398e2d..155259491d87 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create or update an LLM Observability patterns configuration.
+  # Request to create or update an Agent Observability patterns configuration.
   class LLMObsPatternsConfigUpsertRequest
     include BaseGenericModel
 
-    # Data object for creating or updating an LLM Observability patterns configuration.
+    # Data object for creating or updating an Agent Observability patterns configuration.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_attributes.rb
index 16be43cbc408..9c30a33fdd25 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating or updating an LLM Observability patterns configuration.
+  # Attributes for creating or updating an Agent Observability patterns configuration.
   class LLMObsPatternsConfigUpsertRequestAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_data.rb
index 80f778ba8a6f..9047decf1edd 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_config_upsert_request_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating or updating an LLM Observability patterns configuration.
+  # Data object for creating or updating an Agent Observability patterns configuration.
   class LLMObsPatternsConfigUpsertRequestData
     include BaseGenericModel
 
-    # Attributes for creating or updating an LLM Observability patterns configuration.
+    # Attributes for creating or updating an Agent Observability patterns configuration.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability patterns configuration.
+    # Resource type of an Agent Observability patterns configuration.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_list_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_list_type.rb
index 4c16580e7d5f..671151ce8182 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_list_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_list_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of a list of LLM Observability patterns configurations.
+  # Resource type of a list of Agent Observability patterns configurations.
   class LLMObsPatternsConfigsListType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response.rb
index 2517e2cef2d1..eea73b46b22a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability patterns configurations.
+  # Response containing a list of Agent Observability patterns configurations.
   class LLMObsPatternsConfigsResponse
     include BaseGenericModel
 
-    # Data object of a list of LLM Observability patterns configurations.
+    # Data object of a list of Agent Observability patterns configurations.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_attributes.rb
index 7edfb68123a7..5144fec64278 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of a list of LLM Observability patterns configurations.
+  # Attributes of a list of Agent Observability patterns configurations.
   class LLMObsPatternsConfigsResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_data.rb
index cdff51baf4dd..f451fbef1639 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_configs_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of a list of LLM Observability patterns configurations.
+  # Data object of a list of Agent Observability patterns configurations.
   class LLMObsPatternsConfigsResponseData
     include BaseGenericModel
 
-    # Attributes of a list of LLM Observability patterns configurations.
+    # Attributes of a list of Agent Observability patterns configurations.
     attr_reader :attributes
 
     # Identifier of the list response.
     attr_reader :id
 
-    # Resource type of a list of LLM Observability patterns configurations.
+    # Resource type of a list of Agent Observability patterns configurations.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_request_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_request_type.rb
index 45d835fb3c34..f1f24c2efc6e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_request_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_request_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type for triggering an LLM Observability patterns run.
+  # Resource type for triggering an Agent Observability patterns run.
   class LLMObsPatternsRequestType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response.rb
index 2f66cc08fee3..6c65e0ee43d9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the status of an LLM Observability patterns run.
+  # Response containing the status of an Agent Observability patterns run.
   class LLMObsPatternsRunStatusResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns run status response.
+    # Data object of an Agent Observability patterns run status response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_attributes.rb
index 070462d67110..2ad34ac701cc 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns run status.
+  # Attributes of an Agent Observability patterns run status.
   class LLMObsPatternsRunStatusResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_data.rb
index 2fe6d9866d29..f7a653e49651 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns run status response.
+  # Data object of an Agent Observability patterns run status response.
   class LLMObsPatternsRunStatusResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns run status.
+    # Attributes of an Agent Observability patterns run status.
     attr_reader :attributes
 
     # The ID of the patterns run.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns run status.
+    # Resource type of an Agent Observability patterns run status.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_type.rb
index 6653172baddf..0f9735781ece 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_status_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns run status.
+  # Resource type of an Agent Observability patterns run status.
   class LLMObsPatternsRunStatusType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_summary.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_summary.rb
index b79cc1001cf6..ee2a5e0d287a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_run_summary.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_run_summary.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Summary of an LLM Observability patterns run.
+  # Summary of an Agent Observability patterns run.
   class LLMObsPatternsRunSummary
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_list_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_list_type.rb
index 0f45d6e07fd4..2eef051a5dc8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_list_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_list_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of a list of LLM Observability patterns runs.
+  # Resource type of a list of Agent Observability patterns runs.
   class LLMObsPatternsRunsListType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response.rb
index 711bac14a2f7..e641f35a1b88 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the completed runs of an LLM Observability patterns configuration.
+  # Response containing the completed runs of an Agent Observability patterns configuration.
   class LLMObsPatternsRunsResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns runs response.
+    # Data object of an Agent Observability patterns runs response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_attributes.rb
index 5add68673252..cfd004abfbd8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns runs response.
+  # Attributes of an Agent Observability patterns runs response.
   class LLMObsPatternsRunsResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_data.rb
index 3e4c7744677a..9bc16cd78b27 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_runs_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns runs response.
+  # Data object of an Agent Observability patterns runs response.
   class LLMObsPatternsRunsResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns runs response.
+    # Attributes of an Agent Observability patterns runs response.
     attr_reader :attributes
 
     # Identifier of the configuration the runs belong to.
     attr_reader :id
 
-    # Resource type of a list of LLM Observability patterns runs.
+    # Resource type of a list of Agent Observability patterns runs.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topic.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topic.rb
index e255bf69a53c..5ca8d32f4db1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topic.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topic.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A topic discovered by an LLM Observability patterns run.
+  # A topic discovered by an Agent Observability patterns run.
   class LLMObsPatternsTopic
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topic_with_clustered_points.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topic_with_clustered_points.rb
index 24e69c7746b9..4af610a2dc38 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topic_with_clustered_points.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topic_with_clustered_points.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A topic discovered by an LLM Observability patterns run, including the
+  # A topic discovered by an Agent Observability patterns run, including the
   # clustered points attached to leaf topics.
   class LLMObsPatternsTopicWithClusteredPoints
     include BaseGenericModel
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response.rb
index e14f6a21dadc..7db0fb5cada7 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the topics discovered by an LLM Observability patterns run.
+  # Response containing the topics discovered by an Agent Observability patterns run.
   class LLMObsPatternsTopicsResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns topics response.
+    # Data object of an Agent Observability patterns topics response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_attributes.rb
index eedde544e519..f1052b0d653c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns topics response.
+  # Attributes of an Agent Observability patterns topics response.
   class LLMObsPatternsTopicsResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_data.rb
index f3f0f2148a49..dfdc58f3f44b 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns topics response.
+  # Data object of an Agent Observability patterns topics response.
   class LLMObsPatternsTopicsResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns topics response.
+    # Attributes of an Agent Observability patterns topics response.
     attr_reader :attributes
 
     # Identifier of the run the topics belong to.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns topics response.
+    # Resource type of an Agent Observability patterns topics response.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_type.rb
index 4df43d663341..32da3ce07c76 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns topics response.
+  # Resource type of an Agent Observability patterns topics response.
   class LLMObsPatternsTopicsType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response.rb
index a0d978d745e1..49a135f8c3a2 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response.rb
@@ -18,11 +18,11 @@
 
 module DatadogAPIClient::V2
   # Response containing the topics, and the clustered points of their leaf topics,
-  # discovered by an LLM Observability patterns run.
+  # discovered by an Agent Observability patterns run.
   class LLMObsPatternsTopicsWithClusteredPointsResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns topics-with-clustered-points response.
+    # Data object of an Agent Observability patterns topics-with-clustered-points response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_attributes.rb
index 648bd6ab61b4..1d54358c4a4e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns topics-with-clustered-points response.
+  # Attributes of an Agent Observability patterns topics-with-clustered-points response.
   class LLMObsPatternsTopicsWithClusteredPointsResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_data.rb
index 6450a953b1d5..afc5ecb9ba75 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns topics-with-clustered-points response.
+  # Data object of an Agent Observability patterns topics-with-clustered-points response.
   class LLMObsPatternsTopicsWithClusteredPointsResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns topics-with-clustered-points response.
+    # Attributes of an Agent Observability patterns topics-with-clustered-points response.
     attr_reader :attributes
 
     # Identifier of the run the topics belong to.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns topics-with-clustered-points response.
+    # Resource type of an Agent Observability patterns topics-with-clustered-points response.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_type.rb
index f32db9a3299f..0d2b9bcd6ed3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_topics_with_clustered_points_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns topics-with-clustered-points response.
+  # Resource type of an Agent Observability patterns topics-with-clustered-points response.
   class LLMObsPatternsTopicsWithClusteredPointsType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request.rb
index bfeaa17f0c0e..6c94fb3409eb 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to trigger an LLM Observability patterns run.
+  # Request to trigger an Agent Observability patterns run.
   class LLMObsPatternsTriggerRequest
     include BaseGenericModel
 
-    # Data object for triggering an LLM Observability patterns run.
+    # Data object for triggering an Agent Observability patterns run.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_attributes.rb
index a422cc1e5c17..a788eb36c39c 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for triggering an LLM Observability patterns run.
+  # Attributes for triggering an Agent Observability patterns run.
   class LLMObsPatternsTriggerRequestAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_data.rb
index f374d8ac4b85..bdb589537f8a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_request_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for triggering an LLM Observability patterns run.
+  # Data object for triggering an Agent Observability patterns run.
   class LLMObsPatternsTriggerRequestData
     include BaseGenericModel
 
-    # Attributes for triggering an LLM Observability patterns run.
+    # Attributes for triggering an Agent Observability patterns run.
     attr_reader :attributes
 
-    # Resource type for triggering an LLM Observability patterns run.
+    # Resource type for triggering an Agent Observability patterns run.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response.rb
index 2dc3e8eedf39..efd1fccbc088 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response after triggering an LLM Observability patterns run.
+  # Response after triggering an Agent Observability patterns run.
   class LLMObsPatternsTriggerResponse
     include BaseGenericModel
 
-    # Data object of an LLM Observability patterns trigger response.
+    # Data object of an Agent Observability patterns trigger response.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_attributes.rb
index 62ddb30a9787..2de318a43bdb 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability patterns trigger response.
+  # Attributes of an Agent Observability patterns trigger response.
   class LLMObsPatternsTriggerResponseAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_data.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_data.rb
index 61f5ba0ffd0f..de9d6c364cd8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object of an LLM Observability patterns trigger response.
+  # Data object of an Agent Observability patterns trigger response.
   class LLMObsPatternsTriggerResponseData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability patterns trigger response.
+    # Attributes of an Agent Observability patterns trigger response.
     attr_reader :attributes
 
     # The ID of the patterns configuration that was run.
     attr_reader :id
 
-    # Resource type of an LLM Observability patterns trigger response.
+    # Resource type of an Agent Observability patterns trigger response.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_type.rb b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_type.rb
index 152f5c6d44fb..2359c8cf9145 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_patterns_trigger_response_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability patterns trigger response.
+  # Resource type of an Agent Observability patterns trigger response.
   class LLMObsPatternsTriggerResponseType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_request.rb
index b148a856de91..4383ab565111 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for creating an LLM Observability project.
+  # Attributes for creating an Agent Observability project.
   class LLMObsProjectDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_response.rb b/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_response.rb
index 28437e117fdf..5b349e5b5fde 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_data_attributes_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability project.
+  # Attributes of an Agent Observability project.
   class LLMObsProjectDataAttributesResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_data_request.rb
index 9e95ee2f4977..41e171c76528 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for creating an LLM Observability project.
+  # Data object for creating an Agent Observability project.
   class LLMObsProjectDataRequest
     include BaseGenericModel
 
-    # Attributes for creating an LLM Observability project.
+    # Attributes for creating an Agent Observability project.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability project.
+    # Resource type of an Agent Observability project.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_data_response.rb b/lib/datadog_api_client/v2/models/llm_obs_project_data_response.rb
index 2195166b4cb7..5fb722b061bf 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_data_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_data_response.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability project.
+  # Data object for an Agent Observability project.
   class LLMObsProjectDataResponse
     include BaseGenericModel
 
-    # Attributes of an LLM Observability project.
+    # Attributes of an Agent Observability project.
     attr_reader :attributes
 
     # Unique identifier of the project.
     attr_reader :id
 
-    # Resource type of an LLM Observability project.
+    # Resource type of an Agent Observability project.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_request.rb
index 9fc04f8bc8b5..39c4c05d6224 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to create an LLM Observability project.
+  # Request to create an Agent Observability project.
   class LLMObsProjectRequest
     include BaseGenericModel
 
-    # Data object for creating an LLM Observability project.
+    # Data object for creating an Agent Observability project.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_response.rb b/lib/datadog_api_client/v2/models/llm_obs_project_response.rb
index 8b186fa42124..89a0649cf098 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability project.
+  # Response containing a single Agent Observability project.
   class LLMObsProjectResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability project.
+    # Data object for an Agent Observability project.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_type.rb b/lib/datadog_api_client/v2/models/llm_obs_project_type.rb
index 95d7b73c1188..ddcce3d97176 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability project.
+  # Resource type of an Agent Observability project.
   class LLMObsProjectType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_update_data_attributes_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_update_data_attributes_request.rb
index 07f806b77d3b..6bb00e2300e8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_update_data_attributes_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_update_data_attributes_request.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability project.
+  # Attributes for updating an Agent Observability project.
   class LLMObsProjectUpdateDataAttributesRequest
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_update_data_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_update_data_request.rb
index 236ef0550c6d..993ebd72d4b0 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_update_data_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_update_data_request.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability project.
+  # Data object for updating an Agent Observability project.
   class LLMObsProjectUpdateDataRequest
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability project.
+    # Attributes for updating an Agent Observability project.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability project.
+    # Resource type of an Agent Observability project.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_project_update_request.rb b/lib/datadog_api_client/v2/models/llm_obs_project_update_request.rb
index b7670d10a1c8..63dd625012df 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_project_update_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_project_update_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to partially update an LLM Observability project.
+  # Request to partially update an Agent Observability project.
   class LLMObsProjectUpdateRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability project.
+    # Data object for updating an Agent Observability project.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_projects_response.rb b/lib/datadog_api_client/v2/models/llm_obs_projects_response.rb
index 94b9ec5db061..f2a37fda40c9 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_projects_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_projects_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability projects.
+  # Response containing a list of Agent Observability projects.
   class LLMObsProjectsResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_data.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_data.rb
index 76fabae91b1a..0f64c03915bb 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability prompt.
+  # Data object for an Agent Observability prompt.
   class LLMObsPromptData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability prompt registry entry.
+    # Attributes of an Agent Observability prompt registry entry.
     attr_reader :attributes
 
     # Unique identifier of the prompt.
     attr_reader :id
 
-    # Resource type of an LLM Observability prompt.
+    # Resource type of an Agent Observability prompt.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_data_attributes.rb
index 4e7eb7883a8f..30cf6350dd9d 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability prompt registry entry.
+  # Attributes of an Agent Observability prompt registry entry.
   class LLMObsPromptDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_response.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_response.rb
index bdebec650f06..97a3c475ae2e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a single LLM Observability prompt.
+  # Response containing a single Agent Observability prompt.
   class LLMObsPromptResponse
     include BaseGenericModel
 
-    # Data object for an LLM Observability prompt.
+    # Data object for an Agent Observability prompt.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_data.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_data.rb
index 00da4db811a8..be4cbe442e66 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_data.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for a flattened LLM Observability prompt version returned for SDK consumption.
+  # Data object for a flattened Agent Observability prompt version returned for SDK consumption.
   class LLMObsPromptSDKData
     include BaseGenericModel
 
@@ -27,7 +27,7 @@ class LLMObsPromptSDKData
     # Unique identifier of the prompt.
     attr_reader :id
 
-    # Resource type of an LLM Observability prompt.
+    # Resource type of an Agent Observability prompt.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_response.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_response.rb
index 20da3e24ff02..94bb14f39c04 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_sdk_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a flattened LLM Observability prompt version for SDK consumption.
+  # Response containing a flattened Agent Observability prompt version for SDK consumption.
   class LLMObsPromptSDKResponse
     include BaseGenericModel
 
-    # Data object for a flattened LLM Observability prompt version returned for SDK consumption.
+    # Data object for a flattened Agent Observability prompt version returned for SDK consumption.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_type.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_type.rb
index cae84be401ea..fdcca85866e0 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability prompt.
+  # Resource type of an Agent Observability prompt.
   class LLMObsPromptType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data.rb
index 44d6909b37d7..0e84ec5a9a76 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for a specific version of an LLM Observability prompt.
+  # Data object for a specific version of an Agent Observability prompt.
   class LLMObsPromptVersionData
     include BaseGenericModel
 
-    # Attributes of a specific version of an LLM Observability prompt.
+    # Attributes of a specific version of an Agent Observability prompt.
     attr_reader :attributes
 
     # Unique identifier of the prompt version.
     attr_reader :id
 
-    # Resource type of an LLM Observability prompt version.
+    # Resource type of an Agent Observability prompt version.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data_attributes.rb
index 35813072372e..644e29012067 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of a specific version of an LLM Observability prompt.
+  # Attributes of a specific version of an Agent Observability prompt.
   class LLMObsPromptVersionDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_label.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_label.rb
index 98d048f1d321..63e836a47d6e 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_label.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_label.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A label attached to an LLM Observability prompt version.
+  # A label attached to an Agent Observability prompt version.
   class LLMObsPromptVersionLabel
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_list_data.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_list_data.rb
index f925f649b06d..0e601440ad14 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_list_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_list_data.rb
@@ -27,7 +27,7 @@ class LLMObsPromptVersionListData
     # Unique identifier of the prompt version.
     attr_reader :id
 
-    # Resource type of an LLM Observability prompt version.
+    # Resource type of an Agent Observability prompt version.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_response.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_response.rb
index 8ee6c28fdfc5..e04401f05519 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a specific version of an LLM Observability prompt.
+  # Response containing a specific version of an Agent Observability prompt.
   class LLMObsPromptVersionResponse
     include BaseGenericModel
 
-    # Data object for a specific version of an LLM Observability prompt.
+    # Data object for a specific version of an Agent Observability prompt.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_type.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_type.rb
index fc12d7ca3e97..61e409e62276 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_version_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_version_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of an LLM Observability prompt version.
+  # Resource type of an Agent Observability prompt version.
   class LLMObsPromptVersionType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompt_versions_response.rb b/lib/datadog_api_client/v2/models/llm_obs_prompt_versions_response.rb
index aa02c541dff9..7c04093f7ba3 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompt_versions_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompt_versions_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing the versions of an LLM Observability prompt.
+  # Response containing the versions of an Agent Observability prompt.
   class LLMObsPromptVersionsResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_prompts_response.rb b/lib/datadog_api_client/v2/models/llm_obs_prompts_response.rb
index 4c4266095b0d..aced29339923 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_prompts_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_prompts_response.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability prompts.
+  # Response containing a list of Agent Observability prompts.
   class LLMObsPromptsResponse
     include BaseGenericModel
 
-    # List of LLM Observability prompts.
+    # List of Agent Observability prompts.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_record_type.rb b/lib/datadog_api_client/v2/models/llm_obs_record_type.rb
index 2fa14f8de095..1332cffccb92 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_record_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_record_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type of LLM Observability dataset records.
+  # Resource type of Agent Observability dataset records.
   class LLMObsRecordType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request.rb b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request.rb
index 283b09dfd80a..c6f8c2970d40 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request body for searching LLM Observability spans.
+  # Request body for searching Agent Observability spans.
   class LLMObsSearchSpansRequest
     include BaseGenericModel
 
-    # Data object for an LLM Observability spans search request.
+    # Data object for an Agent Observability spans search request.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_attributes.rb
index 54226a4403fc..82c9b5663d6d 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_attributes.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability spans search request.
+  # Attributes of an Agent Observability spans search request.
   class LLMObsSearchSpansRequestAttributes
     include BaseGenericModel
 
-    # Filter criteria for an LLM Observability span search.
+    # Filter criteria for an Agent Observability span search.
     attr_accessor :filter
 
     # Additional options for a span search request.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_data.rb b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_data.rb
index 807364066f37..aa41058ef859 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for an LLM Observability spans search request.
+  # Data object for an Agent Observability spans search request.
   class LLMObsSearchSpansRequestData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability spans search request.
+    # Attributes of an Agent Observability spans search request.
     attr_reader :attributes
 
-    # Resource type for an LLM Observability spans search request.
+    # Resource type for an Agent Observability spans search request.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_type.rb b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_type.rb
index 123032909ba2..ba555a3cf830 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_search_spans_request_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type for an LLM Observability spans search request.
+  # Resource type for an Agent Observability spans search request.
   class LLMObsSearchSpansRequestType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_span_attributes.rb
index 46de8149c121..7332bfdf5abd 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes of an LLM Observability span.
+  # Attributes of an Agent Observability span.
   class LLMObsSpanAttributes
     include BaseGenericModel
 
@@ -27,7 +27,7 @@ class LLMObsSpanAttributes
     # Evaluation metrics keyed by evaluator name.
     attr_accessor :evaluation
 
-    # Input or output content of an LLM Observability span.
+    # Input or output content of an Agent Observability span.
     attr_accessor :input
 
     # Detected intent of the span.
@@ -51,7 +51,7 @@ class LLMObsSpanAttributes
     # Name of the span.
     attr_reader :name
 
-    # Input or output content of an LLM Observability span.
+    # Input or output content of an Agent Observability span.
     attr_accessor :output
 
     # Identifier of the parent span, if any.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_data.rb b/lib/datadog_api_client/v2/models/llm_obs_span_data.rb
index 3aef607667f8..d261a36632c4 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_data.rb
@@ -17,17 +17,17 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # A single LLM Observability span.
+  # A single Agent Observability span.
   class LLMObsSpanData
     include BaseGenericModel
 
-    # Attributes of an LLM Observability span.
+    # Attributes of an Agent Observability span.
     attr_reader :attributes
 
     # Unique identifier of the span.
     attr_reader :id
 
-    # Resource type for an LLM Observability span.
+    # Resource type for an Agent Observability span.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_evaluation_metric.rb b/lib/datadog_api_client/v2/models/llm_obs_span_evaluation_metric.rb
index 2ffbd3a058d0..49572897fe84 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_evaluation_metric.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_evaluation_metric.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # An evaluation metric associated with an LLM Observability span.
+  # An evaluation metric associated with an Agent Observability span.
   class LLMObsSpanEvaluationMetric
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_filter.rb b/lib/datadog_api_client/v2/models/llm_obs_span_filter.rb
index 38bc5f9a6c7c..d87f2e3e59a5 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_filter.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_filter.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Filter criteria for an LLM Observability span search.
+  # Filter criteria for an Agent Observability span search.
   class LLMObsSpanFilter
     include BaseGenericModel
 
@@ -27,7 +27,7 @@ class LLMObsSpanFilter
     # Filter by ML application name.
     attr_accessor :ml_app
 
-    # Search query using LLM Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`span_id`, `trace_id`, etc.) are ignored.
+    # Search query using Agent Observability query syntax. Supports attribute filters using the field:value syntax (e.g. session_id, trace_id, ml_app, meta.span.kind). When provided, structured field filters (`span_id`, `trace_id`, etc.) are ignored.
     attr_accessor :query
 
     # Filter by exact span ID.
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_io.rb b/lib/datadog_api_client/v2/models/llm_obs_span_io.rb
index aa71504514fc..deee63578163 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_io.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_io.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Input or output content of an LLM Observability span.
+  # Input or output content of an Agent Observability span.
   class LLMObsSpanIO
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_span_type.rb b/lib/datadog_api_client/v2/models/llm_obs_span_type.rb
index f5a01cfad29b..93feb1a4d933 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_span_type.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_span_type.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Resource type for an LLM Observability span.
+  # Resource type for an Agent Observability span.
   class LLMObsSpanType
     include BaseEnumModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_spans_response.rb b/lib/datadog_api_client/v2/models/llm_obs_spans_response.rb
index 40dd1d02ee5a..2afc6eed0deb 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_spans_response.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_spans_response.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Response containing a list of LLM Observability spans.
+  # Response containing a list of Agent Observability spans.
   class LLMObsSpansResponse
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data.rb
index 924fabb765df..58ece8bc83d8 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability prompt.
+  # Data object for updating an Agent Observability prompt.
   class LLMObsUpdatePromptData
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
+    # Attributes for updating an Agent Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability prompt.
+    # Resource type of an Agent Observability prompt.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data_attributes.rb
index 91e373865753..cd3e4938101a 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
+  # Attributes for updating an Agent Observability prompt. At least one of `title` or `description` must be provided; both attributes are optional individually.
   class LLMObsUpdatePromptDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_request.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_request.rb
index 6ffbc50fa032..4eae7562a614 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to update an LLM Observability prompt's metadata.
+  # Request to update an Agent Observability prompt's metadata.
   class LLMObsUpdatePromptRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability prompt.
+    # Data object for updating an Agent Observability prompt.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data.rb
index 485a1620d033..8ec5d9291385 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Data object for updating an LLM Observability prompt version.
+  # Data object for updating an Agent Observability prompt version.
   class LLMObsUpdatePromptVersionData
     include BaseGenericModel
 
-    # Attributes for updating an LLM Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
+    # Attributes for updating an Agent Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
     attr_reader :attributes
 
-    # Resource type of an LLM Observability prompt version.
+    # Resource type of an Agent Observability prompt version.
     attr_reader :type
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data_attributes.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data_attributes.rb
index 579a2441f5a9..75b7a1d6c256 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data_attributes.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_data_attributes.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Attributes for updating an LLM Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
+  # Attributes for updating an Agent Observability prompt version. At least one of `description`, `labels`, or `env_ids` must be provided; all three attributes are optional individually.
   class LLMObsUpdatePromptVersionDataAttributes
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_request.rb b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_request.rb
index 7b5673615830..569023eb3ec1 100644
--- a/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_request.rb
+++ b/lib/datadog_api_client/v2/models/llm_obs_update_prompt_version_request.rb
@@ -17,11 +17,11 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # Request to update an LLM Observability prompt version's metadata or feature-flag environments.
+  # Request to update an Agent Observability prompt version's metadata or feature-flag environments.
   class LLMObsUpdatePromptVersionRequest
     include BaseGenericModel
 
-    # Data object for updating an LLM Observability prompt version.
+    # Data object for updating an Agent Observability prompt version.
     attr_reader :data
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_adaptive_config.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_adaptive_config.rb
new file mode 100644
index 000000000000..d7f0958dbe5e
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_adaptive_config.rb
@@ -0,0 +1,131 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The configuration used when `mode` is `adaptive`.
+  class RumRetentionQuotaAdaptiveConfig
+    include BaseGenericModel
+
+    # The maximum fraction of sessions to retain, in the range `(0, 1]`.
+    attr_reader :max_retention_rate
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'max_retention_rate' => :'max_retention_rate'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'max_retention_rate' => :'Float'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaAdaptiveConfig` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'max_retention_rate')
+        self.max_retention_rate = attributes[:'max_retention_rate']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @max_retention_rate.nil?
+      return false if @max_retention_rate > 1
+      return false if @max_retention_rate <= 0
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param max_retention_rate [Object] Object to be assigned
+    # @!visibility private
+    def max_retention_rate=(max_retention_rate)
+      if max_retention_rate.nil?
+        fail ArgumentError, 'invalid value for "max_retention_rate", max_retention_rate cannot be nil.'
+      end
+      if max_retention_rate > 1
+        fail ArgumentError, 'invalid value for "max_retention_rate", must be smaller than or equal to 1.'
+      end
+      if max_retention_rate <= 0
+        fail ArgumentError, 'invalid value for "max_retention_rate", must be greater than 0.'
+      end
+      @max_retention_rate = max_retention_rate
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          max_retention_rate == o.max_retention_rate &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [max_retention_rate, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_attributes.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_attributes.rb
new file mode 100644
index 000000000000..294836fc157f
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_attributes.rb
@@ -0,0 +1,185 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The RUM retention quota configuration properties.
+  class RumRetentionQuotaConfigAttributes
+    include BaseGenericModel
+
+    # The configuration used when `mode` is `adaptive`.
+    attr_accessor :adaptive
+
+    # The configuration used when `mode` is `custom`.
+    attr_accessor :custom
+
+    # The retention quota mode. `custom` enforces a fixed session limit, while
+    # `adaptive` dynamically adjusts retention.
+    attr_reader :mode
+
+    # The ID of the organization the retention quota configuration belongs to.
+    attr_reader :org_id
+
+    # The date the retention quota configuration was last updated.
+    attr_accessor :updated_at
+
+    # The handle of the user who last updated the retention quota configuration.
+    attr_accessor :updated_by
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'adaptive' => :'adaptive',
+        :'custom' => :'custom',
+        :'mode' => :'mode',
+        :'org_id' => :'org_id',
+        :'updated_at' => :'updated_at',
+        :'updated_by' => :'updated_by'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'adaptive' => :'RumRetentionQuotaAdaptiveConfig',
+        :'custom' => :'RumRetentionQuotaCustomConfig',
+        :'mode' => :'RumRetentionQuotaMode',
+        :'org_id' => :'Integer',
+        :'updated_at' => :'Time',
+        :'updated_by' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigAttributes` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'adaptive')
+        self.adaptive = attributes[:'adaptive']
+      end
+
+      if attributes.key?(:'custom')
+        self.custom = attributes[:'custom']
+      end
+
+      if attributes.key?(:'mode')
+        self.mode = attributes[:'mode']
+      end
+
+      if attributes.key?(:'org_id')
+        self.org_id = attributes[:'org_id']
+      end
+
+      if attributes.key?(:'updated_at')
+        self.updated_at = attributes[:'updated_at']
+      end
+
+      if attributes.key?(:'updated_by')
+        self.updated_by = attributes[:'updated_by']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @mode.nil?
+      return false if @org_id.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param mode [Object] Object to be assigned
+    # @!visibility private
+    def mode=(mode)
+      if mode.nil?
+        fail ArgumentError, 'invalid value for "mode", mode cannot be nil.'
+      end
+      @mode = mode
+    end
+
+    # Custom attribute writer method with validation
+    # @param org_id [Object] Object to be assigned
+    # @!visibility private
+    def org_id=(org_id)
+      if org_id.nil?
+        fail ArgumentError, 'invalid value for "org_id", org_id cannot be nil.'
+      end
+      @org_id = org_id
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          adaptive == o.adaptive &&
+          custom == o.custom &&
+          mode == o.mode &&
+          org_id == o.org_id &&
+          updated_at == o.updated_at &&
+          updated_by == o.updated_by &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [adaptive, custom, mode, org_id, updated_at, updated_by, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_data.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_data.rb
new file mode 100644
index 000000000000..5987637d5c50
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_data.rb
@@ -0,0 +1,165 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The RUM retention quota configuration object.
+  class RumRetentionQuotaConfigData
+    include BaseGenericModel
+
+    # The RUM retention quota configuration properties.
+    attr_reader :attributes
+
+    # The identifier of the scope the retention quota configuration applies to.
+    attr_reader :id
+
+    # The type of the resource, always `rum_quota_config`.
+    attr_reader :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'attributes' => :'attributes',
+        :'id' => :'id',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'attributes' => :'RumRetentionQuotaConfigAttributes',
+        :'id' => :'String',
+        :'type' => :'RumRetentionQuotaConfigType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigData` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'attributes')
+        self.attributes = attributes[:'attributes']
+      end
+
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @attributes.nil?
+      return false if @id.nil?
+      return false if @type.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param attributes [Object] Object to be assigned
+    # @!visibility private
+    def attributes=(attributes)
+      if attributes.nil?
+        fail ArgumentError, 'invalid value for "attributes", attributes cannot be nil.'
+      end
+      @attributes = attributes
+    end
+
+    # Custom attribute writer method with validation
+    # @param id [Object] Object to be assigned
+    # @!visibility private
+    def id=(id)
+      if id.nil?
+        fail ArgumentError, 'invalid value for "id", id cannot be nil.'
+      end
+      @id = id
+    end
+
+    # Custom attribute writer method with validation
+    # @param type [Object] Object to be assigned
+    # @!visibility private
+    def type=(type)
+      if type.nil?
+        fail ArgumentError, 'invalid value for "type", type cannot be nil.'
+      end
+      @type = type
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          attributes == o.attributes &&
+          id == o.id &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [attributes, id, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_response.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_response.rb
new file mode 100644
index 000000000000..3ae1a556be61
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_response.rb
@@ -0,0 +1,123 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The RUM retention quota configuration response.
+  class RumRetentionQuotaConfigResponse
+    include BaseGenericModel
+
+    # The RUM retention quota configuration object.
+    attr_reader :data
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data' => :'data'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data' => :'RumRetentionQuotaConfigData'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigResponse` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data')
+        self.data = attributes[:'data']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data [Object] Object to be assigned
+    # @!visibility private
+    def data=(data)
+      if data.nil?
+        fail ArgumentError, 'invalid value for "data", data cannot be nil.'
+      end
+      @data = data
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data == o.data &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_type.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_type.rb
new file mode 100644
index 000000000000..9bd0d4028474
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The type of the resource, always `rum_quota_config`.
+  class RumRetentionQuotaConfigType
+    include BaseEnumModel
+
+    RUM_QUOTA_CONFIG = "rum_quota_config".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_attributes.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_attributes.rb
new file mode 100644
index 000000000000..37f49d47b722
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_attributes.rb
@@ -0,0 +1,144 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The RUM retention quota configuration properties to create or update.
+  class RumRetentionQuotaConfigUpdateAttributes
+    include BaseGenericModel
+
+    # The configuration used when `mode` is `adaptive`.
+    attr_accessor :adaptive
+
+    # The configuration used when `mode` is `custom`.
+    attr_accessor :custom
+
+    # The retention quota mode. `custom` enforces a fixed session limit, while
+    # `adaptive` dynamically adjusts retention.
+    attr_reader :mode
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'adaptive' => :'adaptive',
+        :'custom' => :'custom',
+        :'mode' => :'mode'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'adaptive' => :'RumRetentionQuotaAdaptiveConfig',
+        :'custom' => :'RumRetentionQuotaCustomConfig',
+        :'mode' => :'RumRetentionQuotaMode'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateAttributes` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'adaptive')
+        self.adaptive = attributes[:'adaptive']
+      end
+
+      if attributes.key?(:'custom')
+        self.custom = attributes[:'custom']
+      end
+
+      if attributes.key?(:'mode')
+        self.mode = attributes[:'mode']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @mode.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param mode [Object] Object to be assigned
+    # @!visibility private
+    def mode=(mode)
+      if mode.nil?
+        fail ArgumentError, 'invalid value for "mode", mode cannot be nil.'
+      end
+      @mode = mode
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          adaptive == o.adaptive &&
+          custom == o.custom &&
+          mode == o.mode &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [adaptive, custom, mode, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_data.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_data.rb
new file mode 100644
index 000000000000..a054d1763aa0
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_data.rb
@@ -0,0 +1,166 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The RUM retention quota configuration to create or update.
+  class RumRetentionQuotaConfigUpdateData
+    include BaseGenericModel
+
+    # The RUM retention quota configuration properties to create or update.
+    attr_reader :attributes
+
+    # The identifier of the scope the retention quota configuration applies to.
+    # Must match `scope_id` in the path.
+    attr_reader :id
+
+    # The type of the resource, always `rum_quota_config`.
+    attr_reader :type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'attributes' => :'attributes',
+        :'id' => :'id',
+        :'type' => :'type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'attributes' => :'RumRetentionQuotaConfigUpdateAttributes',
+        :'id' => :'String',
+        :'type' => :'RumRetentionQuotaConfigType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateData` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'attributes')
+        self.attributes = attributes[:'attributes']
+      end
+
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      end
+
+      if attributes.key?(:'type')
+        self.type = attributes[:'type']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @attributes.nil?
+      return false if @id.nil?
+      return false if @type.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param attributes [Object] Object to be assigned
+    # @!visibility private
+    def attributes=(attributes)
+      if attributes.nil?
+        fail ArgumentError, 'invalid value for "attributes", attributes cannot be nil.'
+      end
+      @attributes = attributes
+    end
+
+    # Custom attribute writer method with validation
+    # @param id [Object] Object to be assigned
+    # @!visibility private
+    def id=(id)
+      if id.nil?
+        fail ArgumentError, 'invalid value for "id", id cannot be nil.'
+      end
+      @id = id
+    end
+
+    # Custom attribute writer method with validation
+    # @param type [Object] Object to be assigned
+    # @!visibility private
+    def type=(type)
+      if type.nil?
+        fail ArgumentError, 'invalid value for "type", type cannot be nil.'
+      end
+      @type = type
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          attributes == o.attributes &&
+          id == o.id &&
+          type == o.type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [attributes, id, type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_request.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_request.rb
new file mode 100644
index 000000000000..bd7cb8a69d8c
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_config_update_request.rb
@@ -0,0 +1,123 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The body of a request to create or update a RUM retention quota configuration.
+  class RumRetentionQuotaConfigUpdateRequest
+    include BaseGenericModel
+
+    # The RUM retention quota configuration to create or update.
+    attr_reader :data
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data' => :'data'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data' => :'RumRetentionQuotaConfigUpdateData'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaConfigUpdateRequest` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data')
+        self.data = attributes[:'data']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data [Object] Object to be assigned
+    # @!visibility private
+    def data=(data)
+      if data.nil?
+        fail ArgumentError, 'invalid value for "data", data cannot be nil.'
+      end
+      @data = data
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data == o.data &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_custom_config.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_custom_config.rb
new file mode 100644
index 000000000000..583dd1084e22
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_custom_config.rb
@@ -0,0 +1,223 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The configuration used when `mode` is `custom`.
+  class RumRetentionQuotaCustomConfig
+    include BaseGenericModel
+
+    # The time of day when the daily quota resets, in `HH:MM` 24-hour format.
+    attr_reader :daily_reset_time
+
+    # The timezone offset used for the daily reset time, in `±HH:MM` format.
+    attr_reader :daily_reset_timezone
+
+    # The action to take when the session quota is reached.
+    attr_reader :quota_reached_action
+
+    # The maximum number of sessions allowed within the window. Must be at least `1000`.
+    attr_reader :session_limit
+
+    # The window type over which the session limit is enforced.
+    attr_reader :window_type
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'daily_reset_time' => :'daily_reset_time',
+        :'daily_reset_timezone' => :'daily_reset_timezone',
+        :'quota_reached_action' => :'quota_reached_action',
+        :'session_limit' => :'session_limit',
+        :'window_type' => :'window_type'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'daily_reset_time' => :'String',
+        :'daily_reset_timezone' => :'String',
+        :'quota_reached_action' => :'RumRetentionQuotaReachedAction',
+        :'session_limit' => :'Integer',
+        :'window_type' => :'RumRetentionQuotaWindowType'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V2::RumRetentionQuotaCustomConfig` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'daily_reset_time')
+        self.daily_reset_time = attributes[:'daily_reset_time']
+      end
+
+      if attributes.key?(:'daily_reset_timezone')
+        self.daily_reset_timezone = attributes[:'daily_reset_timezone']
+      end
+
+      if attributes.key?(:'quota_reached_action')
+        self.quota_reached_action = attributes[:'quota_reached_action']
+      end
+
+      if attributes.key?(:'session_limit')
+        self.session_limit = attributes[:'session_limit']
+      end
+
+      if attributes.key?(:'window_type')
+        self.window_type = attributes[:'window_type']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @daily_reset_time.nil?
+      pattern = Regexp.new(/^([01]\d|2[0-3]):[0-5]\d$/)
+      return false if @daily_reset_time !~ pattern
+      return false if @daily_reset_timezone.nil?
+      pattern = Regexp.new(/^[+-](0\d|1[0-4]):[0-5]\d$/)
+      return false if @daily_reset_timezone !~ pattern
+      return false if @quota_reached_action.nil?
+      return false if @session_limit.nil?
+      return false if @session_limit < 1000
+      return false if @window_type.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param daily_reset_time [Object] Object to be assigned
+    # @!visibility private
+    def daily_reset_time=(daily_reset_time)
+      if daily_reset_time.nil?
+        fail ArgumentError, 'invalid value for "daily_reset_time", daily_reset_time cannot be nil.'
+      end
+      pattern = Regexp.new(/^([01]\d|2[0-3]):[0-5]\d$/)
+      if daily_reset_time !~ pattern
+        fail ArgumentError, "invalid value for \"daily_reset_time\", must conform to the pattern #{pattern}."
+      end
+      @daily_reset_time = daily_reset_time
+    end
+
+    # Custom attribute writer method with validation
+    # @param daily_reset_timezone [Object] Object to be assigned
+    # @!visibility private
+    def daily_reset_timezone=(daily_reset_timezone)
+      if daily_reset_timezone.nil?
+        fail ArgumentError, 'invalid value for "daily_reset_timezone", daily_reset_timezone cannot be nil.'
+      end
+      pattern = Regexp.new(/^[+-](0\d|1[0-4]):[0-5]\d$/)
+      if daily_reset_timezone !~ pattern
+        fail ArgumentError, "invalid value for \"daily_reset_timezone\", must conform to the pattern #{pattern}."
+      end
+      @daily_reset_timezone = daily_reset_timezone
+    end
+
+    # Custom attribute writer method with validation
+    # @param quota_reached_action [Object] Object to be assigned
+    # @!visibility private
+    def quota_reached_action=(quota_reached_action)
+      if quota_reached_action.nil?
+        fail ArgumentError, 'invalid value for "quota_reached_action", quota_reached_action cannot be nil.'
+      end
+      @quota_reached_action = quota_reached_action
+    end
+
+    # Custom attribute writer method with validation
+    # @param session_limit [Object] Object to be assigned
+    # @!visibility private
+    def session_limit=(session_limit)
+      if session_limit.nil?
+        fail ArgumentError, 'invalid value for "session_limit", session_limit cannot be nil.'
+      end
+      if session_limit < 1000
+        fail ArgumentError, 'invalid value for "session_limit", must be greater than or equal to 1000.'
+      end
+      @session_limit = session_limit
+    end
+
+    # Custom attribute writer method with validation
+    # @param window_type [Object] Object to be assigned
+    # @!visibility private
+    def window_type=(window_type)
+      if window_type.nil?
+        fail ArgumentError, 'invalid value for "window_type", window_type cannot be nil.'
+      end
+      @window_type = window_type
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          daily_reset_time == o.daily_reset_time &&
+          daily_reset_timezone == o.daily_reset_timezone &&
+          quota_reached_action == o.quota_reached_action &&
+          session_limit == o.session_limit &&
+          window_type == o.window_type &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [daily_reset_time, daily_reset_timezone, quota_reached_action, session_limit, window_type, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_mode.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_mode.rb
new file mode 100644
index 000000000000..8a21aba5f12c
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_mode.rb
@@ -0,0 +1,28 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The retention quota mode. `custom` enforces a fixed session limit, while
+  # `adaptive` dynamically adjusts retention.
+  class RumRetentionQuotaMode
+    include BaseEnumModel
+
+    CUSTOM = "custom".freeze
+    ADAPTIVE = "adaptive".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_reached_action.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_reached_action.rb
new file mode 100644
index 000000000000..9b245c033dd9
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_reached_action.rb
@@ -0,0 +1,27 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The action to take when the session quota is reached.
+  class RumRetentionQuotaReachedAction
+    include BaseEnumModel
+
+    STOP = "stop".freeze
+    SLOWDOWN = "slowdown".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_scope_type.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_scope_type.rb
new file mode 100644
index 000000000000..6f14857fb31f
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_scope_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The type of scope the retention quota configuration applies to.
+  class RumRetentionQuotaScopeType
+    include BaseEnumModel
+
+    APPLICATION = "application".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/rum_retention_quota_window_type.rb b/lib/datadog_api_client/v2/models/rum_retention_quota_window_type.rb
new file mode 100644
index 000000000000..ae084bec8996
--- /dev/null
+++ b/lib/datadog_api_client/v2/models/rum_retention_quota_window_type.rb
@@ -0,0 +1,26 @@
+=begin
+#Datadog API V2 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ 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 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V2
+  # The window type over which the session limit is enforced.
+  class RumRetentionQuotaWindowType
+    include BaseEnumModel
+
+    DAILY = "daily".freeze
+  end
+end
diff --git a/lib/datadog_api_client/v2/models/spec.rb b/lib/datadog_api_client/v2/models/spec.rb
index 34ebf82dcda8..327d84768d8d 100644
--- a/lib/datadog_api_client/v2/models/spec.rb
+++ b/lib/datadog_api_client/v2/models/spec.rb
@@ -30,7 +30,7 @@ class Spec
     # Unique identifier used to trigger workflows automatically in Datadog.
     attr_accessor :handle
 
-    # A list of input parameters for the workflow. These can be used as dynamic runtime values in your workflow.
+    # A list of input parameters for the workflow. Input parameters are available under the `Trigger` object and can be referenced in workflow steps using `{{ Trigger.<parameter_name> }}`.
     attr_accessor :input_schema
 
     # A list of output parameters for the workflow.