diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index 4707c147e8..a2917dc496 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -3018,6 +3018,8 @@ components:
           type: string
         group_by:
           description: Array of fields to group results by.
+          example:
+            - "resource_name"
           items:
             description: Field to group results by.
             example: "resource_name"
@@ -3055,6 +3057,8 @@ components:
         - name
         - service
         - stat
+        - operation_name
+        - group_by
       type: object
     FormulaAndFunctionCloudCostDataSource:
       description: Data source for Cloud Cost queries.
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 18755c0511..3f7521dd08 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -4447,6 +4447,8 @@ components:
           type: string
         group_by:
           description: Tag keys to group results by.
+          example:
+            - resource_name
           items:
             description: A tag key to group by.
             example: resource_name
@@ -4484,6 +4486,8 @@ components:
         - env
         - service
         - stat
+        - operation_name
+        - group_by
       type: object
     ApmRetentionFilterType:
       default: apm_retention_filter
diff --git a/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py b/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py
index e896fb35bb..9d095c2058 100644
--- a/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py
+++ b/src/datadog_api_client/v1/model/distribution_widget_histogram_request_query.py
@@ -52,7 +52,7 @@ def __init__(self, **kwargs):
         :type env: str
 
         :param operation_name: Name of operation on service.
-        :type operation_name: str, optional
+        :type operation_name: str
 
         :param primary_tag_name: Name of the second primary tag used within APM. Required when `primary_tag_value` is specified. See https://docs.datadoghq.com/tracing/guide/setting_primary_tags_to_scope/#add-a-second-primary-tag-in-datadog
         :type primary_tag_name: str, optional
