Release 2.1.4

Author: predix-adoption-bot

pom.xml

@@ -1,13 +1,10 @@
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.ge.predix.audit</groupId>
     <artifactId>audit-sdk</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <packaging>jar</packaging>
-
     <name>audit-sdk</name>
     <url>http://maven.apache.org</url>
 
@@ -16,16 +13,15 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <powermock.version>1.7.1</powermock.version>
-        <jackson.version>2.9.6</jackson.version>
-        <eventhub.sdk.version>2.0.7</eventhub.sdk.version>
-        <lombok.version>1.18.0</lombok.version>
+        <jackson.version>2.9.8</jackson.version>
+        <eventhub.sdk.version>2.2.4</eventhub.sdk.version>
+        <lombok.version>1.18.4</lombok.version>
         <jacoco.version>0.7.9</jacoco.version>
         <guava.version>26.0-jre</guava.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -51,7 +47,6 @@
                 <artifactId>httpclient</artifactId>
                 <version>4.5.3</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -110,7 +105,7 @@
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
-            <version>3.0.1-b04</version>
+            <version>3.0.1-b06</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>

src/main/java/com/ge/predix/audit/sdk/AbstractAuditClientImpl.java

@@ -105,6 +105,7 @@ public synchronized void reconnect() throws EventHubClientException {
 	public synchronized void shutdown() {
 		setStateAndNotify(AuditCommonClientState.SHUTDOWN);
 		Optional.ofNullable(tracingExecutor).ifPresent(ExecutorService::shutdownNow);
+		tracingHandler.shutdown();
 		client.shutdown();
 	}
 

src/main/java/com/ge/predix/audit/sdk/TracingHandleEmptyImpl.java

@@ -35,4 +35,9 @@ public boolean isTracingAck(Ack ack) {
     public boolean isTracingEvent(AuditEvent event) {
         return false;
     }
+
+    @Override
+    public void shutdown() {
+
+    }
 }

src/main/java/com/ge/predix/audit/sdk/TracingHandler.java

@@ -25,4 +25,6 @@ public interface TracingHandler {
     boolean isTracingAck(Ack ack);
 
     boolean isTracingEvent(AuditEvent event);
+
+    void shutdown();
 }

src/main/java/com/ge/predix/audit/sdk/TracingHandlerImpl.java

@@ -61,6 +61,11 @@ public boolean isTracingEvent(AuditEvent event) {
         return this.auditTracingEvent.get().getMessageId().equals(event.getMessageId());
     }
 
+    @Override
+    public void shutdown() {
+        tracingMessageSender.shutdown();
+    }
+
     @Override
     public void sendCheckpoint(AuditEvent event, LifeCycleEnum lifeCycleStatus, String message) {
         log.logWithPrefix(Level.INFO, logPrefix, "found tracing event. notifying LifeCycle FAIL");

src/main/java/com/ge/predix/audit/sdk/config/vcap/VcapLoaderServiceImpl.java

@@ -31,6 +31,7 @@ public class VcapLoaderServiceImpl implements VcapLoaderService {
     private static final String AUDIT_RETRY_INTERVAL_MILLIS = "AUDIT_RETRY_INTERVAL_MILLIS";
     private static final String AUDIT_MAX_CACHED_EVENTS = "AUDIT_MAX_CACHED_EVENTS";
     private static final String AUDIT_RECONNECT_POLICY = "AUDIT_RECONNECT_POLICY";
+    private static final String AUDIT_TRACE_ENABLED = "AUDIT_TRACE_ENABLED";
 
     private static CustomLogger log = LoggerUtils.getLogger(VcapLoaderServiceImpl.class.getName());
 
@@ -75,6 +76,9 @@ public class VcapLoaderServiceImpl implements VcapLoaderService {
     @Setter
     private String reconnectPolicy;
 
+    @Setter
+    private boolean traceEnabled;
+
     public VcapLoaderServiceImpl() {
         this.vcapServicesEnv = System.getenv(VCAP_SERVICES);
         this.auditServiceName = System.getenv(AUDIT_SERVICE_NAME);
@@ -96,6 +100,8 @@ private void init() {
         this.retryIntervalMillis = System.getenv(AUDIT_RETRY_INTERVAL_MILLIS);
         this.maxCachedEvents = System.getenv(AUDIT_MAX_CACHED_EVENTS);
         this.reconnectPolicy = System.getenv(AUDIT_RECONNECT_POLICY);
+        String traceFromEnv = System.getenv(AUDIT_TRACE_ENABLED);
+        this.traceEnabled = traceFromEnv == null || !traceFromEnv.equalsIgnoreCase("false"); // default true
         this.deserializer = new VcapServicesDeserializer();
         GsonBuilder gsonBuilder = new GsonBuilder();
         gsonBuilder.disableHtmlEscaping()
@@ -217,7 +223,7 @@ private AuditConfiguration buildAuditConfiguration() throws VcapLoadException {
                     .tracingUrl(auditServiceCredentials.getTracingUrl())
                     .tracingToken(auditServiceCredentials.getTracingToken())
                     .tracingInterval(auditServiceCredentials.getTracingInterval())
-                    .traceEnabled(true)
+                    .traceEnabled(traceEnabled)
                     .cfAppName(vcapApplication.getName())
                     .auditServiceName(auditServiceName)
                     .auditZoneId(auditServiceCredentials.getAuditQueryApiScope().split("\\.")[2])

src/main/java/com/ge/predix/audit/sdk/message/tracing/TracingMessageSender.java

@@ -6,4 +6,6 @@
 
 public interface TracingMessageSender {
     void sendTracingMessage(Checkpoint checkpoint);
+
+    void shutdown();
 }

src/main/java/com/ge/predix/audit/sdk/message/tracing/TracingMessageSenderImpl.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ge.predix.audit.sdk.util.CustomLogger;
 import com.ge.predix.audit.sdk.util.LoggerUtils;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -14,7 +15,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
 
@@ -33,7 +34,7 @@ public class TracingMessageSenderImpl implements TracingMessageSender {
 
     private ObjectMapper objectMapper;
     private URIBuilder uriBuilder;
-    private Executor executor;
+    private ExecutorService executor;
 
     public TracingMessageSenderImpl(String endpoint, String token)
             throws URISyntaxException {
@@ -45,7 +46,7 @@ protected TracingMessageSenderImpl(String destination, String token, CloseableHt
         this.token = token;
         this.objectMapper = new ObjectMapper();
         this.uriBuilder = new URIBuilder(destination);
-        this.executor = Executors.newFixedThreadPool(1);
+        this.executor = Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat("TracingMessageSenderImpl-%d").build());
         this.httpClient = closeableHttpClient;
     }
 
@@ -77,4 +78,9 @@ private HttpPost buildRequest(Checkpoint checkpoint)
         request.setHeader(AUTHORIZATION, BASIC + token);
         return request;
     }
+
+    public void shutdown() {
+        executor.shutdownNow();
+    }
+
 }