Skip to content

Commit 92418ad

Browse files
respond to PR comment
1 parent fd4c395 commit 92418ad

File tree

1 file changed

+10
-1
lines changed
  • exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal

1 file changed

+10
-1
lines changed

exporters/sender/okhttp/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpGrpcSender.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
import java.util.concurrent.TimeUnit;
4545
import java.util.function.Consumer;
4646
import java.util.function.Supplier;
47+
import java.util.logging.Level;
48+
import java.util.logging.Logger;
4749
import javax.annotation.Nullable;
4850
import javax.net.ssl.SSLContext;
4951
import javax.net.ssl.X509TrustManager;
@@ -66,6 +68,8 @@
6668
*/
6769
public final class OkHttpGrpcSender<T extends Marshaler> implements GrpcSender<T> {
6870

71+
private static final Logger logger = Logger.getLogger(OkHttpGrpcSender.class.getName());
72+
6973
private static final String GRPC_STATUS = "grpc-status";
7074
private static final String GRPC_MESSAGE = "grpc-message";
7175

@@ -229,7 +233,12 @@ public CompletableResultCode shutdown() {
229233
try {
230234
// Wait up to 5 seconds for threads to terminate
231235
// Even if timeout occurs, we succeed since these are daemon threads
232-
executorService.awaitTermination(5, TimeUnit.SECONDS);
236+
boolean terminated = executorService.awaitTermination(5, TimeUnit.SECONDS);
237+
if (!terminated) {
238+
logger.log(
239+
Level.WARNING,
240+
"Executor did not terminate within 5 seconds, proceeding with shutdown since threads are daemon threads.");
241+
}
233242
} catch (InterruptedException e) {
234243
Thread.currentThread().interrupt();
235244
} finally {

0 commit comments

Comments
 (0)