Merge master into datadog-api-spec/test/th-ch/SYNTH-15776/synthetics-…

…uptime-endpoint
DataDog · Oct 2, 2024 · a3039dc · a3039dc
2 parents 21b8a99 + 1629497
commit a3039dc
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 18 deletions.
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 11:36:10.883909",
-            "spec_repo_commit": "c09e55c6"
+            "regenerated": "2024-10-02 13:39:19.776742",
+            "spec_repo_commit": "e02e4f4c"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-10-02 11:36:10.897654",
-            "spec_repo_commit": "c09e55c6"
+            "regenerated": "2024-10-02 13:39:19.791012",
+            "spec_repo_commit": "e02e4f4c"
         }
     }
 }
diff --git a/examples/v2/logs/AggregateLogs_2955613758.py b/examples/v2/logs/AggregateLogs_2955613758.py
@@ -40,7 +40,6 @@
                 aggregation=LogsAggregationFunction.PERCENTILE_90,
                 metric="@duration",
             ),
-            total="recall",
         ),
     ],
 )

diff --git a/tests/v2/cassettes/test_scenarios/test_aggregate_compute_events_returns_ok_response.frozen b/tests/v2/cassettes/test_scenarios/test_aggregate_compute_events_returns_ok_response.frozen
@@ -1 +1 @@
-2022-01-06T00:51:50.120Z
+2024-10-01T15:36:42.516Z
diff --git a/tests/v2/cassettes/test_scenarios/test_aggregate_compute_events_returns_ok_response.yaml b/tests/v2/cassettes/test_scenarios/test_aggregate_compute_events_returns_ok_response.yaml
@@ -10,7 +10,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/logs/analytics/aggregate
   response:
     body:
-      string: '{"meta":{"status":"done","request_id":"pddv1ChZ0Y2dJQVlDMVJOYWlYcjNJcDZfSnNnIiwKHJISw_RInEtZkOv0RnvMfFE5pDSf1A5hU7Jf6FISDPKeDBOH5N-0CxRhGA","elapsed":3},"data":{"buckets":[{"computes":{"c0":[{"value":1,"time":"2022-01-06T00:40:00.000Z"},{"value":1,"time":"2022-01-06T00:50:00.000Z"}]},"by":{}}]}}'
+      string: '{"meta":{"elapsed":165,"request_id":"pddv1ChY3VUd0WGZFS1IzNkpzaENGMDQ5dVlRIi0KHQwfsxs3-LlbabIdJPhP3_aSOsxZS1WRUrEaBffcEgxNrSsbB0hv7ccJCGk","status":"done"},"data":{"buckets":[]}}
+
+        '
     headers:
       content-type:
       - application/json

diff --git a/...tes/test_scenarios/test_aggregate_compute_events_with_group_by_returns_ok_response.frozen b/...tes/test_scenarios/test_aggregate_compute_events_with_group_by_returns_ok_response.frozen
@@ -1 +1 @@
-2022-02-23T10:58:05.766Z
+2024-10-01T15:36:42.902Z
diff --git a/...ettes/test_scenarios/test_aggregate_compute_events_with_group_by_returns_ok_response.yaml b/...ettes/test_scenarios/test_aggregate_compute_events_with_group_by_returns_ok_response.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"compute":[{"aggregation":"count","interval":"5m","type":"timeseries"}],"filter":{"from":"now-15m","indexes":["main"],"query":"*","to":"now"},"group_by":[{"facet":"host","missing":"miss","sort":{"aggregation":"pc90","metric":"@duration","order":"asc","type":"measure"},"total":"recall"}]}'
+    body: '{"compute":[{"aggregation":"count","interval":"5m","type":"timeseries"}],"filter":{"from":"now-15m","indexes":["main"],"query":"*","to":"now"},"group_by":[{"facet":"host","missing":"miss","sort":{"aggregation":"pc90","metric":"@duration","order":"asc","type":"measure"}}]}'
     headers:
       accept:
       - application/json
@@ -10,7 +10,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/logs/analytics/aggregate
   response:
     body:
