diff --git a/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java index 18bc8f7..8a20dbd 100644 --- a/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java +++ b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetricSender.java @@ -110,7 +110,7 @@ public int getElasticSearchVersion() { JSONObject elasticSearchConfig = new JSONObject(responseBody); JSONObject version = (JSONObject) elasticSearchConfig.get("version"); String elasticVersion = version.get("number").toString(); - if (Objects.equals(version.get("distribution").toString(), "opensearch")) { + if (Objects.equals(JsonUtils.getValueOrNull(version, "distribution"), "opensearch")) { elasticSearchVersion = 7; }else{ elasticSearchVersion = Integer.parseInt(elasticVersion.split("\\.")[0]); diff --git a/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchRequests.java b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchRequests.java index 1d62865..04ec2a0 100644 --- a/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchRequests.java +++ b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchRequests.java @@ -4,5 +4,5 @@ public class ElasticSearchRequests { /** * Request to send metrics (JMeter/Percentiles) as ElasticSearch documents */ - public static String SEND_BULK_REQUEST = "{ \"create\" : { \"_index\" : \"%s\" } }%n"; + public static String SEND_BULK_REQUEST = "{ \"index\" : { \"_index\" : \"%s\" } }%n"; } diff --git a/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/JsonUtils.java b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/JsonUtils.java new file mode 100644 index 0000000..ae3e8c5 --- /dev/null +++ b/src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/JsonUtils.java @@ -0,0 +1,15 @@ +package io.github.delirius325.jmeter.backendlistener.elasticsearch; + +import org.json.JSONObject; + +import java.net.HttpRetryException; + +public class JsonUtils { + public static T getValueOrNull(JSONObject object, String key) { + try { + return (T) object.get(key); + } catch (Exception e) { + return null; + } + } +}