Skip to content

deps(3.3.x): update OpenCensus API to 0.30.0 #1610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2021
Merged

deps(3.3.x): update OpenCensus API to 0.30.0 #1610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1107e
deps: update OpenCensus API to 0.30.0
thiagotnunes Dec 17, 2021
7945209
test: fix instance admin test
thiagotnunes Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<properties>
<site.installationModule>google-cloud-spanner</site.installationModule>
<skipUTs>false</skipUTs>
<opencensus.version>0.30.0</opencensus.version>
</properties>


Expand Down Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITInstanceAdminTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Copy link
Collaborator

@olavloite olavloite Dec 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be "name:" + env.getTestHelper().getInstanceId()

See https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1#google.spanner.admin.instance.v1.ListInstancesRequest

Copy link
Contributor Author

@thiagotnunes thiagotnunes Dec 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem here is that : operator is a contains and we have 3 instances that start with spanner-testing. That is why the test is failing.

By using the = operator we do an exact match instead, having a single instance returned. More on operators here: https://cloud.google.com/sdk/gcloud/reference/topic/filters

.iterateAll()
.iterator());
assertThat(instance.getId()).isEqualTo(env.getTestHelper().getInstanceId());
Expand Down
2 changes: 1 addition & 1 deletion samples/install-without-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/snapshot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/snippets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down