Use meter for autocommit metrics

cowpaths · Sep 9, 2024 · 3aab5b3 · 3aab5b3
1 parent e78fc97
commit 3aab5b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java
@@ -266,6 +266,7 @@ public void run() {
       command.openSearcher = openSearcher;
       command.waitSearcher = WAIT_SEARCHER;
       command.softCommit = softCommit;
+      command.autoCommit = true;
       if (core.getCoreDescriptor().getCloudDescriptor() != null
           && core.getCoreDescriptor().getCloudDescriptor().isLeader()
           && !softCommit) {

diff --git a/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java
@@ -27,6 +27,8 @@ public class CommitUpdateCommand extends UpdateCommand {
   public boolean expungeDeletes = false;
   public boolean softCommit = false;
   public boolean prepareCommit = false;
+  boolean autoCommit = false;
+
   /**
    * User provided commit data. Can be let to null if there is none. It is possible to commit this
    * user data, even if there is no uncommitted change in the index writer, provided this user data

diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -96,6 +96,8 @@ public class DirectUpdateHandler2 extends UpdateHandler
   Meter splitCommands;
   Meter optimizeCommands;
   Meter rollbackCommands;
+  Meter hardAutoCommitCounts;
+  Meter softAutoCommitCounts;
   LongAdder numDocsPending = new LongAdder();
   LongAdder numErrors = new LongAdder();
   Meter numErrorsCumulative;
@@ -210,14 +212,9 @@ public void initializeMetrics(SolrMetricsContext parentContext, String scope) {
       this.solrMetricsContext = parentContext.getChildContext(this);
     }
     commitCommands = solrMetricsContext.meter("commits", getCategory().toString(), scope);
-    solrMetricsContext.gauge(
-        () -> commitTracker.getCommitCount(), true, "autoCommits", getCategory().toString(), scope);
-    solrMetricsContext.gauge(
-        () -> softCommitTracker.getCommitCount(),
-        true,
-        "softAutoCommits",
-        getCategory().toString(),
-        scope);
+    hardAutoCommitCounts = solrMetricsContext.meter("autoCommits", getCategory().toString(), scope);
+    softAutoCommitCounts = solrMetricsContext.meter("softAutoCommits", getCategory().toString(), scope);
+
     if (commitTracker.getDocsUpperBound() > 0) {
       solrMetricsContext.gauge(
           () -> commitTracker.getDocsUpperBound(),
@@ -705,6 +702,14 @@ public void commit(CommitUpdateCommand cmd) throws IOException {
       if (cmd.expungeDeletes) expungeDeleteCommands.mark();
     }
 
+    if (cmd.autoCommit) {
+      if (cmd.softCommit) {
+        softAutoCommitCounts.mark();
+      } else {
+        hardAutoCommitCounts.mark();
+      }
+    }
+
     @SuppressWarnings("unchecked")
     Future<Void>[] waitSearcher =
         cmd.waitSearcher ? (Future<Void>[]) Array.newInstance(Future.class, 1) : null;