Add PA plugin support for ElasticSearch v7.4.2 (#80)

Author: ktkrg

build.gradle

@@ -16,7 +16,7 @@
 buildscript {
 
     ext {
-        es_version = System.getProperty("es.version", "7.3.2")
+        es_version = System.getProperty("es.version", "7.4.2")
     }
     // This isn't applying from repositories.gradle so repeating it here
     repositories {
@@ -34,7 +34,7 @@ plugins {
 }
 
 ext {
-    opendistroVersion = '1.3.0'
+    opendistroVersion = '1.4.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

release-notes

@@ -1,3 +1,7 @@
+## Version 1.4.0 (Version compatible with elasticsearch 7.4.2)
+## New Features
+This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 7.4.2
+
 ## Version 1.3.0 (Version compatible with elasticsearch 7.3.2)
 ## New Features
 This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 7.3.2

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerPlugin.java

@@ -186,7 +186,7 @@ public List<org.elasticsearch.rest.RestHandler> getRestHandlers(final Settings s
                                                                     final SettingsFilter settingsFilter,
                                                                     final IndexNameExpressionResolver indexNameExpressionResolver,
                                                                     final Supplier<DiscoveryNodes> nodesInCluster) {
-        PerformanceAnalyzerConfigAction performanceanalyzerConfigAction = new PerformanceAnalyzerConfigAction(settings, restController);
+        PerformanceAnalyzerConfigAction performanceanalyzerConfigAction = new PerformanceAnalyzerConfigAction(restController);
         PerformanceAnalyzerConfigAction.setInstance(performanceanalyzerConfigAction);
         return singletonList(performanceanalyzerConfigAction);
     }

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/collectors/NodeStatsMetricsCollector.java

@@ -152,7 +152,7 @@ public void collectMetrics(long startTime) {
             return;
         }
 
-        NodeIndicesStats nodeIndicesStats = indicesService.stats(true, CommonStatsFlags.ALL);
+        NodeIndicesStats nodeIndicesStats = indicesService.stats(CommonStatsFlags.ALL);
 
         HashSet<ShardId> currentShards = new HashSet<>();
 

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java

@@ -15,32 +15,27 @@
 
 package com.amazon.opendistro.elasticsearch.performanceanalyzer.http_action.config;
 
+import com.amazon.opendistro.elasticsearch.performanceanalyzer.ConfigStatus;
+import com.amazon.opendistro.elasticsearch.performanceanalyzer.ESResources;
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.PerformanceAnalyzerPlugin;
-import org.elasticsearch.rest.BaseRestHandler;
-import org.elasticsearch.rest.RestController;
-import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.RestStatus;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.client.node.NodeClient;
-
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentHelper;
-import org.elasticsearch.rest.BytesRestResponse;
-
+import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Map;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.io.File;
+import java.util.Map;
 import java.util.Scanner;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import com.amazon.opendistro.elasticsearch.performanceanalyzer.ConfigStatus;
-import com.amazon.opendistro.elasticsearch.performanceanalyzer.ESResources;
+import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.rest.BaseRestHandler;
+import org.elasticsearch.rest.BytesRestResponse;
+import org.elasticsearch.rest.RestController;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestStatus;
 
 @SuppressWarnings("deprecation")
 public class PerformanceAnalyzerConfigAction extends BaseRestHandler {
@@ -61,8 +56,8 @@ public static void setInstance(PerformanceAnalyzerConfigAction performanceanalyz
 
     private static final String METRIC_ENABLED_CONF_FILENAME = "performance_analyzer_enabled.conf";
     @Inject
-    public PerformanceAnalyzerConfigAction(Settings settings, RestController controller) {
-        super(settings);
+    public PerformanceAnalyzerConfigAction(RestController controller) {
+        super();
         controller.registerHandler(org.elasticsearch.rest.RestRequest.Method.GET, "/_opendistro/_performanceanalyzer/config", this);
         controller.registerHandler(org.elasticsearch.rest.RestRequest.Method.POST, "/_opendistro/_performanceanalyzer/config", this);
         this.featureEnabled = getFeatureEnabledFromConf();

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/whoami/TransportWhoAmIAction.java

@@ -16,14 +16,13 @@
 package com.amazon.opendistro.elasticsearch.performanceanalyzer.http_action.whoami;
 
 import com.amazon.opendistro.elasticsearch.performanceanalyzer.ESResources;
-
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.common.inject.Inject;
-import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.tasks.Task;
+import org.elasticsearch.transport.TransportService;
 
 public class TransportWhoAmIAction extends HandledTransportAction<WhoAmIRequest, WhoAmIResponse> {
 

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/whoami/WhoAmIRequest.java

@@ -16,6 +16,21 @@
 package com.amazon.opendistro.elasticsearch.performanceanalyzer.http_action.whoami;
 
 import org.elasticsearch.action.support.nodes.BaseNodesRequest;
+import org.elasticsearch.common.io.stream.StreamInput;
 
 public class WhoAmIRequest extends BaseNodesRequest<WhoAmIRequest> {
+
+  private static final String[] EMPTY_NODE_ID_ARRAY = {};
+
+  public WhoAmIRequest() {
+    this(null);
+  }
+
+  public WhoAmIRequest(StreamInput input) {
+    // Adding a ctor which matches the FunctionalInterface Writable.Reader<> so that ctor
+    // reference succeeds.
+    // The ctor itself calls the BaseNodesRequest<>(String... nodeIds) ctor with empty string
+    // array(same functionality as 7.3.2's default ctor) since it was removed in 7.4.2.
+    super(EMPTY_NODE_ID_ARRAY);
+  }
 }

src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
@@ -28,4 +29,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.endObject();
         return builder;
     }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        // This is a no-op call just like how it was in 7.3.2(inherited from TransportMessage
+        // .writeTo)
+    }
 }