mayankshriv commented on a change in pull request #7551:
URL: https://github.com/apache/pinot/pull/7551#discussion_r726688520
##########
File path:
pinot-common/src/main/java/org/apache/pinot/common/metrics/PinotMetricUtils.java
##########
@@ -54,35 +57,49 @@ private PinotMetricUtils() {
private static PinotMetricsFactory _pinotMetricsFactory = null;
- public static void init(PinotConfiguration metricsConfiguration) {
+ public static void init(PinotConfiguration metricsConfiguration, @Nullable
String metricsFactoryClassName) {
// Initializes PinotMetricsFactory.
- initializePinotMetricsFactory(metricsConfiguration);
+ initializePinotMetricsFactory(metricsConfiguration,
metricsFactoryClassName);
// Initializes metrics using the metrics configuration.
initializeMetrics(metricsConfiguration);
registerMetricsRegistry(getPinotMetricsRegistry());
}
+ public static void init(PinotConfiguration metricsConfiguration) {
+ init(metricsConfiguration, null);
+ }
+
/**
* Initializes PinotMetricsFactory with metrics configurations.
* @param metricsConfiguration The subset of the configuration containing
the metrics-related keys
+ * @param configuredMetricsFactoryClassName The configuration value for the
desired metrics factory class. Will
+ * default to Yammer if not
provided.
*/
- private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration) {
+ private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration,
+ @Nullable String configuredMetricsFactoryClassName) {
Set<Class<?>> classes = getPinotMetricsFactoryClasses();
if (classes.size() > 1) {
- LOGGER.warn("More than one PinotMetricsFactory is initialized: {}",
classes);
+ LOGGER.warn("More than one PinotMetricsFactory was found: {}", classes);
}
+
+ String metricsFactoryClassName = configuredMetricsFactoryClassName == null
+ ? DEFAULT_METRICS_FACTORY_CLASS_NAME :
configuredMetricsFactoryClassName;
+
for (Class<?> clazz : classes) {
- MetricsFactory annotation = clazz.getAnnotation(MetricsFactory.class);
- LOGGER.info("Trying to init PinotMetricsFactory: {} and MetricsFactory:
{}", clazz, annotation);
- if (annotation.enabled()) {
- try {
- PinotMetricsFactory pinotMetricsFactory = (PinotMetricsFactory)
clazz.newInstance();
- pinotMetricsFactory.init(metricsConfiguration);
- registerMetricsFactory(pinotMetricsFactory);
- } catch (Exception e) {
- LOGGER.error("Caught exception while initializing pinot metrics
registry: {}, skipping it", clazz, e);
+ if (clazz.getName().equals(metricsFactoryClassName)) {
Review comment:
May be do an upfront `find` instead for better readability, and then
just register the one class that needs to?
##########
File path:
pinot-common/src/main/java/org/apache/pinot/common/metrics/PinotMetricUtils.java
##########
@@ -54,35 +57,49 @@ private PinotMetricUtils() {
private static PinotMetricsFactory _pinotMetricsFactory = null;
- public static void init(PinotConfiguration metricsConfiguration) {
+ public static void init(PinotConfiguration metricsConfiguration, @Nullable
String metricsFactoryClassName) {
// Initializes PinotMetricsFactory.
- initializePinotMetricsFactory(metricsConfiguration);
+ initializePinotMetricsFactory(metricsConfiguration,
metricsFactoryClassName);
// Initializes metrics using the metrics configuration.
initializeMetrics(metricsConfiguration);
registerMetricsRegistry(getPinotMetricsRegistry());
}
+ public static void init(PinotConfiguration metricsConfiguration) {
+ init(metricsConfiguration, null);
+ }
+
/**
* Initializes PinotMetricsFactory with metrics configurations.
* @param metricsConfiguration The subset of the configuration containing
the metrics-related keys
+ * @param configuredMetricsFactoryClassName The configuration value for the
desired metrics factory class. Will
+ * default to Yammer if not
provided.
*/
- private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration) {
+ private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration,
Review comment:
We already have metricsConfiguration, can the config be part of that?
##########
File path:
pinot-common/src/main/java/org/apache/pinot/common/metrics/PinotMetricUtils.java
##########
@@ -54,35 +57,49 @@ private PinotMetricUtils() {
private static PinotMetricsFactory _pinotMetricsFactory = null;
- public static void init(PinotConfiguration metricsConfiguration) {
+ public static void init(PinotConfiguration metricsConfiguration, @Nullable
String metricsFactoryClassName) {
// Initializes PinotMetricsFactory.
- initializePinotMetricsFactory(metricsConfiguration);
+ initializePinotMetricsFactory(metricsConfiguration,
metricsFactoryClassName);
// Initializes metrics using the metrics configuration.
initializeMetrics(metricsConfiguration);
registerMetricsRegistry(getPinotMetricsRegistry());
}
+ public static void init(PinotConfiguration metricsConfiguration) {
+ init(metricsConfiguration, null);
+ }
+
/**
* Initializes PinotMetricsFactory with metrics configurations.
* @param metricsConfiguration The subset of the configuration containing
the metrics-related keys
+ * @param configuredMetricsFactoryClassName The configuration value for the
desired metrics factory class. Will
+ * default to Yammer if not
provided.
*/
- private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration) {
+ private static void initializePinotMetricsFactory(PinotConfiguration
metricsConfiguration,
+ @Nullable String configuredMetricsFactoryClassName) {
Set<Class<?>> classes = getPinotMetricsFactoryClasses();
if (classes.size() > 1) {
- LOGGER.warn("More than one PinotMetricsFactory is initialized: {}",
classes);
+ LOGGER.warn("More than one PinotMetricsFactory was found: {}", classes);
}
+
+ String metricsFactoryClassName = configuredMetricsFactoryClassName == null
+ ? DEFAULT_METRICS_FACTORY_CLASS_NAME :
configuredMetricsFactoryClassName;
Review comment:
Can we log which one was picked?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
