Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-14683: Move the CHANGES.txt entry to the right place. Fix wrong type of null value.

Andrzej Bialecki863a388fe71b
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 80931865e82..1e86b2cb4c2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -50,8 +50,6 @@ Improvements
properly regardless of the mode (standalone, distributed). The API has been stripped of ancient, unused, interfaces
and simplified. (Dawid Weiss)
-* SOLR-14683: Metrics API should ensure consistent placeholders for missing values. (ab)
-
Other Changes
----------------------
* SOLR-14656: Autoscaling framework removed (Ishan Chattopadhyaya, noble, Ilan Ginzburg)
@@ -176,6 +174,8 @@ Improvements
* SOLR-14955: Add env var options for the Prometheus Exporter bin scripts (Houston Putman)
+* SOLR-14683: Metrics API should ensure consistent placeholders for missing values. (ab)
+
Optimizations
---------------------
(No changes)
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 3b136271da5..9908292d91b 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -883,7 +883,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
@Override
public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
super.initializeMetrics(parentContext, scope);
- solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? NumberUtils.readableSize(core.getIndexSize()) : parentContext.nullNumber()),
+ solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? NumberUtils.readableSize(core.getIndexSize()) : parentContext.nullString()),
true, "indexSize", getCategory().toString(), scope);
solrMetricsContext.gauge(() -> (core != null && !core.isClosed() ? getIndexVersion().toString() : parentContext.nullString()),
true, "indexVersion", getCategory().toString(), scope);