-      string: '{"meta":{"status":"done","request_id":"pddv1ChZjajVGdnloOFRydURjT01RakZPRGJRIiwKHAubHcvWGIRKaJwUb1Qgc-peEYojhMk6Z3opAHYSDOMLcdT0IUoqNWaYdA","elapsed":10},"data":{"buckets":[{"computes":{"c0":[{"value":28,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"07266d86-ec5b-40cb-4060-e4d9"}},{"computes":{"c0":[{"value":32,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":40,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"4a5a50c3-5d34-4009-74aa-38d8"}},{"computes":{"c0":[{"value":28,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":44,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"3a1410f9-5b3b-44a8-52bc-5269"}},{"computes":{"c0":[{"value":32,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"e17b600e-a2cf-4d23-4eb2-e648"}},{"computes":{"c0":[{"value":28,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":44,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"3a6c8709-df68-49b2-5992-351d"}},{"computes":{"c0":[{"value":28,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"f301493f-d994-4237-4a99-b382"}},{"computes":{"c0":[{"value":28,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"4d77dd12-b3be-41fd-753b-fcbb"}},{"computes":{"c0":[{"value":32,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":40,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"2961e831-36b5-4c2b-5853-b6d5"}},{"computes":{"c0":[{"value":32,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"cec04667-4f47-4d64-4bf1-b449"}},{"computes":{"c0":[{"value":32,"time":"2022-02-23T10:40:00.000Z"},{"value":80,"time":"2022-02-23T10:45:00.000Z"},{"value":80,"time":"2022-02-23T10:50:00.000Z"},{"value":42,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"352e5c4f-9d7d-4b5e-414f-4199"}},{"computes":{"c0":[{"value":332,"time":"2022-02-23T10:40:00.000Z"},{"value":880,"time":"2022-02-23T10:45:00.000Z"},{"value":880,"time":"2022-02-23T10:50:00.000Z"},{"value":460,"time":"2022-02-23T10:55:00.000Z"}]},"by":{"host":"recall"}}]}}'
+      string: '{"meta":{"elapsed":15,"request_id":"pddv1ChZJZHpESXZreVRVU04ySjMwN1ZGU3JBIi0KHTpQ7N734J4KLzWgxOSfJsxi4hmH9Zp7S5bcjVbKEgw7sLHsv3QXsmnc0-k","status":"done"},"data":{"buckets":[]}}
+
+        '
     headers:
       content-type:
       - application/json

diff --git a/tests/v2/cassettes/test_scenarios/test_aggregate_events_returns_ok_response.frozen b/tests/v2/cassettes/test_scenarios/test_aggregate_events_returns_ok_response.frozen
@@ -1 +1 @@
-2022-01-06T00:51:50.375Z
+2024-10-01T15:36:43.117Z
diff --git a/tests/v2/cassettes/test_scenarios/test_aggregate_events_returns_ok_response.yaml b/tests/v2/cassettes/test_scenarios/test_aggregate_events_returns_ok_response.yaml
@@ -10,7 +10,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/logs/analytics/aggregate
   response:
     body:
-      string: '{"meta":{"status":"done","request_id":"pddv1ChZqNnEtQ2hTU1M5dTYxbWtrUGtBMGFBIi0KHVny0iHoClVAOb_xrSWcwl_hHz3QjhOb8cLTslhGEgz4EiXPOZ8kQFQe2Zw","elapsed":5},"data":{"buckets":[{"computes":{"c0":2},"by":{}}]}}'
+      string: '{"meta":{"elapsed":10,"request_id":"pddv1ChZNTFhDRTJTelQycXp1QXdlX1NmTlpRIi0KHe-ilFcY0rnsNmMKsu8hd-YRCNigxxg3E_n1PmI9EgxGTh_nEXTFJyr3H54","status":"done"},"data":{"buckets":[]}}
+
+        '
     headers:
       content-type:
       - application/json

