remove debug logging; tidying up

Author: DiannaHohensee

server/src/main/java/org/elasticsearch/common/util/concurrent/TaskExecutionTimeTrackingEsThreadPoolExecutor.java

@@ -60,8 +60,8 @@ public enum UtilizationTrackingPurpose {
         ALLOCATION,
     }
 
-    private volatile UtilizationTracker apmUtilizationTracker;
-    private volatile UtilizationTracker allocationUtilizationTracker;
+    private volatile UtilizationTracker apmUtilizationTracker = new UtilizationTracker();
+    private volatile UtilizationTracker allocationUtilizationTracker = new UtilizationTracker();
 
     TaskExecutionTimeTrackingEsThreadPoolExecutor(
         String name,
@@ -82,8 +82,6 @@ public enum UtilizationTrackingPurpose {
         this.executionEWMA = new ExponentiallyWeightedMovingAverage(trackingConfig.getExecutionTimeEwmaAlpha(), 0);
         this.trackOngoingTasks = trackingConfig.trackOngoingTasks();
         this.trackMaxQueueLatency = trackingConfig.trackMaxQueueLatency();
-        this.apmUtilizationTracker = new UtilizationTracker();
-        this.allocationUtilizationTracker = new UtilizationTracker();
     }
 
     public List<Instrument> setupMetrics(MeterRegistry meterRegistry, String threadPoolName) {
@@ -154,10 +152,8 @@ public int getCurrentQueueSize() {
 
     public long getMaxQueueLatencyMillisSinceLastPollAndReset() {
         if (trackMaxQueueLatency == false) {
-            logger.info("~~~trackMaxQueueLatency is false");
             return 0;
         }
-        logger.info("~~~getting max");
         return maxQueueLatencyMillisSinceLastPoll.getThenReset();
     }
 
@@ -194,9 +190,7 @@ protected void beforeExecute(Thread t, Runnable r) {
         var queueLatencyMillis = TimeUnit.NANOSECONDS.toMillis(taskQueueLatency);
         queueLatencyMillisHistogram.addObservation(queueLatencyMillis);
 
-        logger.info("~~~queueLatencyMillis: " + queueLatencyMillis);
         if (trackMaxQueueLatency) {
-            logger.info("~~~adding: " + queueLatencyMillis);
             maxQueueLatencyMillisSinceLastPoll.accumulate(queueLatencyMillis);
         }
     }

server/src/test/java/org/elasticsearch/common/util/concurrent/TaskExecutionTimeTrackingEsThreadPoolExecutorTests.java

@@ -289,15 +289,7 @@ private long getPercentile(List<Measurement> measurements, String percentile) {
      * where {@link TimedRunnable#getTotalExecutionNanos()} always returns {@code timeTakenNanos}.
      */
     private Function<Runnable, WrappedRunnable> settableWrapper(long timeTakenNanos) {
-        return (runnable) -> new SettableTimedRunnable(0, timeTakenNanos, false);
-    }
-
-    /**
-     * The returned function outputs a WrappedRunnable that simulates the case
-     * where {@link TimedRunnable#getQueueTimeNanos()} always returns {@code queueTimeTakenNanos}.
-     */
-    private Function<Runnable, WrappedRunnable> settableQueuingWrapper(long queueTimeTakenNanos) {
-        return (runnable) -> new SettableTimedRunnable(queueTimeTakenNanos, 0, false);
+        return (runnable) -> new SettableTimedRunnable(timeTakenNanos, false);
     }
 
     /**
@@ -306,7 +298,7 @@ private Function<Runnable, WrappedRunnable> settableQueuingWrapper(long queueTim
      * the job failed or was rejected before it finished.
      */
     private Function<Runnable, WrappedRunnable> exceptionalWrapper() {
-        return (runnable) -> new SettableTimedRunnable(0, TimeUnit.NANOSECONDS.toNanos(-1), true);
+        return (runnable) -> new SettableTimedRunnable(TimeUnit.NANOSECONDS.toNanos(-1), true);
     }
 
     /** Execute a blank task {@code times} times for the executor */
@@ -318,21 +310,15 @@ private void executeTask(TaskExecutionTimeTrackingEsThreadPoolExecutor executor,
     }
 
     public class SettableTimedRunnable extends TimedRunnable {
-        private long queuedTimeTakenNanos;
         private final long executionTimeTakenNanos;
         private final boolean testFailedOrRejected;
 
-        public SettableTimedRunnable(long queuedTimeTakenNanos, long executionTimeTakenNanos, boolean failedOrRejected) {
+        public SettableTimedRunnable(long executionTimeTakenNanos, boolean failedOrRejected) {
             super(() -> {});
-            this.queuedTimeTakenNanos = queuedTimeTakenNanos;
             this.executionTimeTakenNanos = executionTimeTakenNanos;
             this.testFailedOrRejected = failedOrRejected;
         }
 
-        public void setQueuedTimeTakenNanos(long timeTakenNanos) {
-            this.queuedTimeTakenNanos = timeTakenNanos;
-        }
-
         @Override
         public long getTotalExecutionNanos() {
             return executionTimeTakenNanos;
@@ -342,11 +328,6 @@ public long getTotalExecutionNanos() {
         public boolean getFailedOrRejected() {
             return testFailedOrRejected;
         }
-
-        @Override
-        long getQueueTimeNanos() {
-            return queuedTimeTakenNanos;
-        }
     }
 
     /**