Repository: incubator-gobblin Updated Branches: refs/heads/master 1155cdc5e -> 63676c3ad
[GOBBLIN-618] Remove unnecessary methods from StandardMetricsBridge Closes #2485 from yukuai518/bri Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/63676c3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/63676c3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/63676c3a Branch: refs/heads/master Commit: 63676c3ad1da8e124c10843b356ce3022ac4126a Parents: 1155cdc Author: Kuai Yu <[email protected]> Authored: Wed Oct 24 14:34:23 2018 -0700 Committer: Hung Tran <[email protected]> Committed: Wed Oct 24 14:34:23 2018 -0700 ---------------------------------------------------------------------- .../gobblin/cluster/GobblinClusterManager.java | 16 +------- .../cluster/GobblinHelixJobScheduler.java | 14 ------- .../cluster/GobblinHelixMultiManager.java | 12 ------ .../gobblin/cluster/GobblinTaskRunner.java | 18 +-------- .../cluster/JobConfigurationManager.java | 3 +- .../StreamingJobConfigurationManager.java | 11 ++++++ .../instrumented/StandardMetricsBridge.java | 26 +------------ .../service/StreamingKafkaSpecConsumer.java | 39 +++++--------------- .../apache/gobblin/runtime/api/JobCatalog.java | 4 -- .../apache/gobblin/runtime/api/SpecCatalog.java | 9 ++--- .../modules/core/GobblinServiceManager.java | 17 --------- 11 files changed, 30 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java index e90a65a..437da37 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinClusterManager.java @@ -63,10 +63,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.gobblin.annotation.Alpha; import org.apache.gobblin.cluster.event.ClusterManagerShutdownRequest; import org.apache.gobblin.configuration.ConfigurationKeys; -import org.apache.gobblin.instrumented.Instrumented; import org.apache.gobblin.instrumented.StandardMetricsBridge; -import org.apache.gobblin.metrics.GobblinMetrics; -import org.apache.gobblin.metrics.MetricContext; import org.apache.gobblin.metrics.Tag; import org.apache.gobblin.runtime.api.MutableJobCatalog; import org.apache.gobblin.runtime.app.ApplicationException; @@ -138,13 +135,11 @@ public class GobblinClusterManager implements ApplicationLauncher, StandardMetri private final String clusterName; private final Config config; - private final MetricContext metricContext; public GobblinClusterManager(String clusterName, String applicationId, Config config, Optional<Path> appWorkDirOptional) throws Exception { this.clusterName = clusterName; this.config = config; - this.metricContext = Instrumented.getMetricContext(ConfigUtils.configToState(config), this.getClass()); this.isStandaloneMode = ConfigUtils.getBoolean(config, GobblinClusterConfigurationKeys.STANDALONE_CLUSTER_MODE_KEY, GobblinClusterConfigurationKeys.DEFAULT_STANDALONE_CLUSTER_MODE); @@ -446,19 +441,10 @@ public class GobblinClusterManager implements ApplicationLauncher, StandardMetri list.addAll(this.jobScheduler.getStandardMetricsCollection()); list.addAll(this.multiManager.getStandardMetricsCollection()); list.addAll(this.jobCatalog.getStandardMetricsCollection()); + list.addAll(this.jobConfigurationManager.getStandardMetricsCollection()); return list; } - @Override - public MetricContext getMetricContext() { - return this.metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return GobblinMetrics.isEnabled(ConfigUtils.configToProperties(this.config)); - } - /** * TODO for now the cluster id is hardcoded to 1 both here and in the {@link GobblinTaskRunner}. In the future, the * cluster id should be created by the {@link GobblinClusterManager} and passed to each {@link GobblinTaskRunner} via http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java index a215ffa..2e488c5 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java @@ -38,8 +38,6 @@ import com.google.common.collect.Maps; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; -import javax.annotation.Nonnull; - import org.apache.gobblin.annotation.Alpha; import org.apache.gobblin.cluster.event.DeleteJobConfigArrivalEvent; import org.apache.gobblin.cluster.event.NewJobConfigArrivalEvent; @@ -47,7 +45,6 @@ import org.apache.gobblin.cluster.event.UpdateJobConfigArrivalEvent; import org.apache.gobblin.configuration.ConfigurationKeys; import org.apache.gobblin.instrumented.Instrumented; import org.apache.gobblin.instrumented.StandardMetricsBridge; -import org.apache.gobblin.metrics.GobblinMetrics; import org.apache.gobblin.metrics.MetricContext; import org.apache.gobblin.metrics.Tag; import org.apache.gobblin.runtime.JobException; @@ -125,17 +122,6 @@ public class GobblinHelixJobScheduler extends JobScheduler implements StandardMe this.startServicesCompleted = false; } - @Nonnull - @Override - public MetricContext getMetricContext() { - return this.metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return GobblinMetrics.isEnabled(this.properties); - } - @Override public Collection<StandardMetrics> getStandardMetricsCollection() { return ImmutableList.of(this.launcherMetrics, this.jobSchedulerMetrics); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixMultiManager.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixMultiManager.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixMultiManager.java index c59625e..a7c5e2e 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixMultiManager.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixMultiManager.java @@ -54,7 +54,6 @@ import com.google.common.eventbus.EventBus; import com.google.common.util.concurrent.MoreExecutors; import com.typesafe.config.Config; -import javax.annotation.Nonnull; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -478,17 +477,6 @@ public class GobblinHelixMultiManager implements StandardMetricsBridge { } } - @Nonnull - @Override - public MetricContext getMetricContext() { - return this.metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return true; - } - @Override public Collection<StandardMetrics> getStandardMetricsCollection() { return ImmutableList.of(this.metrics); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java index 3f63e2d..63e7fd2 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java @@ -68,13 +68,10 @@ import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; import com.typesafe.config.ConfigValueFactory; -import javax.annotation.Nonnull; - import org.apache.gobblin.annotation.Alpha; import org.apache.gobblin.configuration.ConfigurationKeys; import org.apache.gobblin.instrumented.StandardMetricsBridge; import org.apache.gobblin.metrics.GobblinMetrics; -import org.apache.gobblin.metrics.MetricContext; import org.apache.gobblin.util.ClassAliasResolver; import org.apache.gobblin.util.ConfigUtils; import org.apache.gobblin.util.FileUtils; @@ -148,7 +145,6 @@ public class GobblinTaskRunner implements StandardMetricsBridge { private final String applicationId; private final Path appWorkPath; - private final MetricContext metricContext; private final Collection<StandardMetricsBridge.StandardMetrics> metricsCollection; public GobblinTaskRunner(String applicationName, @@ -191,7 +187,6 @@ public class GobblinTaskRunner implements StandardMetricsBridge { this.taskStateModelFactory = createTaskStateModelFactory(suite.getTaskFactoryMap()); this.metricsCollection = suite.getMetricsCollection(); - this.metricContext = suite.getMetricContext(); this.services.addAll(suite.getServices()); this.services.addAll(getServices()); @@ -344,6 +339,8 @@ public class GobblinTaskRunner implements StandardMetricsBridge { List<String> tags = ConfigUtils.getStringList(this.config, GobblinClusterConfigurationKeys.HELIX_INSTANCE_TAGS_KEY); logger.info("Adding tags binding " + tags); tags.forEach(tag -> helixManager.getClusterManagmentTool().addInstanceTag(this.clusterName, this.helixInstanceName, tag)); + logger.info("Actual tags binding " + helixManager.getClusterManagmentTool() + .getInstanceConfig(this.clusterName, this.helixInstanceName).getTags()); } } @@ -397,17 +394,6 @@ public class GobblinTaskRunner implements StandardMetricsBridge { return this.metricsCollection; } - @Nonnull - @Override - public MetricContext getMetricContext() { - return this.metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return GobblinMetrics.isEnabled(this.config); - } - /** * A custom {@link MessageHandlerFactory} for {@link ParticipantShutdownMessageHandler}s that handle messages * of type "SHUTDOWN" for shutting down the participants. http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/JobConfigurationManager.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/JobConfigurationManager.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/JobConfigurationManager.java index d60540c..34ff439 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/JobConfigurationManager.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/JobConfigurationManager.java @@ -36,6 +36,7 @@ import org.apache.gobblin.cluster.event.DeleteJobConfigArrivalEvent; import org.apache.gobblin.cluster.event.NewJobConfigArrivalEvent; import org.apache.gobblin.cluster.event.UpdateJobConfigArrivalEvent; import org.apache.gobblin.configuration.ConfigurationKeys; +import org.apache.gobblin.instrumented.StandardMetricsBridge; import org.apache.gobblin.util.ConfigUtils; import org.apache.gobblin.util.SchedulerUtils; @@ -58,7 +59,7 @@ import org.apache.gobblin.util.SchedulerUtils; * @author Yinan Li */ @Alpha -public class JobConfigurationManager extends AbstractIdleService { +public class JobConfigurationManager extends AbstractIdleService implements StandardMetricsBridge { private static final Logger LOGGER = LoggerFactory.getLogger(JobConfigurationManager.class); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/StreamingJobConfigurationManager.java ---------------------------------------------------------------------- diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/StreamingJobConfigurationManager.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/StreamingJobConfigurationManager.java index b6985a1..a18e759 100644 --- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/StreamingJobConfigurationManager.java +++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/StreamingJobConfigurationManager.java @@ -18,6 +18,7 @@ package org.apache.gobblin.cluster; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.List; import java.util.Properties; import java.util.concurrent.ExecutionException; @@ -38,6 +39,7 @@ import com.typesafe.config.Config; import lombok.Getter; import org.apache.gobblin.annotation.Alpha; +import org.apache.gobblin.instrumented.StandardMetricsBridge; import org.apache.gobblin.runtime.api.JobSpec; import org.apache.gobblin.runtime.api.MutableJobCatalog; import org.apache.gobblin.runtime.api.Spec; @@ -96,6 +98,15 @@ public class StreamingJobConfigurationManager extends JobConfigurationManager { } @Override + public Collection<StandardMetrics> getStandardMetricsCollection() { + if (this.specConsumer instanceof StandardMetricsBridge) { + return ((StandardMetricsBridge)specConsumer).getStandardMetricsCollection(); + } else { + return ImmutableList.of(); + } + } + + @Override protected void startUp() throws Exception { LOGGER.info("Starting the " + StreamingJobConfigurationManager.class.getSimpleName()); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-core-base/src/main/java/org/apache/gobblin/instrumented/StandardMetricsBridge.java ---------------------------------------------------------------------- diff --git a/gobblin-core-base/src/main/java/org/apache/gobblin/instrumented/StandardMetricsBridge.java b/gobblin-core-base/src/main/java/org/apache/gobblin/instrumented/StandardMetricsBridge.java index 8a2b29f..b371fe1 100644 --- a/gobblin-core-base/src/main/java/org/apache/gobblin/instrumented/StandardMetricsBridge.java +++ b/gobblin-core-base/src/main/java/org/apache/gobblin/instrumented/StandardMetricsBridge.java @@ -28,23 +28,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.apache.gobblin.metrics.ContextAwareMetric; -import org.apache.gobblin.metrics.MetricContext; -import org.apache.gobblin.metrics.Tag; /** * This interface indicates a class will expose its metrics to some external systems. */ -public interface StandardMetricsBridge extends Instrumentable { - - /** - * Get a single standard metrics. - * Also see {@link #getStandardMetricsCollection}. - */ - @Deprecated - default StandardMetrics getStandardMetrics() { - throw new UnsupportedOperationException("Deprecated API. Please use getStandardMetricsCollection."); - } - +public interface StandardMetricsBridge { /** * Get multiple standard metrics. */ @@ -52,18 +40,6 @@ public interface StandardMetricsBridge extends Instrumentable { return ImmutableList.of(); } - default void switchMetricContext(MetricContext context) { - throw new UnsupportedOperationException(); - } - - default void switchMetricContext(List<Tag<?>> tags) { - throw new UnsupportedOperationException(); - } - - default List<Tag<?>> generateTags(org.apache.gobblin.configuration.State state) { - return ImmutableList.of(); - } - public class StandardMetrics implements MetricSet { protected final List<ContextAwareMetric> contextAwareMetrics; protected final Map<String, Metric> rawMetrics; http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-modules/gobblin-service-kafka/src/main/java/org/apache/gobblin/service/StreamingKafkaSpecConsumer.java ---------------------------------------------------------------------- diff --git a/gobblin-modules/gobblin-service-kafka/src/main/java/org/apache/gobblin/service/StreamingKafkaSpecConsumer.java b/gobblin-modules/gobblin-service-kafka/src/main/java/org/apache/gobblin/service/StreamingKafkaSpecConsumer.java index ef44c7d..f7a0614 100644 --- a/gobblin-modules/gobblin-service-kafka/src/main/java/org/apache/gobblin/service/StreamingKafkaSpecConsumer.java +++ b/gobblin-modules/gobblin-service-kafka/src/main/java/org/apache/gobblin/service/StreamingKafkaSpecConsumer.java @@ -31,24 +31,21 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.apache.gobblin.instrumented.Instrumented; -import org.apache.gobblin.instrumented.StandardMetricsBridge; -import org.apache.gobblin.metrics.ContextAwareGauge; -import org.apache.gobblin.metrics.ContextAwareMetric; -import org.apache.gobblin.metrics.GobblinMetrics; -import org.apache.gobblin.metrics.MetricContext; -import org.apache.gobblin.metrics.Tag; - import org.slf4j.Logger; import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.AbstractIdleService; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + +import org.apache.gobblin.instrumented.Instrumented; +import org.apache.gobblin.instrumented.StandardMetricsBridge; +import org.apache.gobblin.metrics.MetricContext; import org.apache.gobblin.runtime.api.JobSpec; import org.apache.gobblin.runtime.api.MutableJobCatalog; import org.apache.gobblin.runtime.api.Spec; @@ -62,17 +59,12 @@ import org.apache.gobblin.util.ConfigUtils; import static org.apache.gobblin.service.SimpleKafkaSpecExecutor.SPEC_KAFKA_TOPICS_KEY; -import javax.annotation.Nonnull; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; - @Slf4j /** * SpecConsumer that consumes from kafka in a streaming manner * Implemented {@link AbstractIdleService} for starting up and shutting down. */ public class StreamingKafkaSpecConsumer extends AbstractIdleService implements SpecConsumer<Spec>, Closeable, StandardMetricsBridge { - public static final String SPEC_STREAMING_BLOCKING_QUEUE_SIZE = "spec.StreamingBlockingQueueSize"; private static final int DEFAULT_SPEC_STREAMING_BLOCKING_QUEUE_SIZE = 100; @Getter private final AvroJobSpecKafkaJobMonitor _jobMonitor; @@ -80,7 +72,7 @@ public class StreamingKafkaSpecConsumer extends AbstractIdleService implements S private final MutableJobCatalog _jobCatalog; private final MetricContext _metricContext; private final Metrics _metrics; - private final boolean _isInstrumentedEnabled; + public StreamingKafkaSpecConsumer(Config config, MutableJobCatalog jobCatalog, Optional<Logger> log) { String topic = config.getString(SPEC_KAFKA_TOPICS_KEY); Config defaults = ConfigFactory.parseMap(ImmutableMap.of(AvroJobSpecKafkaJobMonitor.TOPIC_KEY, topic, @@ -92,7 +84,7 @@ public class StreamingKafkaSpecConsumer extends AbstractIdleService implements S } catch (IOException e) { throw new RuntimeException("Could not create job monitor", e); } - _isInstrumentedEnabled = GobblinMetrics.isEnabled(ConfigUtils.configToProperties(config)); + _jobCatalog = jobCatalog; _jobSpecQueue = new LinkedBlockingQueue<>(ConfigUtils.getInt(config, "SPEC_STREAMING_BLOCKING_QUEUE_SIZE", DEFAULT_SPEC_STREAMING_BLOCKING_QUEUE_SIZE)); @@ -235,18 +227,7 @@ public class StreamingKafkaSpecConsumer extends AbstractIdleService implements S } @Override - public StandardMetrics getStandardMetrics() { - return this._metrics; - } - - @Nonnull - @Override - public MetricContext getMetricContext() { - return _metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return _isInstrumentedEnabled; + public Collection<StandardMetrics> getStandardMetricsCollection() { + return ImmutableList.of(this._metrics); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java index 6bc9313..eb54011 100644 --- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java +++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/JobCatalog.java @@ -54,10 +54,6 @@ public interface JobCatalog extends JobCatalogListenersContainer, Instrumentable * ({@link #isInstrumentationEnabled()}) is false. */ JobCatalog.StandardMetrics getMetrics(); - default StandardMetricsBridge.StandardMetrics getStandardMetrics() { - return getMetrics(); - } - default Collection<StandardMetricsBridge.StandardMetrics> getStandardMetricsCollection() { return ImmutableList.of(getMetrics()); } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java index 7905a54..0795d03 100644 --- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java +++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/api/SpecCatalog.java @@ -33,6 +33,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.gobblin.configuration.ConfigurationKeys; import org.apache.gobblin.instrumented.GobblinMetricsKeys; +import org.apache.gobblin.instrumented.Instrumentable; import org.apache.gobblin.instrumented.Instrumented; import org.apache.gobblin.instrumented.StandardMetricsBridge; import org.apache.gobblin.metrics.ContextAwareGauge; @@ -42,7 +43,7 @@ import org.apache.gobblin.metrics.MetricContext; import org.apache.gobblin.util.ConfigUtils; -public interface SpecCatalog extends SpecCatalogListenersContainer, StandardMetricsBridge { +public interface SpecCatalog extends SpecCatalogListenersContainer, Instrumentable, StandardMetricsBridge { /** Returns an immutable {@link Collection} of {@link Spec}s that are known to the catalog. */ Collection<Spec> getSpecs(); @@ -50,10 +51,6 @@ public interface SpecCatalog extends SpecCatalogListenersContainer, StandardMetr * ({@link #isInstrumentationEnabled()}) is false. */ SpecCatalog.StandardMetrics getMetrics(); - default StandardMetricsBridge.StandardMetrics getStandardMetrics() { - return this.getMetrics(); - } - default Collection<StandardMetricsBridge.StandardMetrics> getStandardMetricsCollection() { return ImmutableList.of(this.getMetrics()); } @@ -65,7 +62,7 @@ public interface SpecCatalog extends SpecCatalogListenersContainer, StandardMetr Spec getSpec(URI uri) throws SpecNotFoundException; @Slf4j - public static class StandardMetrics extends StandardMetricsBridge.StandardMetrics implements SpecCatalogListener { + class StandardMetrics extends StandardMetricsBridge.StandardMetrics implements SpecCatalogListener { public static final String NUM_ACTIVE_SPECS_NAME = "numActiveSpecs"; public static final String TOTAL_ADD_CALLS = "totalAddCalls"; public static final String TOTAL_DELETE_CALLS = "totalDeleteCalls"; http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/63676c3a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java index f836573..edb647f 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java @@ -59,7 +59,6 @@ import com.linkedin.restli.server.resources.BaseResource; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import javax.annotation.Nonnull; import lombok.Getter; import org.apache.gobblin.annotation.Alpha; @@ -492,26 +491,10 @@ public class GobblinServiceManager implements ApplicationLauncher, StandardMetri } @Override - public StandardMetrics getStandardMetrics() { - return this.metrics; - } - - @Override public Collection<StandardMetrics> getStandardMetricsCollection() { return ImmutableList.of(this.metrics); } - @Nonnull - @Override - public MetricContext getMetricContext() { - return this.metricContext; - } - - @Override - public boolean isInstrumentationEnabled() { - return false; - } - private class Metrics extends StandardMetrics { public static final String SERVICE_LEADERSHIP_CHANGE = "serviceLeadershipChange"; private ContextAwareHistogram serviceLeadershipChange;
