Skip to content

Commit fd0b598

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 80f37b17 of spec repo
1 parent 3598d7c commit fd0b598

10 files changed

+814
-21
lines changed

.apigentools-info

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2025-04-07 18:49:32.102281",
8-
"spec_repo_commit": "d0287df0"
7+
"regenerated": "2025-04-08 12:10:12.058060",
8+
"spec_repo_commit": "80f37b17"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-04-07 18:49:32.119706",
13-
"spec_repo_commit": "d0287df0"
12+
"regenerated": "2025-04-08 12:10:12.074306",
13+
"spec_repo_commit": "80f37b17"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

+71-3
Original file line numberDiff line numberDiff line change
@@ -21567,7 +21567,6 @@ components:
2156721567
type: array
2156821568
required:
2156921569
- sources
21570-
- processors
2157121570
- destinations
2157221571
type: object
2157321572
ObservabilityPipelineConfigDestinationItem:
@@ -21583,11 +21582,13 @@ components:
2158321582
- $ref: '#/components/schemas/ObservabilityPipelineAddFieldsProcessor'
2158421583
- $ref: '#/components/schemas/ObservabilityPipelineRemoveFieldsProcessor'
2158521584
- $ref: '#/components/schemas/ObservabilityPipelineRenameFieldsProcessor'
21585+
- $ref: '#/components/schemas/ObservabilityPipelineSampleProcessor'
2158621586
ObservabilityPipelineConfigSourceItem:
2158721587
description: A data source for the pipeline.
2158821588
oneOf:
2158921589
- $ref: '#/components/schemas/ObservabilityPipelineKafkaSource'
2159021590
- $ref: '#/components/schemas/ObservabilityPipelineDatadogAgentSource'
21591+
- $ref: '#/components/schemas/ObservabilityPipelineFluentSource'
2159121592
ObservabilityPipelineCreateRequest:
2159221593
description: Top-level schema representing a pipeline.
2159321594
properties:
@@ -21759,6 +21760,32 @@ components:
2175921760
type: string
2176021761
x-enum-varnames:
2176121762
- FILTER
21763+
ObservabilityPipelineFluentSource:
21764+
description: The `fluent` source ingests logs from a Fluentd-compatible service.
21765+
properties:
21766+
id:
21767+
description: The unique identifier for this component. Used to reference
21768+
this component in other parts of the pipeline (for example, as the `input`
21769+
to downstream components).
21770+
example: fluent-source
21771+
type: string
21772+
tls:
21773+
$ref: '#/components/schemas/ObservabilityPipelineTls'
21774+
type:
21775+
$ref: '#/components/schemas/ObservabilityPipelineFluentSourceType'
21776+
required:
21777+
- id
21778+
- type
21779+
type: object
21780+
ObservabilityPipelineFluentSourceType:
21781+
default: fluent
21782+
description: The source type. The value should always be `fluent`.
21783+
enum:
21784+
- fluent
21785+
example: fluent
21786+
type: string
21787+
x-enum-varnames:
21788+
- FLUENT
2176221789
ObservabilityPipelineKafkaSource:
2176321790
description: The `kafka` source ingests data from Apache Kafka topics.
2176421791
properties:
@@ -21926,8 +21953,8 @@ components:
2192621953
limit:
2192721954
$ref: '#/components/schemas/ObservabilityPipelineQuotaProcessorLimit'
2192821955
name:
21929-
description: Name for identifying the processor.
21930-
example: MyPipelineQuotaProcessor
21956+
description: Name of the quota.
21957+
example: MyQuota
2193121958
type: string
2193221959
overrides:
2193321960
description: A list of alternate quota rules that apply to specific sets
@@ -22121,6 +22148,47 @@ components:
2212122148
type: string
2212222149
x-enum-varnames:
2212322150
- RENAME_FIELDS
22151+
ObservabilityPipelineSampleProcessor:
22152+
description: The `sample` processor allows probabilistic sampling of logs at
22153+
a fixed rate.
22154+
properties:
22155+
id:
22156+
description: The unique identifier for this component. Used to reference
22157+
this component in other parts of the pipeline (for example, as the `input`
22158+
to downstream components).
22159+
example: sample-processor
22160+
type: string
22161+
inputs:
22162+
description: A list of component IDs whose output is used as the `input`
22163+
for this component.
22164+
example:
22165+
- filter-processor
22166+
items:
22167+
type: string
22168+
type: array
22169+
rate:
22170+
description: Number of events to sample (1 in N).
22171+
example: 10
22172+
format: int64
22173+
minimum: 1
22174+
type: integer
22175+
type:
22176+
$ref: '#/components/schemas/ObservabilityPipelineSampleProcessorType'
22177+
required:
22178+
- id
22179+
- type
22180+
- rate
22181+
- inputs
22182+
type: object
22183+
ObservabilityPipelineSampleProcessorType:
22184+
default: sample
22185+
description: The processor type. The value should always be `sample`.
22186+
enum:
22187+
- sample
22188+
example: sample
22189+
type: string
22190+
x-enum-varnames:
22191+
- SAMPLE
2212422192
ObservabilityPipelineTls:
2212522193
description: Configuration for enabling TLS encryption.
2212622194
properties:

