Expose usage-attribution-types publicly and update attribution descriptions

.generator/schemas/v1/openapi.yaml

@@ -4506,10 +4506,11 @@ components:
           type: array
       type: object
     HourlyUsageAttributionUsageType:
-      description: 'Supported products for hourly usage attribution requests.
+      description: 'Supported products for hourly usage attribution requests. Usage
+        types are in the format `<usage_type>_usage`.
 
-        The following values have been **deprecated**: `estimated_indexed_spans_usage`,
-        `estimated_ingested_spans_usage`.'
+        To obtain the complete list of valid usage types, make a request to the [Get
+        usage attribution types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types).'
       enum:
       - api_usage
       - apm_fargate_usage
@@ -9059,7 +9060,11 @@ components:
           type: array
       type: object
     MonthlyUsageAttributionSupportedMetrics:
-      description: Supported metrics for monthly usage attribution requests.
+      description: 'Supported metrics for monthly usage attribution requests. Usage
+        types are in the format `<usage_type>_usage`.
+
+        To obtain the complete list of valid usage types, make a request to the [Get
+        usage attribution types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types).'
       enum:
       - api_usage
       - api_percentage
@@ -9390,10 +9395,7 @@ components:
       - SCA_FARGATE_PERCENTAGE
       - ALL
     MonthlyUsageAttributionValues:
-      description: 'Fields in Usage Summary by tag(s).
-
-        The following values have been **deprecated**: `estimated_indexed_spans_usage`,
-        `estimated_indexed_spans_percentage`, `estimated_ingested_spans_usage`, `estimated_ingested_spans_percentage`.'
+      description: Fields in Usage Summary by tag(s).
       properties:
         api_percentage:
           description: The percentage of synthetic API test usage by tag(s).
@@ -37274,10 +37276,7 @@ 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```\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`."
+        next_record_id=cursor)\n  cursor := response.metadata.pagination.next_record_id\nEND\n```"
       operationId: GetHourlyUsageAttribution
       parameters:
       - description: 'Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]`
@@ -37298,9 +37297,14 @@ paths:
         schema:
           format: date-time
           type: string
-      - description: 'Usage type to retrieve. The following values have been **deprecated**:
+      - description: 'Usage type to retrieve. Usage types are in the format `<usage_type>_usage`.
+
+          Example: `infra_host_usage`
 
-          `estimated_indexed_spans_usage`, `estimated_ingested_spans_usage`.'
+          To obtain the complete list of active usage types that can be used to replace
+
+          `<usage_type>` in the field names, make a request to the [Get usage attribution
+          types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types).'
         in: query
         name: usage_type
         required: true
@@ -37853,10 +37857,15 @@ paths:
       - description: 'Comma-separated list of usage types to return, or `*` for all
           usage types.
 
-          The following values have been **deprecated**:
+          Usage types are in the format `<usage_type>_usage` and `<usage_type>_percentage`.
+
+          Example: `infra_host_usage,infra_host_percentage`
 
-          `estimated_indexed_spans_usage`, `estimated_indexed_spans_percentage`, `estimated_ingested_spans_usage`,
-          `estimated_ingested_spans_percentage`, `llm_observability_usage`, `llm_observability_percentage`.'
+          To obtain the complete list of usage attribution types that can be used
+          to replace
+
+          `<usage_type>` in the field names, make a request to the [Get usage attribution
+          types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types).'
         in: query
         name: fields
         required: true
@@ -37868,12 +37877,15 @@ paths:
         required: false
         schema:
           $ref: '#/components/schemas/UsageSortDirection'
-      - description: 'The field to sort by.
+      - description: 'The field to sort by. Sort fields are in the format `<usage_type>_usage`.
+
+          Example: `infra_host_usage`
 
-          The following values have been **deprecated**:
+          To obtain the complete list of usage attribution types that can be used
+          to replace
 
-          `estimated_indexed_spans_usage`, `estimated_indexed_spans_percentage`, `estimated_ingested_spans_usage`,
-          `estimated_ingested_spans_percentage`.'
+          `<usage_type>` in the field names, make a request to the [Get usage attribution
+          types API](https://docs.datadoghq.com/api/latest/usage-metering/#get-usage-attribution-types).'
         in: query
         name: sort_name
         required: false

.generator/schemas/v2/openapi.yaml

@@ -69185,6 +69185,42 @@ components:
         usage_type:
           $ref: '#/components/schemas/HourlyUsageType'
       type: object
+    UsageAttributionTypesAttributes:
+      description: List of usage attribution types.
+      properties:
+        values:
+          description: List of usage attribution types.
+          items:
+            description: A given usage type in a list.
+            example: infra_host
+            type: string
+          type: array
+      type: object
+    UsageAttributionTypesBody:
+      description: Usage attribution types data.
+      properties:
+        attributes:
+          $ref: '#/components/schemas/UsageAttributionTypesAttributes'
+        id:
+          description: Unique ID of the response.
+          type: string
+        type:
+          $ref: '#/components/schemas/UsageAttributionTypesType'
+      type: object
+    UsageAttributionTypesResponse:
+      description: Usage attribution types response.
+      properties:
+        data:
+          $ref: '#/components/schemas/UsageAttributionTypesBody'
+      type: object
+    UsageAttributionTypesType:
+      default: usage_attribution_types
+      description: Type of usage attribution types data.
+      enum:
+      - usage_attribution_types
+      type: string
+      x-enum-varnames:
+      - USAGE_ATTRIBUTION_TYPES
     UsageDataObject:
       description: Usage data.
       properties:
@@ -107077,6 +107113,41 @@ paths:
         permissions:
         - usage_read
         - billing_read
+  /api/v2/usage/usage-attribution-types:
+    get:
+      description: Get usage attribution types.
+      operationId: GetUsageAttributionTypes
+      responses:
+        '200':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/UsageAttributionTypesResponse'
+          description: OK
+        '403':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/APIErrorResponse'
+          description: Forbidden - User is not authorized
+        '429':
+          content:
+            application/json;datetime-format=rfc3339:
+              schema:
+                $ref: '#/components/schemas/APIErrorResponse'
+          description: Too many requests
+      security:
+      - apiKeyAuth: []
+        appKeyAuth: []
+      - AuthZ:
+        - usage_read
+      summary: Get usage attribution types
+      tags:
+      - Usage Metering
+      x-permission:
+        operator: OR
+        permissions:
+        - usage_read
   /api/v2/user_invitations:
     post:
       description: Sends emails to one or more users inviting them to join the organization.

examples/v2/usage-metering/GetUsageAttributionTypes.java

@@ -0,0 +1,24 @@
+// Get usage attribution types returns "OK" response
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v2.api.UsageMeteringApi;
+import com.datadog.api.client.v2.model.UsageAttributionTypesResponse;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    UsageMeteringApi apiInstance = new UsageMeteringApi(defaultClient);
+
+    try {
+      UsageAttributionTypesResponse result = apiInstance.getUsageAttributionTypes();
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling UsageMeteringApi#getUsageAttributionTypes");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}