Skip to content
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

Fix spans/logs custom metrics delete operation responses #1953

Merged
merged 1 commit into from
Apr 18, 2023
Merged

Fix spans/logs custom metrics delete operation responses #1953

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
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.4",
"regenerated": "2023-04-17 18:07:40.313240",
"spec_repo_commit": "25a92e6d"
"regenerated": "2023-04-18 17:35:10.087050",
"spec_repo_commit": "0c4beb36"
},
"v2": {
"apigentools_version": "1.6.4",
"regenerated": "2023-04-17 18:07:40.326034",
"spec_repo_commit": "25a92e6d"
"regenerated": "2023-04-18 17:35:10.100374",
"spec_repo_commit": "0c4beb36"
}
}
}
4 changes: 2 additions & 2 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14564,7 +14564,7 @@ paths:
parameters:
- $ref: '#/components/parameters/SpansMetricIDParameter'
responses:
'200':
'204':
description: OK
'403':
$ref: '#/components/responses/NotAuthorizedResponse'
Expand Down Expand Up @@ -18090,7 +18090,7 @@ paths:
parameters:
- $ref: '#/components/parameters/MetricID'
responses:
'200':
'204':
description: OK
'403':
$ref: '#/components/responses/NotAuthorizedResponse'
Expand Down
2 changes: 1 addition & 1 deletion ...ios/v2/Feature_Logs_Metrics/Scenario_Delete_a_log-based_metric_returns_OK_response.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2022-05-12T09:52:23.762Z
2023-04-18T17:27:11.097Z
24 changes: 14 additions & 10 deletions ...arios/v2/Feature_Logs_Metrics/Scenario_Delete_a_log-based_metric_returns_OK_response.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: |
{"data":{"attributes":{"compute":{"aggregation_type":"count"},"filter":{"query":"source:Test-Delete_a_log_based_metric_returns_OK_response-1652349143"}},"id":"Test-Delete_a_log_based_metric_returns_OK_response-1652349143","type":"logs_metrics"}}
{"data":{"attributes":{"compute":{"aggregation_type":"count"},"filter":{"query":"source:Test-Delete_a_log_based_metric_returns_OK_response-1681838831"}},"id":"Test-Delete_a_log_based_metric_returns_OK_response-1681838831","type":"logs_metrics"}}
form: {}
headers:
Accept:
Expand All @@ -11,7 +11,9 @@ interactions:
method: POST
url: https://api.datadoghq.com/api/v2/logs/config/metrics
response:
body: '{"data":{"attributes":{"filter":{"query":"source:Test-Delete_a_log_based_metric_returns_OK_response-1652349143"},"group_by":[],"compute":{"aggregation_type":"count"}},"type":"logs_metrics","id":"Test_Delete_a_log_based_metric_returns_OK_response_1652349143"}}'
body: '{"data":{"id":"Test_Delete_a_log_based_metric_returns_OK_response_1681838831","attributes":{"filter":{"query":"source:Test-Delete_a_log_based_metric_returns_OK_response-1681838831"},"group_by":[],"compute":{"aggregation_type":"count"}},"type":"logs_metrics"}}
'
code: 200
duration: ''
headers:
Expand All @@ -25,26 +27,28 @@ interactions:
Accept:
- '*/*'
method: DELETE
url: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Delete_a_log_based_metric_returns_OK_response_1652349143
url: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Delete_a_log_based_metric_returns_OK_response_1681838831
response:
body: '{}'
code: 200
body: ''
code: 204
duration: ''
headers:
Content-Type:
- application/json
status: 200 OK
- text/html; charset=utf-8
status: 204 No Content
- request:
body: ''
form: {}
headers:
Accept:
- '*/*'
method: DELETE
url: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Delete_a_log_based_metric_returns_OK_response_1652349143
url: https://api.datadoghq.com/api/v2/logs/config/metrics/Test_Delete_a_log_based_metric_returns_OK_response_1681838831
response:
body: '{"errors":["not_found(Metric with name ''Test_Delete_a_log_based_metric_returns_OK_response_1652349143''
not found)"]}'
body: '{"errors":["not_found(Metric with name ''Test_Delete_a_log_based_metric_returns_OK_response_1681838831''
not found)"]}
'
code: 404
duration: ''
headers:
Expand Down
2 changes: 1 addition & 1 deletion ...s/v2/Feature_Spans_Metrics/Scenario_Delete_a_span-based_metric_returns_OK_response.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2023-03-28T14:55:25.279Z
2023-04-18T17:28:08.946Z
20 changes: 9 additions & 11 deletions ...ios/v2/Feature_Spans_Metrics/Scenario_Delete_a_span-based_metric_returns_OK_response.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interactions:
- request:
body: |
{"data":{"attributes":{"compute":{"aggregation_type":"distribution","include_percentiles":false,"path":"@duration"},"filter":{"query":"source:Test-Delete_a_span_based_metric_returns_OK_response-1680015325"},"group_by":[{"path":"resource_name","tag_name":"resource_name"}]},"id":"Test-Delete_a_span_based_metric_returns_OK_response-1680015325","type":"spans_metrics"}}
{"data":{"attributes":{"compute":{"aggregation_type":"distribution","include_percentiles":false,"path":"@duration"},"filter":{"query":"source:Test-Delete_a_span_based_metric_returns_OK_response-1681838888"},"group_by":[{"path":"resource_name","tag_name":"resource_name"}]},"id":"Test-Delete_a_span_based_metric_returns_OK_response-1681838888","type":"spans_metrics"}}
form: {}
headers:
Accept:
Expand All @@ -11,7 +11,7 @@ interactions:
method: POST
url: https://api.datadoghq.com/api/v2/apm/config/metrics
response:
body: '{"data":{"id":"Test_Delete_a_span_based_metric_returns_OK_response_1680015325","attributes":{"filter":{"query":"source:Test-Delete_a_span_based_metric_returns_OK_response-1680015325"},"group_by":[{"path":"resource_name","tag_name":"resource_name"}],"compute":{"aggregation_type":"distribution","path":"@duration","include_percentiles":false}},"type":"spans_metrics"}}
body: '{"data":{"id":"Test_Delete_a_span_based_metric_returns_OK_response_1681838888","attributes":{"filter":{"query":"source:Test-Delete_a_span_based_metric_returns_OK_response-1681838888"},"group_by":[{"path":"resource_name","tag_name":"resource_name"}],"compute":{"aggregation_type":"distribution","path":"@duration","include_percentiles":false}},"type":"spans_metrics"}}
'
code: 200
Expand All @@ -27,27 +27,25 @@ interactions:
Accept:
- '*/*'
method: DELETE
url: https://api.datadoghq.com/api/v2/apm/config/metrics/Test_Delete_a_span_based_metric_returns_OK_response_1680015325
url: https://api.datadoghq.com/api/v2/apm/config/metrics/Test_Delete_a_span_based_metric_returns_OK_response_1681838888
response:
body: '{}
'
code: 200
body: ''
code: 204
duration: ''
headers:
Content-Type:
- application/json
status: 200 OK
- text/html; charset=utf-8
status: 204 No Content
- request:
body: ''
form: {}
headers:
Accept:
- '*/*'
method: DELETE
url: https://api.datadoghq.com/api/v2/apm/config/metrics/Test_Delete_a_span_based_metric_returns_OK_response_1680015325
url: https://api.datadoghq.com/api/v2/apm/config/metrics/Test_Delete_a_span_based_metric_returns_OK_response_1681838888
response:
body: '{"errors":["not_found(Metric with name ''Test_Delete_a_span_based_metric_returns_OK_response_1680015325''
body: '{"errors":["not_found(Metric with name ''Test_Delete_a_span_based_metric_returns_OK_response_1681838888''
not found)"]}
'
Expand Down
2 changes: 1 addition & 1 deletion tests/scenarios/features/v2/logs_metrics.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Feature: Logs Metrics
And new "DeleteLogsMetric" request
And request contains "metric_id" parameter from "logs_metric.data.id"
When the request is sent
Then the response status is 200 OK
Then the response status is 204 OK

@generated @skip @team:DataDog/logs-backend
Scenario: Get a log-based metric returns "Not Found" response
Expand Down
2 changes: 1 addition & 1 deletion tests/scenarios/features/v2/spans_metrics.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Feature: Spans Metrics
And new "DeleteSpansMetric" request
And request contains "metric_id" parameter from "spans_metric.data.id"
When the request is sent
Then the response status is 200 OK
Then the response status is 204 OK

@generated @skip @team:DataDog/apm
Scenario: Get a span-based metric returns "Not Found" response
Expand Down