diff --git a/README.md b/README.md
index a64487c221..0718c5d7de 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-spanner</artifactId>
-  <version>6.81.1</version>
+  <version>6.84.0</version>
 </dependency>
 
 ```
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceWrapper.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceWrapper.java
index 1787573e69..5eaeaf6ddc 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceWrapper.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TraceWrapper.java
@@ -20,7 +20,6 @@
 import com.google.cloud.spanner.Options.TagOption;
 import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.SpannerOptions.TracingFramework;
-import com.google.cloud.spanner.spi.v1.GapicSpannerRpc;
 import com.google.common.base.MoreObjects;
 import io.opencensus.trace.BlankSpan;
 import io.opencensus.trace.Span;
@@ -48,9 +47,12 @@ class TraceWrapper {
   private static final AttributeKey<List<String>> DB_STATEMENT_ARRAY_KEY =
       AttributeKey.stringArrayKey("db.statement");
   private static final AttributeKey<String> DB_TABLE_NAME_KEY = AttributeKey.stringKey("db.table");
-  private static final AttributeKey<String> GCP_CLIENT_SERVICE_KEY = AttributeKey.stringKey("gcp.client.service");
-  private static final AttributeKey<String> GCP_CLIENT_VERSION_KEY = AttributeKey.stringKey("gcp.client.version");
-  private static final AttributeKey<String> GCP_CLIENT_REPO_KEY = AttributeKey.stringKey("gcp.client.repo");
+  private static final AttributeKey<String> GCP_CLIENT_SERVICE_KEY =
+      AttributeKey.stringKey("gcp.client.service");
+  private static final AttributeKey<String> GCP_CLIENT_VERSION_KEY =
+      AttributeKey.stringKey("gcp.client.version");
+  private static final AttributeKey<String> GCP_CLIENT_REPO_KEY =
+      AttributeKey.stringKey("gcp.client.repo");
   private static final AttributeKey<String> THREAD_NAME_KEY = AttributeKey.stringKey("thread.name");
 
   private final Tracer openCensusTracer;
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
index 09efa75b51..986c5bbfac 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
@@ -873,8 +873,12 @@ private static void verifyCommonAttributes(SpanData span) {
     assertEquals(span.getAttributes().get(AttributeKey.stringKey("instance.name")), "my-instance");
     assertEquals(span.getAttributes().get(AttributeKey.stringKey("db.name")), "my-database");
     assertEquals(span.getAttributes().get(AttributeKey.stringKey("gcp.service.name")), "Spanner");
-    assertEquals(span.getAttributes().get(AttributeKey.stringKey("gcp.client.repo")), "googleapis/java-spanner");
-    assertEquals(span.getAttributes().get(AttributeKey.stringKey("gcp.client.version")), GaxProperties.getLibraryVersion(TraceWrapper.class));
+    assertEquals(
+        span.getAttributes().get(AttributeKey.stringKey("gcp.client.repo")),
+        "googleapis/java-spanner");
+    assertEquals(
+        span.getAttributes().get(AttributeKey.stringKey("gcp.client.version")),
+        GaxProperties.getLibraryVersion(TraceWrapper.class));
   }
 
   private static void verifyTableAttributes(SpanData span) {