You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/03/15 17:03:15 UTC
[4/4] lucene-solr:jira/solr-9959: SOLR-9959 Add version information
in one place.
SOLR-9959 Add version information in one place.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4a2528fe
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a2528fe
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a2528fe
Branch: refs/heads/jira/solr-9959
Commit: 4a2528fe08c60f4c91fd7f1b5f33783c12d88ddb
Parents: 1624ed7
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Mar 15 18:02:09 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Mar 15 18:02:09 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/solr/core/CoreContainer.java | 5 +++++
.../java/org/apache/solr/metrics/MapMetric.java | 18 ------------------
2 files changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a2528fe/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 22fcd74..211370d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -543,6 +543,11 @@ public class CoreContainer {
true, "totalSpace", SolrInfoBean.Category.CONTAINER.toString(), "fs");
metricManager.registerGauge(registryName, () -> cfg.getCoreRootDirectory().toFile().getUsableSpace(),
true, "usableSpace", SolrInfoBean.Category.CONTAINER.toString(), "fs");
+ // add version information
+ metricManager.registerGauge(registryName, () -> this.getClass().getPackage().getSpecificationVersion(),
+ true, "specification", SolrInfoBean.Category.CONTAINER.toString(), "version");
+ metricManager.registerGauge(registryName, () -> this.getClass().getPackage().getImplementationVersion(),
+ true, "implementation", SolrInfoBean.Category.CONTAINER.toString(), "version");
if (isZooKeeperAware()) {
metricManager.loadClusterReporters(cfg.getMetricReporterPlugins(), this);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a2528fe/solr/core/src/java/org/apache/solr/metrics/MapMetric.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/MapMetric.java b/solr/core/src/java/org/apache/solr/metrics/MapMetric.java
deleted file mode 100644
index 7ce3a24..0000000
--- a/solr/core/src/java/org/apache/solr/metrics/MapMetric.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.apache.solr.metrics;
-
-import java.util.Map;
-
-import com.codahale.metrics.Metric;
-
-/**
- * Dynamically constructed map of metrics, intentionally different from {@link com.codahale.metrics.MetricSet}
- * where each metric had to be known in advance and registered separately in {@link com.codahale.metrics.MetricRegistry}.
- */
-public interface MapMetric extends Metric {
-
- Map<String, Metric> getMetrics(boolean detailed);
-
- default Map<String, Metric> getMetrics() {
- return getMetrics(false);
- }
-}
\ No newline at end of file