From 6c1107e19f2e22d96b4d5ae2efefee72d2e2d5d6 Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Fri, 17 Dec 2021 15:49:05 +1100
Subject: [PATCH 1/2] deps: update OpenCensus API to 0.30.0

---
 google-cloud-spanner/pom.xml        | 3 +++
 samples/install-without-bom/pom.xml | 2 +-
 samples/snapshot/pom.xml            | 2 +-
 samples/snippets/pom.xml            | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 9df289cfba6..2b218d0c533 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -16,6 +16,7 @@
   <properties>
     <site.installationModule>google-cloud-spanner</site.installationModule>
     <skipUTs>false</skipUTs>
+    <opencensus.version>0.30.0</opencensus.version>
   </properties>
 
 
@@ -181,10 +182,12 @@
     <dependency>
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-api</artifactId>
+      <version>${opencensus.version}</version>
     </dependency>
     <dependency>
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-contrib-grpc-util</artifactId>
+      <version>${opencensus.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 46b615b5cf2..821fa1673cc 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -21,7 +21,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <opencensus.version>0.28.3</opencensus.version>
+    <opencensus.version>0.30.0</opencensus.version>
     <trace.version>1.2.10</trace.version>
     <cloudmonitoring.version>2.0.11</cloudmonitoring.version>
   </properties>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 7bf6d979598..16be82f5baf 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -21,7 +21,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <opencensus.version>0.28.3</opencensus.version>
+    <opencensus.version>0.30.0</opencensus.version>
     <trace.version>1.2.10</trace.version>
     <cloudmonitoring.version>2.0.11</cloudmonitoring.version>
   </properties>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 8fbf7b1b9e2..e9d68e2967c 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -23,7 +23,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <opencensus.version>0.28.3</opencensus.version>
+    <opencensus.version>0.30.0</opencensus.version>
   </properties>
 
 

From 7945209cb37a693d4229f76a67c963b82c45d29a Mon Sep 17 00:00:00 2001
From: Thiago Nunes <thiagotnunes@google.com>
Date: Fri, 17 Dec 2021 21:36:27 +1100
Subject: [PATCH 2/2] test: fix instance admin test

The list instance filter was matching several instances, because they
contained the same prefix. We now perform an exact match instead.
---
 .../java/com/google/cloud/spanner/it/ITInstanceAdminTest.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
index 340f0a5958c..f4a43a87481 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
@@ -69,9 +69,7 @@ public void listInstances() {
     Instance instance =
         Iterators.getOnlyElement(
             instanceClient
-                .listInstances(
-                    Options.filter(
-                        "name:instances/" + env.getTestHelper().getInstanceId().getInstance()))
+                .listInstances(Options.filter("name=" + env.getTestHelper().getInstanceId()))
                 .iterateAll()
                 .iterator());
     assertThat(instance.getId()).isEqualTo(env.getTestHelper().getInstanceId());