[RQ-7160] Add llm_spans and deprecate llm_observability

.generator/schemas/v1/openapi.yaml

@@ -4315,6 +4315,7 @@ components:
       - invocations_usage
       - lambda_traced_invocations_usage
       - llm_observability_usage
+      - llm_spans_usage
       - logs_indexed_15day_usage
       - logs_indexed_180day_usage
       - logs_indexed_1day_usage
@@ -4396,6 +4397,7 @@ components:
       - INVOCATIONS_USAGE
       - LAMBDA_TRACED_INVOCATIONS_USAGE
       - LLM_OBSERVABILITY_USAGE
+      - LLM_SPANS_USAGE
       - LOGS_INDEXED_15DAY_USAGE
       - LOGS_INDEXED_180DAY_USAGE
       - LOGS_INDEXED_1DAY_USAGE
@@ -8752,6 +8754,8 @@ components:
       - lambda_traced_invocations_percentage
       - llm_observability_usage
       - llm_observability_percentage
+      - llm_spans_usage
+      - llm_spans_percentage
       - mobile_app_testing_percentage
       - mobile_app_testing_usage
       - ndm_netflow_usage
@@ -8909,6 +8913,8 @@ components:
       - LAMBDA_TRACED_INVOCATIONS_PERCENTAGE
       - LLM_OBSERVABILITY_USAGE
       - LLM_OBSERVABILITY_PERCENTAGE
+      - LLM_SPANS_USAGE
+      - LLM_SPANS_PERCENTAGE
       - MOBILE_APP_TESTING_USAGE
       - MOBILE_APP_TESTING_PERCENTAGE
       - NDM_NETFLOW_USAGE
@@ -9329,6 +9335,14 @@ components:
           description: The LLM Observability usage by tag(s).
           format: double
           type: number
+        llm_spans_percentage:
+          description: The percentage of LLM Spans usage by tag(s).
+          format: double
+          type: number
+        llm_spans_usage:
+          description: The LLM Spans usage by tag(s).
+          format: double
+          type: number
         logs_indexed_15day_percentage:
           description: The percentage of Indexed Logs (15-day Retention) usage by
             tag(s).
@@ -36599,7 +36613,10 @@ paths:
         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```"
+        next_record_id=cursor)\n  cursor := response.metadata.pagination.next_record_id\nEND\n```\nThe
+        following values have been **deprecated**:\n    `estimated_indexed_spans_usage`,
+        `estimated_indexed_spans_percentage`, `estimated_ingested_spans_usage`, `estimated_ingested_spans_percentage`,
+        `llm_observability_usage`, `llm_observability_percentage`."
       operationId: GetHourlyUsageAttribution
       parameters:
       - description: 'Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]`
@@ -37178,7 +37195,7 @@ paths:
           The following values have been **deprecated**:
 
           `estimated_indexed_spans_usage`, `estimated_indexed_spans_percentage`, `estimated_ingested_spans_usage`,
-          `estimated_ingested_spans_percentage`.'
+          `estimated_ingested_spans_percentage`, `llm_observability_usage`, `llm_observability_percentage`.'
         in: query
         name: fields
         required: true

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

@@ -479,7 +479,10 @@ public CompletableFuture<HourlyUsageAttributionResponse> getHourlyUsageAttributi
    *   sleep(5 seconds)  # Avoid running into rate limit
    *   response := GetHourlyUsageAttribution(start_month, next_record_id=cursor)
    *   cursor := response.metadata.pagination.next_record_id
-   * END</code>
+   * END</code> The following values have been <strong>deprecated</strong>: <code>
+   * estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>, <code>
+   * estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage</code>, <code>
+   * llm_observability_usage</code>, <code>llm_observability_percentage</code>.
    *
    * @param startHr Datetime in ISO-8601 format, UTC, precise to hour: <code>[YYYY-MM-DDThh]</code>
    *     for usage beginning at this hour. (required)
