Skip to content
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

[GOBBLIN-2164] Add default value for OpenTelemetry attribute #4065

Merged
merged 1 commit into from
Oct 7, 2024
Merged

[GOBBLIN-2164] Add default value for OpenTelemetry attribute #4065

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
26 changes: 21 additions & 5 deletions ...rc/main/java/org/apache/gobblin/service/monitoring/GaaSJobObservabilityEventProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public abstract class GaaSJobObservabilityEventProducer implements Closeable {
public static final String ISSUES_READ_FAILED_METRIC_NAME = GAAS_JOB_OBSERVABILITY_EVENT_PRODUCER_PREFIX + "getIssuesFailedCount";
public static final String GAAS_OBSERVABILITY_METRICS_GROUPNAME = GAAS_JOB_OBSERVABILITY_EVENT_PRODUCER_PREFIX + "metrics";
public static final String GAAS_OBSERVABILITY_JOB_SUCCEEDED_METRIC_NAME = "jobSucceeded";
private static final String DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE = "-";

protected MetricContext metricContext;
protected State state;
Expand Down Expand Up @@ -138,16 +139,31 @@ public void emitObservabilityEvent(final State jobState) {
}

public Attributes getEventAttributes(GaaSJobObservabilityEvent event) {
Attributes tags = Attributes.builder().put(TimingEvent.FlowEventConstants.FLOW_NAME_FIELD, event.getFlowName())
.put(TimingEvent.FlowEventConstants.FLOW_GROUP_FIELD, event.getFlowGroup())
.put(TimingEvent.FlowEventConstants.JOB_NAME_FIELD, event.getJobName())
Attributes tags = Attributes.builder().put(TimingEvent.FlowEventConstants.FLOW_NAME_FIELD, getOrDefault(event.getFlowName(), DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE))
.put(TimingEvent.FlowEventConstants.FLOW_GROUP_FIELD, getOrDefault(event.getFlowGroup(), DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE))
.put(TimingEvent.FlowEventConstants.JOB_NAME_FIELD, getOrDefault(event.getJobName(), DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE))
.put(TimingEvent.FlowEventConstants.FLOW_EXECUTION_ID_FIELD, event.getFlowExecutionId())
.put(TimingEvent.FlowEventConstants.SPEC_EXECUTOR_FIELD, event.getExecutorId())
.put(TimingEvent.FlowEventConstants.FLOW_EDGE_FIELD, event.getFlowEdgeId())
.put(TimingEvent.FlowEventConstants.SPEC_EXECUTOR_FIELD, getOrDefault(event.getExecutorId(), DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE))
.put(TimingEvent.FlowEventConstants.FLOW_EDGE_FIELD, getOrDefault(event.getFlowEdgeId(), DEFAULT_OPENTELEMETRY_ATTRIBUTE_VALUE))
.build();
return tags;
}

/**
* Returns the given string value if it is not empty (i.e., not null and not empty).
* Otherwise, returns the specified default value.
*
* <p>This method utilizes {@link org.apache.commons.lang3.StringUtils#isNotEmpty(CharSequence)}
* to check if the string is non-empty.</p>
*
* @param value the string to check
* @param defaultValue the default value to return if the provided string is empty or null
* @return the original string if it is not empty; otherwise, the provided default value
*/
private String getOrDefault(String value, String defaultValue) {
return StringUtils.isNotEmpty(value) ? value : defaultValue;
}

/**
* Emits the GaaSJobObservabilityEvent with the mechanism that the child class is built upon e.g. Kafka
* @param event
Expand Down
Loading