Add support for enable_custom_metrics in Confluent Account

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-07-06 20:39:48.258694",
-            "spec_repo_commit": "45b9e51d"
+            "regenerated": "2023-07-07 15:50:16.611825",
+            "spec_repo_commit": "6f781b6c"
         },
         "v2": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-07-06 20:39:48.275571",
-            "spec_repo_commit": "45b9e51d"
+            "regenerated": "2023-07-07 15:50:16.631822",
+            "spec_repo_commit": "6f781b6c"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -3116,6 +3116,12 @@ components:
     ConfluentAccountResourceAttributes:
       description: Attributes object for updating a Confluent resource.
       properties:
+        enable_custom_metrics:
+          default: false
+          description: Enable the `custom.consumer_lag_offset` metric, which contains
+            extra metric tags.
+          example: false
+          type: boolean
         id:
           description: The ID associated with a Confluent resource.
           example: resource-id-123
@@ -3256,6 +3262,12 @@ components:
     ConfluentResourceRequestAttributes:
       description: Attributes object for updating a Confluent resource.
       properties:
+        enable_custom_metrics:
+          default: false
+          description: Enable the `custom.consumer_lag_offset` metric, which contains
+            extra metric tags.
+          example: false
+          type: boolean
         resource_type:
           description: The resource type of the Resource. Can be `kafka`, `connector`,
             `ksql`, or `schema_registry`.
@@ -3298,6 +3310,12 @@ components:
     ConfluentResourceResponseAttributes:
       description: Model representation of a Confluent Cloud resource.
       properties:
+        enable_custom_metrics:
+          default: false
+          description: Enable the `custom.consumer_lag_offset` metric, which contains
+            extra metric tags.
+          example: false
+          type: boolean
         resource_type:
           description: The resource type of the Resource. Can be `kafka`, `connector`,
             `ksql`, or `schema_registry`.

examples/v2/confluent-cloud/CreateConfluentAccount.java

@@ -28,6 +28,7 @@ public static void main(String[] args) {
                             .resources(
                                 Collections.singletonList(
                                     new ConfluentAccountResourceAttributes()
+                                        .enableCustomMetrics(false)
                                         .id("resource-id-123")
                                         .resourceType("kafka")
                                         .tags(Arrays.asList("myTag", "myTag2:myValue"))))

examples/v2/confluent-cloud/CreateConfluentResource.java

@@ -25,7 +25,8 @@ public static void main(String[] args) {
                     .attributes(
                         new ConfluentResourceRequestAttributes()
                             .resourceType("kafka")
-                            .tags(Arrays.asList("myTag", "myTag2:myValue")))
+                            .tags(Arrays.asList("myTag", "myTag2:myValue"))
+                            .enableCustomMetrics(false))
                     .id("exampleconfluentcloud")
                     .type(ConfluentResourceType.CONFLUENT_CLOUD_RESOURCES));
 

examples/v2/confluent-cloud/UpdateConfluentResource.java

