diff --git a/README.md b/README.md index f48e47e..9ff3e93 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,16 @@ Find the latest [version here](https://search.maven.org/search?q=g:com.appoptics com.appoptics.metrics appoptics-api-java - 1.0.2 + 1.0.6 + + +You may also pull in a shaded uber jar that has all the dependencies: + + + com.appoptics.metrics + appoptics-api-java + 1.0.6 + nodeps ## Setup diff --git a/pom.xml b/pom.xml index 9d4d936..3cb15d5 100644 --- a/pom.xml +++ b/pom.xml @@ -50,10 +50,6 @@ jar - - - false - @@ -109,17 +105,26 @@ + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + org.apache.maven.plugins maven-shade-plugin - 3.2.0 + 3.5.1 shade + package + ${project.artifactId}-${project.version}-nodeps com.squareup.** + com.fasterxml.** @@ -131,8 +136,11 @@ okio com.appoptics.appopticsjava.shaded.okio + + com.fasterxml + com.appoptics.appopticsjava.shaded.com.fasterxml + - true @@ -151,16 +159,18 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.11.0 - 1.7 - 1.7 + 1.8 + 1.8 + true + true org.apache.maven.plugins maven-surefire-plugin - 2.22.1 + 3.2.2 false @@ -169,7 +179,7 @@ jar - 2.9.8 + 2.16.0 @@ -187,26 +197,27 @@ jackson-annotations ${jackson.version} - - org.slf4j - slf4j-api - 1.7.25 - com.squareup.okhttp3 okhttp - 3.11.0 + 4.12.0 + + + org.slf4j + jul-to-slf4j + 1.7.36 + test org.slf4j slf4j-simple - 1.7.25 + 1.7.36 test junit junit - 4.12 + 4.13.2 test diff --git a/src/main/java/com/appoptics/metrics/client/DefaultPoster.java b/src/main/java/com/appoptics/metrics/client/DefaultPoster.java index 410af36..f6c8a2c 100644 --- a/src/main/java/com/appoptics/metrics/client/DefaultPoster.java +++ b/src/main/java/com/appoptics/metrics/client/DefaultPoster.java @@ -1,17 +1,16 @@ package com.appoptics.metrics.client; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import static java.util.concurrent.TimeUnit.MILLISECONDS; public class DefaultPoster implements IPoster { - private static final Logger log = LoggerFactory.getLogger(DefaultPoster.class); + private static final Logger log = Logger.getLogger(DefaultPoster.class.getName()); @Override public HttpResponse post(String uri, Duration connectTimeout, Duration readTimeout, Map headers, byte[] payload) { @@ -43,7 +42,7 @@ public HttpResponse post(String uri, Duration connectTimeout, Duration readTimeo responseStream = connection.getErrorStream(); } if(responseStream == null) { - log.warn("responseStream null for {} responseCode {}", uri, responseCode); + log.warning(() -> "responseStream null for " + uri + " responseCode " + responseCode); responseBody = new byte[0]; } else { responseBody = readResponse(responseStream); @@ -92,7 +91,7 @@ void close(Closeable closeable) { closeable.close(); } } catch (IOException e) { - log.warn("Could not close " + closeable, e); + log.log(Level.WARNING, e, () -> "Could not close " + closeable); } } diff --git a/src/main/java/com/appoptics/metrics/client/Versions.java b/src/main/java/com/appoptics/metrics/client/Versions.java index 547c170..1d02c0f 100644 --- a/src/main/java/com/appoptics/metrics/client/Versions.java +++ b/src/main/java/com/appoptics/metrics/client/Versions.java @@ -1,19 +1,17 @@ package com.appoptics.metrics.client; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.logging.Level; +import java.util.logging.Logger; /** * Encapsulates logic about versions found in POM files */ public class Versions { - private static final Logger LOG = LoggerFactory.getLogger(Versions.class); private Versions() { // do not construct. @@ -30,8 +28,7 @@ public static String getVersion(String path, Class klass) { try { final InputStream in = klass.getClassLoader().getResourceAsStream(path); if (in != null) { - try { - final BufferedReader reader = new BufferedReader(new InputStreamReader(in)); + try (final BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { String line = reader.readLine(); while (line != null) { if (line.startsWith("version")) { @@ -39,12 +36,11 @@ public static String getVersion(String path, Class klass) { } line = reader.readLine(); } - } finally { - in.close(); } } } catch (IOException e) { - LOG.error("Could not read package version using path " + path + ":", e); + Logger logger = Logger.getLogger(Versions.class.getName()); + logger.log(Level.SEVERE, e, () -> "Could not read package version using path " + path); } return "unknown"; }