wip, removing now superfluous flags

Author: chrishagglund-ship-it

conductor-client/src/main/java/com/netflix/conductor/client/automator/TaskRunner.java

@@ -84,8 +84,6 @@ class TaskRunner {
     private static final double LEASE_EXTEND_DURATION_FACTOR = 0.8;
     private final ScheduledExecutorService leaseExtendExecutorService;
     private Map<String, ScheduledFuture<?>> leaseExtendMap = new ConcurrentHashMap<>();
-    private final boolean trackActiveWorkers;
-    private final boolean trackDiagnosticEvents;
     private final AtomicInteger activeWorkerCount = new AtomicInteger(0);
 
     TaskRunner(Worker worker,
@@ -97,8 +95,6 @@ class TaskRunner {
                int taskPollTimeout,
                List<PollFilter> pollFilters,
                EventDispatcher<TaskRunnerEvent> eventDispatcher,
-               boolean trackActiveWorkers,
-               boolean trackDiagnosticEvents,
                boolean useVirtualThreads) {
         this.worker = worker;
         this.taskClient = taskClient;
@@ -109,8 +105,6 @@ class TaskRunner {
         this.permits = new Semaphore(threadCount);
         this.pollFilters = pollFilters;
         this.eventDispatcher = eventDispatcher;
-        this.trackActiveWorkers = trackActiveWorkers;
-        this.trackDiagnosticEvents = trackDiagnosticEvents;
         this.tasksTobeExecuted = new LinkedBlockingQueue<>();
         this.enableUpdateV2 = Boolean.parseBoolean(System.getProperty("taskUpdateV2", "false")) || Boolean.parseBoolean(System.getenv("taskUpdateV2"));
 
@@ -251,9 +245,7 @@ private List<Task> pollTasksForWorker() {
 
         if (worker.paused()) {
             LOGGER.trace("Worker {} has been paused. Not polling anymore!", worker.getClass());
-            if (trackDiagnosticEvents) {
-                eventDispatcher.publish(new TaskPaused(taskType));
-            }
+            eventDispatcher.publish(new TaskPaused(taskType));
             return List.of();
         }
 
@@ -270,9 +262,7 @@ private List<Task> pollTasksForWorker() {
         }
 
         if (pollCount == 0) {
-            if (trackDiagnosticEvents) {
-                eventDispatcher.publish(new TaskExecutionQueueFull(taskType));
-            }
+            eventDispatcher.publish(new TaskExecutionQueueFull(taskType));
             return List.of();
         }
 
@@ -352,9 +342,7 @@ private void onUncaughtException(Thread thread, Throwable error) {
 
     private Task processTask(Task task) {
         eventDispatcher.publish(new TaskExecutionStarted(taskType, task.getTaskId(), worker.getIdentity()));
-        if (trackActiveWorkers) {
-            eventDispatcher.publish(new ActiveWorkersChanged(taskType, activeWorkerCount.incrementAndGet()));
-        }
+        eventDispatcher.publish(new ActiveWorkersChanged(taskType, activeWorkerCount.incrementAndGet()));
 
         // record execution start time for a task
         task.getExecutionMetadata().setExecutionStartTime(System.currentTimeMillis());
@@ -377,9 +365,7 @@ private Task processTask(Task task) {
         } finally {
             cancelLeaseExtension(task.getTaskId());
             permits.release();
-            if (trackActiveWorkers) {
-                eventDispatcher.publish(new ActiveWorkersChanged(taskType, activeWorkerCount.decrementAndGet()));
-            }
+            eventDispatcher.publish(new ActiveWorkersChanged(taskType, activeWorkerCount.decrementAndGet()));
         }
         return task;
     }

conductor-client/src/main/java/com/netflix/conductor/client/automator/TaskRunnerConfigurer.java

@@ -54,8 +54,6 @@ public class TaskRunnerConfigurer {
     private final List<PollFilter> pollFilters;
     private final EventDispatcher<TaskRunnerEvent> eventDispatcher;
     private final MetricsCollector metricsCollector;
-    private final boolean trackActiveWorkers;
-    private final boolean trackDiagnosticEvents;
     private final boolean useVirtualThreads;
 
     /**
@@ -78,8 +76,6 @@ private TaskRunnerConfigurer(TaskRunnerConfigurer.Builder builder) {
         this.pollFilters = builder.pollFilters;
         this.eventDispatcher = builder.eventDispatcher;
         this.metricsCollector = builder.metricsCollector;
-        this.trackActiveWorkers = builder.resolveActiveWorkersTracking();
-        this.trackDiagnosticEvents = builder.resolveDiagnosticEvents();
         this.useVirtualThreads = builder.useVirtualThreads;
         builder.workers.forEach(this.workers::add);
         taskRunners = new LinkedList<>();
@@ -183,8 +179,6 @@ private void startWorker(Worker worker) {
                 taskPollTimeout,
                 pollFilters,
                 eventDispatcher,
-                trackActiveWorkers,
-                trackDiagnosticEvents,
                 useVirtualThreads);
         // startWorker(worker) is executed by several threads.
         // taskRunners.add(taskRunner) without synchronization could lead to a race condition and unpredictable behavior,
@@ -375,14 +369,6 @@ public Builder withMetricsCollector(MetricsCollector metricsCollector) {
             return this;
         }
 
-        private boolean resolveActiveWorkersTracking() {
-            return metricsCollector != null;
-        }
-
-        private boolean resolveDiagnosticEvents() {
-            return metricsCollector != null;
-        }
-
         public Builder withUseVirtualThreads(boolean useVirtualThreads) {
             this.useVirtualThreads = useVirtualThreads;
             return this;