Release 2.1.5

Author: predix-adoption-bot

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ge.predix.audit</groupId>
     <artifactId>audit-sdk</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
     <packaging>jar</packaging>
     <name>audit-sdk</name>
     <url>http://maven.apache.org</url>

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

@@ -11,6 +11,7 @@
 import com.ge.predix.eventhub.client.Client;
 import com.ge.predix.eventhub.configuration.EventHubConfiguration;
 import com.ge.predix.eventhub.configuration.PublishConfiguration;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -77,7 +78,7 @@ public AbstractAuditClientImpl(AuditConfiguration configuration, TracingHandler
 		this.automaticTokenRenew = (configuration.getAuthenticationMethod() != AuthenticationMethod.AUTH_TOKEN );
 
 		if(configuration.isTraceEnabled()){
-			tracingExecutor = Executors.newScheduledThreadPool(1);
+			tracingExecutor = Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-AbstractAuditClientImpl-%d").build());
 			startTracingRepetitive();
 		}
 		this.logPrefix = generateLogPrefix(configuration.getAuditZoneId());

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

@@ -34,6 +34,7 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Queues;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -81,7 +82,7 @@ public AuditClientAsyncImpl(AuditConfiguration configuration, AuditCallback<T> c
 			this.queueSize = configuration.getMaxNumberOfEventsInCache();
 			this.eventQueue = Queues.newLinkedBlockingQueue(queueSize);
 
-			retryExecutorService = Executors.newScheduledThreadPool(1);
+			retryExecutorService = Executors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-AuditClientAsyncImpl-%d").build());
 			retryExecutorService.scheduleAtFixedRate(
 					this::handleNotAcceptedEvents, noAckLimit, noAckLimit, TimeUnit.MILLISECONDS);
 			handleEventHubCallback();

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

@@ -2,6 +2,7 @@
 
 import com.ge.predix.audit.sdk.util.CustomLogger;
 import com.ge.predix.audit.sdk.util.LoggerUtils;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import io.netty.util.internal.PlatformDependent;
 
 import java.lang.reflect.Field;
@@ -45,7 +46,7 @@ public synchronized void startMeasuringDirectMemory() {
              if (!initialized) {
                  initialized = true;
                  directMemoryCounter = initDirectMemoryCounter();
-                 executorService = Executors.newSingleThreadScheduledExecutor();
+                 executorService = Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setNameFormat("AUDIT-DirectMemoryMonitor-%d").build());
                  executorService.scheduleAtFixedRate(this::printDirectMemoryCount, 1, 10, TimeUnit.SECONDS);
              }
              else {

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

@@ -2,6 +2,7 @@
 
 import com.ge.predix.audit.sdk.util.CustomLogger;
 import com.ge.predix.audit.sdk.util.LoggerUtils;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -32,7 +33,7 @@ public class ExponentialReconnectStrategy implements ReconnectStrategy {
 
     public ExponentialReconnectStrategy(Runnable actionToPerform, String logPrefix) {
         this.logPrefix = logPrefix;
-        threadExecutor = Executors.newSingleThreadScheduledExecutor();
+        threadExecutor = Executors.newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setNameFormat("AUDIT-ExponentialReconnectStrategy-%d").build());
         curIndex = new AtomicInteger(0);
         this.actionToPerform = actionToPerform;
         isBetweenIntervals = new AtomicBoolean(false);

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

@@ -46,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, new ThreadFactoryBuilder().setNameFormat("TracingMessageSenderImpl-%d").build());
+        this.executor = Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-TracingMessageSenderImpl-%d").build());
         this.httpClient = closeableHttpClient;
     }
 

src/main/java/com/ge/predix/audit/sdk/routing/RoutingAuditClient.java

@@ -23,6 +23,7 @@
 import com.ge.predix.audit.sdk.util.LoggerUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 
@@ -67,7 +68,7 @@ public RoutingAuditClient(RoutingAuditConfiguration configuration, RoutingAuditC
             monitor.startMeasuringDirectMemory();
         }
         routingAuditPublisher = init(configuration, callback);
-        executor = Executors.newSingleThreadExecutor();
+        executor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("AUDIT-RoutingAuditClient-%d").build());
         handleEvents();
     }
 