src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfig.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ObservabilityPipelineConfig {
3333
private List<ObservabilityPipelineConfigDestinationItem> destinations = new ArrayList<>();
3434

3535
public static final String JSON_PROPERTY_PROCESSORS = "processors";
36-
private List<ObservabilityPipelineConfigProcessorItem> processors = new ArrayList<>();
36+
private List<ObservabilityPipelineConfigProcessorItem> processors = null;
3737

3838
public static final String JSON_PROPERTY_SOURCES = "sources";
3939
private List<ObservabilityPipelineConfigSourceItem> sources = new ArrayList<>();
@@ -44,12 +44,9 @@ public ObservabilityPipelineConfig() {}
4444
public ObservabilityPipelineConfig(
4545
@JsonProperty(required = true, value = JSON_PROPERTY_DESTINATIONS)
4646
List<ObservabilityPipelineConfigDestinationItem> destinations,
47-
@JsonProperty(required = true, value = JSON_PROPERTY_PROCESSORS)
48-
List<ObservabilityPipelineConfigProcessorItem> processors,
4947
@JsonProperty(required = true, value = JSON_PROPERTY_SOURCES)
5048
List<ObservabilityPipelineConfigSourceItem> sources) {
5149
this.destinations = destinations;
52-
this.processors = processors;
5350
this.sources = sources;
5451
}
5552

@@ -95,6 +92,9 @@ public ObservabilityPipelineConfig processors(
9592

9693
public ObservabilityPipelineConfig addProcessorsItem(
9794
ObservabilityPipelineConfigProcessorItem processorsItem) {
95+
if (this.processors == null) {
96+
this.processors = new ArrayList<>();
97+
}
9898
this.processors.add(processorsItem);
9999
this.unparsed |= processorsItem.unparsed;
100100
return this;
@@ -105,8 +105,9 @@ public ObservabilityPipelineConfig addProcessorsItem(
105105
*
106106
* @return processors
107107
*/
108+
@jakarta.annotation.Nullable
108109
@JsonProperty(JSON_PROPERTY_PROCESSORS)
109-
@JsonInclude(value = JsonInclude.Include.ALWAYS)
110+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
110111
public List<ObservabilityPipelineConfigProcessorItem> getProcessors() {
111112
return processors;
112113
}

src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfigProcessorItem.java

+78-4
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,55 @@ public ObservabilityPipelineConfigProcessorItem deserialize(
393393
e);
394394
}
395395

396+
// deserialize ObservabilityPipelineSampleProcessor
397+
try {
398+
boolean attemptParsing = true;
399+
// ensure that we respect type coercion as set on the client ObjectMapper
400+
if (ObservabilityPipelineSampleProcessor.class.equals(Integer.class)
401+
|| ObservabilityPipelineSampleProcessor.class.equals(Long.class)
402+
|| ObservabilityPipelineSampleProcessor.class.equals(Float.class)
403+
|| ObservabilityPipelineSampleProcessor.class.equals(Double.class)
404+
|| ObservabilityPipelineSampleProcessor.class.equals(Boolean.class)
405+
|| ObservabilityPipelineSampleProcessor.class.equals(String.class)) {
406+
attemptParsing = typeCoercion;
407+
if (!attemptParsing) {
408+
attemptParsing |=
409+
((ObservabilityPipelineSampleProcessor.class.equals(Integer.class)
410+
|| ObservabilityPipelineSampleProcessor.class.equals(Long.class))
411+
&& token == JsonToken.VALUE_NUMBER_INT);
412+
attemptParsing |=
413+
((ObservabilityPipelineSampleProcessor.class.equals(Float.class)
414+
|| ObservabilityPipelineSampleProcessor.class.equals(Double.class))
415+
&& (token == JsonToken.VALUE_NUMBER_FLOAT
416+
|| token == JsonToken.VALUE_NUMBER_INT));
417+
attemptParsing |=
418+
(ObservabilityPipelineSampleProcessor.class.equals(Boolean.class)
419+
&& (token == JsonToken.VALUE_FALSE || token == JsonToken.VALUE_TRUE));
420+
attemptParsing |=
421+
(ObservabilityPipelineSampleProcessor.class.equals(String.class)
422+
&& token == JsonToken.VALUE_STRING);
423+
}
424+
}
425+
if (attemptParsing) {
426+
tmp =
427+
tree.traverse(jp.getCodec()).readValueAs(ObservabilityPipelineSampleProcessor.class);
428+
// TODO: there is no validation against JSON schema constraints
429+
// (min, max, enum, pattern...), this does not perform a strict JSON
430+
// validation, which means the 'match' count may be higher than it should be.
431+
if (!((ObservabilityPipelineSampleProcessor) tmp).unparsed) {
432+
deserialized = tmp;
433+
match++;
434+
}
435+
log.log(Level.FINER, "Input data matches schema 'ObservabilityPipelineSampleProcessor'");
436+
}
437+
} catch (Exception e) {
438+
// deserialization failed, continue
439+
log.log(
440+
Level.FINER,
441+
"Input data does not match schema 'ObservabilityPipelineSampleProcessor'",
442+
e);
443+
}
444+
396445
ObservabilityPipelineConfigProcessorItem ret = new ObservabilityPipelineConfigProcessorItem();
397446
if (match == 1) {
398447
ret.setActualInstance(deserialized);
@@ -453,6 +502,11 @@ public ObservabilityPipelineConfigProcessorItem(ObservabilityPipelineRenameField
453502
setActualInstance(o);
454503
}
455504

505+
public ObservabilityPipelineConfigProcessorItem(ObservabilityPipelineSampleProcessor o) {
506+
super("oneOf", Boolean.FALSE);
507+
setActualInstance(o);
508+
}
509+
456510
static {
457511
schemas.put(
458512
"ObservabilityPipelineFilterProcessor",
@@ -472,6 +526,9 @@ public ObservabilityPipelineConfigProcessorItem(ObservabilityPipelineRenameField
472526
schemas.put(
473527
"ObservabilityPipelineRenameFieldsProcessor",
474528
new GenericType<ObservabilityPipelineRenameFieldsProcessor>() {});
529+
schemas.put(
530+
"ObservabilityPipelineSampleProcessor",
531+
new GenericType<ObservabilityPipelineSampleProcessor>() {});
475532
JSON.registerDescendants(
476533
ObservabilityPipelineConfigProcessorItem.class, Collections.unmodifiableMap(schemas));
477534
}
@@ -486,7 +543,7 @@ public Map<String, GenericType> getSchemas() {
486543
* against the oneOf child schemas: ObservabilityPipelineFilterProcessor,
487544
* ObservabilityPipelineParseJSONProcessor, ObservabilityPipelineQuotaProcessor,
488545
* ObservabilityPipelineAddFieldsProcessor, ObservabilityPipelineRemoveFieldsProcessor,
489-
* ObservabilityPipelineRenameFieldsProcessor
546+
* ObservabilityPipelineRenameFieldsProcessor, ObservabilityPipelineSampleProcessor
490547
*
491548
* <p>It could be an instance of the 'oneOf' schemas. The oneOf child schemas may themselves be a
492549
* composed schema (allOf, anyOf, oneOf).
@@ -523,6 +580,11 @@ public void setActualInstance(Object instance) {
523580
super.setActualInstance(instance);
524581
return;
525582
}
583+
if (JSON.isInstanceOf(
584+
ObservabilityPipelineSampleProcessor.class, instance, new HashSet<Class<?>>())) {
585+
super.setActualInstance(instance);
586+
return;
587+
}
526588

527589
if (JSON.isInstanceOf(UnparsedObject.class, instance, new HashSet<Class<?>>())) {
528590
super.setActualInstance(instance);
@@ -533,19 +595,19 @@ public void setActualInstance(Object instance) {
533595
+ " ObservabilityPipelineParseJSONProcessor, ObservabilityPipelineQuotaProcessor,"
534596
+ " ObservabilityPipelineAddFieldsProcessor,"
535597
+ " ObservabilityPipelineRemoveFieldsProcessor,"
536-
+ " ObservabilityPipelineRenameFieldsProcessor");
598+
+ " ObservabilityPipelineRenameFieldsProcessor, ObservabilityPipelineSampleProcessor");
537599
}
538600

539601
/**
540602
* Get the actual instance, which can be the following: ObservabilityPipelineFilterProcessor,
541603
* ObservabilityPipelineParseJSONProcessor, ObservabilityPipelineQuotaProcessor,
542604
* ObservabilityPipelineAddFieldsProcessor, ObservabilityPipelineRemoveFieldsProcessor,
543-
* ObservabilityPipelineRenameFieldsProcessor
605+
* ObservabilityPipelineRenameFieldsProcessor, ObservabilityPipelineSampleProcessor
544606
*
545607
* @return The actual instance (ObservabilityPipelineFilterProcessor,
546608
* ObservabilityPipelineParseJSONProcessor, ObservabilityPipelineQuotaProcessor,
547609
* ObservabilityPipelineAddFieldsProcessor, ObservabilityPipelineRemoveFieldsProcessor,
548-
* ObservabilityPipelineRenameFieldsProcessor)
610+
* ObservabilityPipelineRenameFieldsProcessor, ObservabilityPipelineSampleProcessor)
549611
*/
550612
@Override
551613
public Object getActualInstance() {
@@ -623,4 +685,16 @@ public ObservabilityPipelineRenameFieldsProcessor getObservabilityPipelineRename
623685
throws ClassCastException {
624686
return (ObservabilityPipelineRenameFieldsProcessor) super.getActualInstance();
625687
}
688+
689+
/**
690+
* Get the actual instance of `ObservabilityPipelineSampleProcessor`. If the actual instance is
691+
* not `ObservabilityPipelineSampleProcessor`, the ClassCastException will be thrown.
692+
*
693+
* @return The actual instance of `ObservabilityPipelineSampleProcessor`
694+
* @throws ClassCastException if the instance is not `ObservabilityPipelineSampleProcessor`
695+
*/
696+
public ObservabilityPipelineSampleProcessor getObservabilityPipelineSampleProcessor()
697+
throws ClassCastException {
698+
return (ObservabilityPipelineSampleProcessor) super.getActualInstance();
699+
}
626700
}

0 commit comments

Comments
 (0)