From 352fde7e7e5602793b03d779bd1a7ec3c6adaba6 Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Fri, 8 Aug 2025 18:44:35 -0400
Subject: [PATCH] fix: fix otel span lifetime for BlobAppendableUpload

---
 .../cloud/storage/OtelStorageDecorator.java     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/OtelStorageDecorator.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/OtelStorageDecorator.java
index 6733631091..8cfa7b031d 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/OtelStorageDecorator.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/OtelStorageDecorator.java
@@ -1516,15 +1516,13 @@ public BlobAppendableUpload blobAppendableUpload(
     try (Scope ignore = span.makeCurrent()) {
 
       return new OtelDecoratingBlobAppendableUpload(
-          delegate.blobAppendableUpload(blobInfo, uploadConfig, options));
+          delegate.blobAppendableUpload(blobInfo, uploadConfig, options), span);
 
     } catch (Throwable t) {
       span.recordException(t);
       span.setStatus(StatusCode.ERROR, t.getClass().getSimpleName());
       span.end();
       throw t;
-    } finally {
-      span.end();
     }
   }
 
@@ -2110,10 +2108,12 @@ public String toString() {
 
   final class OtelDecoratingBlobAppendableUpload implements BlobAppendableUpload {
     private final BlobAppendableUpload delegate;
+    private final Span uploadSpan;
     private final Tracer tracer;
 
-    private OtelDecoratingBlobAppendableUpload(BlobAppendableUpload delegate) {
+    private OtelDecoratingBlobAppendableUpload(BlobAppendableUpload delegate, Span uploadSpan) {
       this.delegate = delegate;
+      this.uploadSpan = uploadSpan;
       this.tracer =
           TracerDecorator.decorate(
               Context.current(),
@@ -2159,9 +2159,12 @@ public void finalizeAndClose() throws IOException {
         } catch (IOException | RuntimeException e) {
           openSpan.recordException(e);
           openSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
+          uploadSpan.recordException(e);
+          uploadSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
           throw e;
         } finally {
           openSpan.end();
+          uploadSpan.end();
         }
       }
 
@@ -2173,9 +2176,12 @@ public void closeWithoutFinalizing() throws IOException {
         } catch (IOException | RuntimeException e) {
           openSpan.recordException(e);
           openSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
+          uploadSpan.recordException(e);
+          uploadSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
           throw e;
         } finally {
           openSpan.end();
+          uploadSpan.end();
         }
       }
 
@@ -2187,9 +2193,12 @@ public void close() throws IOException {
         } catch (IOException | RuntimeException e) {
           openSpan.recordException(e);
           openSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
+          uploadSpan.recordException(e);
+          uploadSpan.setStatus(StatusCode.ERROR, e.getClass().getSimpleName());
           throw e;
         } finally {
           openSpan.end();
+          uploadSpan.end();
         }
       }