diff --git a/tests/v2/cassettes/test_scenarios/test_get_a_quick_list_of_logs_returns_ok_response.frozen b/tests/v2/cassettes/test_scenarios/test_get_a_quick_list_of_logs_returns_ok_response.frozen
@@ -1 +1 @@
-2023-07-05T20:27:06.820Z
+2024-10-01T15:36:43.285Z
diff --git a/tests/v2/cassettes/test_scenarios/test_get_a_quick_list_of_logs_returns_ok_response.yaml b/tests/v2/cassettes/test_scenarios/test_get_a_quick_list_of_logs_returns_ok_response.yaml
@@ -8,7 +8,7 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/logs/events?filter%5Bquery%5D=datadog-agent&filter%5Bindexes%5D=main&filter%5Bfrom%5D=2020-09-17T11%3A48%3A36%2B01%3A00&filter%5Bto%5D=2020-09-17T12%3A48%3A36%2B01%3A00&page%5Blimit%5D=5
   response:
     body:
-      string: '{"data":[],"meta":{"elapsed":0,"request_id":"pddv1ChZVZjdFSUNKdlM3LVBKNXNPcjR6R1hnIiwKHP4qJC1KWavJCGIvcezlUg3AhhLxU4JfitQ_QFESDFVjhmcEEEIN8NN7KA","status":"done"}}
+      string: '{"data":[],"meta":{"elapsed":0,"request_id":"pddv1ChZnUldBVG01WlRMU2Q0d2xmaG1NWG1BIiwKHFtksVd_gLLg8oGdAfyjZkpusj-6_bbNxRpOSeoSDCx7sBKmq-5VxGtliw","status":"done"}}
 
         '
     headers:

diff --git a/tests/v2/cassettes/test_scenarios/test_search_logs_returns_ok_response.frozen b/tests/v2/cassettes/test_scenarios/test_search_logs_returns_ok_response.frozen
@@ -1 +1 @@
-2022-01-06T00:51:50.851Z
+2024-10-01T15:36:43.434Z
diff --git a/tests/v2/cassettes/test_scenarios/test_search_logs_returns_ok_response.yaml b/tests/v2/cassettes/test_scenarios/test_search_logs_returns_ok_response.yaml
@@ -10,7 +10,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/logs/events/search
   response:
     body:
-      string: '{"data":[]}'
+      string: '{"data":[],"meta":{"elapsed":0,"request_id":"pddv1ChZDajdxSjQ4ZFJOT1VyZ2xURmRrSW5BIi0KHTBXibXkWStvRXkS72BJw44UvhZhIF-UDmT52UYhEgyW3j58vq2SlrrUWNc","status":"done"}}
+
+        '
     headers:
       content-type:
       - application/json

diff --git a/...t_send_logs_returns_request_accepted_for_processing_always_202_empty_json_response.frozen b/...t_send_logs_returns_request_accepted_for_processing_always_202_empty_json_response.frozen
@@ -1 +1 @@
-2023-04-13T18:28:45.445Z
+2024-10-01T15:36:43.563Z
diff --git a/tests/v2/features/logs.feature b/tests/v2/features/logs.feature
@@ -21,7 +21,7 @@ Feature: Logs
   Scenario: Aggregate compute events with group by returns "OK" response
     Given a valid "appKeyAuth" key in the system
     And new "AggregateLogs" request
-    And body with value {"compute": [{"aggregation": "count", "interval": "5m", "type": "timeseries"}], "filter": {"from": "now-15m", "indexes": ["main"], "query": "*", "to": "now"}, "group_by": [{"facet": "host", "missing": "miss", "sort": {"type": "measure", "order": "asc", "aggregation": "pc90", "metric": "@duration"}, "total": "recall"}]}
+    And body with value {"compute": [{"aggregation": "count", "interval": "5m", "type": "timeseries"}], "filter": {"from": "now-15m", "indexes": ["main"], "query": "*", "to": "now"}, "group_by": [{"facet": "host", "missing": "miss", "sort": {"type": "measure", "order": "asc", "aggregation": "pc90", "metric": "@duration"}}]}
     When the request is sent
     Then the response status is 200 OK
     And the response "meta.status" is equal to "done"
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ @@
                     aggregation=LogsAggregationFunction.PERCENTILE_90,
                     metric="@duration",
                 ),
-                total="recall",
             ),
         ],
     )
@@ Expand Down @@