Add APM and USM usage attribution type

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-08-16 07:23:55.567583",
-            "spec_repo_commit": "f7f3d222"
+            "regenerated": "2023-08-17 17:20:36.058215",
+            "spec_repo_commit": "357af604"
         },
         "v2": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-08-16 07:23:55.584895",
-            "spec_repo_commit": "f7f3d222"
+            "regenerated": "2023-08-17 17:20:36.074246",
+            "spec_repo_commit": "357af604"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3887,6 +3887,7 @@ components:
       - api_usage
       - apm_fargate_usage
       - apm_host_usage
+      - apm_usm_usage
       - appsec_fargate_usage
       - appsec_usage
       - browser_usage
@@ -3924,6 +3925,7 @@ components:
       - API_USAGE
       - APM_FARGATE_USAGE
       - APM_HOST_USAGE
+      - APM_USM_USAGE
       - APPSEC_FARGATE_USAGE
       - APPSEC_USAGE
       - BROWSER_USAGE
@@ -7430,6 +7432,8 @@ components:
       - appsec_fargate_percentage
       - apm_host_usage
       - apm_host_percentage
+      - apm_usm_usage
+      - apm_usm_percentage
       - appsec_usage
       - appsec_percentage
       - browser_usage
@@ -7503,6 +7507,8 @@ components:
       - APPSEC_FARGATE_PERCENTAGE
       - APM_HOST_USAGE
       - APM_HOST_PERCENTAGE
+      - APM_USM_USAGE
+      - APM_USM_PERCENTAGE
       - APPSEC_USAGE
       - APPSEC_PERCENTAGE
       - BROWSER_USAGE
@@ -7593,6 +7599,15 @@ components:
           description: The APM host usage by tag(s).
           format: double
           type: number
+        apm_usm_percentage:
+          description: The percentage of APM and Universal Service Monitoring host
+            usage by tag(s).
+          format: double
+          type: number
+        apm_usm_usage:
+          description: The APM and Universal Service Monitoring host usage by tag(s).
+          format: double
+          type: number
         appsec_fargate_percentage:
           description: The percentage of Application Security Monitoring ECS Fargate
             task usage by tag(s).

src/main/java/com/datadog/api/client/v1/model/HourlyUsageAttributionUsageType.java

@@ -29,6 +29,7 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
               "api_usage",
               "apm_fargate_usage",
               "apm_host_usage",
+              "apm_usm_usage",
               "appsec_fargate_usage",
               "appsec_usage",
               "browser_usage",
@@ -68,6 +69,8 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
       new HourlyUsageAttributionUsageType("apm_fargate_usage");
   public static final HourlyUsageAttributionUsageType APM_HOST_USAGE =
       new HourlyUsageAttributionUsageType("apm_host_usage");
+  public static final HourlyUsageAttributionUsageType APM_USM_USAGE =
+      new HourlyUsageAttributionUsageType("apm_usm_usage");
   public static final HourlyUsageAttributionUsageType APPSEC_FARGATE_USAGE =
       new HourlyUsageAttributionUsageType("appsec_fargate_usage");
   public static final HourlyUsageAttributionUsageType APPSEC_USAGE =

src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionSupportedMetrics.java

@@ -36,6 +36,8 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
               "appsec_fargate_percentage",
               "apm_host_usage",
               "apm_host_percentage",
+              "apm_usm_usage",
+              "apm_usm_percentage",
               "appsec_usage",
               "appsec_percentage",
               "browser_usage",
@@ -116,6 +118,10 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
       new MonthlyUsageAttributionSupportedMetrics("apm_host_usage");
   public static final MonthlyUsageAttributionSupportedMetrics APM_HOST_PERCENTAGE =
       new MonthlyUsageAttributionSupportedMetrics("apm_host_percentage");
