Skip to content

Commit e147378

Browse files
committed
Rename module to metricsdb
1 parent 868c10e commit e147378

File tree

10 files changed

+16
-18
lines changed

10 files changed

+16
-18
lines changed

x-pack/plugin/metrics/build.gradle renamed to x-pack/plugin/metricsdb/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ apply plugin: 'elasticsearch.internal-es-plugin'
99
apply plugin: 'elasticsearch.internal-cluster-test'
1010

1111
esplugin {
12-
name = 'metrics'
12+
name = 'metricsdb'
1313
description = 'A plugin for metrics related functionality'
1414
classname ='org.elasticsearch.xpack.metrics.MetricsPlugin'
1515
extendedPlugins = ['x-pack-core']
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class MetricsDBIndexingIT extends ESSingleNodeTestCase {
4343

4444
@Override
4545
protected Collection<Class<? extends Plugin>> getPlugins() {
46-
return List.of(DataStreamsPlugin.class, InternalSettingsPlugin.class, MetricsPlugin.class);
46+
return List.of(DataStreamsPlugin.class, InternalSettingsPlugin.class, MetricsDBPlugin.class);
4747
}
4848

4949
@Override

x-pack/plugin/metrics/src/main/java/org/elasticsearch/xpack/metrics/MetricsPlugin.java renamed to x-pack/plugin/metricsdb/src/main/java/org/elasticsearch/xpack/metrics/MetricsDBPlugin.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
package org.elasticsearch.xpack.metrics;
99

10-
import org.elasticsearch.action.ActionRequest;
11-
import org.elasticsearch.action.ActionResponse;
1210
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1311
import org.elasticsearch.cluster.node.DiscoveryNodes;
1412
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -27,7 +25,7 @@
2725
import java.util.function.Predicate;
2826
import java.util.function.Supplier;
2927

30-
public class MetricsPlugin extends Plugin implements ActionPlugin {
28+
public class MetricsDBPlugin extends Plugin implements ActionPlugin {
3129
@Override
3230
public Collection<RestHandler> getRestHandlers(
3331
Settings settings,
@@ -40,11 +38,11 @@ public Collection<RestHandler> getRestHandlers(
4038
Supplier<DiscoveryNodes> nodesInCluster,
4139
Predicate<NodeFeature> clusterSupportsFeature
4240
) {
43-
return List.of(new MetricsRestAction());
41+
return List.of(new MetricsDBRestAction());
4442
}
4543

4644
@Override
47-
public Collection<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
48-
return List.of(new ActionHandler<>(MetricsTransportAction.TYPE, MetricsTransportAction.class));
45+
public Collection<ActionHandler> getActions() {
46+
return List.of(new ActionHandler(MetricsDBTransportAction.TYPE, MetricsDBTransportAction.class));
4947
}
5048
}

x-pack/plugin/metrics/src/main/java/org/elasticsearch/xpack/metrics/MetricsRestAction.java renamed to x-pack/plugin/metricsdb/src/main/java/org/elasticsearch/xpack/metrics/MetricsDBRestAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import static org.elasticsearch.rest.RestRequest.Method.POST;
2828

29-
public class MetricsRestAction extends BaseRestHandler {
29+
public class MetricsDBRestAction extends BaseRestHandler {
3030
@Override
3131
public String getName() {
3232
return "metrics_action";
@@ -46,17 +46,17 @@ public boolean mediaTypesValid(RestRequest request) {
4646
@Override
4747
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
4848
if (request.hasContent()) {
49-
var transportRequest = new MetricsTransportAction.MetricsRequest(
49+
var transportRequest = new MetricsDBTransportAction.MetricsRequest(
5050
Boolean.parseBoolean(request.header("X-MetricsDB-Normalized")),
5151
Boolean.parseBoolean(request.header("X-MetricsDB-Noop")),
5252
request.content().retain()
5353
);
5454
return channel -> client.execute(
55-
MetricsTransportAction.TYPE,
55+
MetricsDBTransportAction.TYPE,
5656
transportRequest,
5757
ActionListener.releaseBefore(request.content(), new RestResponseListener<>(channel) {
5858
@Override
59-
public RestResponse buildResponse(MetricsTransportAction.MetricsResponse r) throws Exception {
59+
public RestResponse buildResponse(MetricsDBTransportAction.MetricsResponse r) throws Exception {
6060
return successResponse();
6161
}
6262
})
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@
7777
import java.util.Set;
7878
import java.util.concurrent.ConcurrentHashMap;
7979

80-
public class MetricsTransportAction extends HandledTransportAction<
81-
MetricsTransportAction.MetricsRequest,
82-
MetricsTransportAction.MetricsResponse> {
80+
public class MetricsDBTransportAction extends HandledTransportAction<
81+
MetricsDBTransportAction.MetricsRequest,
82+
MetricsDBTransportAction.MetricsResponse> {
8383

8484
public static final String NAME = "indices:data/write/metrics";
85-
public static final ActionType<MetricsTransportAction.MetricsResponse> TYPE = new ActionType<>(NAME);
85+
public static final ActionType<MetricsDBTransportAction.MetricsResponse> TYPE = new ActionType<>(NAME);
8686

87-
private static final Logger logger = LogManager.getLogger(MetricsTransportAction.class);
87+
private static final Logger logger = LogManager.getLogger(MetricsDBTransportAction.class);
8888
private static final int MAX_TSID_CACHE_SIZE = 1_000_000;
8989
private static final Hasher128 HASHER = Hashing.murmur3_128();
9090
/**
@@ -99,7 +99,7 @@ public class MetricsTransportAction extends HandledTransportAction<
9999

100100

101101
@Inject
102-
public MetricsTransportAction(
102+
public MetricsDBTransportAction(
103103
TransportService transportService,
104104
ActionFilters actionFilters,
105105
ThreadPool threadPool,

0 commit comments

Comments
 (0)