Skip to content

Commit 0e6eb7b

Browse files
committed
Fix tests
1 parent a584056 commit 0e6eb7b

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,8 @@ public Map<String, String> queryFields() {
10991099
localNodeFactory,
11001100
settingsModule.getClusterSettings(),
11011101
taskManager,
1102-
telemetryProvider.getTracer()
1102+
telemetryProvider.getTracer(),
1103+
nodeEnvironment.nodeId()
11031104
);
11041105
final SearchResponseMetrics searchResponseMetrics = new SearchResponseMetrics(telemetryProvider.getMeterRegistry());
11051106
final SearchTransportService searchTransportService = new SearchTransportService(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ TransportService newTransportService(
114114
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
115115
ClusterSettings clusterSettings,
116116
TaskManager taskManager,
117-
Tracer tracer
117+
Tracer tracer,
118+
String initialNodeId
118119
) {
119120
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer);
120121
}

test/framework/src/main/java/org/elasticsearch/node/MockNode.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ protected TransportService newTransportService(
167167
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
168168
ClusterSettings clusterSettings,
169169
TaskManager taskManager,
170-
Tracer tracer
170+
Tracer tracer,
171+
String initialNodeId
171172
) {
172173

173174
// we use the MockTransportService.TestPlugin class as a marker to create a network
@@ -184,7 +185,8 @@ protected TransportService newTransportService(
184185
localNodeFactory,
185186
clusterSettings,
186187
taskManager,
187-
tracer
188+
tracer,
189+
initialNodeId
188190
);
189191
} else {
190192
return new MockTransportService(
@@ -195,7 +197,7 @@ protected TransportService newTransportService(
195197
localNodeFactory,
196198
clusterSettings,
197199
taskManager.getTaskHeaders(),
198-
null
200+
initialNodeId
199201
);
200202
}
201203
}

0 commit comments

Comments
 (0)