Skip to content

[BEAM-3802] Move metrics caching up a level #4824

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

Merged
kennknowles merged 1 commit into from
Mar 9, 2018
Merged

[BEAM-3802] Move metrics caching up a level #4824

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
16 changes: 6 additions & 10 deletions ...e-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class DataflowMetrics extends MetricResults {
* After the job has finished running, Metrics no longer will change, so their results are
* cached here.
*/
private MetricQueryResults cachedMetricResults = null;
private JobMetrics cachedMetricResults = null;

/**
* Constructor for the DataflowMetrics class.
Expand All @@ -88,14 +88,15 @@ private MetricQueryResults populateMetricQueryResults(
.build();
}

private MetricQueryResults queryServiceForMetrics(MetricsFilter filter) {
@Override
public MetricQueryResults queryMetrics(MetricsFilter filter) {
List<com.google.api.services.dataflow.model.MetricUpdate> metricUpdates;
ImmutableList<MetricResult<Long>> counters = ImmutableList.of();
ImmutableList<MetricResult<DistributionResult>> distributions = ImmutableList.of();
ImmutableList<MetricResult<GaugeResult>> gauges = ImmutableList.of();
JobMetrics jobMetrics;
try {
jobMetrics = dataflowClient.getJobMetrics(dataflowPipelineJob.jobId);
jobMetrics = getJobMetrics();
} catch (IOException e) {
LOG.warn("Unable to query job metrics.\n");
return DataflowMetricQueryResults.create(counters, distributions, gauges);
Expand All @@ -106,17 +107,12 @@ private MetricQueryResults queryServiceForMetrics(MetricsFilter filter) {
return populateMetricQueryResults(metricUpdates, filter);
}

public MetricQueryResults queryMetrics() {
return queryMetrics(null);
}

@Override
public MetricQueryResults queryMetrics(MetricsFilter filter) {
private JobMetrics getJobMetrics() throws IOException {
if (cachedMetricResults != null) {
// Metric results have been cached after the job ran.
return cachedMetricResults;
}
MetricQueryResults result = queryServiceForMetrics(filter);
JobMetrics result = dataflowClient.getJobMetrics(dataflowPipelineJob.jobId);
if (dataflowPipelineJob.getState().isTerminal()) {
// Add current query result to the cache.
cachedMetricResults = result;
Expand Down
2 changes: 1 addition & 1 deletion ...oud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void testEmptyMetricUpdates() throws IOException {
when(dataflowClient.getJobMetrics(JOB_ID)).thenReturn(jobMetrics);

DataflowMetrics dataflowMetrics = new DataflowMetrics(job, dataflowClient);
MetricQueryResults result = dataflowMetrics.queryMetrics();
MetricQueryResults result = dataflowMetrics.queryMetrics(null);
assertThat(ImmutableList.copyOf(result.counters()), is(empty()));
assertThat(ImmutableList.copyOf(result.distributions()), is(empty()));
}
Expand Down