Skip to content

fix: Make tag indexing rule synthetic tests independent of shared org state #4468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dd-octo-sts wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Make tag indexing rule synthetic tests independent of shared org state #4468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/v2/metrics/UpdateTagIndexingRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
1 change: 0 additions & 1 deletion examples/v2/metrics/UpdateTagIndexingRule_4127399471.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/com/datadog/api/client/v2/api/metrics.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
1 change: 0 additions & 1 deletion ...ated-test/test-runner-data/v2/metrics/update-a-tag-indexing-rule-returns-ok-response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
},
"version": 1
},
"rule_order": 2,
"tags": [
"env",
"service"
Expand Down
1 change: 0 additions & 1 deletion ...cs/update-a-tag-indexing-rule-with-exclude-mode-tag-usage-fields-returns-ok-response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
},
"version": 1
},
"rule_order": 2,
"tags": [
"env",
"service"
Expand Down
30 changes: 14 additions & 16 deletions src/test/resources/generated-test/test-server-data/v2/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,7 +4817,7 @@
},
{
"feature": "Metrics",
"frozen_at": "2026-06-04T16:39:38.031Z",
"frozen_at": "2026-10-16T15:24:36.785Z",
"interactions": [
{
"request": {
Expand All @@ -4827,9 +4827,9 @@
"data": {
"attributes": {
"metric_name_matches": [
"dd.TestUpdateatagindexingrulereturnsOKresponse1780591178.*"
"dd.TestUpdateatagindexingrulereturnsOKresponse1792164276.*"
],
"name": "TestUpdateatagindexingrulereturnsOKresponse1780591178",
"name": "TestUpdateatagindexingrulereturnsOKresponse1792164276",
"tags": [
"env",
"service"
Expand All @@ -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"
Expand Down Expand Up @@ -4879,7 +4879,6 @@
},
"version": 1
},
"rule_order": 2,
"tags": [
"env",
"service"
Expand All @@ -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"
Expand All @@ -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": {
Expand All @@ -4933,7 +4932,7 @@
},
{
"feature": "Metrics",
"frozen_at": "2026-07-20T13:47:24.486Z",
"frozen_at": "2026-10-16T15:24:39.321Z",
"interactions": [
{
"request": {
Expand All @@ -4944,9 +4943,9 @@
"attributes": {
"exclude_tags_mode": true,
"metric_name_matches": [
"dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244.*"
"dd.TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279.*"
],
"name": "TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1784555244",
"name": "TestUpdateatagindexingrulewithexcludemodetagusagefieldsreturnsOKresponse1792164279",
"tags": [
"env",
"service"
Expand All @@ -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"
Expand Down Expand Up @@ -4997,7 +4996,6 @@
},
"version": 1
},
"rule_order": 2,
"tags": [
"env",
"service"
Expand All @@ -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"
Expand All @@ -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": {
Expand Down
Loading