simplify node name retrieval

Author: idegtiarenko

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java

@@ -59,16 +59,6 @@ public class Driver implements Releasable, Describable {
      */
     private final String taskDescription;
 
-    /**
-     * Name of the cluster executing this driver.
-     */
-    private final String clusterName;
-
-    /**
-     * Name of the node executing this driver.
-     */
-    private final String nodeName;
-
     /**
      * The wall clock time when this driver was created in milliseconds since epoch.
      * Compared to {@link #startNanos} this is less accurate and is measured by a
@@ -141,8 +131,6 @@ public Driver(
     ) {
         this.sessionId = sessionId;
         this.taskDescription = taskDescription;
-        this.clusterName = clusterName;
-        this.nodeName = nodeName;
         this.startTime = startTime;
         this.startNanos = startNanos;
         this.driverContext = driverContext;
@@ -536,8 +524,8 @@ private void updateStatus(long extraCpuNanos, int extraIterations, DriverStatus.
             return new DriverStatus(
                 sessionId,
                 taskDescription,
-                clusterName,
-                nodeName,
+                prev.clusterName(),
+                prev.nodeName(),
                 startTime,
                 now,
                 prev.cpuNanos() + extraCpuNanos,

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/exchange/ExchangeServiceTests.java

@@ -37,7 +37,6 @@
 import org.elasticsearch.compute.operator.SinkOperator;
 import org.elasticsearch.compute.operator.SourceOperator;
 import org.elasticsearch.compute.test.MockBlockFactory;
-import org.elasticsearch.compute.test.TestDriverFactory;
 import org.elasticsearch.core.ReleasableRef;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.tasks.Task;

x-pack/plugin/esql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/RestEsqlIT.java

@@ -531,7 +531,10 @@ public void testForceSleepsProfile() throws IOException {
     }
 
     private MapMatcher commonProfile() {
-        return matchesMap().entry("task_description", any(String.class))
+        return matchesMap() //
+            .entry("task_description", any(String.class))
+            .entry("cluster_name", any(String.class))
+            .entry("node_name", any(String.class))
             .entry("start_millis", greaterThan(0L))
             .entry("stop_millis", greaterThan(0L))
             .entry("iterations", greaterThan(0L))

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlanner.java

@@ -7,6 +7,7 @@
 
 package org.elasticsearch.xpack.esql.planner;
 
+import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.compute.Describable;
@@ -51,6 +52,7 @@
 import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
+import org.elasticsearch.node.Node;
 import org.elasticsearch.tasks.CancellableTask;
 import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.core.expression.Alias;
@@ -131,7 +133,6 @@ public class LocalExecutionPlanner {
     private final BigArrays bigArrays;
     private final BlockFactory blockFactory;
     private final Settings settings;
-    private final NodeInfoSupplier nodeInfoSupplier;
     private final Configuration configuration;
     private final Supplier<ExchangeSource> exchangeSourceSupplier;
     private final Supplier<ExchangeSink> exchangeSinkSupplier;
@@ -147,7 +148,6 @@ public LocalExecutionPlanner(
         BigArrays bigArrays,
         BlockFactory blockFactory,
         Settings settings,
-        NodeInfoSupplier nodeInfoSupplier,
         Configuration configuration,
         Supplier<ExchangeSource> exchangeSourceSupplier,
         Supplier<ExchangeSink> exchangeSinkSupplier,
@@ -163,7 +163,6 @@ public LocalExecutionPlanner(
         this.bigArrays = bigArrays;
         this.blockFactory = blockFactory;
         this.settings = settings;
-        this.nodeInfoSupplier = nodeInfoSupplier;
         this.configuration = configuration;
         this.exchangeSourceSupplier = exchangeSourceSupplier;
         this.exchangeSinkSupplier = exchangeSinkSupplier;
@@ -199,8 +198,8 @@ public LocalExecutionPlan plan(String taskDescription, FoldContext foldCtx, Phys
             new DriverFactory(
                 new DriverSupplier(
                     taskDescription,
-                    nodeInfoSupplier.clusterName(),
-                    nodeInfoSupplier.nodeName(),
+                    Node.NODE_NAME_SETTING.get(settings),
+                    ClusterName.CLUSTER_NAME_SETTING.get(settings).value(),
                     context.bigArrays,
                     context.blockFactory,
                     physicalOperation,

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/NodeInfoSupplier.java

@@ -51,7 +51,6 @@
 import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
 import org.elasticsearch.xpack.esql.planner.EsPhysicalOperationProviders;
 import org.elasticsearch.xpack.esql.planner.LocalExecutionPlanner;
-import org.elasticsearch.xpack.esql.planner.NodeInfoSupplier;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.elasticsearch.xpack.esql.session.Result;
@@ -366,7 +365,6 @@ public SourceProvider createSourceProvider() {
                 bigArrays,
                 blockFactory,
                 clusterService.getSettings(),
-                NodeInfoSupplier.from(clusterService),
                 context.configuration(),
                 context.exchangeSourceSupplier(),
                 context.exchangeSinkSupplier(),

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeService.java

@@ -643,7 +643,6 @@ void executeSubPlan(
             bigArrays,
             blockFactory,
             randomNodeSettings(),
-            TestNodeInfoSupplier.INSTANCE,
             configuration,
             exchangeSource::createExchangeSource,
             () -> exchangeSink.createExchangeSink(() -> {}),

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java

@@ -41,7 +41,6 @@
 import org.elasticsearch.xpack.esql.EsqlTestUtils;
 import org.elasticsearch.xpack.esql.EsqlTestUtils.TestConfigurableSearchStats;
 import org.elasticsearch.xpack.esql.EsqlTestUtils.TestConfigurableSearchStats.Config;
-import org.elasticsearch.xpack.esql.TestNodeInfoSupplier;
 import org.elasticsearch.xpack.esql.VerificationException;
 import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
 import org.elasticsearch.xpack.esql.analysis.Analyzer;
@@ -7596,7 +7595,6 @@ private LocalExecutionPlanner.LocalExecutionPlan physicalOperationsFromPhysicalP
             BigArrays.NON_RECYCLING_INSTANCE,
             TestBlockFactory.getNonBreakingInstance(),
             Settings.EMPTY,
-            TestNodeInfoSupplier.INSTANCE,
             config,
             new ExchangeSourceHandler(10, null)::createExchangeSource,
             () -> exchangeSinkHandler.createExchangeSink(() -> {}),

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/TestNodeInfoSupplier.java

@@ -31,7 +31,6 @@
 import org.elasticsearch.index.mapper.MapperServiceTestCase;
 import org.elasticsearch.search.internal.AliasFilter;
 import org.elasticsearch.search.internal.ContextIndexSearcher;
-import org.elasticsearch.xpack.esql.TestNodeInfoSupplier;
 import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
 import org.elasticsearch.xpack.esql.core.expression.FoldContext;
 import org.elasticsearch.xpack.esql.core.expression.Literal;
@@ -181,7 +180,6 @@ private LocalExecutionPlanner planner() throws IOException {
             BigArrays.NON_RECYCLING_INSTANCE,
             TestBlockFactory.getNonBreakingInstance(),
             Settings.EMPTY,
-            TestNodeInfoSupplier.INSTANCE,
             config(),
             null,
             null,