Skip to content

Rename top-level processors to processor_groups #3363

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

Closed
api-clients-generation-pipeline wants to merge 1 commit into from
Closed

Rename top-level processors to processor_groups #3363

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
2 changes: 1 addition & 1 deletion .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35657,7 +35657,7 @@ components:
items:
$ref: '#/components/schemas/ObservabilityPipelineConfigDestinationItem'
type: array
processors:
processor_groups:
description: A list of processor groups that transform or enrich log data.
example:
- enabled: true
Expand Down
2 changes: 1 addition & 1 deletion examples/v2/observability-pipelines/CreatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static void main(String[] args) {
.type(
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
.processorGroups(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorGroup()
.enabled(true)
Expand Down
2 changes: 1 addition & 1 deletion examples/v2/observability-pipelines/UpdatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static void main(String[] args) {
.type(
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
.processorGroups(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorGroup()
.enabled(true)
Expand Down
2 changes: 1 addition & 1 deletion examples/v2/observability-pipelines/ValidatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static void main(String[] args) {
.type(
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
.processorGroups(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorGroup()
.enabled(true)
Expand Down
44 changes: 22 additions & 22 deletions src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/** Specifies the pipeline's configuration, including its sources, processors, and destinations. */
@JsonPropertyOrder({
ObservabilityPipelineConfig.JSON_PROPERTY_DESTINATIONS,
ObservabilityPipelineConfig.JSON_PROPERTY_PROCESSORS,
ObservabilityPipelineConfig.JSON_PROPERTY_PROCESSOR_GROUPS,
ObservabilityPipelineConfig.JSON_PROPERTY_SOURCES
})
@jakarta.annotation.Generated(
Expand All @@ -32,8 +32,8 @@ public class ObservabilityPipelineConfig {
public static final String JSON_PROPERTY_DESTINATIONS = "destinations";
private List<ObservabilityPipelineConfigDestinationItem> destinations = new ArrayList<>();

public static final String JSON_PROPERTY_PROCESSORS = "processors";
private List<ObservabilityPipelineConfigProcessorGroup> processors = null;
public static final String JSON_PROPERTY_PROCESSOR_GROUPS = "processor_groups";
private List<ObservabilityPipelineConfigProcessorGroup> processorGroups = null;

public static final String JSON_PROPERTY_SOURCES = "sources";
private List<ObservabilityPipelineConfigSourceItem> sources = new ArrayList<>();
Expand Down Expand Up @@ -81,39 +81,39 @@ public void setDestinations(List<ObservabilityPipelineConfigDestinationItem> des
this.destinations = destinations;
}

public ObservabilityPipelineConfig processors(
List<ObservabilityPipelineConfigProcessorGroup> processors) {
this.processors = processors;
for (ObservabilityPipelineConfigProcessorGroup item : processors) {
public ObservabilityPipelineConfig processorGroups(
List<ObservabilityPipelineConfigProcessorGroup> processorGroups) {
this.processorGroups = processorGroups;
for (ObservabilityPipelineConfigProcessorGroup item : processorGroups) {
this.unparsed |= item.unparsed;
}
return this;
}

public ObservabilityPipelineConfig addProcessorsItem(
ObservabilityPipelineConfigProcessorGroup processorsItem) {
if (this.processors == null) {
this.processors = new ArrayList<>();
public ObservabilityPipelineConfig addProcessorGroupsItem(
ObservabilityPipelineConfigProcessorGroup processorGroupsItem) {
if (this.processorGroups == null) {
this.processorGroups = new ArrayList<>();
}
this.processors.add(processorsItem);
this.unparsed |= processorsItem.unparsed;
this.processorGroups.add(processorGroupsItem);
this.unparsed |= processorGroupsItem.unparsed;
return this;
}

/**
* A list of processor groups that transform or enrich log data.
*
* @return processors
* @return processorGroups
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_PROCESSORS)
@JsonProperty(JSON_PROPERTY_PROCESSOR_GROUPS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<ObservabilityPipelineConfigProcessorGroup> getProcessors() {
return processors;
public List<ObservabilityPipelineConfigProcessorGroup> getProcessorGroups() {
return processorGroups;
}

public void setProcessors(List<ObservabilityPipelineConfigProcessorGroup> processors) {
this.processors = processors;
public void setProcessorGroups(List<ObservabilityPipelineConfigProcessorGroup> processorGroups) {
this.processorGroups = processorGroups;
}

public ObservabilityPipelineConfig sources(List<ObservabilityPipelineConfigSourceItem> sources) {
Expand Down Expand Up @@ -203,23 +203,23 @@ public boolean equals(Object o) {
}
ObservabilityPipelineConfig observabilityPipelineConfig = (ObservabilityPipelineConfig) o;
return Objects.equals(this.destinations, observabilityPipelineConfig.destinations)
&& Objects.equals(this.processors, observabilityPipelineConfig.processors)
&& Objects.equals(this.processorGroups, observabilityPipelineConfig.processorGroups)
&& Objects.equals(this.sources, observabilityPipelineConfig.sources)
&& Objects.equals(
this.additionalProperties, observabilityPipelineConfig.additionalProperties);
}

@Override
public int hashCode() {
return Objects.hash(destinations, processors, sources, additionalProperties);
return Objects.hash(destinations, processorGroups, sources, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ObservabilityPipelineConfig {\n");
sb.append(" destinations: ").append(toIndentedString(destinations)).append("\n");
sb.append(" processors: ").append(toIndentedString(processors)).append("\n");
sb.append(" processorGroups: ").append(toIndentedString(processorGroups)).append("\n");
sb.append(" sources: ").append(toIndentedString(sources)).append("\n");
sb.append(" additionalProperties: ")
.append(toIndentedString(additionalProperties))
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/com/datadog/api/client/v2/api/given.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
"parameters": [
{
"name": "body",
"value": "{\n \"data\":{\n \"attributes\":{\n \"config\":{\n \"destinations\":[\n {\n \"id\":\"datadog-logs-destination\",\n \"inputs\":[\n \"processor-group-0\"\n ],\n \"type\":\"datadog_logs\"\n }\n ],\n \"processors\":[\n {\n \"id\":\"processor-group-0\",\n \"include\":\"service:my-service\",\n \"display_name\": \"My Processor Group\",\n \"inputs\":[\n \"datadog-agent-source\"\n ],\n \"enabled\": true,\n \"processors\": [\n {\n \"id\": \"filter-processor\",\n \"type\": \"filter\",\n \"include\": \"status:error\",\n \"display_name\": \"My Filter Processor\",\n \"enabled\": true\n }\n ]\n }\n ],\n \"sources\":[\n {\n \"id\":\"datadog-agent-source\",\n \"type\":\"datadog_agent\"\n }\n ]\n },\n \"name\":\"Main Observability Pipeline\"\n },\n \"type\":\"pipelines\"\n }\n}"
"value": "{\n \"data\":{\n \"attributes\":{\n \"config\":{\n \"destinations\":[\n {\n \"id\":\"datadog-logs-destination\",\n \"inputs\":[\n \"processor-group-0\"\n ],\n \"type\":\"datadog_logs\"\n }\n ],\n \"processor_groups\":[\n {\n \"id\":\"processor-group-0\",\n \"include\":\"service:my-service\",\n \"display_name\": \"My Processor Group\",\n \"inputs\":[\n \"datadog-agent-source\"\n ],\n \"enabled\": true,\n \"processors\": [\n {\n \"id\": \"filter-processor\",\n \"type\": \"filter\",\n \"include\": \"status:error\",\n \"display_name\": \"My Filter Processor\",\n \"enabled\": true\n }\n ]\n }\n ],\n \"sources\":[\n {\n \"id\":\"datadog-agent-source\",\n \"type\":\"datadog_agent\"\n }\n ]\n },\n \"name\":\"Main Observability Pipeline\"\n },\n \"type\":\"pipelines\"\n }\n}"
}
],
"step": "there is a valid \"pipeline\" in the system",
Expand Down
Loading
Loading