diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java
index e7107785df..4b2387b93e 100644
--- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java
+++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java
@@ -19,6 +19,7 @@
 import com.google.api.gax.batching.FlowController;
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.ExecutorProvider;
+import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.auth.Credentials;
@@ -824,10 +825,14 @@ public StreamWriter build() throws IOException {
     }
 
     String getFullTraceId() {
-      if (traceId == null) {
-        return clientId;
+      String clientWithVersion =
+          GaxProperties.getLibraryVersion(StreamWriter.class).isEmpty()
+              ? clientId
+              : clientId + ":" + GaxProperties.getLibraryVersion(StreamWriter.class);
+      if (traceId == null || traceId.isEmpty()) {
+        return clientWithVersion;
       } else {
-        return clientId + " " + traceId;
+        return clientWithVersion + " " + traceId;
       }
     }
   }