Skip to content

Commit 960fa4d

Browse files
moschemosche
committed
Remove tracer where unused (#130429)
1 parent f093d7d commit 960fa4d

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
@@ -116,7 +116,7 @@ TransportService newTransportService(
116116
TaskManager taskManager,
117117
Tracer tracer
118118
) {
119-
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer);
119+
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager);
120120
}
121121

122122
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
@@ -48,7 +48,6 @@
4848
import org.elasticsearch.node.ReportingService;
4949
import org.elasticsearch.tasks.Task;
5050
import org.elasticsearch.tasks.TaskManager;
51-
import org.elasticsearch.telemetry.tracing.Tracer;
5251
import org.elasticsearch.threadpool.Scheduler;
5352
import org.elasticsearch.threadpool.ThreadPool;
5453

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

136135
private static final Logger tracerLog = Loggers.getLogger(logger, ".tracer");
137-
private final Tracer tracer;
138136

139137
volatile String[] tracerLogInclude;
140138
volatile String[] tracerLogExclude;
@@ -206,18 +204,6 @@ public String toString() {
206204
}
207205
};
208206

209-
public TransportService(
210-
Settings settings,
211-
Transport transport,
212-
ThreadPool threadPool,
213-
TransportInterceptor transportInterceptor,
214-
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
215-
@Nullable ClusterSettings clusterSettings,
216-
Set<String> taskHeaders
217-
) {
218-
this(settings, transport, threadPool, transportInterceptor, localNodeFactory, clusterSettings, taskHeaders, Tracer.NOOP);
219-
}
220-
221207
/**
222208
* Build the service.
223209
*
@@ -232,8 +218,7 @@ public TransportService(
232218
TransportInterceptor transportInterceptor,
233219
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
234220
@Nullable ClusterSettings clusterSettings,
235-
TaskManager taskManager,
236-
Tracer tracer
221+
TaskManager taskManager
237222
) {
238223
this(
239224
settings,
@@ -243,8 +228,7 @@ public TransportService(
243228
localNodeFactory,
244229
clusterSettings,
245230
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
246-
taskManager,
247-
tracer
231+
taskManager
248232
);
249233
}
250234

@@ -256,8 +240,7 @@ public TransportService(
256240
TransportInterceptor transportInterceptor,
257241
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
258242
@Nullable ClusterSettings clusterSettings,
259-
Set<String> taskHeaders,
260-
Tracer tracer
243+
Set<String> taskHeaders
261244
) {
262245
this(
263246
settings,
@@ -267,8 +250,7 @@ public TransportService(
267250
localNodeFactory,
268251
clusterSettings,
269252
new ClusterConnectionManager(settings, transport, threadPool.getThreadContext()),
270-
new TaskManager(settings, threadPool, taskHeaders),
271-
tracer
253+
new TaskManager(settings, threadPool, taskHeaders)
272254
);
273255
}
274256

@@ -281,15 +263,13 @@ public TransportService(
281263
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
282264
@Nullable ClusterSettings clusterSettings,
283265
ConnectionManager connectionManager,
284-
TaskManager taskManger,
285-
Tracer tracer
266+
TaskManager taskManger
286267
) {
287268
this.transport = transport;
288269
transport.setSlowLogThreshold(TransportSettings.SLOW_OPERATION_THRESHOLD_SETTING.get(settings));
289270
this.threadPool = threadPool;
290271
this.localNodeFactory = localNodeFactory;
291272
this.connectionManager = connectionManager;
292-
this.tracer = tracer;
293273
this.clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings);
294274
setTracerLogInclude(TransportSettings.TRACE_LOG_INCLUDE_SETTING.get(settings));
295275
setTracerLogExclude(TransportSettings.TRACE_LOG_EXCLUDE_SETTING.get(settings));
@@ -1214,8 +1194,7 @@ public <Request extends TransportRequest> void registerRequestHandler(
12141194
handler,
12151195
executor,
12161196
false,
1217-
true,
1218-
tracer
1197+
true
12191198
);
12201199
transport.registerRequestHandler(reg);
12211200
}
@@ -1247,8 +1226,7 @@ public <Request extends TransportRequest> void registerRequestHandler(
12471226
handler,
12481227
executor,
12491228
forceExecution,
1250-
canTripCircuitBreaker,
1251-
tracer
1229+
canTripCircuitBreaker
12521230
);
12531231
transport.registerRequestHandler(reg);
12541232
}

‎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
@@ -103,7 +103,6 @@
103103
import org.elasticsearch.indices.TestIndexNameExpressionResolver;
104104
import org.elasticsearch.snapshots.EmptySnapshotsInfoService;
105105
import org.elasticsearch.tasks.TaskManager;
106-
import org.elasticsearch.telemetry.tracing.Tracer;
107106
import org.elasticsearch.test.ClusterServiceUtils;
108107
import org.elasticsearch.test.gateway.TestGatewayAllocator;
109108
import org.elasticsearch.threadpool.ThreadPool;
@@ -234,8 +233,7 @@ protected ExecutorService createThreadPoolExecutor() {
234233
.address(boundAddress.publishAddress())
235234
.build(),
236235
clusterSettings,
237-
Collections.emptySet(),
238-
Tracer.NOOP
236+
Collections.emptySet()
239237
) {
240238
@Override
241239
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

@@ -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
@@ -307,8 +307,7 @@ private MockTransportService(
307307
localNodeFactory,
308308
clusterSettings,
309309
new StubbableConnectionManager(new ClusterConnectionManager(settings, transport, threadPool.getThreadContext())),
310-
taskManager,
311-
Tracer.NOOP
310+
taskManager
312311
);
313312
this.original = transport.getDelegate();
314313
this.testExecutor = EsExecutors.newScaling(

0 commit comments

Comments
 (0)