Fix Spans endpoint schemas

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-07-14 13:31:57.344296",
-            "spec_repo_commit": "2bd58701"
+            "regenerated": "2023-07-14 14:04:16.234493",
+            "spec_repo_commit": "3868f953"
         },
         "v2": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-07-14 13:31:57.357559",
-            "spec_repo_commit": "2bd58701"
+            "regenerated": "2023-07-14 14:04:16.248147",
+            "spec_repo_commit": "3868f953"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -15010,6 +15010,17 @@ components:
           $ref: '#/components/schemas/SpansType'
       type: object
     SpansAggregateBucket:
+      description: Spans aggregate.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/SpansAggregateBucketAttributes'
+        id:
+          description: ID of the spans aggregate.
+          type: string
+        type:
+          $ref: '#/components/schemas/SpansAggregateBucketType'
+      type: object
+    SpansAggregateBucketAttributes:
       description: A bucket values.
       properties:
         by:
@@ -15020,13 +15031,24 @@ components:
             '@state': success
             '@version': abc
           type: object
+        compute:
+          description: The compute data.
+          type: object
         computes:
           additionalProperties:
             $ref: '#/components/schemas/SpansAggregateBucketValue'
           description: A map of the metric name -> value for regular compute or list
             of values for a timeseries.
           type: object
       type: object
+    SpansAggregateBucketType:
+      description: The spans aggregate bucket type.
+      enum:
+      - bucket
+      example: bucket
+      type: string
+      x-enum-varnames:
+      - BUCKET
     SpansAggregateBucketValue:
       description: A bucket value, can be either a timeseries or a single value.
       oneOf:
@@ -15214,6 +15236,10 @@ components:
             customAttribute: 123
             duration: 2345
           type: object
+        custom:
+          additionalProperties: {}
+          description: JSON object of custom spans data.
+          type: object
         end_timestamp:
           description: End timestamp of your span.
           example: '2023-01-02T09:42:36.420Z'

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

@@ -16,77 +16,91 @@
 import java.util.Map;
 import java.util.Objects;
 
-/** A bucket values. */
+/** Spans aggregate. */
 @JsonPropertyOrder({
-  SpansAggregateBucket.JSON_PROPERTY_BY,
-  SpansAggregateBucket.JSON_PROPERTY_COMPUTES
+  SpansAggregateBucket.JSON_PROPERTY_ATTRIBUTES,
+  SpansAggregateBucket.JSON_PROPERTY_ID,
+  SpansAggregateBucket.JSON_PROPERTY_TYPE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class SpansAggregateBucket {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_BY = "by";
-  private Map<String, Object> by = null;
+  public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
+  private SpansAggregateBucketAttributes attributes;
 
-  public static final String JSON_PROPERTY_COMPUTES = "computes";
-  private Map<String, SpansAggregateBucketValue> computes = null;
+  public static final String JSON_PROPERTY_ID = "id";
+  private String id;
 
-  public SpansAggregateBucket by(Map<String, Object> by) {
-    this.by = by;
-    return this;
-  }
+  public static final String JSON_PROPERTY_TYPE = "type";
+  private SpansAggregateBucketType type;
 
-  public SpansAggregateBucket putByItem(String key, Object byItem) {
-    if (this.by == null) {
-      this.by = new HashMap<>();
-    }
-    this.by.put(key, byItem);
+  public SpansAggregateBucket attributes(SpansAggregateBucketAttributes attributes) {
+    this.attributes = attributes;
+    this.unparsed |= attributes.unparsed;
     return this;
   }
 
   /**
-   * The key, value pairs for each group by.
+   * A bucket values.
    *
-   * @return by
+   * @return attributes
    */
   @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_BY)
+  @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Map<String, Object> getBy() {
-    return by;
+  public SpansAggregateBucketAttributes getAttributes() {
+    return attributes;
   }
 
-  public void setBy(Map<String, Object> by) {
-    this.by = by;
+  public void setAttributes(SpansAggregateBucketAttributes attributes) {
+    this.attributes = attributes;
   }
 
-  public SpansAggregateBucket computes(Map<String, SpansAggregateBucketValue> computes) {
-    this.computes = computes;
+  public SpansAggregateBucket id(String id) {
+    this.id = id;
     return this;
   }
 
-  public SpansAggregateBucket putComputesItem(String key, SpansAggregateBucketValue computesItem) {
-    if (this.computes == null) {
-      this.computes = new HashMap<>();
-    }
-    this.computes.put(key, computesItem);
+  /**
+   * ID of the spans aggregate.
+   *
+   * @return id
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
+
+  public SpansAggregateBucket type(SpansAggregateBucketType type) {
+    this.type = type;
+    this.unparsed |= !type.isValid();
     return this;
   }
 
   /**
-   * A map of the metric name -&gt; value for regular compute or list of values for a timeseries.
+   * The spans aggregate bucket type.
    *
-   * @return computes
+   * @return type
    */
   @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_COMPUTES)
+  @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Map<String, SpansAggregateBucketValue> getComputes() {
-    return computes;
+  public SpansAggregateBucketType getType() {
+    return type;
   }
 
-  public void setComputes(Map<String, SpansAggregateBucketValue> computes) {
-    this.computes = computes;
+  public void setType(SpansAggregateBucketType type) {
+    if (!type.isValid()) {
+      this.unparsed = true;
+    }
+    this.type = type;
   }
 
   /**
@@ -145,22 +159,24 @@ public boolean equals(Object o) {
       return false;
     }
     SpansAggregateBucket spansAggregateBucket = (SpansAggregateBucket) o;
-    return Objects.equals(this.by, spansAggregateBucket.by)
-        && Objects.equals(this.computes, spansAggregateBucket.computes)
+    return Objects.equals(this.attributes, spansAggregateBucket.attributes)
+        && Objects.equals(this.id, spansAggregateBucket.id)
+        && Objects.equals(this.type, spansAggregateBucket.type)
         && Objects.equals(this.additionalProperties, spansAggregateBucket.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(by, computes, additionalProperties);
+    return Objects.hash(attributes, id, type, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SpansAggregateBucket {\n");
-    sb.append("    by: ").append(toIndentedString(by)).append("\n");
-    sb.append("    computes: ").append(toIndentedString(computes)).append("\n");
+    sb.append("    attributes: ").append(toIndentedString(attributes)).append("\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    additionalProperties: ")
         .append(toIndentedString(additionalProperties))
         .append("\n");