@@ -1426,7 +1429,8 @@ public GetMonthlyUsageAttributionOptionalParameters includeDescendants(
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @return MonthlyUsageAttributionResponse
    * @throws ApiException if fails to make API call
    */
@@ -1449,7 +1453,8 @@ startMonth, fields, new GetMonthlyUsageAttributionOptionalParameters())
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @return CompletableFuture&lt;MonthlyUsageAttributionResponse&gt;
    */
   public CompletableFuture<MonthlyUsageAttributionResponse> getMonthlyUsageAttributionAsync(
@@ -1473,7 +1478,8 @@ startMonth, fields, new GetMonthlyUsageAttributionOptionalParameters())
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @param parameters Optional parameters for the request.
    * @return MonthlyUsageAttributionResponse
    * @throws ApiException if fails to make API call
@@ -1497,7 +1503,8 @@ public MonthlyUsageAttributionResponse getMonthlyUsageAttribution(
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;MonthlyUsageAttributionResponse&gt;
    */
@@ -1533,7 +1540,8 @@ public CompletableFuture<MonthlyUsageAttributionResponse> getMonthlyUsageAttribu
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @param parameters Optional parameters for the request.
    * @return ApiResponse&lt;MonthlyUsageAttributionResponse&gt;
    * @throws ApiException if fails to make API call
@@ -1619,7 +1627,8 @@ public ApiResponse<MonthlyUsageAttributionResponse> getMonthlyUsageAttributionWi
    *     types. The following values have been <strong>deprecated</strong>: <code>
    *     estimated_indexed_spans_usage</code>, <code>estimated_indexed_spans_percentage</code>,
    *     <code>estimated_ingested_spans_usage</code>, <code>estimated_ingested_spans_percentage
-   *     </code>. (required)
+   *     </code>, <code>llm_observability_usage</code>, <code>llm_observability_percentage</code>.
+   *     (required)
    * @param parameters Optional parameters for the request.
    * @return CompletableFuture&lt;ApiResponse&lt;MonthlyUsageAttributionResponse&gt;&gt;
    */

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

@@ -72,6 +72,7 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
               "invocations_usage",
               "lambda_traced_invocations_usage",
               "llm_observability_usage",
+              "llm_spans_usage",
               "logs_indexed_15day_usage",
               "logs_indexed_180day_usage",
               "logs_indexed_1day_usage",
@@ -195,6 +196,8 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
       new HourlyUsageAttributionUsageType("lambda_traced_invocations_usage");
   public static final HourlyUsageAttributionUsageType LLM_OBSERVABILITY_USAGE =
       new HourlyUsageAttributionUsageType("llm_observability_usage");
+  public static final HourlyUsageAttributionUsageType LLM_SPANS_USAGE =
+      new HourlyUsageAttributionUsageType("llm_spans_usage");
   public static final HourlyUsageAttributionUsageType LOGS_INDEXED_15DAY_USAGE =
       new HourlyUsageAttributionUsageType("logs_indexed_15day_usage");
   public static final HourlyUsageAttributionUsageType LOGS_INDEXED_180DAY_USAGE =

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

@@ -96,6 +96,8 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
               "lambda_traced_invocations_percentage",
               "llm_observability_usage",
               "llm_observability_percentage",
+              "llm_spans_usage",
+              "llm_spans_percentage",
               "mobile_app_testing_percentage",
               "mobile_app_testing_usage",
               "ndm_netflow_usage",
@@ -328,6 +330,10 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
       new MonthlyUsageAttributionSupportedMetrics("llm_observability_usage");
   public static final MonthlyUsageAttributionSupportedMetrics LLM_OBSERVABILITY_PERCENTAGE =
       new MonthlyUsageAttributionSupportedMetrics("llm_observability_percentage");
+  public static final MonthlyUsageAttributionSupportedMetrics LLM_SPANS_USAGE =
+      new MonthlyUsageAttributionSupportedMetrics("llm_spans_usage");
+  public static final MonthlyUsageAttributionSupportedMetrics LLM_SPANS_PERCENTAGE =
+      new MonthlyUsageAttributionSupportedMetrics("llm_spans_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics MOBILE_APP_TESTING_USAGE =
       new MonthlyUsageAttributionSupportedMetrics("mobile_app_testing_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics MOBILE_APP_TESTING_PERCENTAGE =

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

@@ -100,6 +100,8 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_LAMBDA_TRACED_INVOCATIONS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_LLM_OBSERVABILITY_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_LLM_OBSERVABILITY_USAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_LLM_SPANS_PERCENTAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_LLM_SPANS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_LOGS_INDEXED_15DAY_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_LOGS_INDEXED_15DAY_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_LOGS_INDEXED_180DAY_PERCENTAGE,
@@ -442,6 +444,12 @@ public class MonthlyUsageAttributionValues {
   public static final String JSON_PROPERTY_LLM_OBSERVABILITY_USAGE = "llm_observability_usage";
   private Double llmObservabilityUsage;
 
+  public static final String JSON_PROPERTY_LLM_SPANS_PERCENTAGE = "llm_spans_percentage";
+  private Double llmSpansPercentage;
+
+  public static final String JSON_PROPERTY_LLM_SPANS_USAGE = "llm_spans_usage";
+  private Double llmSpansUsage;
+
   public static final String JSON_PROPERTY_LOGS_INDEXED_15DAY_PERCENTAGE =
       "logs_indexed_15day_percentage";
   private Double logsIndexed15dayPercentage;
@@ -2366,6 +2374,48 @@ public void setLlmObservabilityUsage(Double llmObservabilityUsage) {
     this.llmObservabilityUsage = llmObservabilityUsage;
   }
 
+  public MonthlyUsageAttributionValues llmSpansPercentage(Double llmSpansPercentage) {
+    this.llmSpansPercentage = llmSpansPercentage;
+    return this;
+  }
+
+  /**
+   * The percentage of LLM Spans usage by tag(s).
+   *
+   * @return llmSpansPercentage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_LLM_SPANS_PERCENTAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getLlmSpansPercentage() {
+    return llmSpansPercentage;
+  }
+
+  public void setLlmSpansPercentage(Double llmSpansPercentage) {
+    this.llmSpansPercentage = llmSpansPercentage;
+  }
+
+  public MonthlyUsageAttributionValues llmSpansUsage(Double llmSpansUsage) {
+    this.llmSpansUsage = llmSpansUsage;
+    return this;
+  }
+
+  /**
+   * The LLM Spans usage by tag(s).
+   *
+   * @return llmSpansUsage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_LLM_SPANS_USAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getLlmSpansUsage() {
+    return llmSpansUsage;
+  }
+
+  public void setLlmSpansUsage(Double llmSpansUsage) {
+    this.llmSpansUsage = llmSpansUsage;
+  }
+
   public MonthlyUsageAttributionValues logsIndexed15dayPercentage(
       Double logsIndexed15dayPercentage) {
     this.logsIndexed15dayPercentage = logsIndexed15dayPercentage;
@@ -4153,6 +4203,8 @@ public boolean equals(Object o) {
             monthlyUsageAttributionValues.llmObservabilityPercentage)
         && Objects.equals(
             this.llmObservabilityUsage, monthlyUsageAttributionValues.llmObservabilityUsage)
+        && Objects.equals(this.llmSpansPercentage, monthlyUsageAttributionValues.llmSpansPercentage)
+        && Objects.equals(this.llmSpansUsage, monthlyUsageAttributionValues.llmSpansUsage)
         && Objects.equals(
             this.logsIndexed15dayPercentage,
             monthlyUsageAttributionValues.logsIndexed15dayPercentage)
@@ -4405,6 +4457,8 @@ public int hashCode() {
         lambdaTracedInvocationsUsage,
         llmObservabilityPercentage,
         llmObservabilityUsage,
+        llmSpansPercentage,
+        llmSpansUsage,
         logsIndexed15dayPercentage,
         logsIndexed15dayUsage,
         logsIndexed180dayPercentage,
@@ -4662,6 +4716,8 @@ public String toString() {
     sb.append("    llmObservabilityUsage: ")
         .append(toIndentedString(llmObservabilityUsage))
         .append("\n");
+    sb.append("    llmSpansPercentage: ").append(toIndentedString(llmSpansPercentage)).append("\n");
+    sb.append("    llmSpansUsage: ").append(toIndentedString(llmSpansUsage)).append("\n");
     sb.append("    logsIndexed15dayPercentage: ")
         .append(toIndentedString(logsIndexed15dayPercentage))
         .append("\n");