http://git-wip-us.apache.org/repos/asf/beam/blob/31624fed/runners/spark/src/test/resources/metrics.properties ---------------------------------------------------------------------- diff --git a/runners/spark/src/test/resources/metrics.properties b/runners/spark/src/test/resources/metrics.properties index 143532d..b2af378 100644 --- a/runners/spark/src/test/resources/metrics.properties +++ b/runners/spark/src/test/resources/metrics.properties @@ -15,12 +15,12 @@ # limitations under the License. -# The "org.apache.beam.runners.spark.aggregators.metrics.sink.XSink" +# The "org.apache.beam.runners.spark.metrics.sink.XSink" # (a.k.a Beam.XSink) is only configured for the driver, the executors are set with a Spark native # implementation "org.apache.spark.metrics.sink.XSink" (a.k.a Spark.XSink). # This is due to sink class loading behavior, which is different on the driver and executors nodes. -# Since Beam aggregator metrics are reported via Spark accumulators and thus make their way to the -# driver, we only need the "Beam.XSink" on the driver side. Executor nodes can keep +# Since Beam aggregators and metrics are reported via Spark accumulators and thus make their way to +# the # driver, we only need the "Beam.XSink" on the driver side. Executor nodes can keep # reporting Spark native metrics using the traditional Spark.XSink. # # The the current sink configuration pattern is therefore: @@ -36,7 +36,7 @@ # ************* A sample configuration for outputting metrics to Graphite ************* -#driver.sink.graphite.class=org.apache.beam.runners.spark.aggregators.metrics.sink.GraphiteSink +#driver.sink.graphite.class=org.apache.beam.runners.spark.metrics.sink.GraphiteSink #driver.sink.graphite.host=YOUR_HOST #driver.sink.graphite.port=2003 #driver.sink.graphite.prefix=spark @@ -55,7 +55,7 @@ # ************* A sample configuration for outputting metrics to a CSV file. ************* -#driver.sink.csv.class=org.apache.beam.runners.spark.aggregators.metrics.sink.CsvSink +#driver.sink.csv.class=org.apache.beam.runners.spark.metrics.sink.CsvSink #driver.sink.csv.directory=/tmp/spark-metrics #driver.sink.csv.period=1 #driver.sink.graphite.unit=SECONDS
http://git-wip-us.apache.org/repos/asf/beam/blob/31624fed/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml ---------------------------------------------------------------------- diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml index 0431252..edbdb14 100644 --- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml +++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml @@ -155,13 +155,13 @@ </Match> <Match> - <Class name="org.apache.beam.runners.spark.aggregators.metrics.sink.CsvSink"/> + <Class name="org.apache.beam.runners.spark.metrics.sink.CsvSink"/> <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/> <!-- Intentionally overriding parent name because inheritors should replace the parent. --> </Match> <Match> - <Class name="org.apache.beam.runners.spark.aggregators.metrics.sink.GraphiteSink"/> + <Class name="org.apache.beam.runners.spark.metrics.sink.GraphiteSink"/> <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/> <!-- Intentionally overriding parent name because inheritors should replace the parent. --> </Match>
