Skip to content

Commit 30b29f3

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 9b957139 of spec repo
1 parent 7ff19d6 commit 30b29f3

22 files changed

+41
-220
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.6.2",
7-
"regenerated": "2022-07-12 16:16:33.942808",
8-
"spec_repo_commit": "2d238f31"
7+
"regenerated": "2022-07-13 14:14:28.533236",
8+
"spec_repo_commit": "9b957139"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.2",
12-
"regenerated": "2022-07-12 16:16:33.954451",
13-
"spec_repo_commit": "2d238f31"
12+
"regenerated": "2022-07-13 14:14:28.549776",
13+
"spec_repo_commit": "9b957139"
1414
}
1515
}
1616
}

‎.generator/schemas/v1/openapi.yaml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3638,7 +3638,6 @@ components:
36383638
- dbm_queries_usage
36393639
- estimated_indexed_logs_usage
36403640
- estimated_indexed_spans_usage
3641-
- estimated_ingested_spans_usage
36423641
- fargate_usage
36433642
- functions_usage
36443643
- indexed_logs_usage
@@ -3664,7 +3663,6 @@ components:
36643663
- DBM_QUERIES_USAGE
36653664
- ESTIMATED_INDEXED_LOGS_USAGE
36663665
- ESTIMATED_INDEXED_SPANS_USAGE
3667-
- ESTIMATED_INGESTED_SPANS_USAGE
36683666
- FARGATE_USAGE
36693667
- FUNCTIONS_USAGE
36703668
- INDEXED_LOGS_USAGE
@@ -6871,8 +6869,6 @@ components:
68716869
- estimated_indexed_logs_percentage
68726870
- estimated_indexed_spans_usage
68736871
- estimated_indexed_spans_percentage
6874-
- estimated_ingested_spans_usage
6875-
- estimated_ingested_spans_percentage
68766872
- fargate_usage
68776873
- fargate_percentage
68786874
- functions_usage
@@ -6922,8 +6918,6 @@ components:
69226918
- ESTIMATED_INDEXED_LOGS_PERCENTAGE
69236919
- ESTIMATED_INDEXED_SPANS_USAGE
69246920
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
6925-
- ESTIMATED_INGESTED_SPANS_USAGE
6926-
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
69276921
- FARGATE_USAGE
69286922
- FARGATE_PERCENTAGE
69296923
- FUNCTIONS_USAGE
@@ -7015,16 +7009,6 @@ components:
70157009
in private beta.
70167010
format: double
70177011
type: number
7018-
estimated_ingested_spans_percentage:
7019-
description: The percentage of estimated ingested spans usage by tag(s).
7020-
This field is in private beta.
7021-
format: double
7022-
type: number
7023-
estimated_ingested_spans_usage:
7024-
description: The estimated ingested spans usage by tag(s). This field is
7025-
in private beta.
7026-
format: double
7027-
type: number
70287012
fargate_percentage:
70297013
description: The percentage of Fargate usage by tags.
70307014
format: double
@@ -13504,8 +13488,6 @@ components:
1350413488
- estimated_indexed_logs_percentage
1350513489
- estimated_indexed_spans_usage
1350613490
- estimated_indexed_spans_percentage
13507-
- estimated_ingested_spans_usage
13508-
- estimated_ingested_spans_percentage
1350913491
type: string
1351013492
x-enum-varnames:
1351113493
- API_PERCENTAGE
@@ -13534,8 +13516,6 @@ components:
1353413516
- ESTIMATED_INDEXED_LOGS_PERCENTAGE
1353513517
- ESTIMATED_INDEXED_SPANS_USAGE
1353613518
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
13537-
- ESTIMATED_INGESTED_SPANS_USAGE
13538-
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
1353913519
UsageAttributionSupportedMetrics:
1354013520
description: Supported fields for usage attribution requests (valid requests
1354113521
contain one or more metrics, or `*` for all).
@@ -13576,8 +13556,6 @@ components:
1357613556
- appsec_percentage
1357713557
- estimated_indexed_spans_usage
1357813558
- estimated_indexed_spans_percentage
13579-
- estimated_ingested_spans_usage
13580-
- estimated_ingested_spans_percentage
1358113559
- '*'
1358213560
type: string
1358313561
x-enum-varnames:
@@ -13617,8 +13595,6 @@ components:
1361713595
- APPSEC_PERCENTAGE
1361813596
- ESTIMATED_INDEXED_SPANS_USAGE
1361913597
- ESTIMATED_INDEXED_SPANS_PERCENTAGE
13620-
- ESTIMATED_INGESTED_SPANS_USAGE
13621-
- ESTIMATED_INGESTED_SPANS_PERCENTAGE
1362213598
- ALL
1362313599
UsageAttributionTagNames:
1362413600
additionalProperties:
@@ -13670,8 +13646,6 @@ components:
1367013646
appsec_percentage:
1367113647
description: The percentage of Application Security Monitoring host usage
1367213648
by tag(s).
13673-
format: double
13674-
type: number
1367513649
appsec_usage:
1367613650
description: The Application Security Monitoring host usage by tag(s).
1367713651
format: double
@@ -13772,16 +13746,6 @@ components:
1377213746
is in private beta.
1377313747
format: double
1377413748
type: number
13775-
estimated_ingested_spans_percentage:
13776-
description: The percentage of estimated ingested spans usage by tag(s).
13777-
Note this field is in private beta.
13778-
format: double
13779-
type: number
13780-
estimated_ingested_spans_usage:
13781-
description: The estimated ingested spans usage by tag(s). Note this field
13782-
is in private beta.
13783-
format: double
13784-
type: number
1378513749
infra_host_percentage:
1378613750
description: The percentage of infrastructure host usage by tag(s).
1378713751
format: double

