(accumulo) 01/01: Merge remote-tracking branch 'upstream/main' into elasticity

[edcoleman]

This is an automated email from the ASF dual-hosted git repository.

edcoleman pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit ef34a4890a76b592a805947d7c8f7d99a0363952
Merge: 5e4ec67ac0 8c485e362d
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Fri May 10 21:34:39 2024 +0000

    Merge remote-tracking branch 'upstream/main' into elasticity

 .../java/org/apache/accumulo/core/metrics/MetricsProducer.java     | 7 ++++---
 .../java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
index 6f82281257,abfdfc9b5a..bdc695e787
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@@ -59,53 -59,12 +59,54 @@@ import io.micrometer.core.instrument.Me
   * <td></td>
   * </tr>
   * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUES}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_LENGTH}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_PRIORITY}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_DEQUEUED}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
 + * <td>N/A</td>
 + * <td>N/A</td>
 + * <td>{@link #METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_REJECTED}</td>
 + * <td>Gauge</td>
 + * <td></td>
 + * </tr>
 + * <tr>
   * <td>currentFateOps</td>
   * <td>Gauge</td>
-  * <td>{@value #METRICS_FATE_TOTAL_IN_PROGRESS}</td>
+  * <td>{@value #METRICS_FATE_OPS}</td>
   * <td>Gauge</td>
-  * <td></td>
+  * <td>Was previously named "accumulo.fate.ops.in.progress". Changed to 
better reflect what the
+  * gauge is actually tracking which is all the current fate ops in any 
state.</td>
   * </tr>
   * <tr>
   * <td>FateTxOpType_{name}</td>
diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
index 1664dd8d93,2f66aef256..e4e5150671
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
@@@ -126,29 -128,31 +126,29 @@@ public class FateMetrics implements Met
  
    @Override
    public void registerMetrics(final MeterRegistry registry) {
-     registry.gauge(METRICS_FATE_TOTAL_IN_PROGRESS, totalCurrentOpsGauge);
 -    totalCurrentOpsGauge = registry.gauge(METRICS_FATE_OPS, new 
AtomicLong(0));
 -    totalOpsGauge = registry.gauge(METRICS_FATE_OPS_ACTIVITY, new 
AtomicLong(0));
 -    fateErrorsGauge = registry.gauge(METRICS_FATE_ERRORS, 
List.of(Tag.of("type", "zk.connection")),
 -        new AtomicLong(0));
 -    newTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.NEW.name().toLowerCase())),
 -        new AtomicLong(0));
 -    submittedTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.SUBMITTED.name().toLowerCase())),
 -        new AtomicLong(0));
 -    inProgressTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.IN_PROGRESS.name().toLowerCase())),
 -        new AtomicLong(0));
 -    failedInProgressTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.FAILED_IN_PROGRESS.name().toLowerCase())),
 -        new AtomicLong(0));
 -    failedTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.FAILED.name().toLowerCase())),
 -        new AtomicLong(0));
 -    successfulTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.SUCCESSFUL.name().toLowerCase())),
 -        new AtomicLong(0));
 -    unknownTxGauge = registry.gauge(METRICS_FATE_TX,
 -        List.of(Tag.of("state", 
ReadOnlyTStore.TStatus.UNKNOWN.name().toLowerCase())),
 -        new AtomicLong(0));
++    registry.gauge(METRICS_FATE_OPS, totalCurrentOpsGauge);
 +    registry.gauge(METRICS_FATE_OPS_ACTIVITY, totalOpsGauge);
 +    registry.gauge(METRICS_FATE_ERRORS, List.of(Tag.of("type", 
"zk.connection")), fateErrorsGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.NEW.name().toLowerCase())), newTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.SUBMITTED.name().toLowerCase())),
 +        submittedTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.IN_PROGRESS.name().toLowerCase())),
 +        inProgressTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.FAILED_IN_PROGRESS.name().toLowerCase())),
 +        failedInProgressTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.FAILED.name().toLowerCase())),
 +        failedTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.SUCCESSFUL.name().toLowerCase())),
 +        successfulTxGauge);
 +    registry.gauge(METRICS_FATE_TX,
 +        List.of(Tag.of("state", 
ReadOnlyFateStore.TStatus.UNKNOWN.name().toLowerCase())),
 +        unknownTxGauge);
  
      update();