Skip to content

Commit b650656

Browse files
api-clients-generation-pipeline[bot]therveci.datadog-api-spec
authored
FIx handling of log aggregation oneOf in Python (#165)
* Re-record * Regenerate client from commit b3fffea of spec repo Co-authored-by: Thomas Hervé <[email protected]> Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent e9e472b commit b650656

File tree

6 files changed

+201
-25
lines changed

6 files changed

+201
-25
lines changed

‎.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.4.1.dev8",
7-
"regenerated": "2021-06-03 18:56:27.021588",
8-
"spec_repo_commit": "eb061ac"
7+
"regenerated": "2021-06-04 09:05:19.498956",
8+
"spec_repo_commit": "b3fffea"
99
},
1010
"v2": {
1111
"apigentools_version": "1.4.1.dev8",
12-
"regenerated": "2021-06-03 18:57:10.950090",
13-
"spec_repo_commit": "eb061ac"
12+
"regenerated": "2021-06-04 09:06:11.110083",
13+
"spec_repo_commit": "b3fffea"
1414
}
1515
}
1616
}

‎cassettes/v2/Logs_1370058150/Aggregate-compute-events-returns-OK-response_3862097832/frozen.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"2021-06-02T10:09:20.065Z"

‎cassettes/v2/Logs_1370058150/Aggregate-compute-events-returns-OK-response_3862097832/recording.har

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"log": {
3+
"_recordingName": "Logs/Aggregate compute events returns \"OK\" response",
4+
"creator": {
5+
"comment": "persister:fs",
6+
"name": "Polly.JS",
7+
"version": "5.1.0"
8+
},
9+
"entries": [
10+
{
11+
"_id": "b8b8b5237ecbd09f8b8e2a6025ebb198",
12+
"_order": 0,
13+
"cache": {},
14+
"request": {
15+
"bodySize": 143,
16+
"cookies": [],
17+
"headers": [
18+
{
19+
"_fromType": "array",
20+
"name": "user-agent",
21+
"value": "datadog-api-client-typescript/0.1.0 (node 15.11.0; os Darwin; arch x64)"
22+
},
23+
{
24+
"_fromType": "array",
25+
"name": "accept",
26+
"value": "application/json, */*;q=0.8"
27+
},
28+
{
29+
"_fromType": "array",
30+
"name": "content-type",
31+
"value": "application/json"
32+
},
33+
{
34+
"_fromType": "array",
35+
"name": "x-datadog-parent-id",
36+
"value": "2282340330001095403"
37+
},
38+
{
39+
"_fromType": "array",
40+
"name": "x-datadog-trace-id",
41+
"value": "2282340330001095403"
42+
},
43+
{
44+
"_fromType": "array",
45+
"name": "content-length",
46+
"value": "143"
47+
},
48+
{
49+
"_fromType": "array",
50+
"name": "connection",
51+
"value": "close"
52+
},
53+
{
54+
"name": "host",
55+
"value": "api.datadoghq.com"
56+
}
57+
],
58+
"headersSize": 485,
59+
"httpVersion": "HTTP/1.1",
60+
"method": "POST",
61+
"postData": {
62+
"mimeType": "application/json",
63+
"params": [],
64+
"text": "{\"compute\":[{\"aggregation\":\"count\",\"interval\":\"5m\",\"type\":\"timeseries\"}],\"filter\":{\"from\":\"now-15m\",\"indexes\":[\"main\"],\"query\":\"*\",\"to\":\"now\"}}"
65+
},
66+
"queryString": [],
67+
"url": "https://api.datadoghq.com/api/v2/logs/analytics/aggregate"
68+
},
69+
"response": {
70+
"bodySize": 297,
71+
"content": {
72+
"mimeType": "application/json",
73+
"size": 297,
74+
"text": "{\"meta\":{\"status\":\"done\",\"request_id\":\"pddv1ChZocmNxWUhOUlM2YVlldlFVVE4weWpnIi0KHZuyJ0Izc6WTvx6409xTlRS_iRRFg3jYVKiLIjbAEgzPt5RlpUdFAOXBR30\",\"elapsed\":3},\"data\":{\"buckets\":[{\"computes\":{\"c0\":[{\"value\":1,\"time\":\"2021-06-02T10:00:00.000Z\"},{\"value\":6,\"time\":\"2021-06-02T10:05:00.000Z\"}]},\"by\":{}}]}}"
75+
},
76+
"cookies": [],
77+
"headers": [
78+
{
79+
"name": "date",
80+
"value": "Wed, 02 Jun 2021 10:09:20 GMT"
81+
},
82+
{
83+
"name": "content-type",
84+
"value": "application/json"
85+
},
86+
{
87+
"name": "content-length",
88+
"value": "297"
89+
},
90+
{
91+
"name": "connection",
92+
"value": "close"
93+
},
94+
{
95+
"name": "vary",
96+
"value": "Accept-Encoding"
97+
},
98+
{
99+
"name": "pragma",
100+
"value": "no-cache"
101+
},
102+
{
103+
"name": "cache-control",
104+
"value": "no-cache"
105+
},
106+
{
107+
"name": "x-dd-version",
108+
"value": "35.4656181"
109+
},
110+
{
111+
"name": "x-ratelimit-limit",
112+
"value": "300"
113+
},
114+
{
115+
"name": "x-ratelimit-period",
116+
"value": "300"
117+
},
118+
{
119+
"name": "x-ratelimit-reset",
120+
"value": "40"
121+
},
122+
{
123+
"name": "x-ratelimit-remaining",
124+
"value": "296"
125+
},
126+
{
127+
"name": "x-dd-debug",
128+
"value": "vdJ3/nHEY1ioXQ6pQrBVvsQK1s4yyc+wufBMPSoXql71qZVuP/xMdtNo6DafhOAk"
129+
},
130+
{
131+
"name": "x-content-type-options",
132+
"value": "nosniff"
133+
},
134+
{
135+
"name": "strict-transport-security",
136+
"value": "max-age=15724800;"
137+
},
138+
{
139+
"name": "content-security-policy",
140+
"value": "frame-ancestors 'self'; report-uri https://api.datadoghq.com/csp-report"
141+
},
142+
{
143+
"name": "x-frame-options",
144+
"value": "SAMEORIGIN"
145+
}
146+
],
147+
"headersSize": 587,
148+
"httpVersion": "HTTP/1.1",
149+
"redirectURL": "",
150+
"status": 200,
151+
"statusText": "OK"
152+
},
153+
"startedDateTime": "2021-06-02T10:09:20.087Z",
154+
"time": 493,
155+
"timings": {
156+
"blocked": -1,
157+
"connect": -1,
158+
"dns": -1,
159+
"receive": 0,
160+
"send": 0,
161+
"ssl": -1,
162+
"wait": 493
163+
}
164+
}
165+
],
166+
"pages": [],
167+
"version": "1.2"
168+
}
169+
}

