From 44dc9ca7a8beaa2a061f049f2af4b6ef6dd57293 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Mon, 7 Jul 2025 15:46:17 +0200 Subject: [PATCH] Remove tracer where unused (#130429) (cherry picked from commit f9d96dc4c4df711304af3d23c882b98c7bd3c6ee) # Conflicts: # server/src/main/java/org/elasticsearch/transport/TransportService.java --- .../node/NodeServiceProvider.java | 2 +- .../transport/RequestHandlerRegistry.java | 9 ++--- .../transport/TransportService.java | 36 ++++--------------- .../node/tasks/TaskManagerTestCase.java | 3 +- .../cluster/coordination/JoinHelperTests.java | 10 ++---- .../discovery/PeerFinderTests.java | 4 +-- .../indices/cluster/ClusterStateChanges.java | 4 +-- .../transport/InboundHandlerTests.java | 7 ++-- .../test/transport/MockTransport.java | 4 +-- .../test/transport/MockTransportService.java | 3 +- .../transport/DisruptableMockTransport.java | 4 +-- .../SecurityNetty4HeaderSizeLimitTests.java | 4 +-- 12 files changed, 22 insertions(+), 68 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java b/server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java index 230fe0e2acb0c..4057d446952eb 100644 --- a/server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java +++ b/server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java @@ -105,7 +105,7 @@ TransportService newTransportService( TaskManager taskManager, Tracer tracer ) { - return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer); + return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager); } HttpServerTransport newHttpTransport(PluginsService pluginsService, NetworkModule networkModule) { diff --git a/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java b/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java index bfe6377b495ab..f24bf46a41026 100644 --- a/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java +++ b/server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java @@ -16,7 +16,6 @@ import org.elasticsearch.tasks.CancellableTask; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import java.io.IOException; import java.util.concurrent.Executor; @@ -31,7 +30,6 @@ public class RequestHandlerRegistry implements private final boolean canTripCircuitBreaker; private final Executor executor; private final TaskManager taskManager; - private final Tracer tracer; private final Writeable.Reader requestReader; private final TransportActionStatsTracker statsTracker = new TransportActionStatsTracker(); @@ -42,8 +40,7 @@ public RequestHandlerRegistry( TransportRequestHandler handler, Executor executor, boolean forceExecution, - boolean canTripCircuitBreaker, - Tracer tracer + boolean canTripCircuitBreaker ) { this.action = action; this.requestReader = requestReader; @@ -52,7 +49,6 @@ public RequestHandlerRegistry( this.canTripCircuitBreaker = canTripCircuitBreaker; this.executor = executor; this.taskManager = taskManager; - this.tracer = tracer; } public String getAction() { @@ -112,8 +108,7 @@ public static RequestHandlerRegistry replaceHand handler, registry.executor, registry.forceExecution, - registry.canTripCircuitBreaker, - registry.tracer + registry.canTripCircuitBreaker ); } diff --git a/server/src/main/java/org/elasticsearch/transport/TransportService.java b/server/src/main/java/org/elasticsearch/transport/TransportService.java index e12eb591410c9..77290d25f499c 100644 --- a/server/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/server/src/main/java/org/elasticsearch/transport/TransportService.java @@ -47,7 +47,6 @@ import org.elasticsearch.node.ReportingService; import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.threadpool.Scheduler; import org.elasticsearch.threadpool.ThreadPool; @@ -135,7 +134,6 @@ protected boolean removeEldestEntry(Map.Entry eldest) { // tracer log private final Logger tracerLog; - private final Tracer tracer; volatile String[] tracerLogInclude; volatile String[] tracerLogExclude; @@ -205,18 +203,6 @@ public String toString() { } }; - public TransportService( - Settings settings, - Transport transport, - ThreadPool threadPool, - TransportInterceptor transportInterceptor, - Function localNodeFactory, - @Nullable ClusterSettings clusterSettings, - Set taskHeaders - ) { - this(settings, transport, threadPool, transportInterceptor, localNodeFactory, clusterSettings, taskHeaders, Tracer.NOOP); - } - /** * Build the service. * @@ -230,8 +216,7 @@ public TransportService( TransportInterceptor transportInterceptor, Function localNodeFactory, @Nullable ClusterSettings clusterSettings, - TaskManager taskManager, - Tracer tracer + TaskManager taskManager ) { this( settings, @@ -241,8 +226,7 @@ public TransportService( localNodeFactory, clusterSettings, new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()), - taskManager, - tracer + taskManager ); } @@ -254,8 +238,7 @@ public TransportService( TransportInterceptor transportInterceptor, Function localNodeFactory, @Nullable ClusterSettings clusterSettings, - Set taskHeaders, - Tracer tracer + Set taskHeaders ) { this( settings, @@ -265,8 +248,7 @@ public TransportService( localNodeFactory, clusterSettings, new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()), - new TaskManager(settings, threadPool, taskHeaders), - tracer + new TaskManager(settings, threadPool, taskHeaders) ); } @@ -279,15 +261,13 @@ public TransportService( Function localNodeFactory, @Nullable ClusterSettings clusterSettings, ConnectionManager connectionManager, - TaskManager taskManger, - Tracer tracer + TaskManager taskManger ) { this.transport = transport; transport.setSlowLogThreshold(TransportSettings.SLOW_OPERATION_THRESHOLD_SETTING.get(settings)); this.threadPool = threadPool; this.localNodeFactory = localNodeFactory; this.connectionManager = connectionManager; - this.tracer = tracer; this.clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings); setTracerLogInclude(TransportSettings.TRACE_LOG_INCLUDE_SETTING.get(settings)); setTracerLogExclude(TransportSettings.TRACE_LOG_EXCLUDE_SETTING.get(settings)); @@ -1220,8 +1200,7 @@ public void registerRequestHandler( handler, executor, false, - true, - tracer + true ); transport.registerRequestHandler(reg); } @@ -1253,8 +1232,7 @@ public void registerRequestHandler( handler, executor, forceExecution, - canTripCircuitBreaker, - tracer + canTripCircuitBreaker ); transport.registerRequestHandler(reg); } diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java index a61360dab7e36..a32d69678f9db 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java @@ -194,8 +194,7 @@ public TestNode(String name, ThreadPool threadPool, Settings settings) { TransportService.NOOP_TRANSPORT_INTERCEPTOR, boundTransportAddressDiscoveryNodeFunction, null, - taskManager, - Tracer.NOOP + taskManager ); taskManager.setTaskCancellationService(new TaskCancellationService(transportService)); transportService.start(); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java index 6672815c8dbcd..4179a6d3958ea 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java @@ -28,7 +28,6 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.monitor.StatusInfo; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.MockLog; import org.elasticsearch.test.junit.annotations.TestLogging; @@ -74,8 +73,7 @@ public void testJoinDeduplication() { x -> localNode, clusterSettings, new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()), - taskManger, - Tracer.NOOP + taskManger ); JoinHelper joinHelper = new JoinHelper( null, @@ -241,8 +239,7 @@ public void testJoinFailureOnUnhealthyNodes() { x -> localNode, clusterSettings, new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()), - taskManger, - Tracer.NOOP + taskManger ); AtomicReference nodeHealthServiceStatus = new AtomicReference<>(new StatusInfo(UNHEALTHY, "unhealthy-info")); JoinHelper joinHelper = new JoinHelper( @@ -319,8 +316,7 @@ public void testLatestStoredStateFailure() { x -> localNode, clusterSettings, new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()), - taskManger, - Tracer.NOOP + taskManger ); JoinHelper joinHelper = new JoinHelper( null, diff --git a/server/src/test/java/org/elasticsearch/discovery/PeerFinderTests.java b/server/src/test/java/org/elasticsearch/discovery/PeerFinderTests.java index ef875017928fb..78f778de89c31 100644 --- a/server/src/test/java/org/elasticsearch/discovery/PeerFinderTests.java +++ b/server/src/test/java/org/elasticsearch/discovery/PeerFinderTests.java @@ -23,7 +23,6 @@ import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.MockLog; import org.elasticsearch.test.junit.annotations.TestLogging; @@ -235,8 +234,7 @@ public void setup() { boundTransportAddress -> localNode, null, connectionManager, - new TaskManager(settings, threadPool, emptySet()), - Tracer.NOOP + new TaskManager(settings, threadPool, emptySet()) ); transportService.start(); diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index 5bb3d33379a5e..5944c61601714 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -99,7 +99,6 @@ import org.elasticsearch.indices.TestIndexNameExpressionResolver; import org.elasticsearch.snapshots.EmptySnapshotsInfoService; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.ClusterServiceUtils; import org.elasticsearch.test.gateway.TestGatewayAllocator; import org.elasticsearch.threadpool.ThreadPool; @@ -231,8 +230,7 @@ protected ExecutorService createThreadPoolExecutor() { .address(boundAddress.publishAddress()) .build(), clusterSettings, - Collections.emptySet(), - Tracer.NOOP + Collections.emptySet() ) { @Override public Transport.Connection getConnection(DiscoveryNode node) { diff --git a/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java b/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java index 5c63616215d66..bd2c95962a4aa 100644 --- a/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java @@ -31,7 +31,6 @@ import org.elasticsearch.core.Tuple; import org.elasticsearch.tasks.TaskId; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.MockLog; import org.elasticsearch.test.TransportVersionUtils; @@ -114,8 +113,7 @@ public void testPing() throws Exception { (request, channel, task) -> channelCaptor.set(channel), EsExecutors.DIRECT_EXECUTOR_SERVICE, false, - true, - Tracer.NOOP + true ); requestHandlers.registerHandler(registry); @@ -167,8 +165,7 @@ public TestResponse read(StreamInput in) throws IOException { }, EsExecutors.DIRECT_EXECUTOR_SERVICE, false, - true, - Tracer.NOOP + true ); requestHandlers.registerHandler(registry); String requestValue = randomAlphaOfLength(10); diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java index 165f2522c5541..adfe81b96223c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java @@ -22,7 +22,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.Tuple; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.CloseableConnection; import org.elasticsearch.transport.ClusterConnectionManager; @@ -74,8 +73,7 @@ public TransportService createTransportService( localNodeFactory, clusterSettings, connectionManager, - new TaskManager(settings, threadPool, taskHeaders), - Tracer.NOOP + new TaskManager(settings, threadPool, taskHeaders) ); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java index 7b948c9b23cff..283f73b953a60 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java @@ -298,8 +298,7 @@ private MockTransportService( localNodeFactory, clusterSettings, new StubbableConnectionManager(new ClusterConnectionManager(settings, transport, threadPool.getThreadContext())), - taskManager, - Tracer.NOOP + taskManager ); this.original = transport.getDelegate(); } diff --git a/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java b/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java index a7dac8f727b0c..5a3b1d8faeb21 100644 --- a/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/transport/DisruptableMockTransport.java @@ -23,7 +23,6 @@ import org.elasticsearch.core.Nullable; import org.elasticsearch.core.Releasables; import org.elasticsearch.tasks.TaskManager; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.transport.MockTransport; import org.elasticsearch.threadpool.ThreadPool; @@ -76,8 +75,7 @@ public TransportService createTransportService( interceptor, localNodeFactory, clusterSettings, - new TaskManager(settings, threadPool, taskHeaders), - Tracer.NOOP + new TaskManager(settings, threadPool, taskHeaders) ); } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HeaderSizeLimitTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HeaderSizeLimitTests.java index 8c37fe56cd93d..d71a717e5d63e 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HeaderSizeLimitTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HeaderSizeLimitTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.mocksocket.MockSocket; import org.elasticsearch.tasks.TaskManager; import org.elasticsearch.telemetry.metric.MeterRegistry; -import org.elasticsearch.telemetry.tracing.Tracer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.DefaultBuiltInExecutorBuilders; import org.elasticsearch.threadpool.ThreadPool; @@ -111,8 +110,7 @@ public void onRequestReceived(long requestId, String action) { (request, channel, task) -> channel.sendResponse(ActionResponse.Empty.INSTANCE), EsExecutors.DIRECT_EXECUTOR_SERVICE, false, - true, - Tracer.NOOP + true ) ); securityNettyTransport.start();