Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit fabe186

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents 4961996 + 50c3fe2 commit fabe186

4 files changed

Lines changed: 72 additions & 48 deletions

File tree

  • google-cloud-bigtable-deps-bom
  • google-cloud-bigtable-emulator-core
  • google-cloud-bigtable

‎google-cloud-bigtable-deps-bom/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1717

1818
<packaging>pom</packaging>
19+
<name>Google Cloud Bigtable Dependency BOM</name>
1920
<description>
2021
A BOM that describes all of the dependencies used by google-cloud-bigtable. It's
2122
mainly intended to be used by java-bigtable-hbase to align dependencies

‎google-cloud-bigtable-emulator-core/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<groupId>com.google.cloud</groupId>
1010
<version>2.60.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
1111
</parent>
12+
<name>Google Cloud Java - Bigtable Emulator Core</name>
1213

1314
<artifactId>google-cloud-bigtable-emulator-core</artifactId>
1415
<version>0.197.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-emulator:current} -->

‎google-cloud-bigtable/pom.xml‎

Lines changed: 63 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,69 @@
349349
</dependencies>
350350

351351
<profiles>
352+
<profile>
353+
<id>enable-enforcer-rules</id>
354+
<activation>
355+
<property>
356+
<!-- By default, Maven runs the enforcer rules. The shared release script
357+
may pass profile name that doesn't exist in this project. Let's ignore
358+
the enforcer rule (requireProfileIdsExist) in that case, leveraging
359+
the presence of the performRelease property. -->
360+
<name>!performRelease</name>
361+
</property>
362+
</activation>
363+
<build>
364+
<plugins>
365+
<plugin>
366+
<groupId>org.apache.maven.plugins</groupId>
367+
<artifactId>maven-enforcer-plugin</artifactId>
368+
<version>3.5.0</version>
369+
<executions>
370+
<!-- Prevent users from mistyping a profile name -->
371+
<execution>
372+
<id>enforce-valid-profile</id>
373+
<configuration>
374+
<rules>
375+
<requireProfileIdsExist/>
376+
</rules>
377+
</configuration>
378+
<goals>
379+
<goal>enforce</goal>
380+
</goals>
381+
</execution>
382+
<!-- Ensure that greatest version of each transitive dependency got selected -->
383+
<execution>
384+
<id>enforce-dependency-upper-bound</id>
385+
<configuration>
386+
<rules>
387+
<requireUpperBoundDeps/>
388+
</rules>
389+
</configuration>
390+
<goals>
391+
<goal>enforce</goal>
392+
</goals>
393+
</execution>
394+
</executions>
395+
<!--
396+
workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132
397+
Remove when it's fixed upstream.
398+
-->
399+
<dependencies>
400+
<dependency>
401+
<groupId>org.codehaus.mojo</groupId>
402+
<artifactId>extra-enforcer-rules</artifactId>
403+
<version>1.8.0</version>
404+
</dependency>
405+
<dependency>
406+
<groupId>org.apache.maven.shared</groupId>
407+
<artifactId>maven-dependency-tree</artifactId>
408+
<version>3.3.0</version>
409+
</dependency>
410+
</dependencies>
411+
</plugin>
412+
</plugins>
413+
</build>
414+
</profile>
352415
<profile>
353416
<id>enable-verbose-grpc-logs</id>
354417
<properties>
@@ -668,54 +731,6 @@
668731
</execution>
669732
</executions>
670733
</plugin>
671-
<plugin>
672-
<groupId>org.apache.maven.plugins</groupId>
673-
<artifactId>maven-enforcer-plugin</artifactId>
674-
<version>3.5.0</version>
675-
<executions>
676-
<!-- Prevent users from mistyping a profile name -->
677-
<execution>
678-
<id>enforce-valid-profile</id>
679-
<configuration>
680-
<rules>
681-
<requireProfileIdsExist/>
682-
</rules>
683-
</configuration>
684-
<goals>
685-
<goal>enforce</goal>
686-
</goals>
687-
</execution>
688-
<!-- Ensure that greatest version of each transitive dependency got selected -->
689-
<execution>
690-
<id>enforce-dependency-upper-bound</id>
691-
<configuration>
692-
<rules>
693-
<requireUpperBoundDeps/>
694-
</rules>
695-
</configuration>
696-
<goals>
697-
<goal>enforce</goal>
698-
</goals>
699-
</execution>
700-
</executions>
701-
<!--
702-
workaround for https://github.com/mojohaus/extra-enforcer-rules/issues/132
703-
Remove when it's fixed upstream.
704-
-->
705-
<dependencies>
706-
<dependency>
707-
<groupId>org.codehaus.mojo</groupId>
708-
<artifactId>extra-enforcer-rules</artifactId>
709-
<version>1.8.0</version>
710-
</dependency>
711-
<dependency>
712-
<groupId>org.apache.maven.shared</groupId>
713-
<artifactId>maven-dependency-tree</artifactId>
714-
<version>3.3.0</version>
715-
</dependency>
716-
</dependencies>
717-
</plugin>
718-
719734
<plugin>
720735
<groupId>org.apache.maven.plugins</groupId>
721736
<artifactId>maven-dependency-plugin</artifactId>

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/Util.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.bigtable.v2.AuthorizedViewName;
2727
import com.google.bigtable.v2.CheckAndMutateRowRequest;
2828
import com.google.bigtable.v2.GenerateInitialChangeStreamPartitionsRequest;
29+
import com.google.bigtable.v2.MaterializedViewName;
2930
import com.google.bigtable.v2.MutateRowRequest;
3031
import com.google.bigtable.v2.MutateRowsRequest;
3132
import com.google.bigtable.v2.ReadChangeStreamRequest;
@@ -121,9 +122,11 @@ static TagValue extractStatusFromFuture(Future<?> future) {
121122
static String extractTableId(Object request) {
122123
String tableName = null;
123124
String authorizedViewName = null;
125+
String materializedViewName = null;
124126
if (request instanceof ReadRowsRequest) {
125127
tableName = ((ReadRowsRequest) request).getTableName();
126128
authorizedViewName = ((ReadRowsRequest) request).getAuthorizedViewName();
129+
materializedViewName = ((ReadRowsRequest) request).getMaterializedViewName();
127130
} else if (request instanceof MutateRowsRequest) {
128131
tableName = ((MutateRowsRequest) request).getTableName();
129132
authorizedViewName = ((MutateRowsRequest) request).getAuthorizedViewName();
@@ -133,6 +136,7 @@ static String extractTableId(Object request) {
133136
} else if (request instanceof SampleRowKeysRequest) {
134137
tableName = ((SampleRowKeysRequest) request).getTableName();
135138
authorizedViewName = ((SampleRowKeysRequest) request).getAuthorizedViewName();
139+
materializedViewName = ((SampleRowKeysRequest) request).getMaterializedViewName();
136140
} else if (request instanceof CheckAndMutateRowRequest) {
137141
tableName = ((CheckAndMutateRowRequest) request).getTableName();
138142
authorizedViewName = ((CheckAndMutateRowRequest) request).getAuthorizedViewName();
@@ -150,6 +154,9 @@ static String extractTableId(Object request) {
150154
if (authorizedViewName != null && !authorizedViewName.isEmpty()) {
151155
return AuthorizedViewName.parse(authorizedViewName).getTable();
152156
}
157+
if (materializedViewName != null && !materializedViewName.isEmpty()) {
158+
return MaterializedViewName.parse(materializedViewName).getMaterializedView();
159+
}
153160
return "<unspecified>";
154161
}
155162

0 commit comments

Comments
 (0)