‎cassettes/v2/Logs_1370058150/Aggregate-events-returns-OK-response_3657265095/frozen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
"2021-04-15T13:02:08.744Z"
1+
"2021-06-02T10:09:20.667Z"

‎cassettes/v2/Logs_1370058150/Aggregate-events-returns-OK-response_3657265095/recording.har

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
},
99
"entries": [
1010
{
11-
"_id": "bfd251f4ca71529cae98910729afd843",
11+
"_id": "d8553d152e86b1e781d128c6d385355b",
1212
"_order": 0,
1313
"cache": {},
1414
"request": {
15-
"bodySize": 247,
15+
"bodySize": 71,
1616
"cookies": [],
1717
"headers": [
1818
{
@@ -33,17 +33,17 @@
3333
{
3434
"_fromType": "array",
3535
"name": "x-datadog-parent-id",
36-
"value": "5095942047695828255"
36+
"value": "2282340330001095403"
3737
},
3838
{
3939
"_fromType": "array",
4040
"name": "x-datadog-trace-id",
41-
"value": "5095942047695828255"
41+
"value": "2282340330001095403"
4242
},
4343
{
4444
"_fromType": "array",
4545
"name": "content-length",
46-
"value": "247"
46+
"value": "71"
4747
},
4848
{
4949
"_fromType": "array",
@@ -55,37 +55,37 @@
5555
"value": "api.datadoghq.com"
5656
}
5757
],
58-
"headersSize": 485,
58+
"headersSize": 484,
5959
"httpVersion": "HTTP/1.1",
6060
"method": "POST",
6161
"postData": {
6262
"mimeType": "application/json",
6363
"params": [],
64-
"text": "{\"compute\":[{\"aggregation\":\"count\",\"interval\":\"300\",\"metric\":\"test.aggregation.Test-Aggregate_events_returns_OK_response-1618491728\",\"type\":\"timeseries\"}],\"filter\":{\"from\":\"1600348573\",\"indexes\":[\"main\"],\"query\":\"datadog-agent\",\"to\":\"1600348600\"}}"
64+
"text": "{\"filter\":{\"from\":\"now-15m\",\"indexes\":[\"main\"],\"query\":\"*\",\"to\":\"now\"}}"
6565
},
6666
"queryString": [],
6767
"url": "https://api.datadoghq.com/api/v2/logs/analytics/aggregate"
6868
},
6969
"response": {
70-
"bodySize": 176,
70+
"bodySize": 204,
7171
"content": {
7272
"mimeType": "application/json",
73-
"size": 176,
74-
"text": "{\"meta\":{\"status\":\"done\",\"request_id\":\"pddv1ChZ3anZVV0pVLVRDNi1jZ3RKNXNFVjJRIi0KHS68cNoX4ZWGKuoIFOhOJlIRUMHJJeIMFU0qDZNUEgxfTkclZFBfa4gzH1w\",\"elapsed\":0},\"data\":{\"buckets\":[]}}"
73+
"size": 204,
74+
"text": "{\"meta\":{\"status\":\"done\",\"request_id\":\"pddv1ChYtOGFfX0hkRFRzeVFxOUkxNFliWkh3IiwKHNZ2_uRW5V74g9U20qpKaJ5w2W333--lwIypXxoSDOtag8A05lWXfz4bnA\",\"elapsed\":3},\"data\":{\"buckets\":[{\"computes\":{\"c0\":7},\"by\":{}}]}}"
7575
},
7676
"cookies": [],
7777
"headers": [
7878
{
7979
"name": "date",
80-
"value": "Thu, 15 Apr 2021 13:02:09 GMT"
80+
"value": "Wed, 02 Jun 2021 10:09:21 GMT"
8181
},
8282
{
8383
"name": "content-type",
8484
"value": "application/json"
8585
},
8686
{
8787
"name": "content-length",
88-
"value": "176"
88+
"value": "204"
8989
},
9090
{
9191
"name": "connection",
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"name": "x-dd-version",
108-
"value": "35.4318655"
108+
"value": "35.4656181"
109109
},
110110
{
111111
"name": "x-ratelimit-limit",
@@ -117,11 +117,11 @@
117117
},
118118
{
119119
"name": "x-ratelimit-reset",
120-
"value": "171"
120+
"value": "40"
121121
},
122122
{
123123
"name": "x-ratelimit-remaining",
124-
"value": "299"
124+
"value": "295"
125125
},
126126
{
127127
"name": "x-dd-debug",
@@ -144,22 +144,22 @@
144144
"value": "SAMEORIGIN"
145145
}
146146
],
147-
"headersSize": 588,
147+
"headersSize": 587,
148148
"httpVersion": "HTTP/1.1",
149149
"redirectURL": "",
150150
"status": 200,
151151
"statusText": "OK"
152152
},
153-
"startedDateTime": "2021-04-15T13:02:08.747Z",
154-
"time": 422,
153+
"startedDateTime": "2021-06-02T10:09:20.673Z",
154+
"time": 338,
155155
"timings": {
156156
"blocked": -1,
157157
"connect": -1,
158158
"dns": -1,
159159
"receive": 0,
160160
"send": 0,
161161
"ssl": -1,
162-
"wait": 422
162+
"wait": 338
163163
}
164164
}
165165
],

‎features/v2/logs.feature

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ Feature: Logs
77
And a valid "appKeyAuth" key in the system
88
And an instance of "Logs" API
99

10+
Scenario: Aggregate compute events returns "OK" response
11+
Given new "AggregateLogs" request
12+
And body with value {"compute": [{"aggregation": "count", "interval": "5m", "type": "timeseries"}], "filter": {"from": "now-15m", "indexes": ["main"], "query": "*", "to": "now"}}
13+
When the request is sent
14+
Then the response status is 200 OK
15+
1016
@generated @skip
1117
Scenario: Aggregate events returns "Bad Request" response
1218
Given new "AggregateLogs" request
@@ -16,7 +22,7 @@ Feature: Logs
1622

1723
Scenario: Aggregate events returns "OK" response
1824
Given new "AggregateLogs" request
19-
And body with value {"compute": [{"aggregation": "count", "interval": "300", "metric": "test.aggregation.{{ unique }}", "type": "timeseries"}], "filter": {"from": "1600348573", "indexes": ["main"], "query": "datadog-agent", "to": "1600348600"}}
25+
And body with value {"filter": {"from": "now-15m", "indexes": ["main"], "query": "*", "to": "now"}}
2026
When the request is sent
2127
Then the response status is 200 OK
2228

0 commit comments

Comments
 (0)