Skip to content

Add estimated ingested spans to usage attribution #981

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

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Add estimated ingested spans to usage attribution #981

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.2",
"regenerated": "2022-07-11 17:47:05.327028",
"spec_repo_commit": "0b076011"
"regenerated": "2022-07-12 16:16:35.898577",
"spec_repo_commit": "2d238f31"
},
"v2": {
"apigentools_version": "1.6.2",
"regenerated": "2022-07-11 17:47:05.341949",
"spec_repo_commit": "0b076011"
"regenerated": "2022-07-12 16:16:35.910410",
"spec_repo_commit": "2d238f31"
}
}
}
36 changes: 36 additions & 0 deletions .generator/schemas/v1/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3638,6 +3638,7 @@ components:
- dbm_queries_usage
- estimated_indexed_logs_usage
- estimated_indexed_spans_usage
- estimated_ingested_spans_usage
- fargate_usage
- functions_usage
- indexed_logs_usage
Expand All @@ -3663,6 +3664,7 @@ components:
- DBM_QUERIES_USAGE
- ESTIMATED_INDEXED_LOGS_USAGE
- ESTIMATED_INDEXED_SPANS_USAGE
- ESTIMATED_INGESTED_SPANS_USAGE
- FARGATE_USAGE
- FUNCTIONS_USAGE
- INDEXED_LOGS_USAGE
Expand Down Expand Up @@ -6869,6 +6871,8 @@ components:
- estimated_indexed_logs_percentage
- estimated_indexed_spans_usage
- estimated_indexed_spans_percentage
- estimated_ingested_spans_usage
- estimated_ingested_spans_percentage
- fargate_usage
- fargate_percentage
- functions_usage
Expand Down Expand Up @@ -6918,6 +6922,8 @@ components:
- ESTIMATED_INDEXED_LOGS_PERCENTAGE
- ESTIMATED_INDEXED_SPANS_USAGE
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
- ESTIMATED_INGESTED_SPANS_USAGE
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
- FARGATE_USAGE
- FARGATE_PERCENTAGE
- FUNCTIONS_USAGE
Expand Down Expand Up @@ -7009,6 +7015,16 @@ components:
in private beta.
format: double
type: number
estimated_ingested_spans_percentage:
description: The percentage of estimated ingested spans usage by tag(s).
This field is in private beta.
format: double
type: number
estimated_ingested_spans_usage:
description: The estimated ingested spans usage by tag(s). This field is
in private beta.
format: double
type: number
fargate_percentage:
description: The percentage of Fargate usage by tags.
format: double
Expand Down Expand Up @@ -13488,6 +13504,8 @@ components:
- estimated_indexed_logs_percentage
- estimated_indexed_spans_usage
- estimated_indexed_spans_percentage
- estimated_ingested_spans_usage
- estimated_ingested_spans_percentage
type: string
x-enum-varnames:
- API_PERCENTAGE
Expand Down Expand Up @@ -13516,6 +13534,8 @@ components:
- ESTIMATED_INDEXED_LOGS_PERCENTAGE
- ESTIMATED_INDEXED_SPANS_USAGE
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
- ESTIMATED_INGESTED_SPANS_USAGE
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
UsageAttributionSupportedMetrics:
description: Supported fields for usage attribution requests (valid requests
contain one or more metrics, or `*` for all).
Expand Down Expand Up @@ -13556,6 +13576,8 @@ components:
- appsec_percentage
- estimated_indexed_spans_usage
- estimated_indexed_spans_percentage
- estimated_ingested_spans_usage
- estimated_ingested_spans_percentage
- '*'
type: string
x-enum-varnames:
Expand Down Expand Up @@ -13595,6 +13617,8 @@ components:
- APPSEC_PERCENTAGE
- ESTIMATED_INDEXED_SPANS_USAGE
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
- ESTIMATED_INGESTED_SPANS_USAGE
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
- ALL
UsageAttributionTagNames:
additionalProperties:
Expand Down Expand Up @@ -13646,6 +13670,8 @@ components:
appsec_percentage:
description: The percentage of Application Security Monitoring host usage
by tag(s).
format: double
type: number
appsec_usage:
description: The Application Security Monitoring host usage by tag(s).
format: double
Expand Down Expand Up @@ -13746,6 +13772,16 @@ components:
is in private beta.
format: double
type: number
estimated_ingested_spans_percentage:
description: The percentage of estimated ingested spans usage by tag(s).
Note this field is in private beta.
format: double
type: number
estimated_ingested_spans_usage:
description: The estimated ingested spans usage by tag(s). Note this field
is in private beta.
format: double
type: number
infra_host_percentage:
description: The percentage of infrastructure host usage by tag(s).
format: double
Expand Down
10 changes: 5 additions & 5 deletions lib/datadog_api_client/v1/api/usage_metering_api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def get_hourly_usage_attribution_with_http_info(start_hr, usage_type, opts = {})
fail ArgumentError, "Missing the required parameter 'usage_type' when calling UsageMeteringAPI.get_hourly_usage_attribution"
end
# verify enum value
allowable_values = ['api_usage', 'apm_host_usage', 'appsec_usage', 'browser_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_spans_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
allowable_values = ['api_usage', 'apm_host_usage', 'appsec_usage', 'browser_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_spans_usage', 'estimated_ingested_spans_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
if @api_client.config.client_side_validation && !allowable_values.include?(usage_type)
fail ArgumentError, "invalid value for \"usage_type\", must be one of #{allowable_values}"
end
Expand Down Expand Up @@ -509,15 +509,15 @@ def get_monthly_usage_attribution_with_http_info(start_month, fields, opts = {})
fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_monthly_usage_attribution"
end
# verify enum value
allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', '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_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', '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_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
if @api_client.config.client_side_validation && !allowable_values.include?(fields)
fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
end
allowable_values = ['desc', 'asc']
if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
end
allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', '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_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', '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_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
end
Expand Down Expand Up @@ -836,15 +836,15 @@ def get_usage_attribution_with_http_info(start_month, fields, opts = {})
fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_usage_attribution"
end
# verify enum value
allowable_values = ['custom_timeseries_usage', 'container_usage', 'snmp_percentage', 'apm_host_usage', 'browser_usage', 'npm_host_percentage', 'infra_host_usage', 'custom_timeseries_percentage', 'container_percentage', 'api_usage', 'apm_host_percentage', 'infra_host_percentage', 'snmp_usage', 'browser_percentage', 'api_percentage', 'npm_host_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'fargate_usage', 'fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'dbm_hosts_usage', 'dbm_hosts_percentage', 'dbm_queries_usage', 'dbm_queries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'appsec_usage', 'appsec_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', '*']
allowable_values = ['custom_timeseries_usage', 'container_usage', 'snmp_percentage', 'apm_host_usage', 'browser_usage', 'npm_host_percentage', 'infra_host_usage', 'custom_timeseries_percentage', 'container_percentage', 'api_usage', 'apm_host_percentage', 'infra_host_percentage', 'snmp_usage', 'browser_percentage', 'api_percentage', 'npm_host_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'fargate_usage', 'fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'dbm_hosts_usage', 'dbm_hosts_percentage', 'dbm_queries_usage', 'dbm_queries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'appsec_usage', 'appsec_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', '*']
if @api_client.config.client_side_validation && !allowable_values.include?(fields)
fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
end
allowable_values = ['desc', 'asc']
if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
end
allowable_values = ['api_percentage', 'snmp_usage', 'apm_host_usage', 'api_usage', 'appsec_usage', 'appsec_percentage', 'container_usage', 'custom_timeseries_percentage', 'container_percentage', 'apm_host_percentage', 'npm_host_percentage', 'browser_percentage', 'browser_usage', 'infra_host_percentage', 'snmp_percentage', 'npm_host_usage', 'infra_host_usage', 'custom_timeseries_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage']
allowable_values = ['api_percentage', 'snmp_usage', 'apm_host_usage', 'api_usage', 'appsec_usage', 'appsec_percentage', 'container_usage', 'custom_timeseries_percentage', 'container_percentage', 'apm_host_percentage', 'npm_host_percentage', 'browser_percentage', 'browser_usage', 'infra_host_percentage', 'snmp_percentage', 'npm_host_usage', 'infra_host_usage', 'custom_timeseries_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage']
if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
end
Expand Down
1 change: 1 addition & 0 deletions lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class HourlyUsageAttributionUsageType
DBM_QUERIES_USAGE = "dbm_queries_usage".freeze
ESTIMATED_INDEXED_LOGS_USAGE = "estimated_indexed_logs_usage".freeze
ESTIMATED_INDEXED_SPANS_USAGE = "estimated_indexed_spans_usage".freeze
ESTIMATED_INGESTED_SPANS_USAGE = "estimated_ingested_spans_usage".freeze
FARGATE_USAGE = "fargate_usage".freeze
FUNCTIONS_USAGE = "functions_usage".freeze
INDEXED_LOGS_USAGE = "indexed_logs_usage".freeze
Expand Down
2 changes: 2 additions & 0 deletions lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class MonthlyUsageAttributionSupportedMetrics
ESTIMATED_INDEXED_LOGS_PERCENTAGE = "estimated_indexed_logs_percentage".freeze
ESTIMATED_INDEXED_SPANS_USAGE = "estimated_indexed_spans_usage".freeze
ESTIMATED_INDEXED_SPANS_PERCENTAGE = "estimated_indexed_spans_percentage".freeze
ESTIMATED_INGESTED_SPANS_USAGE = "estimated_ingested_spans_usage".freeze
ESTIMATED_INGESTED_SPANS_PERCENTAGE = "estimated_ingested_spans_percentage".freeze
FARGATE_USAGE = "fargate_usage".freeze
FARGATE_PERCENTAGE = "fargate_percentage".freeze
FUNCTIONS_USAGE = "functions_usage".freeze
Expand Down
Loading