Merge branch 'master' into kevinzou/bugfix_retry_forms

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-03-29 13:20:47.377297",
-            "spec_repo_commit": "3e55ad68"
+            "regenerated": "2024-04-02 13:17:34.863132",
+            "spec_repo_commit": "de9967cc"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2024-03-29 13:20:47.394748",
-            "spec_repo_commit": "3e55ad68"
+            "regenerated": "2024-04-02 13:17:34.881540",
+            "spec_repo_commit": "de9967cc"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -21742,6 +21742,7 @@ components:
             If the second element is not present, the API returns null.'
           items:
             $ref: '#/components/schemas/Unit'
+          nullable: true
           type: array
       type: object
     TimeseriesResponseSeriesList:
@@ -29029,8 +29030,8 @@ paths:
       x-codegen-request-body-name: body
   /api/v2/metrics/{metric_name}/active-configurations:
     get:
-      description: List tags and aggregations that are actively queried on dashboards
-        and monitors for a given metric name.
+      description: List tags and aggregations that are actively queried on dashboards,
+        notebooks, monitors, and the Metrics Explorer for a given metric name.
       operationId: ListActiveMetricConfigurations
       parameters:
       - $ref: '#/components/parameters/MetricName'

examples/v2_metrics_query_timeseries_data_301142940.rs

@@ -20,7 +20,7 @@ async fn main() {
             vec![TimeseriesQuery::MetricsTimeseriesQuery(Box::new(
                 MetricsTimeseriesQuery::new(
                     MetricsDataSource::METRICS,
-                    "avg:system.cpu.user{*}".to_string(),
+                    "avg:datadog.estimated_usage.metrics.custom{*}".to_string(),
                 )
                 .name("a".to_string()),
             ))],

src/datadogV2/api/api_metrics.rs

@@ -1114,7 +1114,7 @@ impl MetricsAPI {
         }
     }
 
-    /// List tags and aggregations that are actively queried on dashboards and monitors for a given metric name.
+    /// List tags and aggregations that are actively queried on dashboards, notebooks, monitors, and the Metrics Explorer for a given metric name.
     pub async fn list_active_metric_configurations(
         &self,
         metric_name: String,
@@ -1140,7 +1140,7 @@ impl MetricsAPI {
         }
     }
 
-    /// List tags and aggregations that are actively queried on dashboards and monitors for a given metric name.
+    /// List tags and aggregations that are actively queried on dashboards, notebooks, monitors, and the Metrics Explorer for a given metric name.
     pub async fn list_active_metric_configurations_with_http_info(
         &self,
         metric_name: String,

src/datadogV2/model/model_timeseries_response_series.rs

@@ -21,8 +21,8 @@ pub struct TimeseriesResponseSeries {
     /// The first element describes the "primary unit" (for example, `bytes` in `bytes per second`).
     /// The second element describes the "per unit" (for example, `second` in `bytes per second`).
     /// If the second element is not present, the API returns null.
-    #[serde(rename = "unit")]
-    pub unit: Option<Vec<Option<crate::datadogV2::model::Unit>>>,
+    #[serde(rename = "unit", default, with = "::serde_with::rust::double_option")]
+    pub unit: Option<Option<Vec<Option<crate::datadogV2::model::Unit>>>>,
     #[serde(skip)]
     #[serde(default)]
     pub(crate) _unparsed: bool,
@@ -48,7 +48,7 @@ impl TimeseriesResponseSeries {
         self
     }
 
-    pub fn unit(mut self, value: Vec<Option<crate::datadogV2::model::Unit>>) -> Self {
+    pub fn unit(mut self, value: Option<Vec<Option<crate::datadogV2::model::Unit>>>) -> Self {
         self.unit = Some(value);
         self
     }
@@ -79,7 +79,7 @@ impl<'de> Deserialize<'de> for TimeseriesResponseSeries {
             {
                 let mut group_tags: Option<Vec<String>> = None;
                 let mut query_index: Option<i32> = None;
-                let mut unit: Option<Vec<Option<crate::datadogV2::model::Unit>>> = None;
+                let mut unit: Option<Option<Vec<Option<crate::datadogV2::model::Unit>>>> = None;
                 let mut _unparsed = false;
 
                 while let Some((k, v)) = map.next_entry::<String, serde_json::Value>()? {
@@ -98,9 +98,6 @@ impl<'de> Deserialize<'de> for TimeseriesResponseSeries {
                                 Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
                         "unit" => {
-                            if v.is_null() {
-                                continue;
-                            }
                             unit = Some(serde_json::from_value(v).map_err(M::Error::custom)?);
                         }
                         &_ => {}

tests/scenarios/cassettes/v2/metrics/Timeseries-cross-product-query-returns-OK-response.frozen

@@ -1 +1 @@
-2024-03-25T19:28:01.413Z
+2024-04-01T14:20:01.994Z

tests/scenarios/features/v2/metrics.feature

@@ -385,11 +385,10 @@ Feature: Metrics
     Given a valid "appKeyAuth" key in the system
     And operation "QueryTimeseriesData" enabled
     And new "QueryTimeseriesData" request
-    And body with value {"data": {"attributes": {"formulas": [{"formula": "a", "limit": {"count": 10, "order": "desc"}}], "from": {{ timestamp('now - 1h') }}000, "interval": 5000, "queries": [{"data_source": "metrics", "query": "avg:system.cpu.user{*}", "name": "a"}], "to": {{ timestamp('now') }}000}, "type": "timeseries_request"}}
+    And body with value {"data": {"attributes": {"formulas": [{"formula": "a", "limit": {"count": 10, "order": "desc"}}], "from": {{ timestamp('now - 1h') }}000, "interval": 5000, "queries": [{"data_source": "metrics", "query": "avg:datadog.estimated_usage.metrics.custom{*}", "name": "a"}], "to": {{ timestamp('now') }}000}, "type": "timeseries_request"}}
     When the request is sent
     Then the response status is 200 OK
     And the response "data.type" is equal to "timeseries_response"
-    And the response "data.attributes.series[0].unit[0].name" is equal to "percent"
 
   @generated @skip @team:DataDog/metrics-experience
   Scenario: Update a tag configuration returns "Bad Request" response