diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index 5f6006a6baaf..c6a476fdfb3e 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -2875,6 +2875,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"
@@ -2912,6 +2914,8 @@ components:
         - name
         - service
         - stat
+        - operation_name
+        - group_by
       type: object
     FormulaAndFunctionCloudCostDataSource:
       description: Data source for Cloud Cost queries.
diff --git a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
index ea7bc16ed45a..e80c6a5dedf1 100644
--- a/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
+++ b/packages/datadog-api-client-v1/models/FormulaAndFunctionApmResourceStatsQueryDefinition.ts
@@ -27,7 +27,7 @@ export class FormulaAndFunctionApmResourceStatsQueryDefinition {
   /**
    * Array of fields to group results by.
    */
-  "groupBy"?: Array<string>;
+  "groupBy": Array<string>;
   /**
    * Name of this query to use in formulas.
    */
@@ -35,7 +35,7 @@ export class FormulaAndFunctionApmResourceStatsQueryDefinition {
   /**
    * Name of operation on service.
    */
-  "operationName"?: string;
+  "operationName": string;
   /**
    * 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
    */
@@ -90,6 +90,7 @@ export class FormulaAndFunctionApmResourceStatsQueryDefinition {
     groupBy: {
       baseName: "group_by",
       type: "Array<string>",
+      required: true,
     },
     name: {
       baseName: "name",
@@ -99,6 +100,7 @@ export class FormulaAndFunctionApmResourceStatsQueryDefinition {
     operationName: {
       baseName: "operation_name",
       type: "string",
+      required: true,
     },
     primaryTagName: {
       baseName: "primary_tag_name",