Updated for ES 6.6.0

Automattic · Jun 26, 2019 · 48901ca · 48901ca
1 parent 292a1f7
commit 48901ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ The data sent to the StatsD server tries to be roughly equivalent to the [Indice
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 6.6.0          | 6.6.0.0        | Jun 26, 2019 |
 | 6.5.4          | 6.5.4.0        | Jun 26, 2019 |
 | 6.5.3          | 6.5.3.0        | Jun 26, 2019 |
 | 6.5.2          | 6.5.2.0        | Jun 24, 2019 |
@@ -88,12 +89,12 @@ The plugin artifacts are published to Maven Central and Github. To install a pre
 From Github:
 
 ```
-./bin/elasticsearch-plugin install https://github.com/Automattic/elasticsearch-statsd-plugin/releases/download/6.5.4.0/elasticsearch-statsd-6.5.4.0.zip
+./bin/elasticsearch-plugin install https://github.com/Automattic/elasticsearch-statsd-plugin/releases/download/6.6.0.0/elasticsearch-statsd-6.6.0.0.zip
 ```
 
 From Maven Central:
 ```
-./bin/elasticsearch-plugin install http://repo1.maven.org/maven2/com/automattic/elasticsearch-statsd/6.5.4.0/elasticsearch-statsd-6.5.4.0.zip
+./bin/elasticsearch-plugin install http://repo1.maven.org/maven2/com/automattic/elasticsearch-statsd/6.6.0.0/elasticsearch-statsd-6.6.0.0.zip
 ```
 
 Change the version to match your ES version. For ES `x.y.z` the version is `x.y.z.0`

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.automattic</groupId>
     <artifactId>elasticsearch-statsd</artifactId>
-    <version>6.5.4.0</version>
+    <version>6.6.0.0</version>
     <packaging>jar</packaging>
 
     <name>elasticsearch-statsd</name>
@@ -46,7 +46,7 @@
     </developers>
 
     <properties>
-        <elasticsearch.version>6.5.4</elasticsearch.version>
+        <elasticsearch.version>6.6.0</elasticsearch.version>
         <junit.version>4.12</junit.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/automattic/elasticsearch/statsd/StatsdService.java b/src/main/java/com/automattic/elasticsearch/statsd/StatsdService.java
@@ -1,5 +1,7 @@
 package com.automattic.elasticsearch.statsd;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import com.automattic.elasticsearch.plugin.StatsdPlugin;
 import com.timgroup.statsd.NonBlockingStatsDClient;
 import com.timgroup.statsd.StatsDClient;
@@ -46,6 +48,8 @@ public class StatsdService extends AbstractLifecycleComponent {
     private final Thread statsdReporterThread;
     private final AtomicBoolean closed = new AtomicBoolean(false);
 
+    protected static final Logger logger = LogManager.getLogger(StatsdService.class);
+
     @Inject
     public StatsdService(Settings settings, Client client, ClusterService clusterService, IndicesService indicesService, NodeService nodeService) {
         super(settings);
@@ -75,7 +79,7 @@ public StatsdService(Settings settings, Client client, ClusterService clusterSer
                         StatsdService.this.statsdPort));
 
         this.statsdReporterThread = EsExecutors
-                .daemonThreadFactory(this.settings, "statsd_reporter")
+                .daemonThreadFactory(settings, "statsd_reporter")
                 .newThread(new StatsdReporterThread());
     }
 

diff --git a/src/test/java/com/automattic/elasticsearch/statsd/test/StatsdMockServer.java b/src/test/java/com/automattic/elasticsearch/statsd/test/StatsdMockServer.java
@@ -1,7 +1,7 @@
 package com.automattic.elasticsearch.statsd.test;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.logging.Loggers;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -18,7 +18,7 @@ public class StatsdMockServer extends Thread {
     public Collection<String> content = new ArrayList<>();
     private DatagramSocket socket;
     private boolean isClosed = false;
-    private final Logger logger = Loggers.getLogger(getClass());
+    protected static final Logger logger = LogManager.getLogger(StatsdMockServer.class);
 
     public StatsdMockServer(int port) {
         this.port = port;