Skip to content

WIP Add processors groups to Observability Pipelines #3231

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP Add processors groups to Observability Pipelines #3231

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
275 changes: 210 additions & 65 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 14 additions & 11 deletions examples/v2/observability-pipelines/CreatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.datadog.api.client.v2.model.ObservabilityPipelineConfig;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigDestinationItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessorItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessors;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigSourceItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineDataAttributes;
import com.datadog.api.client.v2.model.ObservabilityPipelineDatadogAgentSource;
Expand Down Expand Up @@ -45,17 +46,19 @@ public static void main(String[] args) {
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER))))
ObservabilityPipelineConfigProcessors
.fromObservabilityPipelineConfigProcessorItemList(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER)))))
.sources(
Collections.singletonList(
new ObservabilityPipelineConfigSourceItem(
Expand Down
25 changes: 14 additions & 11 deletions examples/v2/observability-pipelines/UpdatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.datadog.api.client.v2.model.ObservabilityPipelineConfig;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigDestinationItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessorItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessors;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigSourceItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineData;
import com.datadog.api.client.v2.model.ObservabilityPipelineDataAttributes;
Expand Down Expand Up @@ -47,17 +48,19 @@ public static void main(String[] args) {
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER))))
ObservabilityPipelineConfigProcessors
.fromObservabilityPipelineConfigProcessorItemList(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER)))))
.sources(
Collections.singletonList(
new ObservabilityPipelineConfigSourceItem(
Expand Down
25 changes: 14 additions & 11 deletions examples/v2/observability-pipelines/ValidatePipeline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.datadog.api.client.v2.model.ObservabilityPipelineConfig;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigDestinationItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessorItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigProcessors;
import com.datadog.api.client.v2.model.ObservabilityPipelineConfigSourceItem;
import com.datadog.api.client.v2.model.ObservabilityPipelineDataAttributes;
import com.datadog.api.client.v2.model.ObservabilityPipelineDatadogAgentSource;
Expand Down Expand Up @@ -45,17 +46,19 @@ public static void main(String[] args) {
ObservabilityPipelineDatadogLogsDestinationType
.DATADOG_LOGS))))
.processors(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER))))
ObservabilityPipelineConfigProcessors
.fromObservabilityPipelineConfigProcessorItemList(
Collections.singletonList(
new ObservabilityPipelineConfigProcessorItem(
new ObservabilityPipelineFilterProcessor()
.id("filter-processor")
.include("service:my-service")
.inputs(
Collections.singletonList(
"datadog-agent-source"))
.type(
ObservabilityPipelineFilterProcessorType
.FILTER)))))
.sources(
Collections.singletonList(
new ObservabilityPipelineConfigSourceItem(
Expand Down
44 changes: 37 additions & 7 deletions src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineAddEnvVarsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

/** The <code>add_env_vars</code> processor adds environment variable values to log events. */
@JsonPropertyOrder({
ObservabilityPipelineAddEnvVarsProcessor.JSON_PROPERTY_ENABLED,
ObservabilityPipelineAddEnvVarsProcessor.JSON_PROPERTY_ID,
ObservabilityPipelineAddEnvVarsProcessor.JSON_PROPERTY_INCLUDE,
ObservabilityPipelineAddEnvVarsProcessor.JSON_PROPERTY_INPUTS,
Expand All @@ -31,14 +32,17 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class ObservabilityPipelineAddEnvVarsProcessor {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_ENABLED = "enabled";
private Boolean enabled;

public static final String JSON_PROPERTY_ID = "id";
private String id;

public static final String JSON_PROPERTY_INCLUDE = "include";
private String include;

public static final String JSON_PROPERTY_INPUTS = "inputs";
private List<String> inputs = new ArrayList<>();
private List<String> inputs = null;

public static final String JSON_PROPERTY_TYPE = "type";
private ObservabilityPipelineAddEnvVarsProcessorType type =
Expand All @@ -53,19 +57,38 @@ public ObservabilityPipelineAddEnvVarsProcessor() {}
public ObservabilityPipelineAddEnvVarsProcessor(
@JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
@JsonProperty(required = true, value = JSON_PROPERTY_INCLUDE) String include,
@JsonProperty(required = true, value = JSON_PROPERTY_INPUTS) List<String> inputs,
@JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
ObservabilityPipelineAddEnvVarsProcessorType type,
@JsonProperty(required = true, value = JSON_PROPERTY_VARIABLES)
List<ObservabilityPipelineAddEnvVarsProcessorVariable> variables) {
this.id = id;
this.include = include;
this.inputs = inputs;
this.type = type;
this.unparsed |= !type.isValid();
this.variables = variables;
}

public ObservabilityPipelineAddEnvVarsProcessor enabled(Boolean enabled) {
this.enabled = enabled;
return this;
}

/**
* Whether this processor is enabled.
*
* @return enabled
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_ENABLED)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getEnabled() {
return enabled;
}

public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}

public ObservabilityPipelineAddEnvVarsProcessor id(String id) {
this.id = id;
return this;
Expand Down Expand Up @@ -112,17 +135,22 @@ public ObservabilityPipelineAddEnvVarsProcessor inputs(List<String> inputs) {
}

public ObservabilityPipelineAddEnvVarsProcessor addInputsItem(String inputsItem) {
if (this.inputs == null) {
this.inputs = new ArrayList<>();
}
this.inputs.add(inputsItem);
return this;
}

/**
* A list of component IDs whose output is used as the input for this processor.
* A list of component IDs whose output is used as input for this processor. Required when used as
* a standalone processor, omit when used within a processor group.
*
* @return inputs
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_INPUTS)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<String> getInputs() {
return inputs;
}
Expand Down Expand Up @@ -244,7 +272,8 @@ public boolean equals(Object o) {
}
ObservabilityPipelineAddEnvVarsProcessor observabilityPipelineAddEnvVarsProcessor =
(ObservabilityPipelineAddEnvVarsProcessor) o;
return Objects.equals(this.id, observabilityPipelineAddEnvVarsProcessor.id)
return Objects.equals(this.enabled, observabilityPipelineAddEnvVarsProcessor.enabled)
&& Objects.equals(this.id, observabilityPipelineAddEnvVarsProcessor.id)
&& Objects.equals(this.include, observabilityPipelineAddEnvVarsProcessor.include)
&& Objects.equals(this.inputs, observabilityPipelineAddEnvVarsProcessor.inputs)
&& Objects.equals(this.type, observabilityPipelineAddEnvVarsProcessor.type)
Expand All @@ -256,13 +285,14 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(id, include, inputs, type, variables, additionalProperties);
return Objects.hash(enabled, id, include, inputs, type, variables, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ObservabilityPipelineAddEnvVarsProcessor {\n");
sb.append(" enabled: ").append(toIndentedString(enabled)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" include: ").append(toIndentedString(include)).append("\n");
sb.append(" inputs: ").append(toIndentedString(inputs)).append("\n");
Expand Down
44 changes: 37 additions & 7 deletions src/main/java/com/datadog/api/client/v2/model/ObservabilityPipelineAddFieldsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

/** The <code>add_fields</code> processor adds static key-value fields to logs. */
@JsonPropertyOrder({
ObservabilityPipelineAddFieldsProcessor.JSON_PROPERTY_ENABLED,
ObservabilityPipelineAddFieldsProcessor.JSON_PROPERTY_FIELDS,
ObservabilityPipelineAddFieldsProcessor.JSON_PROPERTY_ID,
ObservabilityPipelineAddFieldsProcessor.JSON_PROPERTY_INCLUDE,
Expand All @@ -31,6 +32,9 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class ObservabilityPipelineAddFieldsProcessor {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_ENABLED = "enabled";
private Boolean enabled;

public static final String JSON_PROPERTY_FIELDS = "fields";
private List<ObservabilityPipelineFieldValue> fields = new ArrayList<>();

Expand All @@ -41,7 +45,7 @@ public class ObservabilityPipelineAddFieldsProcessor {
private String include;

public static final String JSON_PROPERTY_INPUTS = "inputs";
private List<String> inputs = new ArrayList<>();
private List<String> inputs = null;

public static final String JSON_PROPERTY_TYPE = "type";
private ObservabilityPipelineAddFieldsProcessorType type =
Expand All @@ -55,17 +59,36 @@ public ObservabilityPipelineAddFieldsProcessor(
List<ObservabilityPipelineFieldValue> fields,
@JsonProperty(required = true, value = JSON_PROPERTY_ID) String id,
@JsonProperty(required = true, value = JSON_PROPERTY_INCLUDE) String include,
@JsonProperty(required = true, value = JSON_PROPERTY_INPUTS) List<String> inputs,
@JsonProperty(required = true, value = JSON_PROPERTY_TYPE)
ObservabilityPipelineAddFieldsProcessorType type) {
this.fields = fields;
this.id = id;
this.include = include;
this.inputs = inputs;
this.type = type;
this.unparsed |= !type.isValid();
}

public ObservabilityPipelineAddFieldsProcessor enabled(Boolean enabled) {
this.enabled = enabled;
return this;
}

/**
* Whether this processor is enabled.
*
* @return enabled
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_ENABLED)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getEnabled() {
return enabled;
}

public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}

public ObservabilityPipelineAddFieldsProcessor fields(
List<ObservabilityPipelineFieldValue> fields) {
this.fields = fields;
Expand Down Expand Up @@ -145,17 +168,22 @@ public ObservabilityPipelineAddFieldsProcessor inputs(List<String> inputs) {
}

public ObservabilityPipelineAddFieldsProcessor addInputsItem(String inputsItem) {
if (this.inputs == null) {
this.inputs = new ArrayList<>();
}
this.inputs.add(inputsItem);
return this;
}

/**
* A list of component IDs whose output is used as the <code>input</code> for this component.
* A list of component IDs whose output is used as input for this processor. Required when used as
* a standalone processor, omit when used within a processor group.
*
* @return inputs
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_INPUTS)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<String> getInputs() {
return inputs;
}
Expand Down Expand Up @@ -246,7 +274,8 @@ public boolean equals(Object o) {
}
ObservabilityPipelineAddFieldsProcessor observabilityPipelineAddFieldsProcessor =
(ObservabilityPipelineAddFieldsProcessor) o;
return Objects.equals(this.fields, observabilityPipelineAddFieldsProcessor.fields)
return Objects.equals(this.enabled, observabilityPipelineAddFieldsProcessor.enabled)
&& Objects.equals(this.fields, observabilityPipelineAddFieldsProcessor.fields)
&& Objects.equals(this.id, observabilityPipelineAddFieldsProcessor.id)
&& Objects.equals(this.include, observabilityPipelineAddFieldsProcessor.include)
&& Objects.equals(this.inputs, observabilityPipelineAddFieldsProcessor.inputs)
Expand All @@ -258,13 +287,14 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(fields, id, include, inputs, type, additionalProperties);
return Objects.hash(enabled, fields, id, include, inputs, type, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class ObservabilityPipelineAddFieldsProcessor {\n");
sb.append(" enabled: ").append(toIndentedString(enabled)).append("\n");
sb.append(" fields: ").append(toIndentedString(fields)).append("\n");
sb.append(" id: ").append(toIndentedString(id)).append("\n");
sb.append(" include: ").append(toIndentedString(include)).append("\n");
Expand Down
Loading
Loading