Skip to content

Commit 7871527

Browse files
chore: fix clirr errors for the google-cloud-bigtable-stats module (#2131)
* Fix clirr errors. * Change clirr exception to method removal instead of method return type change. * Fix inner class ignore syntax for clirr. * Fix missing field with clirr. * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 5ca622d commit 7871527

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
5050
If you are using Gradle 5.x or later, add this to your dependencies:
5151

5252
```Groovy
53-
implementation platform('com.google.cloud:libraries-bom:26.32.0')
53+
implementation platform('com.google.cloud:libraries-bom:26.33.0')
5454
5555
implementation 'com.google.cloud:google-cloud-bigtable'
5656
```
5757
If you are using Gradle without BOM, add this to your dependencies:
5858

5959
```Groovy
60-
implementation 'com.google.cloud:google-cloud-bigtable:2.33.0'
60+
implementation 'com.google.cloud:google-cloud-bigtable:2.34.0'
6161
```
6262

6363
If you are using SBT, add this to your dependencies:
6464

6565
```Scala
66-
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.33.0"
66+
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.34.0"
6767
```
6868
<!-- {x-version-update-end} -->
6969

@@ -609,7 +609,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
609609
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
610610
[stability-image]: https://img.shields.io/badge/stability-stable-green
611611
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-bigtable.svg
612-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.33.0
612+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.34.0
613613
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
614614
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
615615
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

google-cloud-bigtable-stats/clirr-ignored-differences.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,17 @@
1919
<className>com/google/cloud/bigtable/stats/StatsRecorderWrapper</className>
2020
<method>void putBatchRequestThrottled(long)</method>
2121
</difference>
22+
<!-- Internal API is updated -->
23+
<difference>
24+
<differenceType>7005</differenceType>
25+
<className>com/google/cloud/bigtable/stats/StatsRecorderWrapperForConnection</className>
26+
<method>*StatsRecorderWrapperForConnection*</method>
27+
<to>*</to>
28+
</difference>
29+
<!-- Internal API is updated -->
30+
<difference>
31+
<differenceType>7002</differenceType>
32+
<className>com/google/cloud/bigtable/stats/ConsumerEnvironmentUtils$ResourceUtilsWrapper</className>
33+
<method>*detectResource*</method>
34+
</difference>
2235
</differences>

google-cloud-bigtable-stats/src/main/java/com/google/cloud/bigtable/stats/ConsumerEnvironmentUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ public static void setResourceUtilsWrapper(ResourceUtilsWrapper newResourceUtils
3434
}
3535

3636
public static boolean isEnvGce() {
37-
Resource resource = resourceUtilsWrapper.detectResource();
37+
Resource resource = resourceUtilsWrapper.detectOpenCensusResource();
3838
return Objects.equals(resource.getType(), HostResource.TYPE)
3939
&& Objects.equals(
4040
resource.getLabels().get(CloudResource.PROVIDER_KEY), CloudResource.PROVIDER_GCP);
4141
}
4242

4343
public static boolean isEnvGke() {
44-
Resource resource = resourceUtilsWrapper.detectResource();
44+
Resource resource = resourceUtilsWrapper.detectOpenCensusResource();
4545
return Objects.equals(resource.getType(), ContainerResource.TYPE)
4646
&& Objects.equals(
4747
resource.getLabels().get(CloudResource.PROVIDER_KEY), CloudResource.PROVIDER_GCP);
@@ -50,7 +50,7 @@ public static boolean isEnvGke() {
5050
// We wrap the static ResourceUtils.detectResource() method in a non-static method for mocking.
5151
@VisibleForTesting
5252
public static class ResourceUtilsWrapper {
53-
public Resource detectResource() {
53+
public Resource detectOpenCensusResource() {
5454
return ResourceUtils.detectResource();
5555
}
5656
}

google-cloud-bigtable-stats/src/test/java/com/google/cloud/bigtable/stats/BigtableCreateTimeSeriesExporterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void testTimeSeriesForMetricWithGceResource() {
161161
ConsumerEnvironmentUtils.ResourceUtilsWrapper resourceUtilsWrapperMock =
162162
Mockito.mock(ConsumerEnvironmentUtils.ResourceUtilsWrapper.class);
163163
ConsumerEnvironmentUtils.setResourceUtilsWrapper(resourceUtilsWrapperMock);
164-
Mockito.when(resourceUtilsWrapperMock.detectResource())
164+
Mockito.when(resourceUtilsWrapperMock.detectOpenCensusResource())
165165
.thenReturn(
166166
Resource.create(
167167
HostResource.TYPE,
@@ -239,7 +239,7 @@ public void testTimeSeriesForMetricWithGkeResource() {
239239
Mockito.mock(ConsumerEnvironmentUtils.ResourceUtilsWrapper.class);
240240
ConsumerEnvironmentUtils.setResourceUtilsWrapper(resourceUtilsWrapperMock);
241241

242-
Mockito.when(resourceUtilsWrapperMock.detectResource())
242+
Mockito.when(resourceUtilsWrapperMock.detectOpenCensusResource())
243243
.thenReturn(
244244
Resource.create(
245245
ContainerResource.TYPE,

0 commit comments

Comments
 (0)