Merge pull request #86 from cisco-open/fix/master/add-uncaught-exception-handler

Add uncaught exception handler

Author: preet-dev

src/main/java/io/opentelemetry/contrib/generator/telemetry/logs/LogsGenerator.java

@@ -20,6 +20,7 @@
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
 import io.opentelemetry.contrib.generator.telemetry.logs.dto.LogDefinition;
 import io.opentelemetry.contrib.generator.telemetry.logs.dto.Logs;
+import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorExceptionHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.TransportStorage;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -62,7 +64,14 @@ public void runGenerator() {
         }
 
         private void initGeneratorState(int totalPayloadCount) {
-            generatorState = new GeneratorState<>(Executors.newScheduledThreadPool(logs.getLogs().size()));
+            ScheduledExecutorService executorService = Executors.newScheduledThreadPool(
+                    logs.getLogs().size(),
+                    runnable -> {
+                        Thread t = Executors.defaultThreadFactory().newThread(runnable);
+                        t.setUncaughtExceptionHandler(new GeneratorExceptionHandler());
+                        return t;
+                    });
+            generatorState = new GeneratorState<>(executorService);
             generatorState.setTotalPayloadCount(totalPayloadCount);
             generatorState.setThreadPayloadCounts(new ConcurrentHashMap<>());
             if (transportStorage != null) {

src/main/java/io/opentelemetry/contrib/generator/telemetry/metrics/MetricsGenerator.java

@@ -18,6 +18,7 @@
 
 import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
+import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorExceptionHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.TransportStorage;
 import io.opentelemetry.contrib.generator.telemetry.metrics.dto.MetricDefinition;
@@ -29,6 +30,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -70,7 +72,14 @@ public void runGenerator() {
     }
 
     private void initGeneratorState() {
-        generatorState = new GeneratorState<>(Executors.newScheduledThreadPool(metricThreadGroups.size()));
+        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(
+                metricThreadGroups.size(),
+                runnable -> {
+                    Thread t = Executors.defaultThreadFactory().newThread(runnable);
+                    t.setUncaughtExceptionHandler(new GeneratorExceptionHandler());
+                    return t;
+                });
+        generatorState = new GeneratorState<>(executorService);
         generatorState.setThreadPayloadCounts(new ConcurrentHashMap<>());
         if (transportStorage != null) {
             transportStorage.initMetricResponseMaps();

src/main/java/io/opentelemetry/contrib/generator/telemetry/misc/GeneratorExceptionHandler.java

@@ -0,0 +1,12 @@
+package io.opentelemetry.contrib.generator.telemetry.misc;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class GeneratorExceptionHandler implements Thread.UncaughtExceptionHandler {
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        log.error("Error occurred in thread " + t.getName(), e);
+    }
+}

src/main/java/io/opentelemetry/contrib/generator/telemetry/traces/TracesGenerator.java

@@ -18,6 +18,7 @@
 
 import io.opentelemetry.contrib.generator.telemetry.GeneratorsStateProvider;
 import io.opentelemetry.contrib.generator.telemetry.dto.GeneratorState;
+import io.opentelemetry.contrib.generator.telemetry.misc.GeneratorExceptionHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.PayloadHandler;
 import io.opentelemetry.contrib.generator.telemetry.transport.TransportStorage;
 import io.opentelemetry.contrib.generator.telemetry.traces.dto.RootSpanDefinition;
@@ -27,6 +28,7 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -66,7 +68,14 @@ public void runGenerator() {
     }
 
     private void initGeneratorState() {
-        generatorState = new GeneratorState<>(Executors.newScheduledThreadPool(traceGroups.size()));
+        ScheduledExecutorService executorService = Executors.newScheduledThreadPool(
+                traceGroups.size(),
+                runnable -> {
+                    Thread t = Executors.defaultThreadFactory().newThread(runnable);
+                    t.setUncaughtExceptionHandler(new GeneratorExceptionHandler());
+                    return t;
+                });
+        generatorState = new GeneratorState<>(executorService);
         generatorState.setThreadPayloadCounts(new ConcurrentHashMap<>());
         if (transportStorage != null) {
             transportStorage.initTraceResponseMaps();