Skip to content

Commit 4fc059d

Browse files
moschemosche
authored
Remove tracer where unused (#130429) (#130724)
(cherry picked from commit f9d96dc) # Conflicts: # server/src/main/java/org/elasticsearch/transport/TransportService.java
1 parent 373a6ac commit 4fc059d

File tree

12 files changed

+22
-68
lines changed

12 files changed

+22
-68
lines changed

‎server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ TransportService newTransportService(
104104
TaskManager taskManager,
105105
Tracer tracer
106106
) {
107-
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer);
107+
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager);
108108
}
109109

110110
HttpServerTransport newHttpTransport(PluginsService pluginsService, NetworkModule networkModule) {

‎server/src/main/java/org/elasticsearch/transport/RequestHandlerRegistry.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.tasks.CancellableTask;
1717
import org.elasticsearch.tasks.Task;
1818
import org.elasticsearch.tasks.TaskManager;
19-
import org.elasticsearch.telemetry.tracing.Tracer;
2019

2120
import java.io.IOException;
2221
import java.lang.invoke.MethodHandles;
@@ -33,7 +32,6 @@ public class RequestHandlerRegistry<Request extends TransportRequest> implements
3332
private final boolean canTripCircuitBreaker;
3433
private final Executor executor;
3534
private final TaskManager taskManager;
36-
private final Tracer tracer;
3735
private final Writeable.Reader<Request> requestReader;
3836
@SuppressWarnings("unused") // only accessed via #STATS_TRACKER_HANDLE, lazy initialized because instances consume non-trivial heap
3937
private TransportActionStatsTracker statsTracker;
@@ -56,8 +54,7 @@ public RequestHandlerRegistry(
5654
TransportRequestHandler<Request> handler,
5755
Executor executor,
5856
boolean forceExecution,
59-
boolean canTripCircuitBreaker,
60-
Tracer tracer
57+
boolean canTripCircuitBreaker
6158
) {
6259
this.action = action;
6360
this.requestReader = requestReader;
@@ -66,7 +63,6 @@ public RequestHandlerRegistry(
6663
this.canTripCircuitBreaker = canTripCircuitBreaker;
6764
this.executor = executor;
6865
this.taskManager = taskManager;
69-
this.tracer = tracer;
7066
}
7167

7268
public String getAction() {
@@ -126,8 +122,7 @@ public static <R extends TransportRequest> RequestHandlerRegistry<R> replaceHand
126122
handler,
127123
registry.executor,
128124
registry.forceExecution,
129-
registry.canTripCircuitBreaker,
130-
registry.tracer
125+
registry.canTripCircuitBreaker
131126
);
132127
}
133128

‎server/src/main/java/org/elasticsearch/transport/TransportService.java‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.elasticsearch.node.ReportingService;
4848
import org.elasticsearch.tasks.Task;
4949
import org.elasticsearch.tasks.TaskManager;
50-
import org.elasticsearch.telemetry.tracing.Tracer;
5150
import org.elasticsearch.threadpool.Scheduler;
5251
import org.elasticsearch.threadpool.ThreadPool;
5352

@@ -135,7 +134,6 @@ protected boolean removeEldestEntry(Map.Entry<Long, TimeoutInfoHolder> eldest) {
135134
// tracer log
136135

137136
private final Logger tracerLog;
138-
private final Tracer tracer;
139137

140138
volatile String[] tracerLogInclude;
141139
volatile String[] tracerLogExclude;
@@ -205,18 +203,6 @@ public String toString() {
205203
}
206204
};
207205

208-
public TransportService(
209-
Settings settings,
210-
Transport transport,
211-
ThreadPool threadPool,
212-
TransportInterceptor transportInterceptor,
213-
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
214-
@Nullable ClusterSettings clusterSettings,
215-
Set<String> taskHeaders
216-
) {
217-
this(settings, transport, threadPool, transportInterceptor, localNodeFactory, clusterSettings, taskHeaders, Tracer.NOOP);
218-
}
219-
220206
/**
221207
* Build the service.
222208
*
@@ -230,8 +216,7 @@ public TransportService(
230216
TransportInterceptor transportInterceptor,
231217
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
232218
@Nullable ClusterSettings clusterSettings,
233-
TaskManager taskManager,
234-
Tracer tracer
219+
TaskManager taskManager
235220
) {
236221
this(
237222
settings,
@@ -241,8 +226,7 @@ public TransportService(
241226
localNodeFactory,
242227
clusterSettings,
243228
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
244-
taskManager,
245-
tracer
229+
taskManager
246230
);
247231
}
248232

@@ -254,8 +238,7 @@ public TransportService(
254238
TransportInterceptor transportInterceptor,
255239
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
256240
@Nullable ClusterSettings clusterSettings,
257-
Set<String> taskHeaders,
258-
Tracer tracer
241+
Set<String> taskHeaders
259242
) {
260243
this(
261244
settings,
@@ -265,8 +248,7 @@ public TransportService(
265248
localNodeFactory,
266249
clusterSettings,
267250
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
268-
new TaskManager(settings, threadPool, taskHeaders),
269-
tracer
251+
new TaskManager(settings, threadPool, taskHeaders)
270252
);
271253
}
272254

@@ -279,15 +261,13 @@ public TransportService(
279261
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
280262
@Nullable ClusterSettings clusterSettings,
281263
ConnectionManager connectionManager,
282-
TaskManager taskManger,
283-
Tracer tracer
264+
TaskManager taskManger
284265
) {
285266
this.transport = transport;
286267
transport.setSlowLogThreshold(TransportSettings.SLOW_OPERATION_THRESHOLD_SETTING.get(settings));
287268
this.threadPool = threadPool;
288269
this.localNodeFactory = localNodeFactory;
289270
this.connectionManager = connectionManager;
290-
this.tracer = tracer;
291271
this.clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings);
292272
setTracerLogInclude(TransportSettings.TRACE_LOG_INCLUDE_SETTING.get(settings));
293273
setTracerLogExclude(TransportSettings.TRACE_LOG_EXCLUDE_SETTING.get(settings));
@@ -1220,8 +1200,7 @@ public <Request extends TransportRequest> void registerRequestHandler(
12201200
handler,
12211201
executor,
12221202
false,
1223-
true,
1224-
tracer
1203+
true
12251204
);
12261205
transport.registerRequestHandler(reg);
12271206
}
@@ -1253,8 +1232,7 @@ public <Request extends TransportRequest> void registerRequestHandler(
12531232
handler,
12541233
executor,
12551234
forceExecution,
1256-
canTripCircuitBreaker,
1257-
tracer
1235+
canTripCircuitBreaker
12581236
);
12591237
transport.registerRequestHandler(reg);
12601238
}

‎server/src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ public TestNode(String name, ThreadPool threadPool, Settings settings) {
194194
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
195195
boundTransportAddressDiscoveryNodeFunction,
196196
null,
197-
taskManager,
198-
Tracer.NOOP
197+
taskManager
199198
);
200199
taskManager.setTaskCancellationService(new TaskCancellationService(transportService));
201200
transportService.start();

‎server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
2828
import org.elasticsearch.monitor.StatusInfo;
2929
import org.elasticsearch.tasks.TaskManager;
30-
import org.elasticsearch.telemetry.tracing.Tracer;
3130
import org.elasticsearch.test.ESTestCase;
3231
import org.elasticsearch.test.MockLog;
3332
import org.elasticsearch.test.junit.annotations.TestLogging;
@@ -74,8 +73,7 @@ public void testJoinDeduplication() {
7473
x -> localNode,
7574
clusterSettings,
7675
new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()),
77-
taskManger,
78-
Tracer.NOOP
76+
taskManger
7977
);
8078
JoinHelper joinHelper = new JoinHelper(
8179
null,
@@ -241,8 +239,7 @@ public void testJoinFailureOnUnhealthyNodes() {
241239
x -> localNode,
242240
clusterSettings,
243241
new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()),
244-
taskManger,
245-
Tracer.NOOP
242+
taskManger
246243
);
247244
AtomicReference<StatusInfo> nodeHealthServiceStatus = new AtomicReference<>(new StatusInfo(UNHEALTHY, "unhealthy-info"));
248245
JoinHelper joinHelper = new JoinHelper(
@@ -319,8 +316,7 @@ public void testLatestStoredStateFailure() {
319316
x -> localNode,
320317
clusterSettings,
321318
new ClusterConnectionManager(Settings.EMPTY, capturingTransport, threadPool.getThreadContext()),
322-
taskManger,
323-
Tracer.NOOP
319+
taskManger
324320
);
325321
JoinHelper joinHelper = new JoinHelper(
326322
null,

‎server/src/test/java/org/elasticsearch/discovery/PeerFinderTests.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.common.transport.TransportAddress;
2424
import org.elasticsearch.common.util.concurrent.DeterministicTaskQueue;
2525
import org.elasticsearch.tasks.TaskManager;
26-
import org.elasticsearch.telemetry.tracing.Tracer;
2726
import org.elasticsearch.test.ESTestCase;
2827
import org.elasticsearch.test.MockLog;
2928
import org.elasticsearch.test.junit.annotations.TestLogging;
@@ -235,8 +234,7 @@ public void setup() {
235234
boundTransportAddress -> localNode,
236235
null,
237236
connectionManager,
238-
new TaskManager(settings, threadPool, emptySet()),
239-
Tracer.NOOP
237+
new TaskManager(settings, threadPool, emptySet())
240238
);
241239

242240
transportService.start();

‎server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
import org.elasticsearch.indices.TestIndexNameExpressionResolver;
100100
import org.elasticsearch.snapshots.EmptySnapshotsInfoService;
101101
import org.elasticsearch.tasks.TaskManager;
102-
import org.elasticsearch.telemetry.tracing.Tracer;
103102
import org.elasticsearch.test.ClusterServiceUtils;
104103
import org.elasticsearch.test.gateway.TestGatewayAllocator;
105104
import org.elasticsearch.threadpool.ThreadPool;
@@ -231,8 +230,7 @@ protected ExecutorService createThreadPoolExecutor() {
231230
.address(boundAddress.publishAddress())
232231
.build(),
233232
clusterSettings,
234-
Collections.emptySet(),
235-
Tracer.NOOP
233+
Collections.emptySet()
236234
) {
237235
@Override
238236
public Transport.Connection getConnection(DiscoveryNode node) {

‎server/src/test/java/org/elasticsearch/transport/InboundHandlerTests.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.core.Tuple;
3131
import org.elasticsearch.tasks.TaskId;
3232
import org.elasticsearch.tasks.TaskManager;
33-
import org.elasticsearch.telemetry.tracing.Tracer;
3433
import org.elasticsearch.test.ESTestCase;
3534
import org.elasticsearch.test.MockLog;
3635
import org.elasticsearch.test.TransportVersionUtils;
@@ -113,8 +112,7 @@ public void testPing() throws Exception {
113112
(request, channel, task) -> channelCaptor.set(channel),
114113
EsExecutors.DIRECT_EXECUTOR_SERVICE,
115114
false,
116-
true,
117-
Tracer.NOOP
115+
true
118116
);
119117
requestHandlers.registerHandler(registry);
120118

@@ -166,8 +164,7 @@ public TestResponse read(StreamInput in) throws IOException {
166164
},
167165
EsExecutors.DIRECT_EXECUTOR_SERVICE,
168166
false,
169-
true,
170-
Tracer.NOOP
167+
true
171168
);
172169
requestHandlers.registerHandler(registry);
173170
String requestValue = randomAlphaOfLength(10);

‎test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.elasticsearch.core.Nullable;
2323
import org.elasticsearch.core.Tuple;
2424
import org.elasticsearch.tasks.TaskManager;
25-
import org.elasticsearch.telemetry.tracing.Tracer;
2625
import org.elasticsearch.threadpool.ThreadPool;
2726
import org.elasticsearch.transport.CloseableConnection;
2827
import org.elasticsearch.transport.ClusterConnectionManager;
@@ -74,8 +73,7 @@ public TransportService createTransportService(
7473
localNodeFactory,
7574
clusterSettings,
7675
connectionManager,
77-
new TaskManager(settings, threadPool, taskHeaders),
78-
Tracer.NOOP
76+
new TaskManager(settings, threadPool, taskHeaders)
7977
);
8078
}
8179

‎test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,7 @@ private MockTransportService(
304304
localNodeFactory,
305305
clusterSettings,
306306
new StubbableConnectionManager(new ClusterConnectionManager(settings, transport, threadPool.getThreadContext())),
307-
taskManager,
308-
Tracer.NOOP
307+
taskManager
309308
);
310309
this.original = transport.getDelegate();
311310
this.testExecutor = EsExecutors.newScaling(

0 commit comments

Comments
 (0)