+  public static final MonthlyUsageAttributionSupportedMetrics APM_USM_USAGE =
+      new MonthlyUsageAttributionSupportedMetrics("apm_usm_usage");
+  public static final MonthlyUsageAttributionSupportedMetrics APM_USM_PERCENTAGE =
+      new MonthlyUsageAttributionSupportedMetrics("apm_usm_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics APPSEC_USAGE =
       new MonthlyUsageAttributionSupportedMetrics("appsec_usage");
   public static final MonthlyUsageAttributionSupportedMetrics APPSEC_PERCENTAGE =

src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionValues.java

@@ -24,6 +24,8 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_APM_FARGATE_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_APM_HOST_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_APM_HOST_USAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_APM_USM_PERCENTAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_APM_USM_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_APPSEC_FARGATE_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_APPSEC_FARGATE_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_APPSEC_PERCENTAGE,
@@ -111,6 +113,12 @@ public class MonthlyUsageAttributionValues {
   public static final String JSON_PROPERTY_APM_HOST_USAGE = "apm_host_usage";
   private Double apmHostUsage;
 
+  public static final String JSON_PROPERTY_APM_USM_PERCENTAGE = "apm_usm_percentage";
+  private Double apmUsmPercentage;
+
+  public static final String JSON_PROPERTY_APM_USM_USAGE = "apm_usm_usage";
+  private Double apmUsmUsage;
+
   public static final String JSON_PROPERTY_APPSEC_FARGATE_PERCENTAGE = "appsec_fargate_percentage";
   private Double appsecFargatePercentage;
 
@@ -454,6 +462,48 @@ public void setApmHostUsage(Double apmHostUsage) {
     this.apmHostUsage = apmHostUsage;
   }
 
+  public MonthlyUsageAttributionValues apmUsmPercentage(Double apmUsmPercentage) {
+    this.apmUsmPercentage = apmUsmPercentage;
+    return this;
+  }
+
+  /**
+   * The percentage of APM and Universal Service Monitoring host usage by tag(s).
+   *
+   * @return apmUsmPercentage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_APM_USM_PERCENTAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getApmUsmPercentage() {
+    return apmUsmPercentage;
+  }
+
+  public void setApmUsmPercentage(Double apmUsmPercentage) {
+    this.apmUsmPercentage = apmUsmPercentage;
+  }
+
+  public MonthlyUsageAttributionValues apmUsmUsage(Double apmUsmUsage) {
+    this.apmUsmUsage = apmUsmUsage;
+    return this;
+  }
+
+  /**
+   * The APM and Universal Service Monitoring host usage by tag(s).
+   *
+   * @return apmUsmUsage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_APM_USM_USAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getApmUsmUsage() {
+    return apmUsmUsage;
+  }
+
+  public void setApmUsmUsage(Double apmUsmUsage) {
+    this.apmUsmUsage = apmUsmUsage;
+  }
+
   public MonthlyUsageAttributionValues appsecFargatePercentage(Double appsecFargatePercentage) {
     this.appsecFargatePercentage = appsecFargatePercentage;
     return this;
@@ -1878,6 +1928,8 @@ public boolean equals(Object o) {
         && Objects.equals(this.apmFargateUsage, monthlyUsageAttributionValues.apmFargateUsage)
         && Objects.equals(this.apmHostPercentage, monthlyUsageAttributionValues.apmHostPercentage)
         && Objects.equals(this.apmHostUsage, monthlyUsageAttributionValues.apmHostUsage)
+        && Objects.equals(this.apmUsmPercentage, monthlyUsageAttributionValues.apmUsmPercentage)
+        && Objects.equals(this.apmUsmUsage, monthlyUsageAttributionValues.apmUsmUsage)
         && Objects.equals(
             this.appsecFargatePercentage, monthlyUsageAttributionValues.appsecFargatePercentage)
         && Objects.equals(this.appsecFargateUsage, monthlyUsageAttributionValues.appsecFargateUsage)
@@ -2013,6 +2065,8 @@ public int hashCode() {
         apmFargateUsage,
         apmHostPercentage,
         apmHostUsage,
+        apmUsmPercentage,
+        apmUsmUsage,
         appsecFargatePercentage,
         appsecFargateUsage,
         appsecPercentage,
@@ -2092,6 +2146,8 @@ public String toString() {
     sb.append("    apmFargateUsage: ").append(toIndentedString(apmFargateUsage)).append("\n");
     sb.append("    apmHostPercentage: ").append(toIndentedString(apmHostPercentage)).append("\n");
     sb.append("    apmHostUsage: ").append(toIndentedString(apmHostUsage)).append("\n");
+    sb.append("    apmUsmPercentage: ").append(toIndentedString(apmUsmPercentage)).append("\n");
+    sb.append("    apmUsmUsage: ").append(toIndentedString(apmUsmUsage)).append("\n");
     sb.append("    appsecFargatePercentage: ")
         .append(toIndentedString(appsecFargatePercentage))
         .append("\n");