mlbiscoc commented on code in PR #3482:
URL: https://github.com/apache/solr/pull/3482#discussion_r2283756329
##########
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java:
##########
@@ -2592,83 +2607,145 @@ public SolrMetricsContext getSolrMetricsContext() {
// TODO SOLR-17458: Migrate to Otel
@Override
public void initializeMetrics(
- SolrMetricsContext parentContext, Attributes attributes, String scope) {
- parentContext.gauge(() -> name, true, "searcherName",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(() -> cachingEnabled, true, "caching",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(() -> openTime, true, "openedAt",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(() -> warmupTime, true, "warmupTime",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(
- () -> registerTime, true, "registeredAt",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(
- fullSortCount::sum, true, "fullSortCount",
Category.SEARCHER.toString(), scope);
- parentContext.gauge(
- skipSortCount::sum, true, "skipSortCount",
Category.SEARCHER.toString(), scope);
- final MetricsMap liveDocsCacheMetrics =
- new MetricsMap(
- (map) -> {
- map.put("inserts", liveDocsInsertsCount.sum());
- map.put("hits", liveDocsHitCount.sum());
- map.put("naiveHits", liveDocsNaiveCacheHitCount.sum());
- });
- parentContext.gauge(
- liveDocsCacheMetrics, true, "liveDocsCache",
Category.SEARCHER.toString(), scope);
- // reader stats
- parentContext.gauge(
- rgauge(parentContext.nullNumber(), () -> reader.numDocs()),
- true,
- "numDocs",
- Category.SEARCHER.toString(),
- scope);
- parentContext.gauge(
- rgauge(parentContext.nullNumber(), () -> reader.maxDoc()),
- true,
- "maxDoc",
- Category.SEARCHER.toString(),
- scope);
- parentContext.gauge(
- rgauge(parentContext.nullNumber(), () -> reader.maxDoc() -
reader.numDocs()),
- true,
- "deletedDocs",
- Category.SEARCHER.toString(),
- scope);
- parentContext.gauge(
- rgauge(parentContext.nullString(), () -> reader.toString()),
- true,
- "reader",
- Category.SEARCHER.toString(),
- scope);
- parentContext.gauge(
- rgauge(parentContext.nullString(), () ->
reader.directory().toString()),
- true,
- "readerDir",
- Category.SEARCHER.toString(),
- scope);
- parentContext.gauge(
- rgauge(parentContext.nullNumber(), () -> reader.getVersion()),
- true,
- "indexVersion",
- Category.SEARCHER.toString(),
- scope);
+ SolrMetricsContext solrMetricsContext, Attributes attributes, String
scope) {
+ var baseAttributes =
+ attributes.toBuilder()
+ .remove(AttributeKey.stringKey("scope"))
+ .put(CATEGORY_ATTR, Category.SEARCHER.toString())
+ .build();
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_name", "Searcher name (as attribute)", obs ->
obs.record(1, baseAttributes));
+ // caching (boolean -> 0/1)
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_caching_enabled",
+ "1 if caching enabled",
+ obs -> obs.record(cachingEnabled ? 1 : 0, baseAttributes));
+
+ // warmupTime (ms)
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_warmup_time_ms",
+ "Searcher warmup time (ms)",
+ obs -> obs.record(warmupTime, baseAttributes));
+ // registeredAt (ms)
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_registered_at_ms",
+ "Searcher registered time (ms)",
+ obs -> obs.record(registerTime.getTime(), baseAttributes));
+
+ // fullSortCount
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_full_sort_count",
+ "Total full sorts",
+ obs -> obs.record(fullSortCount.sum(), baseAttributes));
+ // fullSortCount
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_full_sort_count",
+ "Total full sorts",
+ obs -> obs.record(fullSortCount.sum(), baseAttributes));
+
+ // skipSortCount
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_skip_sort_count",
+ "Total skip sorts",
+ obs -> obs.record(skipSortCount.sum(), baseAttributes));
+ solrMetricsContext.observableLongGauge(
+ "solr_searcher_live_docs_cache",
+ "LiveDocs cache metrics",
+ obs -> {
+ obs.record(
+ liveDocsInsertsCount.sum(),
+ baseAttributes.toBuilder().put("type", "inserts").build());
Review Comment:
Use `TYPE_ATTR`. I don't think you can put in a "type" key just as a string.
--
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]