‎.generator/schemas/v2/openapi.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4166,6 +4166,9 @@ components:
41664166
points:
41674167
- timestamp: 1475317847
41684168
value: 0.7
4169+
resources:
4170+
- name: dummyhost
4171+
type: host
41694172
items:
41704173
$ref: '#/components/schemas/MetricSeries'
41714174
type: array
@@ -4193,12 +4196,15 @@ components:
41934196
type: object
41944197
MetricResource:
41954198
description: Metric resource.
4199+
example:
4200+
name: dummyhost
4201+
type: host
41964202
properties:
41974203
name:
4198-
description: The name of the metric.
4204+
description: The name of the resource.
41994205
type: string
42004206
type:
4201-
description: The type of metric.
4207+
description: The type of the resource.
42024208
type: string
42034209
type: object
42044210
MetricSeries:
@@ -12097,7 +12103,7 @@ paths:
1209712103
metrics directly to the Datadog API without using DogStatsD, expect:\n\n-
1209812104
64 bits for the timestamp\n- 64 bits for the value\n- 20 bytes for the metric
1209912105
names\n- 50 bytes for the timeseries\n- The full payload is approximately
12100-
100 bytes."
12106+
100 bytes.\n\nHost name is one of the resources in the Resources field."
1210112107
operationId: SubmitMetrics
1210212108
parameters:
1210312109
- description: HTTP header used to compress the media-type.

‎examples/v2/metrics/SubmitMetrics.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.datadog.api.client.v2.model.MetricIntakeType;
77
import com.datadog.api.client.v2.model.MetricPayload;
88
import com.datadog.api.client.v2.model.MetricPoint;
9+
import com.datadog.api.client.v2.model.MetricResource;
910
import com.datadog.api.client.v2.model.MetricSeries;
1011
import java.time.OffsetDateTime;
1112
import java.util.Collections;
@@ -26,7 +27,10 @@ public static void main(String[] args) {
2627
Collections.singletonList(
2728
new MetricPoint()
2829
.timestamp(OffsetDateTime.now().toInstant().getEpochSecond())
29-
.value(0.7)))));
30+
.value(0.7)))
31+
.resources(
32+
Collections.singletonList(
33+
new MetricResource().name("dummyhost").type("host")))));
3034

