This is an automated email from the ASF dual-hosted git repository. dsmiley pushed a commit to branch feature/SOLR-17458-rebased in repository https://gitbox.apache.org/repos/asf/solr.git
commit 49e02946bed84fb7d5e1fd3832eaf64377b57c44 Author: David Smiley <[email protected]> AuthorDate: Mon Oct 13 22:50:30 2025 -0400 SOLR-17799: add core attributes. --- .../org/apache/solr/update/SolrIndexWriter.java | 33 +++++++++------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java index 5b3f2b5ccd5..fd29f7ddf04 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java @@ -246,31 +246,27 @@ public class SolrIndexWriter extends IndexWriter { solrMetricsContext = core.getSolrMetricsContext().getChildContext(this); } - var baseAttributesBuilder = - Attributes.builder().put(CATEGORY_ATTR, SolrInfoBean.Category.INDEX.toString()); - baseAttributes = baseAttributesBuilder.build(); + baseAttributes = + core.getCoreAttributes().toBuilder() + .put(CATEGORY_ATTR, SolrInfoBean.Category.INDEX.toString()) + .build(); + + String descSuffix = + " where \"major\" merges involve more than " + + majorMergeDocs + + " documents, otherwise merge classified as minor."; mergesCounter = solrMetricsContext.longCounter( - "solr_indexwriter_merges", - "Number of total merge operations, " - + " where \"major\" merges involve more than " - + majorMergeDocs - + " documents, otherwise merge classified as minor."); + "solr_indexwriter_merges", "Number of total merge operations, " + descSuffix); mergeDocsCounter = solrMetricsContext.longCounter( "solr_indexwriter_merge_docs", - "Number of documents involved in merge, " - + " where \"major\" merges involve more than " - + majorMergeDocs - + " documents, otherwise merge classified as minor."); + "Number of documents involved in merge, " + descSuffix); mergeSegmentsCounter = solrMetricsContext.longCounter( "solr_indexwriter_merge_segments", - "Number of segments involved in merge, " - + " where \"major\" merges involve more than " - + majorMergeDocs - + " documents, otherwise merge classified as minor."); + "Number of segments involved in merge, " + descSuffix); flushesCounter = solrMetricsContext.longCounter( "solr_indexwriter_flushes", "Number of flush to disk operations triggered"); @@ -278,10 +274,7 @@ public class SolrIndexWriter extends IndexWriter { var mergesTimerBase = solrMetricsContext.longHistogram( "solr_indexwriter_merge_time", - "Time spent merging segments, " - + " where \"major\" merges involve more than " - + majorMergeDocs - + " documents, otherwise merge classified as minor.", + "Time spent merging segments, " + descSuffix, OtelUnit.MILLISECONDS); majorMergeTimer = new AttributedLongTimer(
