Fix flush on JVM shutdown

Azure · Nov 10, 2023 · 6f7c523 · 6f7c523
1 parent a367610
commit 6f7c523
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-exporter/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- [Fix flush on JVM shutdown](https://github.com/Azure/azure-sdk-for-java/pull/37618)
 
 ### Other Changes
 

diff --git a/...m/azure/monitor/opentelemetry/exporter/implementation/pipeline/TelemetryItemExporter.java b/...m/azure/monitor/opentelemetry/exporter/implementation/pipeline/TelemetryItemExporter.java
@@ -85,7 +85,8 @@ public CompletableResultCode send(List<TelemetryItem> telemetryItems) {
         for (Map.Entry<TelemetryItemBatchKey, List<TelemetryItem>> batch : batches.entrySet()) {
             resultCodeList.add(internalSendByBatch(batch.getKey(), batch.getValue()));
         }
-        return maybeAddToActiveExportResults(resultCodeList);
+        maybeAddToActiveExportResults(resultCodeList);
+        return CompletableResultCode.ofAll(resultCodeList);
     }
 
     // visible for tests
@@ -106,14 +107,13 @@ Map<TelemetryItemBatchKey, List<TelemetryItem>> splitIntoBatches(
         return groupings;
     }
 
-    private CompletableResultCode maybeAddToActiveExportResults(List<CompletableResultCode> results) {
+    private void maybeAddToActiveExportResults(List<CompletableResultCode> results) {
         if (activeExportResults.size() >= MAX_CONCURRENT_EXPORTS) {
             // this is just a failsafe to limit concurrent exports, it's not ideal because it blocks
             // waiting for the most recent export instead of waiting for the first export to return
             operationLogger.recordFailure(
                 "Hit max " + MAX_CONCURRENT_EXPORTS + " active concurrent requests",
                 TELEMETRY_ITEM_EXPORTER_ERROR);
-            return CompletableResultCode.ofAll(results);
         }
 
         operationLogger.recordSuccess();
@@ -122,8 +122,6 @@ private CompletableResultCode maybeAddToActiveExportResults(List<CompletableResu
         for (CompletableResultCode result : results) {
             result.whenComplete(() -> activeExportResults.remove(result));
         }
-
-        return CompletableResultCode.ofSuccess();
     }
 
     public CompletableResultCode flush() {