diff --git a/Dockerfile b/Dockerfile index 86086e4..57ebb57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Yogev Mets RUN apk add --no-cache --update bash curl vim -ADD target/jmx2graphite-1.4.3-javaagent.jar /jmx2graphite.jar +ADD target/jmx2graphite-1.4.4-javaagent.jar /jmx2graphite.jar ADD slf4j-simple-1.7.25.jar /slf4j-simple-1.7.25.jar ADD application.conf /application.conf # Default Start diff --git a/README.md b/README.md index e4c1c75..9c2990f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ See our [sample config file](application.conf)]. You can find a complete list of the required parameters [here](#using-bash--jolokia-agent) ```bash -docker run -d -name jmx2graphtite -v path/to/config/myConfig.conf:application.conf logizo/jmx2graphite +docker run -d --name jmx2graphite -v path/to/config/myConfig.conf:/application.conf logzio/jmx2graphite ``` **Note**: The config file at the docker end must be name application.conf @@ -249,6 +249,9 @@ docker push logzio/jmx2graphite # Changelog +- v1.4.4 + - dependencies + - remove minor deprecation - v1.4.3 - update dependencies - v1.4.0 diff --git a/pom.xml b/pom.xml index 555d8db..8ca46f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.logz jmx2graphite - 1.4.3 + 1.4.4 @@ -102,7 +102,7 @@ com.google.guava guava - 24.1.1-jre + 29.0-jre compile @@ -120,7 +120,7 @@ com.fasterxml.jackson.core jackson-databind - 2.9.10.3 + 2.11.1 compile @@ -143,12 +143,12 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.11.1 + 2.13.3 org.apache.logging.log4j log4j-core - 2.11.2 + 2.13.3 diff --git a/src/main/java/io/logz/jmx2graphite/PickledGraphite.java b/src/main/java/io/logz/jmx2graphite/PickledGraphite.java index 315764f..ace462c 100644 --- a/src/main/java/io/logz/jmx2graphite/PickledGraphite.java +++ b/src/main/java/io/logz/jmx2graphite/PickledGraphite.java @@ -438,8 +438,6 @@ private void tryWritingMetrics() throws IOException { } throw e; } - } catch (IOException e) { - throw Throwables.propagate(e); } } } diff --git a/src/test/java/io/logz/jmx2graphite/DummyGraphiteServer.java b/src/test/java/io/logz/jmx2graphite/DummyGraphiteServer.java index 6bd96cb..308cdcf 100644 --- a/src/test/java/io/logz/jmx2graphite/DummyGraphiteServer.java +++ b/src/test/java/io/logz/jmx2graphite/DummyGraphiteServer.java @@ -84,7 +84,7 @@ public void stop() { Closeables.close(clientSocket, true); Closeables.close(serverSocket, true); } catch (IOException e) { - throw Throwables.propagate(e); + logger.error("got IO exception while closing: {}", e); } logger.info("Waiting for server to finish shutdown..."); try { @@ -93,7 +93,7 @@ public void stop() { throw new RuntimeException("Timed out on waiting for dummy graphite server shutdown"); } } catch (InterruptedException e) { - throw Throwables.propagate(e); + logger.error("got interrupt while closing: {}", e); } logger.info("Dummy graphite server closed");