Skip to content

Commit 67eb753

Browse files
committed
Add MeterRegistry param in callers
1 parent 9eeee30 commit 67eb753

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,6 @@ public class RepositoriesService extends AbstractLifecycleComponent implements C
127127
private final List<BiConsumer<Snapshot, IndexVersion>> preRestoreChecks;
128128
private final SnapshotMetrics snapshotMetrics;
129129

130-
public RepositoriesService(
131-
Settings settings,
132-
ClusterService clusterService,
133-
Map<String, Repository.Factory> typesRegistry,
134-
Map<String, Repository.Factory> internalTypesRegistry,
135-
ThreadPool threadPool,
136-
NodeClient client,
137-
List<BiConsumer<Snapshot, IndexVersion>> preRestoreChecks
138-
) {
139-
this(settings, clusterService, typesRegistry, internalTypesRegistry, threadPool, client, preRestoreChecks, MeterRegistry.NOOP);
140-
}
141-
142130
@SuppressWarnings("this-escape")
143131
public RepositoriesService(
144132
Settings settings,

server/src/test/java/org/elasticsearch/action/admin/cluster/repositories/reservedstate/ReservedRepositoryActionTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.elasticsearch.repositories.RepositoryException;
2323
import org.elasticsearch.repositories.RepositoryMissingException;
2424
import org.elasticsearch.reservedstate.TransformState;
25+
import org.elasticsearch.telemetry.metric.MeterRegistry;
2526
import org.elasticsearch.test.ESTestCase;
2627
import org.elasticsearch.threadpool.ThreadPool;
2728
import org.elasticsearch.xcontent.XContentParser;
@@ -143,7 +144,8 @@ public Repository create(ProjectId projectId, RepositoryMetadata metadata) {
143144
Map.of("fs", fsFactory),
144145
threadPool,
145146
mock(NodeClient.class),
146-
null
147+
null,
148+
MeterRegistry.NOOP
147149
)
148150
);
149151

server/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusActionTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.elasticsearch.tasks.CancellableTask;
3232
import org.elasticsearch.tasks.TaskCancelHelper;
3333
import org.elasticsearch.tasks.TaskCancelledException;
34+
import org.elasticsearch.telemetry.metric.MeterRegistry;
3435
import org.elasticsearch.test.ClusterServiceUtils;
3536
import org.elasticsearch.test.ESTestCase;
3637
import org.elasticsearch.test.transport.CapturingTransport;
@@ -74,7 +75,8 @@ public void initializeComponents() throws Exception {
7475
Map.of(),
7576
threadPool,
7677
nodeClient,
77-
List.of()
78+
List.of(),
79+
MeterRegistry.NOOP
7880
);
7981
action = new TransportSnapshotsStatusAction(
8082
transportService,

server/src/test/java/org/elasticsearch/indices/cluster/IndicesClusterStateServiceRandomUpdatesTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.elasticsearch.indices.recovery.PeerRecoveryTargetService;
4848
import org.elasticsearch.indices.recovery.SnapshotFilesProvider;
4949
import org.elasticsearch.repositories.RepositoriesService;
50+
import org.elasticsearch.telemetry.metric.MeterRegistry;
5051
import org.elasticsearch.threadpool.TestThreadPool;
5152
import org.elasticsearch.threadpool.ThreadPool;
5253
import org.elasticsearch.transport.Transport;
@@ -549,7 +550,8 @@ private IndicesClusterStateService createIndicesClusterStateService(
549550
Collections.emptyMap(),
550551
threadPool,
551552
client,
552-
List.of()
553+
List.of(),
554+
MeterRegistry.NOOP
553555
);
554556
final PeerRecoveryTargetService recoveryTargetService = new PeerRecoveryTargetService(
555557
client,

server/src/test/java/org/elasticsearch/repositories/RepositoriesServiceTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import org.elasticsearch.repositories.blobstore.MeteredBlobStoreRepository;
5454
import org.elasticsearch.snapshots.SnapshotId;
5555
import org.elasticsearch.snapshots.SnapshotInfo;
56+
import org.elasticsearch.telemetry.metric.MeterRegistry;
5657
import org.elasticsearch.test.ClusterServiceUtils;
5758
import org.elasticsearch.test.ESTestCase;
5859
import org.elasticsearch.threadpool.TestThreadPool;
@@ -155,7 +156,8 @@ public void setUp() throws Exception {
155156
typesRegistry,
156157
threadPool,
157158
client,
158-
List.of()
159+
List.of(),
160+
MeterRegistry.NOOP
159161
);
160162

161163
clusterService.start();

server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
import org.elasticsearch.search.builder.SearchSourceBuilder;
188188
import org.elasticsearch.search.fetch.FetchPhase;
189189
import org.elasticsearch.telemetry.TelemetryProvider;
190+
import org.elasticsearch.telemetry.metric.MeterRegistry;
190191
import org.elasticsearch.telemetry.tracing.Tracer;
191192
import org.elasticsearch.test.ClusterServiceUtils;
192193
import org.elasticsearch.test.ESTestCase;
@@ -2410,7 +2411,8 @@ public RecyclerBytesStreamOutput newNetworkBytesStream() {
24102411
emptyMap(),
24112412
threadPool,
24122413
client,
2413-
List.of()
2414+
List.of(),
2415+
MeterRegistry.NOOP
24142416
);
24152417
final ActionFilters actionFilters = new ActionFilters(emptySet());
24162418
snapshotsService = new SnapshotsService(

0 commit comments

Comments
 (0)