Skip to content

[BEAM-1792] Changing Spark to use MetricFiltering #2304

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
pabloem wants to merge 1 commit into from
Closed

[BEAM-1792] Changing Spark to use MetricFiltering #2304

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
40 changes: 2 additions & 38 deletions runners/spark/src/main/java/org/apache/beam/runners/spark/metrics/SparkMetricResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@
package org.apache.beam.runners.spark.metrics;

import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import java.util.Set;
import org.apache.beam.sdk.metrics.DistributionData;
import org.apache.beam.sdk.metrics.DistributionResult;
import org.apache.beam.sdk.metrics.GaugeData;
import org.apache.beam.sdk.metrics.GaugeResult;
import org.apache.beam.sdk.metrics.MetricFiltering;
import org.apache.beam.sdk.metrics.MetricKey;
import org.apache.beam.sdk.metrics.MetricName;
import org.apache.beam.sdk.metrics.MetricNameFilter;
import org.apache.beam.sdk.metrics.MetricQueryResults;
import org.apache.beam.sdk.metrics.MetricResult;
import org.apache.beam.sdk.metrics.MetricResults;
Expand Down Expand Up @@ -88,44 +86,10 @@ private Predicate<MetricUpdate<?>> matchesFilter(final MetricsFilter filter) {
return new Predicate<MetricUpdate<?>>() {
@Override
public boolean apply(MetricUpdate<?> metricResult) {
return matches(filter, metricResult.getKey());
return MetricFiltering.matches(filter, metricResult.getKey());
}
};
}

private boolean matches(MetricsFilter filter, MetricKey key) {
return matchesName(key.metricName(), filter.names())
&& matchesScope(key.stepName(), filter.steps());
}

private boolean matchesName(MetricName metricName, Set<MetricNameFilter> nameFilters) {
if (nameFilters.isEmpty()) {
return true;
}

for (MetricNameFilter nameFilter : nameFilters) {
if ((nameFilter.getName() == null || nameFilter.getName().equals(metricName.name()))
&& Objects.equal(metricName.namespace(), nameFilter.getNamespace())) {
return true;
}
}

return false;
}

private boolean matchesScope(String actualScope, Set<String> scopes) {
if (scopes.isEmpty() || scopes.contains(actualScope)) {
return true;
}

for (String scope : scopes) {
if (actualScope.startsWith(scope)) {
return true;
}
}

return false;
}
}

private static final Function<MetricUpdate<DistributionData>, MetricResult<DistributionResult>>
Expand Down