Skip to content

Commit 9fba634

Browse files
moschemosche
authored
Remove tracer where unused (#130429) (#130725)
(cherry picked from commit f9d96dc) # Conflicts: # server/src/main/java/org/elasticsearch/transport/TransportService.java
1 parent a9cf685 commit 9fba634

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
@@ -105,7 +105,7 @@ TransportService newTransportService(
105105
TaskManager taskManager,
106106
Tracer tracer
107107
) {
108-
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer);
108+
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager);
109109
}
110110

111111
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.util.concurrent.Executor;
@@ -31,7 +30,6 @@ public class RequestHandlerRegistry<Request extends TransportRequest> implements
3130
private final boolean canTripCircuitBreaker;
3231
private final Executor executor;
3332
private final TaskManager taskManager;
34-
private final Tracer tracer;
3533
private final Writeable.Reader<Request> requestReader;
3634
private final TransportActionStatsTracker statsTracker = new TransportActionStatsTracker();
3735

@@ -42,8 +40,7 @@ public RequestHandlerRegistry(
4240
TransportRequestHandler<Request> handler,
4341
Executor executor,
4442
boolean forceExecution,
45-
boolean canTripCircuitBreaker,
46-
Tracer tracer
43+
boolean canTripCircuitBreaker
4744
) {
4845
this.action = action;
4946
this.requestReader = requestReader;
@@ -52,7 +49,6 @@ public RequestHandlerRegistry(
5249
this.canTripCircuitBreaker = canTripCircuitBreaker;
5350
this.executor = executor;
5451
this.taskManager = taskManager;
55-
this.tracer = tracer;
5652
}
5753

5854
public String getAction() {
@@ -112,8 +108,7 @@ public static <R extends TransportRequest> RequestHandlerRegistry<R> replaceHand
112108
handler,
113109
registry.executor,
114110
registry.forceExecution,
115-
registry.canTripCircuitBreaker,
116-
registry.tracer
111+
registry.canTripCircuitBreaker
117112
);
118113
}
119114

‎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
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
2929
import org.elasticsearch.monitor.StatusInfo;
3030
import org.elasticsearch.tasks.TaskManager;
31-
import org.elasticsearch.telemetry.tracing.Tracer;
3231
import org.elasticsearch.test.ESTestCase;
3332
import org.elasticsearch.test.MockLog;
3433
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
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.core.Tuple;
3232
import org.elasticsearch.tasks.TaskId;
3333
import org.elasticsearch.tasks.TaskManager;
34-
import org.elasticsearch.telemetry.tracing.Tracer;
3534
import org.elasticsearch.test.ESTestCase;
3635
import org.elasticsearch.test.MockLog;
3736
import org.elasticsearch.test.TransportVersionUtils;
@@ -114,8 +113,7 @@ public void testPing() throws Exception {
114113
(request, channel, task) -> channelCaptor.set(channel),
115114
EsExecutors.DIRECT_EXECUTOR_SERVICE,
116115
false,
117-
true,
118-
Tracer.NOOP
116+
true
119117
);
120118
requestHandlers.registerHandler(registry);
121119

@@ -167,8 +165,7 @@ public TestResponse read(StreamInput in) throws IOException {
167165
},
168166
EsExecutors.DIRECT_EXECUTOR_SERVICE,
169167
false,
170-
true,
171-
Tracer.NOOP
168+
true
172169
);
173170
requestHandlers.registerHandler(registry);
174171
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
@@ -298,8 +298,7 @@ private MockTransportService(
298298
localNodeFactory,
299299
clusterSettings,
300300
new StubbableConnectionManager(new ClusterConnectionManager(settings, transport, threadPool.getThreadContext())),
301-
taskManager,
302-
Tracer.NOOP
301+
taskManager
303302
);
304303
this.original = transport.getDelegate();
305304
}

0 commit comments

Comments
 (0)