Remove estimated_{ingested,indexed}_spans from usage attribution api

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-18 21:00:50.939199",
-            "spec_repo_commit": "37070fd4"
+            "regenerated": "2024-10-21 16:02:36.569238",
+            "spec_repo_commit": "85355ab0"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-18 21:00:50.957619",
-            "spec_repo_commit": "37070fd4"
+            "regenerated": "2024-10-21 16:02:36.588242",
+            "spec_repo_commit": "85355ab0"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -4195,9 +4195,7 @@ components:
       - error_tracking_usage
       - error_tracking_percentage
       - estimated_indexed_logs_usage
-      - estimated_indexed_spans_usage
       - estimated_ingested_logs_usage
-      - estimated_ingested_spans_usage
       - estimated_rum_sessions_usage
       - fargate_usage
       - functions_usage
@@ -4270,9 +4268,7 @@ components:
       - ERROR_TRACKING_USAGE
       - ERROR_TRACKING_PERCENTAGE
       - ESTIMATED_INDEXED_LOGS_USAGE
-      - ESTIMATED_INDEXED_SPANS_USAGE
       - ESTIMATED_INGESTED_LOGS_USAGE
-      - ESTIMATED_INGESTED_SPANS_USAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
       - FARGATE_USAGE
       - FUNCTIONS_USAGE
@@ -7961,10 +7957,6 @@ components:
       - estimated_indexed_logs_percentage
       - estimated_ingested_logs_usage
       - estimated_ingested_logs_percentage
-      - estimated_indexed_spans_usage
-      - estimated_indexed_spans_percentage
-      - estimated_ingested_spans_usage
-      - estimated_ingested_spans_percentage
       - fargate_usage
       - fargate_percentage
       - functions_usage
@@ -8106,10 +8098,6 @@ components:
       - ESTIMATED_INDEXED_LOGS_PERCENTAGE
       - ESTIMATED_INGESTED_LOGS_USAGE
       - ESTIMATED_INGESTED_LOGS_PERCENTAGE
-      - ESTIMATED_INDEXED_SPANS_USAGE
-      - ESTIMATED_INDEXED_SPANS_PERCENTAGE
-      - ESTIMATED_INGESTED_SPANS_USAGE
-      - ESTIMATED_INGESTED_SPANS_PERCENTAGE
       - FARGATE_USAGE
       - FARGATE_PERCENTAGE
       - FUNCTIONS_USAGE
@@ -8423,14 +8411,6 @@ components:
           description: The estimated live indexed logs usage by tag(s).
           format: double
           type: number
-        estimated_indexed_spans_percentage:
-          description: The percentage of estimated indexed spans usage by tag(s).
-          format: double
-          type: number
-        estimated_indexed_spans_usage:
-          description: The estimated indexed spans usage by tag(s).
-          format: double
-          type: number
         estimated_ingested_logs_percentage:
           description: The percentage of estimated live ingested logs usage by tag(s).
           format: double
@@ -8439,14 +8419,6 @@ components:
           description: The estimated live ingested logs usage by tag(s).
           format: double
           type: number
-        estimated_ingested_spans_percentage:
-          description: The percentage of estimated ingested spans usage by tag(s).
-          format: double
-          type: number
-        estimated_ingested_spans_usage:
-          description: The estimated ingested spans usage by tag(s).
-          format: double
-          type: number
         estimated_rum_sessions_percentage:
           description: The percentage of estimated rum sessions usage by tag(s).
           format: double

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

@@ -55,9 +55,7 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
               "error_tracking_usage",
               "error_tracking_percentage",
               "estimated_indexed_logs_usage",
-              "estimated_indexed_spans_usage",
               "estimated_ingested_logs_usage",
-              "estimated_ingested_spans_usage",
               "estimated_rum_sessions_usage",
               "fargate_usage",
               "functions_usage",
@@ -158,12 +156,8 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
       new HourlyUsageAttributionUsageType("error_tracking_percentage");
   public static final HourlyUsageAttributionUsageType ESTIMATED_INDEXED_LOGS_USAGE =
       new HourlyUsageAttributionUsageType("estimated_indexed_logs_usage");
-  public static final HourlyUsageAttributionUsageType ESTIMATED_INDEXED_SPANS_USAGE =
-      new HourlyUsageAttributionUsageType("estimated_indexed_spans_usage");
   public static final HourlyUsageAttributionUsageType ESTIMATED_INGESTED_LOGS_USAGE =
       new HourlyUsageAttributionUsageType("estimated_ingested_logs_usage");
-  public static final HourlyUsageAttributionUsageType ESTIMATED_INGESTED_SPANS_USAGE =
-      new HourlyUsageAttributionUsageType("estimated_ingested_spans_usage");
   public static final HourlyUsageAttributionUsageType ESTIMATED_RUM_SESSIONS_USAGE =
       new HourlyUsageAttributionUsageType("estimated_rum_sessions_usage");
   public static final HourlyUsageAttributionUsageType FARGATE_USAGE =

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

