This is an automated email from the ASF dual-hosted git repository. jlli pushed a commit to branch add-metrics-jmx in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 5d772606e4c993e8b44d40a34fb2010c28695ac7 Author: Jack Li(Analytics Engineering) <[email protected]> AuthorDate: Wed Aug 12 17:24:14 2020 -0700 Bump up dropwizard metrics version to 4.1.2 --- .travis.yml | 58 +++++++++++----------- .../pinot/common/metrics/AbstractMetrics.java | 2 + ...eporterMetricsRegistryRegistrationListener.java | 6 +++ .../apache/pinot/common/metrics/MetricsHelper.java | 5 ++ pom.xml | 4 +- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index da44855..6f26380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,35 +35,35 @@ stages: jobs: include: - - name: "Integration Tests - OracleJDK 8" - jdk: oraclejdk8 - script: - - ./.travis/.travis_test.sh - env: - - RUN_INTEGRATION_TESTS=true - - name: "Unit Tests - OracleJDK 8" - jdk: oraclejdk8 - script: - - ./.travis/.travis_test.sh - env: - - RUN_INTEGRATION_TESTS=false - - name: "QuickStart - Java 8 & OpenJDK 14-15" - jdk: oraclejdk8 - script: - - ./.travis/.travis_quickstart.sh - - jdk_switcher use openjdk8 - - ./.travis/.travis_install.sh - - ./.travis/.travis_quickstart.sh - - ./.travis/.travis_quickstart_openjdk.sh 14 - - ./.travis/.travis_quickstart_openjdk.sh 15 - - name: "QuickStart - OpenJDK 10-13" - jdk: openjdk10 - script: - - java -version - - ./.travis/.travis_quickstart.sh - - ./.travis/.travis_quickstart_openjdk.sh 11 - - ./.travis/.travis_quickstart_openjdk.sh 12 - - ./.travis/.travis_quickstart_openjdk.sh 13 +# - name: "Integration Tests - OracleJDK 8" +# jdk: oraclejdk8 +# script: +# - ./.travis/.travis_test.sh +# env: +# - RUN_INTEGRATION_TESTS=true +# - name: "Unit Tests - OracleJDK 8" +# jdk: oraclejdk8 +# script: +# - ./.travis/.travis_test.sh +# env: +# - RUN_INTEGRATION_TESTS=false +# - name: "QuickStart - Java 8 & OpenJDK 14-15" +# jdk: oraclejdk8 +# script: +# - ./.travis/.travis_quickstart.sh +# - jdk_switcher use openjdk8 +# - ./.travis/.travis_install.sh +# - ./.travis/.travis_quickstart.sh +# - ./.travis/.travis_quickstart_openjdk.sh 14 +# - ./.travis/.travis_quickstart_openjdk.sh 15 +# - name: "QuickStart - OpenJDK 10-13" +# jdk: openjdk10 +# script: +# - java -version +# - ./.travis/.travis_quickstart.sh +# - ./.travis/.travis_quickstart_openjdk.sh 11 +# - ./.travis/.travis_quickstart_openjdk.sh 12 +# - ./.travis/.travis_quickstart_openjdk.sh 13 - stage: deploy script: - travis_wait 40 ./.travis/.travis_nightly_build.sh diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java index 5178fc1..cf40f69 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/AbstractMetrics.java @@ -376,6 +376,7 @@ public abstract class AbstractMetrics<QP extends AbstractMetrics.QueryPhase, M e */ public void initializeGlobalMeters() { M[] meters = getMeters(); + LOGGER.info("Initializing global {} meters", meters.length); for (M meter : meters) { if (meter.isGlobal()) { @@ -384,6 +385,7 @@ public abstract class AbstractMetrics<QP extends AbstractMetrics.QueryPhase, M e } G[] gauges = getGauges(); + LOGGER.info("Initializing global {} gauges", gauges.length); for (G gauge : gauges) { if (gauge.isGlobal()) { setValueOfGlobalGauge(gauge, 0); diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java index 1c2cf15..9e6cb13 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/JmxReporterMetricsRegistryRegistrationListener.java @@ -20,6 +20,8 @@ package org.apache.pinot.common.metrics; import com.yammer.metrics.core.MetricsRegistry; import com.yammer.metrics.reporting.JmxReporter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -27,8 +29,12 @@ import com.yammer.metrics.reporting.JmxReporter; * */ public class JmxReporterMetricsRegistryRegistrationListener implements MetricsRegistryRegistrationListener { + private static final Logger LOGGER = LoggerFactory.getLogger(JmxReporterMetricsRegistryRegistrationListener.class); + @Override public void onMetricsRegistryRegistered(MetricsRegistry metricsRegistry) { + LOGGER.info("Registering JmxReporterMetricsRegistryRegistrationListener"); new JmxReporter(metricsRegistry).start(); + LOGGER.info("Number of metrics in metricsRegistry: {}", metricsRegistry.allMetrics().size()); } } diff --git a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java index 9d2933f..5524e88 100644 --- a/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java +++ b/pinot-common/src/main/java/org/apache/pinot/common/metrics/MetricsHelper.java @@ -68,6 +68,7 @@ public class MetricsHelper { clazz.getDeclaredConstructor(); MetricsRegistryRegistrationListener listener = defaultConstructor.newInstance(); + LOGGER.info("Registering metricsRegistry to listener {}", listenerClassName); addMetricsRegistryRegistrationListener(listener); } catch (Exception e) { LOGGER @@ -90,6 +91,7 @@ public class MetricsHelper { // Fire events to register all previously registered metrics registries Set<MetricsRegistry> metricsRegistries = metricsRegistryMap.keySet(); + LOGGER.info("Size of metricsRegistries: {}", metricsRegistries.size()); for (MetricsRegistry metricsRegistry : metricsRegistries) { listener.onMetricsRegistryRegistered(metricsRegistry); } @@ -127,6 +129,7 @@ public class MetricsHelper { * @return Meter */ public static Meter newMeter(MetricsRegistry registry, MetricName name, String eventType, TimeUnit unit) { + LOGGER.info("Adding new meter {}", name); if (registry != null) { return registry.newMeter(name, eventType, unit); } else { @@ -236,6 +239,7 @@ public class MetricsHelper { * @return gauge */ public static <T> Gauge<T> newGauge(MetricsRegistry registry, MetricName name, Gauge<T> gauge) { + LOGGER.info("Adding new gauge {}", name); if (registry != null) { return registry.newGauge(name, gauge); } else { @@ -247,6 +251,7 @@ public class MetricsHelper { * Removes an existing metric */ public static void removeMetric(MetricsRegistry registry, MetricName name) { + LOGGER.info("Removing new metric {}", name); if (registry != null) { registry.removeMetric(name); } else { diff --git a/pom.xml b/pom.xml index c59189a..b54f8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <!-- hadoop-common, spark-core use commons-net --> <commons-net.version>3.1</commons-net.version> <!-- helix-core, spark-core use libraries from io.dropwizard.metrics --> - <dropwizard-metrics.version>3.2.3</dropwizard-metrics.version> + <dropwizard-metrics.version>4.1.2</dropwizard-metrics.version> <snappy-java.version>1.1.1.7</snappy-java.version> <log4j.version>2.11.2</log4j.version> <netty.version>4.1.42.Final</netty.version> @@ -390,7 +390,7 @@ <dependency> <groupId>com.yammer.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>2.2.0</version> + <version>2.2.1</version> </dependency> <dependency> <groupId>commons-cli</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
