Add region field and note about multiregion start

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-10 11:13:59.785215",
-            "spec_repo_commit": "04eeb6ee"
+            "regenerated": "2023-04-10 15:00:18.020845",
+            "spec_repo_commit": "615bff17"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-10 11:13:59.803682",
-            "spec_repo_commit": "04eeb6ee"
+            "regenerated": "2023-04-10 15:00:18.033376",
+            "spec_repo_commit": "615bff17"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3606,6 +3606,10 @@ components:
         public_id:
           description: The organization public ID.
           type: string
+        region:
+          description: The region of the Datadog instance that the organization belongs
+            to.
+          type: string
         tag_config_source:
           description: The source of the usage attribution tag configuration and the
             selected tags in the format of `<source_org_name>:::<selected tag 1>///<selected
@@ -7068,6 +7072,10 @@ components:
         public_id:
           description: The organization public ID.
           type: string
+        region:
+          description: The region of the Datadog instance that the organization belongs
+            to.
+          type: string
         tag_config_source:
           description: The source of the usage attribution tag configuration and the
             selected tags in the format `<source_org_name>:::<selected tag 1>///<selected
@@ -28591,10 +28599,11 @@ paths:
       - Usage Metering
   /api/v1/usage/hourly-attribution:
     get:
-      description: "Get hourly usage attribution.\n\nThis API endpoint is paginated.
-        To make sure you receive all records, check if the value of `next_record_id`
-        is\nset in the response. If it is, make another request and pass `next_record_id`
-        as a parameter.\nPseudo code example:\n\n```\nresponse := GetHourlyUsageAttribution(start_month)\ncursor
+      description: "Get hourly usage attribution. Multi-region data is available starting
+        March 1, 2023.\n\nThis API endpoint is paginated. To make sure you receive
+        all records, check if the value of `next_record_id` is\nset in the response.
+        If it is, make another request and pass `next_record_id` as a parameter.\nPseudo
+        code example:\n\n```\nresponse := GetHourlyUsageAttribution(start_month)\ncursor
         := response.metadata.pagination.next_record_id\nWHILE cursor != null BEGIN\n
         \ sleep(5 seconds)  # Avoid running into rate limit\n  response := GetHourlyUsageAttribution(start_month,
         next_record_id=cursor)\n  cursor := response.metadata.pagination.next_record_id\nEND\n```"
@@ -29102,10 +29111,11 @@ paths:
       - Usage Metering
   /api/v1/usage/monthly-attribution:
     get:
-      description: "Get monthly usage attribution.\n\nThis API endpoint is paginated.
-        To make sure you receive all records, check if the value of `next_record_id`
-        is\nset in the response. If it is, make another request and pass `next_record_id`
-        as a parameter.\nPseudo code example:\n\n```\nresponse := GetMonthlyUsageAttribution(start_month)\ncursor
+      description: "Get monthly usage attribution. Multi-region data is available
+        starting March 1, 2023.\n\nThis API endpoint is paginated. To make sure you
+        receive all records, check if the value of `next_record_id` is\nset in the
+        response. If it is, make another request and pass `next_record_id` as a parameter.\nPseudo
+        code example:\n\n```\nresponse := GetMonthlyUsageAttribution(start_month)\ncursor
         := response.metadata.pagination.next_record_id\nWHILE cursor != null BEGIN\n
         \ sleep(5 seconds)  # Avoid running into rate limit\n  response := GetMonthlyUsageAttribution(start_month,
         next_record_id=cursor)\n  cursor := response.metadata.pagination.next_record_id\nEND\n```"

src/main/java/com/datadog/api/client/v1/api/UsageMeteringApi.java