3135
try {
3236
IntakePayloadAccepted result = apiInstance.submitMetrics(body);

‎src/main/java/com/datadog/api/client/v1/model/HourlyUsageAttributionUsageType.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ public class HourlyUsageAttributionUsageType {
5252
new HourlyUsageAttributionUsageType("estimated_indexed_logs_usage");
5353
public static final HourlyUsageAttributionUsageType ESTIMATED_INDEXED_SPANS_USAGE =
5454
new HourlyUsageAttributionUsageType("estimated_indexed_spans_usage");
55-
public static final HourlyUsageAttributionUsageType ESTIMATED_INGESTED_SPANS_USAGE =
56-
new HourlyUsageAttributionUsageType("estimated_ingested_spans_usage");
5755
public static final HourlyUsageAttributionUsageType FARGATE_USAGE =
5856
new HourlyUsageAttributionUsageType("fargate_usage");
5957
public static final HourlyUsageAttributionUsageType FUNCTIONS_USAGE =
@@ -90,7 +88,6 @@ public class HourlyUsageAttributionUsageType {
9088
"dbm_queries_usage",
9189
"estimated_indexed_logs_usage",
9290
"estimated_indexed_spans_usage",
93-
"estimated_ingested_spans_usage",
9491
"fargate_usage",
9592
"functions_usage",
9693
"indexed_logs_usage",

‎src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionSupportedMetrics.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ public class MonthlyUsageAttributionSupportedMetrics {
8282
new MonthlyUsageAttributionSupportedMetrics("estimated_indexed_spans_usage");
8383
public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INDEXED_SPANS_PERCENTAGE =
8484
new MonthlyUsageAttributionSupportedMetrics("estimated_indexed_spans_percentage");
85-
public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_USAGE =
86-
new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_spans_usage");
87-
public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_PERCENTAGE =
88-
new MonthlyUsageAttributionSupportedMetrics("estimated_ingested_spans_percentage");
8985
public static final MonthlyUsageAttributionSupportedMetrics FARGATE_USAGE =
9086
new MonthlyUsageAttributionSupportedMetrics("fargate_usage");
9187
public static final MonthlyUsageAttributionSupportedMetrics FARGATE_PERCENTAGE =
@@ -156,8 +152,6 @@ public class MonthlyUsageAttributionSupportedMetrics {
156152
"estimated_indexed_logs_percentage",
157153
"estimated_indexed_spans_usage",
158154
"estimated_indexed_spans_percentage",
159-
"estimated_ingested_spans_usage",
160-
"estimated_ingested_spans_percentage",
161155
"fargate_usage",
162156
"fargate_percentage",
163157
"functions_usage",

‎src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionValues.java‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_LOGS_USAGE,
3131
MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_PERCENTAGE,
3232
MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INDEXED_SPANS_USAGE,
33-
MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE,
34-
MonthlyUsageAttributionValues.JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE,
3533
MonthlyUsageAttributionValues.JSON_PROPERTY_FARGATE_PERCENTAGE,
3634
MonthlyUsageAttributionValues.JSON_PROPERTY_FARGATE_USAGE,
3735
MonthlyUsageAttributionValues.JSON_PROPERTY_FUNCTIONS_PERCENTAGE,
@@ -108,14 +106,6 @@ public class MonthlyUsageAttributionValues {
108106
"estimated_indexed_spans_usage";
109107
private Double estimatedIndexedSpansUsage;
110108

111-
public static final String JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE =
112-
"estimated_ingested_spans_percentage";
113-
private Double estimatedIngestedSpansPercentage;
114-
115-
public static final String JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE =
116-
"estimated_ingested_spans_usage";
117-
private Double estimatedIngestedSpansUsage;
118-
119109
public static final String JSON_PROPERTY_FARGATE_PERCENTAGE = "fargate_percentage";
120110
private Double fargatePercentage;
121111

@@ -511,50 +501,6 @@ public void setEstimatedIndexedSpansUsage(Double estimatedIndexedSpansUsage) {
511501
this.estimatedIndexedSpansUsage = estimatedIndexedSpansUsage;
512502
}
513503

514-
public MonthlyUsageAttributionValues estimatedIngestedSpansPercentage(
515-
Double estimatedIngestedSpansPercentage) {
516-
this.estimatedIngestedSpansPercentage = estimatedIngestedSpansPercentage;
517-
return this;
518-
}
519-
520-
/**
521-
* The percentage of estimated ingested spans usage by tag(s). This field is in private beta.
522-
*
523-
* @return estimatedIngestedSpansPercentage
524-
*/
525-
@javax.annotation.Nullable
526-
@JsonProperty(JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_PERCENTAGE)
527-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
528-
public Double getEstimatedIngestedSpansPercentage() {
529-
return estimatedIngestedSpansPercentage;
530-
}
531-
532-
public void setEstimatedIngestedSpansPercentage(Double estimatedIngestedSpansPercentage) {
533-
this.estimatedIngestedSpansPercentage = estimatedIngestedSpansPercentage;
534-
}
535-
536-
public MonthlyUsageAttributionValues estimatedIngestedSpansUsage(
537-
Double estimatedIngestedSpansUsage) {
538-
this.estimatedIngestedSpansUsage = estimatedIngestedSpansUsage;
539-
return this;
540-
}
541-
542-
/**
543-
* The estimated ingested spans usage by tag(s). This field is in private beta.
544-
*
545-
* @return estimatedIngestedSpansUsage
546-
*/
547-
@javax.annotation.Nullable
548-
@JsonProperty(JSON_PROPERTY_ESTIMATED_INGESTED_SPANS_USAGE)
549-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
550-
public Double getEstimatedIngestedSpansUsage() {
551-
return estimatedIngestedSpansUsage;
552-
}
553-
554-
public void setEstimatedIngestedSpansUsage(Double estimatedIngestedSpansUsage) {
555-
this.estimatedIngestedSpansUsage = estimatedIngestedSpansUsage;
556-
}
557-
558504
public MonthlyUsageAttributionValues fargatePercentage(Double fargatePercentage) {
559505
this.fargatePercentage = fargatePercentage;
560506
return this;
@@ -971,12 +917,6 @@ public boolean equals(Object o) {
971917
&& Objects.equals(
972918
this.estimatedIndexedSpansUsage,
973919
monthlyUsageAttributionValues.estimatedIndexedSpansUsage)
974-
&& Objects.equals(
975-
this.estimatedIngestedSpansPercentage,
976-
monthlyUsageAttributionValues.estimatedIngestedSpansPercentage)
977-
&& Objects.equals(
978-
this.estimatedIngestedSpansUsage,
979-
monthlyUsageAttributionValues.estimatedIngestedSpansUsage)
980920
&& Objects.equals(this.fargatePercentage, monthlyUsageAttributionValues.fargatePercentage)
981921
&& Objects.equals(this.fargateUsage, monthlyUsageAttributionValues.fargateUsage)
982922
&& Objects.equals(
@@ -1024,8 +964,6 @@ public int hashCode() {
1024964
estimatedIndexedLogsUsage,
1025965
estimatedIndexedSpansPercentage,
1026966
estimatedIndexedSpansUsage,
1027-
estimatedIngestedSpansPercentage,
1028-
estimatedIngestedSpansUsage,
1029967
fargatePercentage,
1030968
fargateUsage,
1031969
functionsPercentage,
@@ -1080,12 +1018,6 @@ public String toString() {
10801018
sb.append(" estimatedIndexedSpansUsage: ")
10811019
.append(toIndentedString(estimatedIndexedSpansUsage))
10821020
.append("\n");
1083-
sb.append(" estimatedIngestedSpansPercentage: ")
1084-
.append(toIndentedString(estimatedIngestedSpansPercentage))
1085-
.append("\n");
1086-
sb.append(" estimatedIngestedSpansUsage: ")
1087-
.append(toIndentedString(estimatedIngestedSpansUsage))
1088-
.append("\n");
10891021
sb.append(" fargatePercentage: ").append(toIndentedString(fargatePercentage)).append("\n");
10901022
sb.append(" fargateUsage: ").append(toIndentedString(fargateUsage)).append("\n");
10911023
sb.append(" functionsPercentage: ")

‎src/main/java/com/datadog/api/client/v1/model/UsageAttributionSort.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ public class UsageAttributionSort {
7272
new UsageAttributionSort("estimated_indexed_spans_usage");
7373
public static final UsageAttributionSort ESTIMATED_INDEXED_SPANS_PERCENTAGE =
7474
new UsageAttributionSort("estimated_indexed_spans_percentage");
75-
public static final UsageAttributionSort ESTIMATED_INGESTED_SPANS_USAGE =
76-
new UsageAttributionSort("estimated_ingested_spans_usage");
77-
public static final UsageAttributionSort ESTIMATED_INGESTED_SPANS_PERCENTAGE =
78-
new UsageAttributionSort("estimated_ingested_spans_percentage");
7975

8076
private static final Set<String> allowedValues =
8177
new HashSet<String>(
@@ -105,9 +101,7 @@ public class UsageAttributionSort {
105101
"estimated_indexed_logs_usage",
106102
"estimated_indexed_logs_percentage",
107103
"estimated_indexed_spans_usage",
108-
"estimated_indexed_spans_percentage",
109-
"estimated_ingested_spans_usage",
110-
"estimated_ingested_spans_percentage"));
104+
"estimated_indexed_spans_percentage"));
111105

112106
private String value;
113107

‎src/main/java/com/datadog/api/client/v1/model/UsageAttributionSupportedMetrics.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ public class UsageAttributionSupportedMetrics {
9999
new UsageAttributionSupportedMetrics("estimated_indexed_spans_usage");
100100
public static final UsageAttributionSupportedMetrics ESTIMATED_INDEXED_SPANS_PERCENTAGE =
101101
new UsageAttributionSupportedMetrics("estimated_indexed_spans_percentage");
102-
public static final UsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_USAGE =
103-
new UsageAttributionSupportedMetrics("estimated_ingested_spans_usage");
104-
public static final UsageAttributionSupportedMetrics ESTIMATED_INGESTED_SPANS_PERCENTAGE =
105-
new UsageAttributionSupportedMetrics("estimated_ingested_spans_percentage");
106102
public static final UsageAttributionSupportedMetrics ALL =
107103
new UsageAttributionSupportedMetrics("*");
108104

@@ -145,8 +141,6 @@ public class UsageAttributionSupportedMetrics {
145141
"appsec_percentage",
146142
"estimated_indexed_spans_usage",
147143
"estimated_indexed_spans_percentage",
148-
"estimated_ingested_spans_usage",
149-
"estimated_ingested_spans_percentage",
150144
"*"));
151145

152146
private String value;

0 commit comments

Comments
 (0)