@@ -78,10 +78,6 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
               "estimated_indexed_logs_percentage",
               "estimated_ingested_logs_usage",
               "estimated_ingested_logs_percentage",
-              "estimated_indexed_spans_usage",
-              "estimated_indexed_spans_percentage",
-              "estimated_ingested_spans_usage",
-              "estimated_ingested_spans_percentage",
               "fargate_usage",
               "fargate_percentage",
               "functions_usage",
@@ -276,14 +272,6 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
       new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_logs_usage");
   public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INGESTED_LOGS_PERCENTAGE =
       new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_logs_percentage");
-  public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INDEXED_SPANS_USAGE =
-      new MonthlyUsageAttributionSupportedMetrics("estimated_indexed_spans_usage");
-  public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INDEXED_SPANS_PERCENTAGE =
-      new MonthlyUsageAttributionSupportedMetrics("estimated_indexed_spans_percentage");
-  public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_USAGE =
-      new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_spans_usage");
-  public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_PERCENTAGE =
-      new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_spans_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics FARGATE_USAGE =
       new MonthlyUsageAttributionSupportedMetrics("fargate_usage");
   public static final MonthlyUsageAttributionSupportedMetrics FARGATE_PERCENTAGE =

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

@@ -70,12 +70,8 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_ERROR_TRACKING_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_LOGS_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_LOGS_USAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_PERCENTAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_LOGS_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_LOGS_USAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_RUM_SESSIONS_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_RUM_SESSIONS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_FARGATE_PERCENTAGE,
@@ -336,14 +332,6 @@ public class MonthlyUsageAttributionValues {
       "estimated_indexed_logs_usage";
   private Double estimatedIndexedLogsUsage;
 
-  public static final String JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_PERCENTAGE =
-      "estimated_indexed_spans_percentage";
-  private Double estimatedIndexedSpansPercentage;
-
-  public static final String JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_USAGE =
-      "estimated_indexed_spans_usage";
-  private Double estimatedIndexedSpansUsage;
-
   public static final String JSON_PROPERTY_ESTIMATED_INGESTED_LOGS_PERCENTAGE =
       "estimated_ingested_logs_percentage";
   private Double estimatedIngestedLogsPercentage;
@@ -352,14 +340,6 @@ public class MonthlyUsageAttributionValues {
       "estimated_ingested_logs_usage";
   private Double estimatedIngestedLogsUsage;
 
-  public static final String JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE =
-      "estimated_ingested_spans_percentage";
-  private Double estimatedIngestedSpansPercentage;
-
-  public static final String JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE =
-      "estimated_ingested_spans_usage";
-  private Double estimatedIngestedSpansUsage;
-
   public static final String JSON_PROPERTY_ESTIMATED_RUM_SESSIONS_PERCENTAGE =
       "estimated_rum_sessions_percentage";
   private Double estimatedRumSessionsPercentage;
@@ -1749,50 +1729,6 @@ public void setEstimatedIndexedLogsUsage(Double estimatedIndexedLogsUsage) {
     this.estimatedIndexedLogsUsage = estimatedIndexedLogsUsage;
   }
 
-  public MonthlyUsageAttributionValues estimatedIndexedSpansPercentage(
-      Double estimatedIndexedSpansPercentage) {
-    this.estimatedIndexedSpansPercentage = estimatedIndexedSpansPercentage;
-    return this;
-  }
-
-  /**
-   * The percentage of estimated indexed spans usage by tag(s).
-   *
-   * @return estimatedIndexedSpansPercentage
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_PERCENTAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Double getEstimatedIndexedSpansPercentage() {
-    return estimatedIndexedSpansPercentage;
-  }
-
-  public void setEstimatedIndexedSpansPercentage(Double estimatedIndexedSpansPercentage) {
-    this.estimatedIndexedSpansPercentage = estimatedIndexedSpansPercentage;
-  }
-
-  public MonthlyUsageAttributionValues estimatedIndexedSpansUsage(
-      Double estimatedIndexedSpansUsage) {
-    this.estimatedIndexedSpansUsage = estimatedIndexedSpansUsage;
-    return this;
-  }
-
-  /**
-   * The estimated indexed spans usage by tag(s).
-   *
-   * @return estimatedIndexedSpansUsage
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_USAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Double getEstimatedIndexedSpansUsage() {
-    return estimatedIndexedSpansUsage;
-  }
-
-  public void setEstimatedIndexedSpansUsage(Double estimatedIndexedSpansUsage) {
-    this.estimatedIndexedSpansUsage = estimatedIndexedSpansUsage;
-  }
-
   public MonthlyUsageAttributionValues estimatedIngestedLogsPercentage(
       Double estimatedIngestedLogsPercentage) {
     this.estimatedIngestedLogsPercentage = estimatedIngestedLogsPercentage;
@@ -1837,50 +1773,6 @@ public void setEstimatedIngestedLogsUsage(Double estimatedIngestedLogsUsage) {
     this.estimatedIngestedLogsUsage = estimatedIngestedLogsUsage;
   }
 
-  public MonthlyUsageAttributionValues estimatedIngestedSpansPercentage(
-      Double estimatedIngestedSpansPercentage) {
-    this.estimatedIngestedSpansPercentage = estimatedIngestedSpansPercentage;
-    return this;
-  }
-
-  /**
-   * The percentage of estimated ingested spans usage by tag(s).
-   *
-   * @return estimatedIngestedSpansPercentage
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Double getEstimatedIngestedSpansPercentage() {
-    return estimatedIngestedSpansPercentage;
-  }
-
-  public void setEstimatedIngestedSpansPercentage(Double estimatedIngestedSpansPercentage) {
-    this.estimatedIngestedSpansPercentage = estimatedIngestedSpansPercentage;
-  }
-
-  public MonthlyUsageAttributionValues estimatedIngestedSpansUsage(
-      Double estimatedIngestedSpansUsage) {
-    this.estimatedIngestedSpansUsage = estimatedIngestedSpansUsage;
-    return this;
-  }
-
-  /**
-   * The estimated ingested spans usage by tag(s).
-   *
-   * @return estimatedIngestedSpansUsage
-   */
-  @jakarta.annotation.Nullable
-  @JsonProperty(JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Double getEstimatedIngestedSpansUsage() {
-    return estimatedIngestedSpansUsage;
-  }
-
-  public void setEstimatedIngestedSpansUsage(Double estimatedIngestedSpansUsage) {
-    this.estimatedIngestedSpansUsage = estimatedIngestedSpansUsage;
-  }
-
   public MonthlyUsageAttributionValues estimatedRumSessionsPercentage(
       Double estimatedRumSessionsPercentage) {
     this.estimatedRumSessionsPercentage = estimatedRumSessionsPercentage;
@@ -3784,24 +3676,12 @@ public boolean equals(Object o) {
             monthlyUsageAttributionValues.estimatedIndexedLogsPercentage)
         && Objects.equals(
             this.estimatedIndexedLogsUsage, monthlyUsageAttributionValues.estimatedIndexedLogsUsage)
-        && Objects.equals(
-            this.estimatedIndexedSpansPercentage,
-            monthlyUsageAttributionValues.estimatedIndexedSpansPercentage)
-        && Objects.equals(
-            this.estimatedIndexedSpansUsage,
-            monthlyUsageAttributionValues.estimatedIndexedSpansUsage)
         && Objects.equals(
             this.estimatedIngestedLogsPercentage,
             monthlyUsageAttributionValues.estimatedIngestedLogsPercentage)
         && Objects.equals(
             this.estimatedIngestedLogsUsage,
             monthlyUsageAttributionValues.estimatedIngestedLogsUsage)
-        && Objects.equals(
-            this.estimatedIngestedSpansPercentage,
-            monthlyUsageAttributionValues.estimatedIngestedSpansPercentage)
-        && Objects.equals(
-            this.estimatedIngestedSpansUsage,
-            monthlyUsageAttributionValues.estimatedIngestedSpansUsage)
         && Objects.equals(
             this.estimatedRumSessionsPercentage,
             monthlyUsageAttributionValues.estimatedRumSessionsPercentage)
@@ -4041,12 +3921,8 @@ public int hashCode() {
         errorTrackingUsage,
         estimatedIndexedLogsPercentage,
         estimatedIndexedLogsUsage,
-        estimatedIndexedSpansPercentage,
-        estimatedIndexedSpansUsage,
         estimatedIngestedLogsPercentage,
         estimatedIngestedLogsUsage,
-        estimatedIngestedSpansPercentage,
-        estimatedIngestedSpansUsage,
         estimatedRumSessionsPercentage,
         estimatedRumSessionsUsage,
         fargatePercentage,
@@ -4246,24 +4122,12 @@ public String toString() {
     sb.append("    estimatedIndexedLogsUsage: ")
         .append(toIndentedString(estimatedIndexedLogsUsage))
         .append("\n");
-    sb.append("    estimatedIndexedSpansPercentage: ")
-        .append(toIndentedString(estimatedIndexedSpansPercentage))
-        .append("\n");
-    sb.append("    estimatedIndexedSpansUsage: ")
-        .append(toIndentedString(estimatedIndexedSpansUsage))
-        .append("\n");
     sb.append("    estimatedIngestedLogsPercentage: ")
         .append(toIndentedString(estimatedIngestedLogsPercentage))
         .append("\n");
     sb.append("    estimatedIngestedLogsUsage: ")
         .append(toIndentedString(estimatedIngestedLogsUsage))
         .append("\n");
-    sb.append("    estimatedIngestedSpansPercentage: ")
-        .append(toIndentedString(estimatedIngestedSpansPercentage))
-        .append("\n");
-    sb.append("    estimatedIngestedSpansUsage: ")
-        .append(toIndentedString(estimatedIngestedSpansUsage))
-        .append("\n");
     sb.append("    estimatedRumSessionsPercentage: ")
         .append(toIndentedString(estimatedRumSessionsPercentage))
         .append("\n");