[pull] master from DataDog:master

.generator/schemas/v2/openapi.yaml

@@ -104076,8 +104076,29 @@ components:
           $ref: "#/components/schemas/TagIndexingRuleType"
       type: object
     TagIndexingRuleDynamicTags:
-      description: Configuration for including dynamically queried tags.
+      description: |-
+        Options for dynamic tag indexing applied per metric, such as tags filtered by query usage.
+
+        Before a tag key is dropped by this rule, two grace period conditions must be met:
+
+        1. The metric must be submitted for at least as long as the selected window.
+        2. A tag key must have been submitted for at least 15 days.
+
+        Any metric or tag key that does not meet these conditions are excluded from this
+        indexing rule. The `exclude_not_*` fields require `exclude_tags_mode` to be set to `true`.
       properties:
+        exclude_not_queried_window_seconds:
+          description: >-
+            Tags that have not been queried within this window are excluded from indexing. Maximum of `7776000` (90 days).
+          example: 3600
+          format: int64
+          maximum: 7776000
+          type: integer
+        exclude_not_used_in_assets:
+          description: >-
+            Tags not used in any dashboards,  monitors, notebooks, or SLOs are excluded from indexing.
+          example: false
+          type: boolean
         queried_tags_window_seconds:
           description: Window in seconds for evaluating queried tags.
           example: 3600

cassettes/features/v2/metrics/Create-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-Created-response.frozen

@@ -0,0 +1 @@
+2026-07-20T13:47:22.097Z

cassettes/features/v2/metrics/Create-a-tag-indexing-rule-with-exclude-not-queried-window-seconds-and-exclude-tags-mode-false-returns-Bad-Request-response.frozen

@@ -0,0 +1 @@
+2026-07-20T13:47:24.179Z

cassettes/features/v2/metrics/Create-a-tag-indexing-rule-with-exclude-not-queried-window-seconds-over-the-maximum-returns-Bad-Request-response.frozen

@@ -0,0 +1 @@
+2026-07-20T13:47:24.273Z

cassettes/features/v2/metrics/Create-a-tag-indexing-rule-with-exclude-not-used-in-assets-and-exclude-tags-mode-false-returns-Bad-Request-response.frozen

@@ -0,0 +1 @@
+2026-07-20T13:47:24.367Z

cassettes/features/v2/metrics/Update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-OK-response.frozen

@@ -0,0 +1 @@
+2026-07-20T13:47:24.486Z

examples/v2/metrics/CreateTagIndexingRule_2435129406.rb

@@ -0,0 +1,37 @@
+# Create a tag indexing rule with exclude-mode tag usage fields returns "Created" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.create_tag_indexing_rule".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::MetricsAPI.new
+
+body = DatadogAPIClient::V2::TagIndexingRuleCreateRequest.new({
+  data: DatadogAPIClient::V2::TagIndexingRuleCreateData.new({
+    attributes: DatadogAPIClient::V2::TagIndexingRuleCreateAttributes.new({
+      exclude_tags_mode: true,
+      ignored_metric_name_matches: [],
+      metric_name_matches: [
+        "dd.test.*",
+      ],
+      name: "my-indexing-rule",
+      options: DatadogAPIClient::V2::TagIndexingRuleOptions.new({
+        data: DatadogAPIClient::V2::TagIndexingRuleOptionsData.new({
+          dynamic_tags: DatadogAPIClient::V2::TagIndexingRuleDynamicTags.new({
+            exclude_not_queried_window_seconds: 3600,
+            exclude_not_used_in_assets: true,
+          }),
+          manage_preexisting_metrics: true,
+          override_previous_rules: false,
+        }),
+        version: 1,
+      }),
+      tags: [
+        "env",
+        "service",
+      ],
+    }),
+    type: DatadogAPIClient::V2::TagIndexingRuleType::TAG_INDEXING_RULES,
+  }),
+})
+p api_instance.create_tag_indexing_rule(body)

examples/v2/metrics/UpdateTagIndexingRule_4127399471.rb

@@ -0,0 +1,41 @@
+# Update a tag indexing rule with exclude-mode tag usage fields returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient.configure do |config|
+  config.unstable_operations["v2.update_tag_indexing_rule".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::MetricsAPI.new
+
+# there is a valid "tag_indexing_rule_exclude_mode" in the system
+TAG_INDEXING_RULE_EXCLUDE_MODE_DATA_ID = ENV["TAG_INDEXING_RULE_EXCLUDE_MODE_DATA_ID"]
+
+body = DatadogAPIClient::V2::TagIndexingRuleUpdateRequest.new({
+  data: DatadogAPIClient::V2::TagIndexingRuleUpdateData.new({
+    attributes: DatadogAPIClient::V2::TagIndexingRuleUpdateAttributes.new({
+      exclude_tags_mode: true,
+      ignored_metric_name_matches: [],
+      metric_name_matches: [
+        "dd.test.*",
+      ],
+      name: "my-indexing-rule",
+      options: DatadogAPIClient::V2::TagIndexingRuleOptions.new({
+        data: DatadogAPIClient::V2::TagIndexingRuleOptionsData.new({
+          dynamic_tags: DatadogAPIClient::V2::TagIndexingRuleDynamicTags.new({
+            exclude_not_queried_window_seconds: 7200,
+            exclude_not_used_in_assets: true,
+          }),
+          manage_preexisting_metrics: true,
+          override_previous_rules: false,
+        }),
+        version: 1,
+      }),
+      rule_order: 2,
+      tags: [
+        "env",
+        "service",
+      ],
+    }),
+    type: DatadogAPIClient::V2::TagIndexingRuleType::TAG_INDEXING_RULES,
+  }),
+})
+p api_instance.update_tag_indexing_rule(TAG_INDEXING_RULE_EXCLUDE_MODE_DATA_ID, body)

features/v2/given.json

@@ -954,6 +954,18 @@
     "tag": "Metrics",
     "operationId": "CreateTagIndexingRule"
   },
+  {
+    "parameters": [
+      {
+        "name": "body",
+        "value": "{\n  \"data\": {\n    \"type\": \"tag_indexing_rules\",\n    \"attributes\": {\n      \"name\": \"{{ unique_alnum }}\",\n      \"exclude_tags_mode\": true,\n      \"metric_name_matches\": [\"dd.{{ unique_alnum }}.*\"],\n      \"tags\": [\"env\", \"service\"]\n    }\n  }\n}"
+      }
+    ],
+    "step": "there is a valid \"tag_indexing_rule_exclude_mode\" in the system",
+    "key": "tag_indexing_rule_exclude_mode",
+    "tag": "Metrics",
+    "operationId": "CreateTagIndexingRule"
+  },
   {
     "parameters": [
       {