Merge 4f56284 into 7f4ccf2

thiagotnunes · web-flow · commit 4e6408925d25 · 2021-02-23T05:31:00.000Z
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java
@@ -511,16 +511,17 @@ public void testAdminRequestsLimitExceededRetryAlgorithm() {
   @Test
   public void testDefaultUserAgent() {
     final SpannerOptions options = createSpannerOptions();
-    final Spanner spanner = options.getService();
-    final DatabaseClient databaseClient =
-        spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
+    try (final Spanner spanner = options.getService()) {
+      final DatabaseClient databaseClient =
+          spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));
 
-    try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) {
-      rs.next();
-    }
+      try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) {
+        rs.next();
+      }
 
-    assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER)))
-        .contains(defaultUserAgent);
+      assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER)))
+          .contains(defaultUserAgent);
+    }
   }
 
   @Test
