Crash handler join() async flush result (#368)

* ensure that the async result is joined * spotless
open-telemetry · Oct 3, 2022 · 31b481d · 31b481d
1 parent d146504
commit 31b481d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/splunk-otel-android/src/main/java/com/splunk/rum/CrashReporter.java b/splunk-otel-android/src/main/java/com/splunk/rum/CrashReporter.java
@@ -20,8 +20,10 @@
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 class CrashReporter {
@@ -73,7 +75,8 @@ public void uncaughtException(@NonNull Thread t, @NonNull Throwable e) {
                     .setStatus(StatusCode.ERROR)
                     .end();
             // do our best to make sure the crash makes it out of the VM
-            sdkTracerProvider.forceFlush();
+            CompletableResultCode result = sdkTracerProvider.forceFlush();
+            result.join(10, TimeUnit.SECONDS);
             // preserve any existing behavior:
             if (existingHandler != null) {
                 existingHandler.uncaughtException(t, e);

diff --git a/splunk-otel-android/src/test/java/com/splunk/rum/CrashReporterTest.java b/splunk-otel-android/src/test/java/com/splunk/rum/CrashReporterTest.java
@@ -23,15 +23,18 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import androidx.annotation.NonNull;
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Before;
 import org.junit.Rule;
@@ -40,16 +43,20 @@
 public class CrashReporterTest {
     @Rule public OpenTelemetryRule otelTesting = OpenTelemetryRule.create();
     private Tracer tracer;
+    private SdkTracerProvider sdkTracerProvider;
+    private CompletableResultCode flushResult;
 
     @Before
     public void setup() {
         tracer = otelTesting.getOpenTelemetry().getTracer("testTracer");
+        sdkTracerProvider = mock(SdkTracerProvider.class);
+        flushResult = mock(CompletableResultCode.class);
+        when(sdkTracerProvider.forceFlush()).thenReturn(flushResult);
     }
 
     @Test
     public void crashReportingSpan() {
         TestDelegateHandler existingHandler = new TestDelegateHandler();
-        SdkTracerProvider sdkTracerProvider = mock(SdkTracerProvider.class);
         CrashReporter.CrashReportingExceptionHandler crashReporter =
                 new CrashReporter.CrashReportingExceptionHandler(
                         tracer, sdkTracerProvider, existingHandler);
@@ -74,11 +81,11 @@ public void crashReportingSpan() {
 
         assertTrue(existingHandler.wasDelegatedTo.get());
         verify(sdkTracerProvider).forceFlush();
+        verify(flushResult).join(10, TimeUnit.SECONDS);
     }
 
     @Test
     public void multipleErrorsDuringACrash() {
-        SdkTracerProvider sdkTracerProvider = mock(SdkTracerProvider.class);
         CrashReporter.CrashReportingExceptionHandler crashReporter =
                 new CrashReporter.CrashReportingExceptionHandler(tracer, sdkTracerProvider, null);