@@ -189,7 +190,7 @@ private RoutingAuditPublisher<T> init(RoutingAuditConfiguration configuration, R
             AuditEventsConverter converter = new AuditEventsConverter(new AppNameClient(tokenClient, appNameConfig.getAppNamePrefix()));
             //shutdown client
             AuditAsyncShutdownHandler<T> shutdownClient = new AuditAsyncShutdownHandler<>(configuration.getTenantAuditConfig(), tokenServiceClient,
-                    Executors.newFixedThreadPool(routingResourceConfig.getNumOfConnections()));
+                    Executors.newFixedThreadPool(routingResourceConfig.getNumOfConnections(), new ThreadFactoryBuilder().setNameFormat("AUDIT-RoutingAuditClient(shutdown)-%d").build()));
 
             //Dedicated tenants cache
            ICache<String, AuditAsyncClientHolder<T>> dedicatedClients = new AsyncClientHolderICacheImpl<>(shutdownClient,

src/main/java/com/ge/predix/audit/sdk/routing/cache/impl/AsyncClientHolderICacheImpl.java

@@ -9,6 +9,7 @@
 import com.ge.predix.audit.sdk.util.LoggerUtils;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.util.Map;
 import java.util.Optional;
@@ -28,7 +29,7 @@ public class AsyncClientHolderICacheImpl<T extends AuditEvent> implements ICache
     public AsyncClientHolderICacheImpl(AuditAsyncShutdownHandler<T> shutdownHandler, AuditCacheRefresher<T> refresher,
                                        long connectionLifeTime, int numOfConnections, long refreshPeriod){
         tenantClientCache = buildCache(shutdownHandler, connectionLifeTime, numOfConnections);
-        maintenanceExecutor = new ScheduledThreadPoolExecutor(1);
+        maintenanceExecutor = new ScheduledThreadPoolExecutor(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-AsyncClientHolderICacheImpl-%d").build());
         this.shutdownHandler = shutdownHandler;
         startCacheRefresh(refresher, refreshPeriod);
     }

src/test/java/com/ge/predix/audit/sdk/routing/RoutingAuditClientTest.java

@@ -6,6 +6,7 @@
 import com.ge.predix.audit.sdk.message.AuditEnums;
 import com.ge.predix.audit.sdk.message.AuditEventV2;
 import com.google.common.collect.Queues;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.junit.Test;
 
 import java.util.ArrayList;
@@ -26,7 +27,7 @@
 @SuppressWarnings("unchecked")
 public class RoutingAuditClientTest {
 
-    private ExecutorService executorService = Executors.newFixedThreadPool(1);
+    private ExecutorService executorService = Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-RoutingAuditClientTest-%d").build());
     private RoutingTestHelper<AuditEventV2> cb = new RoutingTestHelper<>();
     private RoutingAuditPublisher<AuditEventV2> publisher = mock(RoutingAuditPublisher.class);
     private AtomicReference<AuditClientState> atomicReference = spy(new AtomicReference<>(AuditClientState.CONNECTED));
@@ -121,7 +122,7 @@ public void auditTooManyEventsCauseException() throws InterruptedException {
     @Test
     public void shouldNotLetAuditWhenStatusIsShutdown() {
         routingAuditClient = new RoutingAuditClient<>(Queues.newLinkedBlockingQueue(2),
-                Executors.newFixedThreadPool(1), publisher, new AtomicReference<>(AuditClientState.SHUTDOWN), cb);
+                Executors.newFixedThreadPool(1, new ThreadFactoryBuilder().setNameFormat("AUDIT-RoutingAuditClientTest-%d").build()), publisher, new AtomicReference<>(AuditClientState.SHUTDOWN), cb);
 
         assertThatThrownBy(() -> routingAuditClient.audit(AuditEventV2.builder().publisherType(AuditEnums.PublisherType.APP_SERVICE)
                 .categoryType(AuditEnums.CategoryType.ADMINISTRATIONS)