diff --git a/src/datadog_api_client/v1/model/formula_and_function_apm_resource_stats_query_definition.py b/src/datadog_api_client/v1/model/formula_and_function_apm_resource_stats_query_definition.py
index 6ed9197a67..3aa2492817 100644
--- a/src/datadog_api_client/v1/model/formula_and_function_apm_resource_stats_query_definition.py
+++ b/src/datadog_api_client/v1/model/formula_and_function_apm_resource_stats_query_definition.py
@@ -70,12 +70,12 @@ def __init__(
         self_,
         data_source: FormulaAndFunctionApmResourceStatsDataSource,
         env: str,
+        group_by: List[str],
         name: str,
+        operation_name: str,
         service: str,
         stat: FormulaAndFunctionApmResourceStatName,
         cross_org_uuids: Union[List[str], UnsetType] = unset,
-        group_by: Union[List[str], UnsetType] = unset,
-        operation_name: Union[str, UnsetType] = unset,
         primary_tag_name: Union[str, UnsetType] = unset,
         primary_tag_value: Union[str, UnsetType] = unset,
         resource_name: Union[str, UnsetType] = unset,
@@ -94,13 +94,13 @@ def __init__(
         :type env: str
 
         :param group_by: Array of fields to group results by.
-        :type group_by: [str], optional
+        :type group_by: [str]
 
         :param name: Name of this query to use in formulas.
         :type name: str
 
         :param operation_name: Name of operation on service.
-        :type operation_name: str, optional
+        :type operation_name: str
 
         :param primary_tag_name: Name of the second primary tag used within APM. Required when ``primary_tag_value`` is specified. See https://docs.datadoghq.com/tracing/guide/setting_primary_tags_to_scope/#add-a-second-primary-tag-in-datadog
         :type primary_tag_name: str, optional
@@ -119,10 +119,6 @@ def __init__(
         """
         if cross_org_uuids is not unset:
             kwargs["cross_org_uuids"] = cross_org_uuids
-        if group_by is not unset:
-            kwargs["group_by"] = group_by
-        if operation_name is not unset:
-            kwargs["operation_name"] = operation_name
         if primary_tag_name is not unset:
             kwargs["primary_tag_name"] = primary_tag_name
         if primary_tag_value is not unset:
@@ -133,6 +129,8 @@ def __init__(
 
         self_.data_source = data_source
         self_.env = env
+        self_.group_by = group_by
         self_.name = name
+        self_.operation_name = operation_name
         self_.service = service
         self_.stat = stat
diff --git a/src/datadog_api_client/v2/model/apm_resource_stats_query.py b/src/datadog_api_client/v2/model/apm_resource_stats_query.py
index 1b0b18f8e0..1ddfbac3ec 100644
--- a/src/datadog_api_client/v2/model/apm_resource_stats_query.py
+++ b/src/datadog_api_client/v2/model/apm_resource_stats_query.py
@@ -54,11 +54,11 @@ def __init__(
         self_,
         data_source: ApmResourceStatsDataSource,
         env: str,
+        group_by: List[str],
         name: str,
+        operation_name: str,
         service: str,
         stat: ApmResourceStatName,
-        group_by: Union[List[str], UnsetType] = unset,
-        operation_name: Union[str, UnsetType] = unset,
         primary_tag_name: Union[str, UnsetType] = unset,
         primary_tag_value: Union[str, UnsetType] = unset,
         resource_name: Union[str, UnsetType] = unset,
@@ -74,13 +74,13 @@ def __init__(
         :type env: str
 
         :param group_by: Tag keys to group results by.
-        :type group_by: [str], optional
+        :type group_by: [str]
 
         :param name: The variable name for use in formulas.
         :type name: str
 
         :param operation_name: The APM operation name.
-        :type operation_name: str, optional
+        :type operation_name: str
 
         :param primary_tag_name: Name of the second primary tag used within APM. Required when ``primary_tag_value`` is specified. See https://docs.datadoghq.com/tracing/guide/setting_primary_tags_to_scope/#add-a-second-primary-tag-in-datadog
         :type primary_tag_name: str, optional
@@ -97,10 +97,6 @@ def __init__(
         :param stat: The APM resource statistic to query.
         :type stat: ApmResourceStatName
         """
-        if group_by is not unset:
-            kwargs["group_by"] = group_by
-        if operation_name is not unset:
-            kwargs["operation_name"] = operation_name
         if primary_tag_name is not unset:
             kwargs["primary_tag_name"] = primary_tag_name
         if primary_tag_value is not unset:
@@ -111,6 +107,8 @@ def __init__(
 
         self_.data_source = data_source
         self_.env = env
+        self_.group_by = group_by
         self_.name = name
+        self_.operation_name = operation_name
         self_.service = service
         self_.stat = stat
diff --git a/src/datadog_api_client/v2/model/scalar_query.py b/src/datadog_api_client/v2/model/scalar_query.py
index 8d9439acf2..952243bb1d 100644
--- a/src/datadog_api_client/v2/model/scalar_query.py
+++ b/src/datadog_api_client/v2/model/scalar_query.py
@@ -43,7 +43,7 @@ def __init__(self, **kwargs):
         :type env: str
 
         :param operation_name: The APM operation name.
-        :type operation_name: str, optional
+        :type operation_name: str
 
         :param primary_tag_name: Name of the second primary tag used within APM. Required when `primary_tag_value` is specified. See https://docs.datadoghq.com/tracing/guide/setting_primary_tags_to_scope/#add-a-second-primary-tag-in-datadog
         :type primary_tag_name: str, optional
diff --git a/src/datadog_api_client/v2/model/timeseries_query.py b/src/datadog_api_client/v2/model/timeseries_query.py
index d95f319600..110bb09b61 100644
--- a/src/datadog_api_client/v2/model/timeseries_query.py
+++ b/src/datadog_api_client/v2/model/timeseries_query.py
@@ -40,7 +40,7 @@ def __init__(self, **kwargs):
         :type env: str
 
         :param operation_name: The APM operation name.
-        :type operation_name: str, optional
+        :type operation_name: str
 
         :param primary_tag_name: Name of the second primary tag used within APM. Required when `primary_tag_value` is specified. See https://docs.datadoghq.com/tracing/guide/setting_primary_tags_to_scope/#add-a-second-primary-tag-in-datadog
         :type primary_tag_name: str, optional