@@ -462,7 +462,7 @@ public CompletableFuture<HourlyUsageAttributionResponse> getHourlyUsageAttributi
   }
 
   /**
-   * Get hourly usage attribution.
+   * Get hourly usage attribution. Multi-region data is available starting March 1, 2023.
    *
    * <p>This API endpoint is paginated. To make sure you receive all records, check if the value of
    * <code>next_record_id</code> is set in the response. If it is, make another request and pass
@@ -1463,7 +1463,7 @@ public CompletableFuture<MonthlyUsageAttributionResponse> getMonthlyUsageAttribu
   }
 
   /**
-   * Get monthly usage attribution.
+   * Get monthly usage attribution. Multi-region data is available starting March 1, 2023.
    *
    * <p>This API endpoint is paginated. To make sure you receive all records, check if the value of
    * <code>next_record_id</code> is set in the response. If it is, make another request and pass

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

@@ -23,6 +23,7 @@
   HourlyUsageAttributionBody.JSON_PROPERTY_HOUR,
   HourlyUsageAttributionBody.JSON_PROPERTY_ORG_NAME,
   HourlyUsageAttributionBody.JSON_PROPERTY_PUBLIC_ID,
+  HourlyUsageAttributionBody.JSON_PROPERTY_REGION,
   HourlyUsageAttributionBody.JSON_PROPERTY_TAG_CONFIG_SOURCE,
   HourlyUsageAttributionBody.JSON_PROPERTY_TAGS,
   HourlyUsageAttributionBody.JSON_PROPERTY_TOTAL_USAGE_SUM,
@@ -44,6 +45,9 @@ public class HourlyUsageAttributionBody {
   public static final String JSON_PROPERTY_PUBLIC_ID = "public_id";
   private String publicId;
 
+  public static final String JSON_PROPERTY_REGION = "region";
+  private String region;
+
   public static final String JSON_PROPERTY_TAG_CONFIG_SOURCE = "tag_config_source";
   private String tagConfigSource;
 
@@ -122,6 +126,27 @@ public void setPublicId(String publicId) {
     this.publicId = publicId;
   }
 
+  public HourlyUsageAttributionBody region(String region) {
+    this.region = region;
+    return this;
+  }
+
+  /**
+   * The region of the Datadog instance that the organization belongs to.
+   *
+   * @return region
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REGION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getRegion() {
+    return region;
+  }
+
+  public void setRegion(String region) {
+    this.region = region;
+  }
+
   public HourlyUsageAttributionBody tagConfigSource(String tagConfigSource) {
     this.tagConfigSource = tagConfigSource;
     return this;
@@ -262,6 +287,7 @@ public boolean equals(Object o) {
     return Objects.equals(this.hour, hourlyUsageAttributionBody.hour)
         && Objects.equals(this.orgName, hourlyUsageAttributionBody.orgName)
         && Objects.equals(this.publicId, hourlyUsageAttributionBody.publicId)
+        && Objects.equals(this.region, hourlyUsageAttributionBody.region)
         && Objects.equals(this.tagConfigSource, hourlyUsageAttributionBody.tagConfigSource)
         && Objects.equals(this.tags, hourlyUsageAttributionBody.tags)
         && Objects.equals(this.totalUsageSum, hourlyUsageAttributionBody.totalUsageSum)
@@ -272,7 +298,15 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
-        hour, orgName, publicId, tagConfigSource, tags, totalUsageSum, updatedAt, usageType);
+        hour,
+        orgName,
+        publicId,
+        region,
+        tagConfigSource,
+        tags,
+        totalUsageSum,
+        updatedAt,
+        usageType);
   }
 
   @Override
@@ -282,6 +316,7 @@ public String toString() {
     sb.append("    hour: ").append(toIndentedString(hour)).append("\n");
     sb.append("    orgName: ").append(toIndentedString(orgName)).append("\n");
     sb.append("    publicId: ").append(toIndentedString(publicId)).append("\n");
+    sb.append("    region: ").append(toIndentedString(region)).append("\n");
     sb.append("    tagConfigSource: ").append(toIndentedString(tagConfigSource)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    totalUsageSum: ").append(toIndentedString(totalUsageSum)).append("\n");

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

@@ -23,6 +23,7 @@
   MonthlyUsageAttributionBody.JSON_PROPERTY_MONTH,
   MonthlyUsageAttributionBody.JSON_PROPERTY_ORG_NAME,
   MonthlyUsageAttributionBody.JSON_PROPERTY_PUBLIC_ID,
+  MonthlyUsageAttributionBody.JSON_PROPERTY_REGION,
   MonthlyUsageAttributionBody.JSON_PROPERTY_TAG_CONFIG_SOURCE,
   MonthlyUsageAttributionBody.JSON_PROPERTY_TAGS,
   MonthlyUsageAttributionBody.JSON_PROPERTY_UPDATED_AT,
@@ -43,6 +44,9 @@ public class MonthlyUsageAttributionBody {
   public static final String JSON_PROPERTY_PUBLIC_ID = "public_id";
   private String publicId;
 
+  public static final String JSON_PROPERTY_REGION = "region";
+  private String region;
+
   public static final String JSON_PROPERTY_TAG_CONFIG_SOURCE = "tag_config_source";
   private String tagConfigSource;
 
@@ -120,6 +124,27 @@ public void setPublicId(String publicId) {
     this.publicId = publicId;
   }
 
+  public MonthlyUsageAttributionBody region(String region) {
+    this.region = region;
+    return this;
+  }
+
+  /**
+   * The region of the Datadog instance that the organization belongs to.
+   *
+   * @return region
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_REGION)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getRegion() {
+    return region;
+  }
+
+  public void setRegion(String region) {
+    this.region = region;
+  }
+
   public MonthlyUsageAttributionBody tagConfigSource(String tagConfigSource) {
     this.tagConfigSource = tagConfigSource;
     return this;
@@ -235,6 +260,7 @@ public boolean equals(Object o) {
     return Objects.equals(this.month, monthlyUsageAttributionBody.month)
         && Objects.equals(this.orgName, monthlyUsageAttributionBody.orgName)
         && Objects.equals(this.publicId, monthlyUsageAttributionBody.publicId)
+        && Objects.equals(this.region, monthlyUsageAttributionBody.region)
         && Objects.equals(this.tagConfigSource, monthlyUsageAttributionBody.tagConfigSource)
         && Objects.equals(this.tags, monthlyUsageAttributionBody.tags)
         && Objects.equals(this.updatedAt, monthlyUsageAttributionBody.updatedAt)
@@ -243,7 +269,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(month, orgName, publicId, tagConfigSource, tags, updatedAt, values);
+    return Objects.hash(month, orgName, publicId, region, tagConfigSource, tags, updatedAt, values);
   }
 
   @Override
@@ -253,6 +279,7 @@ public String toString() {
     sb.append("    month: ").append(toIndentedString(month)).append("\n");
     sb.append("    orgName: ").append(toIndentedString(orgName)).append("\n");
     sb.append("    publicId: ").append(toIndentedString(publicId)).append("\n");
+    sb.append("    region: ").append(toIndentedString(region)).append("\n");
     sb.append("    tagConfigSource: ").append(toIndentedString(tagConfigSource)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    updatedAt: ").append(toIndentedString(updatedAt)).append("\n");