@@ -21,6 +21,7 @@ public static void main(String[] args) {
                 new ConfluentResourceRequestData()
                     .attributes(
                         new ConfluentResourceRequestAttributes()
+                            .enableCustomMetrics(false)
                             .resourceType("kafka")
                             .tags(Arrays.asList("myTag", "myTag2:myValue")))
                     .id("resource-id-123")

src/main/java/com/datadog/api/client/v2/model/ConfluentAccountResourceAttributes.java

@@ -21,6 +21,7 @@
 
 /** Attributes object for updating a Confluent resource. */
 @JsonPropertyOrder({
+  ConfluentAccountResourceAttributes.JSON_PROPERTY_ENABLE_CUSTOM_METRICS,
   ConfluentAccountResourceAttributes.JSON_PROPERTY_ID,
   ConfluentAccountResourceAttributes.JSON_PROPERTY_RESOURCE_TYPE,
   ConfluentAccountResourceAttributes.JSON_PROPERTY_TAGS
@@ -29,6 +30,9 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class ConfluentAccountResourceAttributes {
   @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ENABLE_CUSTOM_METRICS = "enable_custom_metrics";
+  private Boolean enableCustomMetrics = false;
+
   public static final String JSON_PROPERTY_ID = "id";
   private String id;
 
@@ -46,6 +50,27 @@ public ConfluentAccountResourceAttributes(
     this.resourceType = resourceType;
   }
 
+  public ConfluentAccountResourceAttributes enableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+    return this;
+  }
+
+  /**
+   * Enable the <code>custom.consumer_lag_offset</code> metric, which contains extra metric tags.
+   *
+   * @return enableCustomMetrics
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENABLE_CUSTOM_METRICS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getEnableCustomMetrics() {
+    return enableCustomMetrics;
+  }
+
+  public void setEnableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+  }
+
   public ConfluentAccountResourceAttributes id(String id) {
     this.id = id;
     return this;
@@ -175,7 +200,9 @@ public boolean equals(Object o) {
     }
     ConfluentAccountResourceAttributes confluentAccountResourceAttributes =
         (ConfluentAccountResourceAttributes) o;
-    return Objects.equals(this.id, confluentAccountResourceAttributes.id)
+    return Objects.equals(
+            this.enableCustomMetrics, confluentAccountResourceAttributes.enableCustomMetrics)
+        && Objects.equals(this.id, confluentAccountResourceAttributes.id)
         && Objects.equals(this.resourceType, confluentAccountResourceAttributes.resourceType)
         && Objects.equals(this.tags, confluentAccountResourceAttributes.tags)
         && Objects.equals(
@@ -184,13 +211,16 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, resourceType, tags, additionalProperties);
+    return Objects.hash(enableCustomMetrics, id, resourceType, tags, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ConfluentAccountResourceAttributes {\n");
+    sb.append("    enableCustomMetrics: ")
+        .append(toIndentedString(enableCustomMetrics))
+        .append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    resourceType: ").append(toIndentedString(resourceType)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");

src/main/java/com/datadog/api/client/v2/model/ConfluentResourceRequestAttributes.java

@@ -21,13 +21,17 @@
 
 /** Attributes object for updating a Confluent resource. */
 @JsonPropertyOrder({
+  ConfluentResourceRequestAttributes.JSON_PROPERTY_ENABLE_CUSTOM_METRICS,
   ConfluentResourceRequestAttributes.JSON_PROPERTY_RESOURCE_TYPE,
   ConfluentResourceRequestAttributes.JSON_PROPERTY_TAGS
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class ConfluentResourceRequestAttributes {
   @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ENABLE_CUSTOM_METRICS = "enable_custom_metrics";
+  private Boolean enableCustomMetrics = false;
+
   public static final String JSON_PROPERTY_RESOURCE_TYPE = "resource_type";
   private String resourceType;
 
@@ -42,6 +46,27 @@ public ConfluentResourceRequestAttributes(
     this.resourceType = resourceType;
   }
 
+  public ConfluentResourceRequestAttributes enableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+    return this;
+  }
+
+  /**
+   * Enable the <code>custom.consumer_lag_offset</code> metric, which contains extra metric tags.
+   *
+   * @return enableCustomMetrics
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENABLE_CUSTOM_METRICS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getEnableCustomMetrics() {
+    return enableCustomMetrics;
+  }
+
+  public void setEnableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+  }
+
   public ConfluentResourceRequestAttributes resourceType(String resourceType) {
     this.resourceType = resourceType;
     return this;
@@ -150,21 +175,26 @@ public boolean equals(Object o) {
     }
     ConfluentResourceRequestAttributes confluentResourceRequestAttributes =
         (ConfluentResourceRequestAttributes) o;
-    return Objects.equals(this.resourceType, confluentResourceRequestAttributes.resourceType)
+    return Objects.equals(
+            this.enableCustomMetrics, confluentResourceRequestAttributes.enableCustomMetrics)
+        && Objects.equals(this.resourceType, confluentResourceRequestAttributes.resourceType)
         && Objects.equals(this.tags, confluentResourceRequestAttributes.tags)
         && Objects.equals(
             this.additionalProperties, confluentResourceRequestAttributes.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(resourceType, tags, additionalProperties);
+    return Objects.hash(enableCustomMetrics, resourceType, tags, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ConfluentResourceRequestAttributes {\n");
+    sb.append("    enableCustomMetrics: ")
+        .append(toIndentedString(enableCustomMetrics))
+        .append("\n");
     sb.append("    resourceType: ").append(toIndentedString(resourceType)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    additionalProperties: ")

src/main/java/com/datadog/api/client/v2/model/ConfluentResourceResponseAttributes.java

@@ -21,13 +21,17 @@
 
 /** Model representation of a Confluent Cloud resource. */
 @JsonPropertyOrder({
+  ConfluentResourceResponseAttributes.JSON_PROPERTY_ENABLE_CUSTOM_METRICS,
   ConfluentResourceResponseAttributes.JSON_PROPERTY_RESOURCE_TYPE,
   ConfluentResourceResponseAttributes.JSON_PROPERTY_TAGS
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class ConfluentResourceResponseAttributes {
   @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_ENABLE_CUSTOM_METRICS = "enable_custom_metrics";
+  private Boolean enableCustomMetrics = false;
+
   public static final String JSON_PROPERTY_RESOURCE_TYPE = "resource_type";
   private String resourceType;
 
@@ -42,6 +46,27 @@ public ConfluentResourceResponseAttributes(
     this.resourceType = resourceType;
   }
 
+  public ConfluentResourceResponseAttributes enableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+    return this;
+  }
+
+  /**
+   * Enable the <code>custom.consumer_lag_offset</code> metric, which contains extra metric tags.
+   *
+   * @return enableCustomMetrics
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ENABLE_CUSTOM_METRICS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getEnableCustomMetrics() {
+    return enableCustomMetrics;
+  }
+
+  public void setEnableCustomMetrics(Boolean enableCustomMetrics) {
+    this.enableCustomMetrics = enableCustomMetrics;
+  }
+
   public ConfluentResourceResponseAttributes resourceType(String resourceType) {
     this.resourceType = resourceType;
     return this;
@@ -150,21 +175,26 @@ public boolean equals(Object o) {
     }
     ConfluentResourceResponseAttributes confluentResourceResponseAttributes =
         (ConfluentResourceResponseAttributes) o;
-    return Objects.equals(this.resourceType, confluentResourceResponseAttributes.resourceType)
+    return Objects.equals(
+            this.enableCustomMetrics, confluentResourceResponseAttributes.enableCustomMetrics)
+        && Objects.equals(this.resourceType, confluentResourceResponseAttributes.resourceType)
         && Objects.equals(this.tags, confluentResourceResponseAttributes.tags)
         && Objects.equals(
             this.additionalProperties, confluentResourceResponseAttributes.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(resourceType, tags, additionalProperties);
+    return Objects.hash(enableCustomMetrics, resourceType, tags, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ConfluentResourceResponseAttributes {\n");
+    sb.append("    enableCustomMetrics: ")
+        .append(toIndentedString(enableCustomMetrics))
+        .append("\n");
     sb.append("    resourceType: ").append(toIndentedString(resourceType)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    additionalProperties: ")

src/test/resources/cassettes/features/v2/Add_resource_to_Confluent_account_returns_OK_response.freeze

@@ -1 +1 @@
-2023-04-06T14:00:35.438Z
+2023-07-03T14:38:40.799Z

src/test/resources/cassettes/features/v2/Add_resource_to_Confluent_account_returns_OK_response.json

@@ -3,7 +3,7 @@
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"api_key\":\"TestAddresourcetoConfluentaccountreturnsOKresponse1680789635\",\"api_secret\":\"test-api-secret\",\"resources\":[{\"id\":\"test-resource-id\",\"resource_type\":\"kafka\",\"tags\":[\"tag1\",\"tag2:val2\"]}],\"tags\":[\"tag1\",\"tag2:val2\"]},\"type\":\"confluent-cloud-accounts\"}}"
+        "json": "{\"data\":{\"attributes\":{\"api_key\":\"TestAddresourcetoConfluentaccountreturnsOKresponse1688395120\",\"api_secret\":\"test-api-secret\",\"resources\":[{\"id\":\"test-resource-id\",\"resource_type\":\"kafka\",\"tags\":[\"tag1\",\"tag2:val2\"]}],\"tags\":[\"tag1\",\"tag2:val2\"]},\"type\":\"confluent-cloud-accounts\"}}"
       },
       "headers": {},
       "method": "POST",
@@ -12,7 +12,7 @@
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"confluent-cloud-accounts\",\"attributes\":{\"tags\":[\"tag1\",\"tag2:val2\"],\"api_key\":\"TestAddresourcetoConfluentaccountreturnsOKresponse1680789635\",\"resources\":[{\"tags\":[\"tag1\",\"tag2:val2\"],\"resource_type\":\"kafka\",\"id\":\"test-resource-id\"}]},\"id\":\"cc6lo3zoip\"}}\n",
+      "body": "{\"data\":{\"type\":\"confluent-cloud-accounts\",\"attributes\":{\"tags\":[\"tag1\",\"tag2:val2\"],\"resources\":[{\"id\":\"test-resource-id\",\"enable_custom_metrics\":false,\"resource_type\":\"kafka\",\"tags\":[\"tag1\",\"tag2:val2\"]}],\"api_key\":\"TestAddresourcetoConfluentaccountreturnsOKresponse1688395120\"},\"id\":\"ca66091df9181d4c62d17f0484461a0d\"}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -27,22 +27,22 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "60221833-9eeb-958d-bff2-cb35633e7b1a"
+    "id": "4ee58e40-959a-3243-a98e-5b27158c3a2f"
   },
   {
     "httpRequest": {
       "body": {
         "type": "JSON",
-        "json": "{\"data\":{\"attributes\":{\"resource_type\":\"kafka\",\"tags\":[\"myTag\",\"myTag2:myValue\"]},\"id\":\"testaddresourcetoconfluentaccountreturnsokresponse1680789635\",\"type\":\"confluent-cloud-resources\"}}"
+        "json": "{\"data\":{\"attributes\":{\"enable_custom_metrics\":false,\"resource_type\":\"kafka\",\"tags\":[\"myTag\",\"myTag2:myValue\"]},\"id\":\"testaddresourcetoconfluentaccountreturnsokresponse1688395120\",\"type\":\"confluent-cloud-resources\"}}"
       },
       "headers": {},
       "method": "POST",
-      "path": "/api/v2/integrations/confluent-cloud/accounts/cc6lo3zoip/resources",
+      "path": "/api/v2/integrations/confluent-cloud/accounts/ca66091df9181d4c62d17f0484461a0d/resources",
       "keepAlive": false,
       "secure": true
     },
     "httpResponse": {
-      "body": "{\"data\":{\"type\":\"confluent-cloud-resources\",\"attributes\":{\"tags\":[\"mytag\",\"mytag2:myvalue\"],\"resource_type\":\"kafka\"},\"id\":\"testaddresourcetoconfluentaccountreturnsokresponse1680789635\"}}\n",
+      "body": "{\"data\":{\"type\":\"confluent-cloud-resources\",\"attributes\":{\"enable_custom_metrics\":false,\"tags\":[\"mytag\",\"mytag2:myvalue\"],\"resource_type\":\"kafka\"},\"id\":\"testaddresourcetoconfluentaccountreturnsokresponse1688395120\"}}\n",
       "headers": {
         "Content-Type": [
           "application/json"
@@ -57,13 +57,13 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "a97b16fc-b20e-d59a-c298-ce43f624213c"
+    "id": "18138a64-7808-5df7-dcbf-6f410b2302ed"
   },
   {
     "httpRequest": {
       "headers": {},
       "method": "DELETE",
-      "path": "/api/v2/integrations/confluent-cloud/accounts/cc6lo3zoip",
+      "path": "/api/v2/integrations/confluent-cloud/accounts/ca66091df9181d4c62d17f0484461a0d",
       "keepAlive": false,
       "secure": true
     },
@@ -82,6 +82,6 @@
     "timeToLive": {
       "unlimited": true
     },
-    "id": "67351ab7-7775-fb3a-c03d-faf0ca6840a5"
+    "id": "a614ffb7-77e1-6eaa-c1ff-5aba97dc7e68"
   }
 ]

src/test/resources/cassettes/features/v2/Get_Confluent_account_returns_OK_response.freeze

@@ -1 +1 @@
-2022-10-06T21:02:45.471Z
+2023-07-03T14:38:41.593Z