diff --git a/examples/v2/metrics/UpdateTagIndexingRule.java b/examples/v2/metrics/UpdateTagIndexingRule.java index aacdc6f4e19..f9271aae5e5 100644 --- a/examples/v2/metrics/UpdateTagIndexingRule.java +++ b/examples/v2/metrics/UpdateTagIndexingRule.java @@ -44,7 +44,6 @@ public static void main(String[] args) { .queriedWindowSeconds(3600L)) .overridePreviousRules(false)) .version(1L)) - .ruleOrder(2L) .tags(Arrays.asList("env", "service"))) .type(TagIndexingRuleType.TAG_INDEXING_RULES)); diff --git a/examples/v2/metrics/UpdateTagIndexingRule_4127399471.java b/examples/v2/metrics/UpdateTagIndexingRule_4127399471.java index 53101fae05b..cf74aa213a9 100644 --- a/examples/v2/metrics/UpdateTagIndexingRule_4127399471.java +++ b/examples/v2/metrics/UpdateTagIndexingRule_4127399471.java @@ -45,7 +45,6 @@ public static void main(String[] args) { .managePreexistingMetrics(true) .overridePreviousRules(false)) .version(1L)) - .ruleOrder(2L) .tags(Arrays.asList("env", "service"))) .type(TagIndexingRuleType.TAG_INDEXING_RULES)); diff --git a/src/test/resources/com/datadog/api/client/v2/api/metrics.feature b/src/test/resources/com/datadog/api/client/v2/api/metrics.feature index 2d187a673ec..0c4551409ae 100644 --- a/src/test/resources/com/datadog/api/client/v2/api/metrics.feature +++ b/src/test/resources/com/datadog/api/client/v2/api/metrics.feature @@ -625,7 +625,7 @@ Feature: Metrics When the request is sent Then the response status is 400 Bad Request - @team:ddoghq/metrics-experience + @skip-terraform-config @team:ddoghq/metrics-experience Scenario: Reorder tag indexing rules returns "No Content" response Given a valid "appKeyAuth" key in the system And operation "ReorderTagIndexingRules" enabled @@ -1142,7 +1142,7 @@ Feature: Metrics And there is a valid "tag_indexing_rule" in the system And new "UpdateTagIndexingRule" request And request contains "id" parameter from "tag_indexing_rule.data.id" - And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "rule_order": 2, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}} + And body with value {"data": {"attributes": {"ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {}, "manage_preexisting_metrics": true, "metric_match": {"queried_window_seconds": 3600}, "override_previous_rules": false}, "version": 1}, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}} When the request is sent Then the response status is 200 OK @@ -1153,6 +1153,6 @@ Feature: Metrics And there is a valid "tag_indexing_rule_exclude_mode" in the system And new "UpdateTagIndexingRule" request And request contains "id" parameter from "tag_indexing_rule_exclude_mode.data.id" - And body with value {"data": {"attributes": {"exclude_tags_mode": true, "ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"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": "tag_indexing_rules"}} + And body with value {"data": {"attributes": {"exclude_tags_mode": true, "ignored_metric_name_matches": [], "metric_name_matches": ["dd.test.*"], "name": "my-indexing-rule", "options": {"data": {"dynamic_tags": {"exclude_not_queried_window_seconds": 7200, "exclude_not_used_in_assets": true}, "manage_preexisting_metrics": true, "override_previous_rules": false}, "version": 1}, "tags": ["env", "service"]}, "type": "tag_indexing_rules"}} When the request is sent Then the response status is 200 OK diff --git a/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json b/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json index b389c97a778..c920222d2b4 100644 --- a/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json +++ b/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json @@ -31,7 +31,6 @@ }, "version": 1 }, - "rule_order": 2, "tags": [ "env", "service" diff --git a/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-ok-response.json b/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-ok-response.json index 22a26b035dd..73eba34587d 100644 --- a/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-ok-response.json +++ b/src/test/resources/generated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-ok-response.json @@ -32,7 +32,6 @@ }, "version": 1 }, - "rule_order": 2, "tags": [ "env", "service" diff --git a/src/test/resources/generated-test/test-server-data/v2/metrics.json b/src/test/resources/generated-test/test-server-data/v2/metrics.json index d7e161a016b..4b57257f8c8 100644 --- a/src/test/resources/generated-test/test-server-data/v2/metrics.json +++ b/src/test/resources/generated-test/test-server-data/v2/metrics.json @@ -4817,7 +4817,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-06-04T16:39:38.031Z", + "frozen_at": "2026-10-16T15:24:36.785Z", "interactions": [ { "request": { @@ -4827,9 +4827,9 @@ "data": { "attributes": { "metric_name_matches": [ - "dd.TestUpdateatagindexingrulereturnsOKresponse1780591178.*" + "dd.TestUpdateatagindexingrulereturnsOKresponse1792164276.*" ], - "name": "TestUpdateatagindexingrulereturnsOKresponse1780591178", + "name": "TestUpdateatagindexingrulereturnsOKresponse1792164276", "tags": [ "env", "service" @@ -4847,7 +4847,7 @@ "response": { "body": { "encoding": "text", - "value": "{\"data\":{\"id\":\"c9f5704f-f5b9-4afe-9dec-69edfce00c0a\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:38.068057Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulereturnsOKresponse1780591178.*\"],\"modified_at\":\"2026-06-04T16:39:38.068057Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"TestUpdateatagindexingrulereturnsOKresponse1780591178\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":1,\"tags\":[\"env\",\"service\"]}}}" + "value": "{\"data\":{\"id\":\"4fd3cef3-f631-4688-ab71-8b0278280ce6\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-10-16T15:24:38.92442Z\",\"created_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulereturnsOKresponse1792164276.*\"],\"modified_at\":\"2026-10-16T15:24:38.92442Z\",\"modified_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"name\":\"TestUpdateatagindexingrulereturnsOKresponse1792164276\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":4,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -4879,7 +4879,6 @@ }, "version": 1 }, - "rule_order": 2, "tags": [ "env", "service" @@ -4891,13 +4890,13 @@ }, "content_type": "application/json", "method": "PUT", - "path": "/api/v2/metrics/tag-indexing-rules/c9f5704f-f5b9-4afe-9dec-69edfce00c0a", + "path": "/api/v2/metrics/tag-indexing-rules/4fd3cef3-f631-4688-ab71-8b0278280ce6", "query": [] }, "response": { "body": { "encoding": "text", - "value": "{\"data\":{\"id\":\"c9f5704f-f5b9-4afe-9dec-69edfce00c0a\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-06-04T16:39:38.068057Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-06-04T16:39:38.137079Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{},\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}" + "value": "{\"data\":{\"id\":\"4fd3cef3-f631-4688-ab71-8b0278280ce6\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-10-16T15:24:38.92442Z\",\"created_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"exclude_tags_mode\":false,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-10-16T15:24:39.110625Z\",\"modified_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"metric_match\":{\"queried_window_seconds\":3600}}},\"rule_order\":4,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -4914,7 +4913,7 @@ }, "content_type": "", "method": "DELETE", - "path": "/api/v2/metrics/tag-indexing-rules/c9f5704f-f5b9-4afe-9dec-69edfce00c0a", + "path": "/api/v2/metrics/tag-indexing-rules/4fd3cef3-f631-4688-ab71-8b0278280ce6", "query": [] }, "response": { @@ -4933,7 +4932,7 @@ }, { "feature": "Metrics", - "frozen_at": "2026-07-20T13:47:24.486Z", + "frozen_at": "2026-10-16T15:24:39.321Z", "interactions": [ { "request": { @@ -4944,9 +4943,9 @@ "attributes": { "exclude_tags_mode": true, "metric_name_matches": [ - "dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244.*" + "dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279.*" ], - "name": "TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244", + "name": "TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279", "tags": [ "env", "service" @@ -4964,7 +4963,7 @@ "response": { "body": { "encoding": "text", - "value": "{\"data\":{\"id\":\"e4a507ac-ee83-439b-bf65-72d162150e3c\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-07-20T13:47:24.568418Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":true,\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244.*\"],\"modified_at\":\"2026-07-20T13:47:24.568418Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":1,\"tags\":[\"env\",\"service\"]}}}" + "value": "{\"data\":{\"id\":\"64083bbc-4c4a-4408-90d7-b1225da802e2\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-10-16T15:24:39.44276Z\",\"created_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"exclude_tags_mode\":true,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279.*\"],\"modified_at\":\"2026-10-16T15:24:39.44276Z\",\"modified_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"name\":\"TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true}},\"rule_order\":4,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -4997,7 +4996,6 @@ }, "version": 1 }, - "rule_order": 2, "tags": [ "env", "service" @@ -5009,13 +5007,13 @@ }, "content_type": "application/json", "method": "PUT", - "path": "/api/v2/metrics/tag-indexing-rules/e4a507ac-ee83-439b-bf65-72d162150e3c", + "path": "/api/v2/metrics/tag-indexing-rules/64083bbc-4c4a-4408-90d7-b1225da802e2", "query": [] }, "response": { "body": { "encoding": "text", - "value": "{\"data\":{\"id\":\"e4a507ac-ee83-439b-bf65-72d162150e3c\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-07-20T13:47:24.568418Z\",\"created_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"exclude_tags_mode\":true,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-07-20T13:47:24.708603Z\",\"modified_by_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{\"exclude_not_queried_window_seconds\":7200,\"exclude_not_used_in_assets\":true}}},\"rule_order\":2,\"tags\":[\"env\",\"service\"]}}}" + "value": "{\"data\":{\"id\":\"64083bbc-4c4a-4408-90d7-b1225da802e2\",\"type\":\"tag_indexing_rules\",\"attributes\":{\"created_at\":\"2026-10-16T15:24:39.44276Z\",\"created_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"exclude_tags_mode\":true,\"ignored_metric_name_matches\":[],\"metric_name_matches\":[\"dd.test.*\"],\"modified_at\":\"2026-10-16T15:24:39.607913Z\",\"modified_by_handle\":\"cedric.vanrompay@datadoghq.com\",\"name\":\"my-indexing-rule\",\"options\":{\"version\":1,\"data\":{\"override_previous_rules\":false,\"manage_preexisting_metrics\":true,\"dynamic_tags\":{\"exclude_not_queried_window_seconds\":7200,\"exclude_not_used_in_assets\":true}}},\"rule_order\":4,\"tags\":[\"env\",\"service\"]}}}" }, "headers": { "content-type": "application/vnd.api+json" @@ -5032,7 +5030,7 @@ }, "content_type": "", "method": "DELETE", - "path": "/api/v2/metrics/tag-indexing-rules/e4a507ac-ee83-439b-bf65-72d162150e3c", + "path": "/api/v2/metrics/tag-indexing-rules/64083bbc-4c4a-4408-90d7-b1225da802e2", "query": [] }, "response": {