From bbf1bc3f358509b86e537d9ca8b26f097acf0dcf Mon Sep 17 00:00:00 2001 From: "api-clients-generation-pipeline[bot]" <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 19:55:49 +0000 Subject: [PATCH] Add serverless apm to usage attribution api (#2240) Co-authored-by: ci.datadog-api-spec --- .apigentools-info | 8 +-- .generator/schemas/v1/openapi.yaml | 14 ++++ ...del_hourly_usage_attribution_usage_type.go | 2 + ...hly_usage_attribution_supported_metrics.go | 4 ++ .../model_monthly_usage_attribution_values.go | 72 ++++++++++++++++++- 5 files changed, 95 insertions(+), 5 deletions(-) diff --git a/.apigentools-info b/.apigentools-info index 8ffbd1d3232..ed953b2fe5f 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2023-10-19 13:24:06.162821", - "spec_repo_commit": "823e1cf6" + "regenerated": "2023-10-23 18:35:32.097430", + "spec_repo_commit": "696abec0" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2023-10-19 13:24:06.177267", - "spec_repo_commit": "823e1cf6" + "regenerated": "2023-10-23 18:35:32.111345", + "spec_repo_commit": "696abec0" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 5eca576350e..29cfdad974c 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -3922,6 +3922,7 @@ components: - functions_usage - infra_host_usage - invocations_usage + - lambda_traced_invocations_usage - mobile_app_testing_usage - ndm_netflow_usage - npm_host_usage @@ -3964,6 +3965,7 @@ components: - FUNCTIONS_USAGE - INFRA_HOST_USAGE - INVOCATIONS_USAGE + - LAMBDA_TRACED_INVOCATIONS_USAGE - MOBILE_APP_TESTING_USAGE - NDM_NETFLOW_USAGE - NPM_HOST_USAGE @@ -7545,6 +7547,8 @@ components: - infra_host_percentage - invocations_usage - invocations_percentage + - lambda_traced_invocations_usage + - lambda_traced_invocations_percentage - mobile_app_testing_percentage - mobile_app_testing_usage - ndm_netflow_usage @@ -7628,6 +7632,8 @@ components: - INFRA_HOST_PERCENTAGE - INVOCATIONS_USAGE - INVOCATIONS_PERCENTAGE + - LAMBDA_TRACED_INVOCATIONS_USAGE + - LAMBDA_TRACED_INVOCATIONS_PERCENTAGE - MOBILE_APP_TESTING_USAGE - MOBILE_APP_TESTING_PERCENTAGE - NDM_NETFLOW_USAGE @@ -7893,6 +7899,14 @@ components: description: The Lambda invocation usage by tag(s). format: double type: number + lambda_traced_invocations_percentage: + description: The percentage of Serverless APM usage by tag(s). + format: double + type: number + lambda_traced_invocations_usage: + description: The Serverless APM usage by tag(s). + format: double + type: number mobile_app_testing_percentage: description: The percentage of Synthetic mobile application test usage by tag(s). diff --git a/api/datadogV1/model_hourly_usage_attribution_usage_type.go b/api/datadogV1/model_hourly_usage_attribution_usage_type.go index 81dc2b5046e..9b300705b7d 100644 --- a/api/datadogV1/model_hourly_usage_attribution_usage_type.go +++ b/api/datadogV1/model_hourly_usage_attribution_usage_type.go @@ -43,6 +43,7 @@ const ( HOURLYUSAGEATTRIBUTIONUSAGETYPE_FUNCTIONS_USAGE HourlyUsageAttributionUsageType = "functions_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_INFRA_HOST_USAGE HourlyUsageAttributionUsageType = "infra_host_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_INVOCATIONS_USAGE HourlyUsageAttributionUsageType = "invocations_usage" + HOURLYUSAGEATTRIBUTIONUSAGETYPE_LAMBDA_TRACED_INVOCATIONS_USAGE HourlyUsageAttributionUsageType = "lambda_traced_invocations_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_MOBILE_APP_TESTING_USAGE HourlyUsageAttributionUsageType = "mobile_app_testing_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_NDM_NETFLOW_USAGE HourlyUsageAttributionUsageType = "ndm_netflow_usage" HOURLYUSAGEATTRIBUTIONUSAGETYPE_NPM_HOST_USAGE HourlyUsageAttributionUsageType = "npm_host_usage" @@ -86,6 +87,7 @@ var allowedHourlyUsageAttributionUsageTypeEnumValues = []HourlyUsageAttributionU HOURLYUSAGEATTRIBUTIONUSAGETYPE_FUNCTIONS_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_INFRA_HOST_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_INVOCATIONS_USAGE, + HOURLYUSAGEATTRIBUTIONUSAGETYPE_LAMBDA_TRACED_INVOCATIONS_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_MOBILE_APP_TESTING_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_NDM_NETFLOW_USAGE, HOURLYUSAGEATTRIBUTIONUSAGETYPE_NPM_HOST_USAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go index c080f4339ed..7938dd7b48f 100644 --- a/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go +++ b/api/datadogV1/model_monthly_usage_attribution_supported_metrics.go @@ -69,6 +69,8 @@ const ( MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INFRA_HOST_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "infra_host_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INVOCATIONS_USAGE MonthlyUsageAttributionSupportedMetrics = "invocations_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INVOCATIONS_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "invocations_percentage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_LAMBDA_TRACED_INVOCATIONS_USAGE MonthlyUsageAttributionSupportedMetrics = "lambda_traced_invocations_usage" + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_LAMBDA_TRACED_INVOCATIONS_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "lambda_traced_invocations_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_MOBILE_APP_TESTING_USAGE MonthlyUsageAttributionSupportedMetrics = "mobile_app_testing_percentage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_MOBILE_APP_TESTING_PERCENTAGE MonthlyUsageAttributionSupportedMetrics = "mobile_app_testing_usage" MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_NDM_NETFLOW_USAGE MonthlyUsageAttributionSupportedMetrics = "ndm_netflow_usage" @@ -153,6 +155,8 @@ var allowedMonthlyUsageAttributionSupportedMetricsEnumValues = []MonthlyUsageAtt MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INFRA_HOST_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INVOCATIONS_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_INVOCATIONS_PERCENTAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_LAMBDA_TRACED_INVOCATIONS_USAGE, + MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_LAMBDA_TRACED_INVOCATIONS_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_MOBILE_APP_TESTING_USAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_MOBILE_APP_TESTING_PERCENTAGE, MONTHLYUSAGEATTRIBUTIONSUPPORTEDMETRICS_NDM_NETFLOW_USAGE, diff --git a/api/datadogV1/model_monthly_usage_attribution_values.go b/api/datadogV1/model_monthly_usage_attribution_values.go index aefe4e3c429..473cc5cba83 100644 --- a/api/datadogV1/model_monthly_usage_attribution_values.go +++ b/api/datadogV1/model_monthly_usage_attribution_values.go @@ -124,6 +124,10 @@ type MonthlyUsageAttributionValues struct { InvocationsPercentage *float64 `json:"invocations_percentage,omitempty"` // The Lambda invocation usage by tag(s). InvocationsUsage *float64 `json:"invocations_usage,omitempty"` + // The percentage of Serverless APM usage by tag(s). + LambdaTracedInvocationsPercentage *float64 `json:"lambda_traced_invocations_percentage,omitempty"` + // The Serverless APM usage by tag(s). + LambdaTracedInvocationsUsage *float64 `json:"lambda_traced_invocations_usage,omitempty"` // The percentage of Synthetic mobile application test usage by tag(s). MobileAppTestingPercentage *float64 `json:"mobile_app_testing_percentage,omitempty"` // The Synthetic mobile application test usage by tag(s). @@ -1762,6 +1766,62 @@ func (o *MonthlyUsageAttributionValues) SetInvocationsUsage(v float64) { o.InvocationsUsage = &v } +// GetLambdaTracedInvocationsPercentage returns the LambdaTracedInvocationsPercentage field value if set, zero value otherwise. +func (o *MonthlyUsageAttributionValues) GetLambdaTracedInvocationsPercentage() float64 { + if o == nil || o.LambdaTracedInvocationsPercentage == nil { + var ret float64 + return ret + } + return *o.LambdaTracedInvocationsPercentage +} + +// GetLambdaTracedInvocationsPercentageOk returns a tuple with the LambdaTracedInvocationsPercentage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *MonthlyUsageAttributionValues) GetLambdaTracedInvocationsPercentageOk() (*float64, bool) { + if o == nil || o.LambdaTracedInvocationsPercentage == nil { + return nil, false + } + return o.LambdaTracedInvocationsPercentage, true +} + +// HasLambdaTracedInvocationsPercentage returns a boolean if a field has been set. +func (o *MonthlyUsageAttributionValues) HasLambdaTracedInvocationsPercentage() bool { + return o != nil && o.LambdaTracedInvocationsPercentage != nil +} + +// SetLambdaTracedInvocationsPercentage gets a reference to the given float64 and assigns it to the LambdaTracedInvocationsPercentage field. +func (o *MonthlyUsageAttributionValues) SetLambdaTracedInvocationsPercentage(v float64) { + o.LambdaTracedInvocationsPercentage = &v +} + +// GetLambdaTracedInvocationsUsage returns the LambdaTracedInvocationsUsage field value if set, zero value otherwise. +func (o *MonthlyUsageAttributionValues) GetLambdaTracedInvocationsUsage() float64 { + if o == nil || o.LambdaTracedInvocationsUsage == nil { + var ret float64 + return ret + } + return *o.LambdaTracedInvocationsUsage +} + +// GetLambdaTracedInvocationsUsageOk returns a tuple with the LambdaTracedInvocationsUsage field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *MonthlyUsageAttributionValues) GetLambdaTracedInvocationsUsageOk() (*float64, bool) { + if o == nil || o.LambdaTracedInvocationsUsage == nil { + return nil, false + } + return o.LambdaTracedInvocationsUsage, true +} + +// HasLambdaTracedInvocationsUsage returns a boolean if a field has been set. +func (o *MonthlyUsageAttributionValues) HasLambdaTracedInvocationsUsage() bool { + return o != nil && o.LambdaTracedInvocationsUsage != nil +} + +// SetLambdaTracedInvocationsUsage gets a reference to the given float64 and assigns it to the LambdaTracedInvocationsUsage field. +func (o *MonthlyUsageAttributionValues) SetLambdaTracedInvocationsUsage(v float64) { + o.LambdaTracedInvocationsUsage = &v +} + // GetMobileAppTestingPercentage returns the MobileAppTestingPercentage field value if set, zero value otherwise. func (o *MonthlyUsageAttributionValues) GetMobileAppTestingPercentage() float64 { if o == nil || o.MobileAppTestingPercentage == nil { @@ -2608,6 +2668,12 @@ func (o MonthlyUsageAttributionValues) MarshalJSON() ([]byte, error) { if o.InvocationsUsage != nil { toSerialize["invocations_usage"] = o.InvocationsUsage } + if o.LambdaTracedInvocationsPercentage != nil { + toSerialize["lambda_traced_invocations_percentage"] = o.LambdaTracedInvocationsPercentage + } + if o.LambdaTracedInvocationsUsage != nil { + toSerialize["lambda_traced_invocations_usage"] = o.LambdaTracedInvocationsUsage + } if o.MobileAppTestingPercentage != nil { toSerialize["mobile_app_testing_percentage"] = o.MobileAppTestingPercentage } @@ -2746,6 +2812,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) InfraHostUsage *float64 `json:"infra_host_usage,omitempty"` InvocationsPercentage *float64 `json:"invocations_percentage,omitempty"` InvocationsUsage *float64 `json:"invocations_usage,omitempty"` + LambdaTracedInvocationsPercentage *float64 `json:"lambda_traced_invocations_percentage,omitempty"` + LambdaTracedInvocationsUsage *float64 `json:"lambda_traced_invocations_usage,omitempty"` MobileAppTestingPercentage *float64 `json:"mobile_app_testing_percentage,omitempty"` MobileAppTestingUsage *float64 `json:"mobile_app_testing_usage,omitempty"` NdmNetflowPercentage *float64 `json:"ndm_netflow_percentage,omitempty"` @@ -2776,7 +2844,7 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) } additionalProperties := make(map[string]interface{}) if err = json.Unmarshal(bytes, &additionalProperties); err == nil { - datadog.DeleteKeys(additionalProperties, &[]string{"api_percentage", "api_usage", "apm_fargate_percentage", "apm_fargate_usage", "apm_host_percentage", "apm_host_usage", "apm_usm_percentage", "apm_usm_usage", "appsec_fargate_percentage", "appsec_fargate_usage", "appsec_percentage", "appsec_usage", "browser_percentage", "browser_usage", "ci_visibility_itr_percentage", "ci_visibility_itr_usage", "cloud_siem_percentage", "cloud_siem_usage", "container_excl_agent_percentage", "container_excl_agent_usage", "container_percentage", "container_usage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_ingested_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_timeseries_percentage", "custom_timeseries_usage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "estimated_indexed_logs_percentage", "estimated_indexed_logs_usage", "estimated_indexed_spans_percentage", "estimated_indexed_spans_usage", "estimated_ingested_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_spans_percentage", "estimated_ingested_spans_usage", "estimated_rum_sessions_percentage", "estimated_rum_sessions_usage", "fargate_percentage", "fargate_usage", "functions_percentage", "functions_usage", "infra_host_percentage", "infra_host_usage", "invocations_percentage", "invocations_usage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_percentage", "ndm_netflow_usage", "npm_host_percentage", "npm_host_usage", "obs_pipeline_bytes_percentage", "obs_pipeline_bytes_usage", "profiled_container_percentage", "profiled_container_usage", "profiled_fargate_percentage", "profiled_fargate_usage", "profiled_host_percentage", "profiled_host_usage", "sds_scanned_bytes_percentage", "sds_scanned_bytes_usage", "serverless_apps_percentage", "serverless_apps_usage", "snmp_percentage", "snmp_usage", "universal_service_monitoring_percentage", "universal_service_monitoring_usage", "vuln_management_hosts_percentage", "vuln_management_hosts_usage"}) + datadog.DeleteKeys(additionalProperties, &[]string{"api_percentage", "api_usage", "apm_fargate_percentage", "apm_fargate_usage", "apm_host_percentage", "apm_host_usage", "apm_usm_percentage", "apm_usm_usage", "appsec_fargate_percentage", "appsec_fargate_usage", "appsec_percentage", "appsec_usage", "browser_percentage", "browser_usage", "ci_visibility_itr_percentage", "ci_visibility_itr_usage", "cloud_siem_percentage", "cloud_siem_usage", "container_excl_agent_percentage", "container_excl_agent_usage", "container_percentage", "container_usage", "cspm_containers_percentage", "cspm_containers_usage", "cspm_hosts_percentage", "cspm_hosts_usage", "custom_ingested_timeseries_percentage", "custom_ingested_timeseries_usage", "custom_timeseries_percentage", "custom_timeseries_usage", "cws_containers_percentage", "cws_containers_usage", "cws_hosts_percentage", "cws_hosts_usage", "dbm_hosts_percentage", "dbm_hosts_usage", "dbm_queries_percentage", "dbm_queries_usage", "estimated_indexed_logs_percentage", "estimated_indexed_logs_usage", "estimated_indexed_spans_percentage", "estimated_indexed_spans_usage", "estimated_ingested_logs_percentage", "estimated_ingested_logs_usage", "estimated_ingested_spans_percentage", "estimated_ingested_spans_usage", "estimated_rum_sessions_percentage", "estimated_rum_sessions_usage", "fargate_percentage", "fargate_usage", "functions_percentage", "functions_usage", "infra_host_percentage", "infra_host_usage", "invocations_percentage", "invocations_usage", "lambda_traced_invocations_percentage", "lambda_traced_invocations_usage", "mobile_app_testing_percentage", "mobile_app_testing_usage", "ndm_netflow_percentage", "ndm_netflow_usage", "npm_host_percentage", "npm_host_usage", "obs_pipeline_bytes_percentage", "obs_pipeline_bytes_usage", "profiled_container_percentage", "profiled_container_usage", "profiled_fargate_percentage", "profiled_fargate_usage", "profiled_host_percentage", "profiled_host_usage", "sds_scanned_bytes_percentage", "sds_scanned_bytes_usage", "serverless_apps_percentage", "serverless_apps_usage", "snmp_percentage", "snmp_usage", "universal_service_monitoring_percentage", "universal_service_monitoring_usage", "vuln_management_hosts_percentage", "vuln_management_hosts_usage"}) } else { return err } @@ -2836,6 +2904,8 @@ func (o *MonthlyUsageAttributionValues) UnmarshalJSON(bytes []byte) (err error) o.InfraHostUsage = all.InfraHostUsage o.InvocationsPercentage = all.InvocationsPercentage o.InvocationsUsage = all.InvocationsUsage + o.LambdaTracedInvocationsPercentage = all.LambdaTracedInvocationsPercentage + o.LambdaTracedInvocationsUsage = all.LambdaTracedInvocationsUsage o.MobileAppTestingPercentage = all.MobileAppTestingPercentage o.MobileAppTestingUsage = all.MobileAppTestingUsage o.NdmNetflowPercentage = all.NdmNetflowPercentage